factor 0.1.04 → 0.1.05

data/lib/client/client.rb

@@ -12,6 +12,12 @@ module Factor
     
       def initialize(host="http://factor.io")
         @host=host
+
+        if ENV["FACTOR_HOST"]
+          @host=ENV['FACTOR_HOST']
+          code.call("Using #{@host} as host address")
+        end
+
       end
     
       def register(email,password)
@@ -77,11 +83,10 @@ module Factor
           # unzip download zip into unzipped directory
           unzip(temp_file.path,unzip_dir)
         
-          code.call(channel.to_json)
           filename = unzip_dir + "/" + channel['module_name'].split(/(?=[A-Z])/).map{ |x| x.downcase }.join('_') + ".rb"
           
-          code.call("loading '#{filename}' into engine")
-          engine.load_channel(filename)
+          code.call("loading '#{channel["name"]}' into engine")
+          engine.load_channel(filename, channel)
         end
       
       

data/lib/runtime/engine.rb

@@ -12,6 +12,7 @@ module Factor
       # Engine needs modules that contain the code, workflows to run, and message bus for communication
       def initialize(username,token)
         @channel_modules=Hash.new
+        @channel_definitions=Array.new
         @workflows = Hash.new
         @message_bus = MessageBus.new(username,token)
         @credentials = Hash.new
@@ -26,12 +27,14 @@ module Factor
       # the filename is lowercase with "_" for spaces
       # and the module inside must be camal cased to match
       # once loaded it is in the channel_modules Hash
-      def load_channel filename
+      def load_channel filename, definition
         filename = File.absolute_path(File.expand_path(filename.path)) if filename.is_a?(File) # just in case someone passes in a File not a String (i.e. me)
         require filename
-        channel_module_name = File.basename(filename).gsub('.rb','').split('_').map{|ea| ea.capitalize}.join('')
+        # channel_module_name = File.basename(filename).gsub('.rb','').split('_').map{|ea| ea.capitalize}.join('')
+        channel_module_name = definition['module_name']
         channel_module= self.class.const_get(channel_module_name)
         @channel_modules[channel_module_name]=channel_module  
+        @channel_definitions << definition
       end
     
       def load_credentials credentials
@@ -80,7 +83,7 @@ module Factor
                   target = activity["target"]
                   params_template = activity["params"]
               
-                  if match(target)              
+                  # if match(target)              
                     values = message.body.merge(@credentials)
 
                     # this maps the input values passed in with the templated defined in the workflow
@@ -89,7 +92,7 @@ module Factor
                     response_message = message.respond(event.params,event.class.name.split("::").last)
               
                     @message_bus.send response_message
-                  end
+                  # end
                 end
               else
                 # workflow doesn't exist
@@ -103,15 +106,28 @@ module Factor
         end
       end
 
-      def call_channel_method(channel_name,class_name,params)
-        channel_module = @channel_modules[channel_name]
-        command = channel_module.const_get(class_name)
-        puts "command: #{command.inspect}"
+      def call_channel_method(channel_name,action_name,params)
+        channel_module_name = get_channel_module(channel_name)
+        channel_module = @channel_modules[channel_module_name]
+        action_class = get_action_class(action_name)
+        command = channel_module.const_get(action_class)
         command.new.do_work(params)
       end
       
       private 
       
+      def get_channel_module(channel_name)
+        @channel_definitions.select { |channel_definition| channel_definition['name']==channel_name }.first['module_name']
+      end
+
+      def get_action_class(action_name)
+        @channel_definitions.each do |channel_definition|
+          channel_definition['actions'].each do |action|
+            return action["class_name"] if action['name']==action_name
+          end
+        end
+      end
+
       def render_template(source,values)
         #params = Hash.new
         
@@ -130,14 +146,14 @@ module Factor
         params
       end
       
-      def match(target)
-        return true if target==nil || target==""
-        facts={}
-        #Facter.each {|k,v| facts[k]=v}
-        @tags.each {|k,v| facts[k]=v}
-        key,value=target.split("=")
-        facts[key]==value
-      end
+      # def match(target)
+      #   return true if target==nil || target==""
+      #   facts={}
+      #   #Facter.each {|k,v| facts[k]=v}
+      #   @tags.each {|k,v| facts[k]=v}
+      #   key,value=target.split("=")
+      #   facts[key]==value
+      # end
       
       
     end

data/lib/runtime/message.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'json/pure'
+require 'json'
 
 module Factor
   module Runtime

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.1.04
+  version: 0.1.05
   prerelease: 
 platform: ruby
 authors:
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement