Merge branch 'release/v0.0.3'

Author: Michael L. Artz

lib/rflow.rb

@@ -16,9 +16,10 @@
 require 'rflow/components'
 require 'rflow/connections'
 
-include Log4r
 
 class RFlow
+  include Log4r
+
   class Error < StandardError; end
 
   LOG_PATTERN_FORMAT = '%l [%d] %c (%p) - %M'
@@ -45,7 +46,7 @@ class << self
 #   end
 
   def self.initialize_logger(log_file_path, log_level='INFO', include_stdout=nil)
-    rflow_logger = Logger.new 'rflow.log'
+    rflow_logger = Logger.new((configuration['rflow.application_name'] rescue File.basename(log_file_path)))
     rflow_logger.level = LNAMES.index log_level
     # TODO: Remove this once all the logging puts in its own
     # Class.Method names.
@@ -351,7 +352,7 @@ def self.run(config_database_path, daemonize=nil)
     end
 
     Dir.chdir configuration['rflow.application_directory_path']
-
+    
     initialize_logger(configuration['rflow.log_file_path'], configuration['rflow.log_level'], !daemonize)
 
     application_name = configuration['rflow.application_name']

lib/rflow/configuration.rb

@@ -1,9 +1,4 @@
 require 'rflow/util'
-require 'rflow/configuration/setting'
-require 'rflow/configuration/component'
-require 'rflow/configuration/port'
-require 'rflow/configuration/connection'
-
 
 class RFlow
 
@@ -23,6 +18,12 @@ class Configuration
     class ConfigurationInvalid < StandardError; end
 
 
+    # A class to hold DB config and connection information
+    class ConfigDB < ActiveRecord::Base
+        self.abstract_class = true
+    end
+    
+    
     # A collection class for data extensions that supports a naive
     # prefix-based 'inheritance' on lookup.  When looking up a key
     # with [] all existing keys will be examined to determine if the
@@ -131,14 +132,16 @@ def self.add_available_component(component)
     end
 
 
-    # Connect to the configuration sqlite database.
+    # Connect to the configuration sqlite database, but use the
+    # ConfigDB subclass to protect the connection information from
+    # other ActiveRecord apps (i.e. Rails)
     def self.establish_config_database_connection(config_database_path)
       RFlow.logger.debug "Establishing connection to config database (#{Dir.getwd}) '#{config_database_path}'"
       ActiveRecord::Base.logger = RFlow.logger
-      ActiveRecord::Base.establish_connection(:adapter => "sqlite3",
-                                              :database  => config_database_path)
+      ConfigDB.establish_connection(:adapter => "sqlite3",
+                                    :database  => config_database_path)
     end
-
+    
 
     # Using default ActiveRecord migrations, attempt to migrate the
     # database to the latest version.
@@ -162,7 +165,12 @@ def self.process_config_file(config_file_path)
     # version, and process a config file if provided.
     def self.initialize_database(config_database_path, config_file_path=nil)
       RFlow.logger.debug "Initializing config database (#{Dir.getwd}) '#{config_database_path}'"
-      establish_config_database_connection(config_database_path)
+
+      RFlow.logger.debug "Establishing connection to config database (#{Dir.getwd}) '#{config_database_path}'"
+      ActiveRecord::Base.logger = RFlow.logger
+      ActiveRecord::Base.establish_connection(:adapter => "sqlite3",
+                                              :database  => config_database_path)
+
       migrate_database
 
       expanded_config_file_path = File.expand_path config_file_path if config_file_path
@@ -272,5 +280,11 @@ def available_components
   end
 end
 
+# Load the models
+require 'rflow/configuration/setting'
+require 'rflow/configuration/component'
+require 'rflow/configuration/port'
+require 'rflow/configuration/connection'
+
 # Incorporate various config file processors
 require 'rflow/configuration/ruby_dsl'

lib/rflow/configuration/component.rb

@@ -3,7 +3,7 @@
 
 class RFlow
   class Configuration
-    class Component < ActiveRecord::Base
+    class Component < ConfigDB
       include UUIDKeyed
       include ActiveModel::Validations
 

lib/rflow/configuration/connection.rb

@@ -3,7 +3,7 @@
 
 class RFlow
   class Configuration
-    class Connection < ActiveRecord::Base
+    class Connection < ConfigDB
       class ConnectionInvalid < StandardError; end
 
       include UUIDKeyed

lib/rflow/configuration/port.rb

@@ -3,7 +3,7 @@
 
 class RFlow
   class Configuration
-    class Port < ActiveRecord::Base
+    class Port < ConfigDB
       include UUIDKeyed
       include ActiveModel::Validations
 

lib/rflow/configuration/ruby_dsl.rb

@@ -135,10 +135,10 @@ def process_connection_spec(connection_spec)
         input_port.save!
 
         # Create a unique ZMQ address
-        zmq_address = "ipc://run/rflow.#{output_component.uuid}.#{output_port.uuid}"
-        if connection_spec[:output_port_key]
-          zmq_address << ".#{connection_spec[:output_port_key].gsub(/[^\w]/, '').downcase}"
-        end
+#        zmq_address = "ipc://run/rflow.#{output_component.uuid}.#{output_port.uuid}"
+#        if connection_spec[:output_port_key]
+#          zmq_address << ".#{connection_spec[:output_port_key].gsub(/[^\w]/, '').downcase}"
+#        end
 
         connection = RFlow::Configuration::ZMQConnection.new(:name => connection_spec[:name],
                                                              :output_port_key => connection_spec[:output_port_key],

lib/rflow/configuration/setting.rb

@@ -3,7 +3,7 @@
 
 class RFlow
   class Configuration
-    class Setting < ActiveRecord::Base
+    class Setting < ConfigDB
       class SettingInvalid < StandardError; end
 
       include ActiveModel::Validations
@@ -15,8 +15,8 @@ class SettingInvalid < StandardError; end
         'rflow.application_name' => 'rflow',
 
         'rflow.application_directory_path' => '.',
-        'rflow.pid_directory_path'         => lambda {File.join(Setting['rflow.application_directory_path'], 'run')},
-        'rflow.log_directory_path'         => lambda {File.join(Setting['rflow.application_directory_path'], 'log')},
+        'rflow.pid_directory_path'         => 'run', #lambda {File.join(Setting['rflow.application_directory_path'], 'run')},
+        'rflow.log_directory_path'         => 'log', #lambda {File.join(Setting['rflow.application_directory_path'], 'log')},
 
         'rflow.log_file_path' => lambda {File.join(Setting['rflow.log_directory_path'], Setting['rflow.application_name'] + '.log')},
         'rflow.pid_file_path' => lambda {File.join(Setting['rflow.pid_directory_path'], Setting['rflow.application_name'] + '.pid')},
@@ -35,8 +35,10 @@ class SettingInvalid < StandardError; end
                    ]
 
 
-      validate :valid_directory_path, :if => :directory_path?
-      validate :valid_writable_path, :if => :directory_path?
+      # TODO: fix these validations, as they run without the
+      #application directory path context for subdirectories
+      #validate :valid_directory_path, :if => :directory_path?
+      #validate :valid_writable_path, :if => :directory_path?
 
       # TODO: Think about making this a regex check to pull in other,
       # externally-defined settings 

lib/rflow/connections/zmq_connection.rb

@@ -30,14 +30,14 @@ def zmq_context
 
       attr_accessor :socket
 
-      REQUIRED_OPTIONS = ['_socket_type', '_address', '_responsibility']
+      REQUIRED_OPTION_SUFFIXES = ['_socket_type', '_address', '_responsibility']
 
       def self.configuration_errors(configuration)
         # TODO: Normalize/validate configuration
         missing_config_elements = []
 
         ['input', 'output'].each do |direction_prefix|
-          REQUIRED_OPTIONS.each do |option_suffix|
+          REQUIRED_OPTION_SUFFIXES.each do |option_suffix|
             config_element = "#{direction_prefix}#{option_suffix}"
             unless configuration.include? config_element
               missing_config_elements << config_element

lib/rflow/version.rb

@@ -1,3 +1,3 @@
 class RFlow
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end # class RFlow

spec/fixtures/config.rb

@@ -6,6 +6,8 @@
   config.setting('rflow.log_level', 'DEBUG')
   config.setting('rflow.application_directory_path', '../tmp')
 
+  config.setting('rflow.application_name', 'testapp')
+  
   # Add schemas to the list of available.  Not convinced this is necessary
 #  config.schema('schemaname', 'schematype', 'schemadata')