resque_safe 0.0.3 → 0.0.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTUwNmQzNzJmM2QyMjdmMDRjODJlZWZjMGRlMjM5MzJjNWVkMTk0MA==
+    ZDk5Yjk2YmY0NjAxMTJlZTU0NWMxY2YxZDUxY2I4OTMxMTc2MmNiMw==
   data.tar.gz: !binary |-
-    MjYzY2ZhYzIxMGM1ZTRiYjY2MmRjZTE4NTkzNDBlYTdmOWQ5MzQ2Yw==
+    MDIyODhkYjA2YTc0Y2I1M2M1Y2NlZDkyNDhmYWZiMWJiMzhiNGEwYw==
 SHA512:
   metadata.gz: !binary |-
-    ZGFjNGEwYmFhNzRkMDI4NjE5NDQxNzcwZTA1OTExMzUzMjFiODNiN2RhZGIy
-    ODU4MWI1OTdhNTU4Y2FkYzZlZjFmNWFmYzg3MjEzNmY2MTk4NjhkZTBkNDRl
-    NWExMTFmOGU2ZjhkMmU0OWVhYWI0ZWM1MDFmYTJhM2MxMDc4YzY=
+    NTQzYWVjZTg5ZWVmM2YzYzQ5MWMzNWI0NWU4YTkwNzMwNzViYzNkZGM5OWYy
+    ZmRiMjE5ZWYxN2YxNzgzNTEyZDE4YmQzYjgxZDAxYzk1NTM3OGNhMGQ5ZTJl
+    M2QwMWY2ZWY2MGZlOTIyYWI2MTFmMTQ1OTY0Zjg5NzczYmVkYTM=
   data.tar.gz: !binary |-
-    YTc4ZGQ3ZDQ5Yzc3NDlmMjE5NDI4YTJjZjk0ZTM5NmZkNDYzNzMxNDU3MWU5
-    NmUwMDI0YmExZTMwMjkzMDUwMzZkODJjNTNlZGFlMzAyM2E5ZDBmNDVhOWNh
-    YzUzMWRmZWJhODIzZjE2YThjNDQ3ZWY2OGM2Njk4MDE1NDc1MDY=
+    OGFlZDIzMjkyYzI5ZGU0MDA4NDQwODA0MTUxOGQ3ZDA2ZjRmNmJmYzBlNGUx
+    OTdjNDQ2ZTY5M2U3YmVhYjI5NDliNTNmMjUxZWIyODMzMmE3ZWZlZjBkNDBi
+    ZDJhMTVmODA4MzU0MDRkNDAwOWMwY2U1ODg4NDIyZDc5YzBhOTI=

data/lib/resque_safe/convert_from_hash.rb

@@ -1,6 +1,9 @@
+
 module ResqueSafe
   module ConvertFromHash
-    def to_objects(inbound_hash)
+    def args_to_objects(inbound_hash)
+      raise NotImplementedError.new "This isn't completed, not sure how to set it up"
+
       objects = {}
       inbound_hash.each do |klass_name,value|
         klass_name, value = klass_name.to_s, value.to_s
@@ -37,30 +40,60 @@ module ResqueSafe
       end
     end
 
+    def set_instance_args_for_class(mailer_instance, args)
+       #take each key, if a model, make it an @#{model} = model.find(value)
+      #else make it a @#{name}=#{value}
+
+      args.each do |klass_name,value|
+        klass_name, value = klass_name.to_s, value.to_s
+        klassified_klass = klass_name.classify
+
+        if Object.const_defined?(klassified_klass) &&
+          known_models.include?(klassified_klass.constantize)
+
+          set_instance_for_active_record_mailer_instance(mailer_instance, klassified_klass, value)
+        else
+          set_instance_for_other_mialer_instance(mailer_instance, klass_name, value)
+        end
+      end
+    end
+
     private
-    def return_active_record(klass_name, value)
-      return self.instance_eval("#{klass_name.constantize}.find(#{value})")
+    def set_instance_for_active_record(klass_name, value)
+      set_instance_for_active_record_mailer_instance(self, klass_name, value)
     end
 
-    def return_other_object(klass_name, value)
+    def set_instance_for_active_record_mailer_instance(mailer_instance, klass_name, value)
+      mailer_instance.instance_eval("@#{klass_name.downcase}= #{klass_name.constantize}.find(#{value})")
+    end
+
+    def set_instance_for_other(instance_name, value)
+      set_instance_for_other_mialer_instance(self, instance_name, value)
+    end
+
+
+    def set_instance_for_other_mialer_instance(mailer_instance, instance_name, value)
       if value.is_a?(String)
-        return self.instance_eval("%|#{value}|")
+        mailer_instance.instance_eval("@#{instance_name} = %|#{value}|")
       else
-        return self.instance_eval(":#{instance_name} => #{value}")
+        mailer_instance.instance_eval("@#{instance_name}=#{value}")
       end
-
     end
 
-    def set_instance_for_active_record(klass_name, value)
-      self.instance_eval("@#{klass_name}= #{klass_name.constantize}.find(#{value})")
+    def return_active_record(klass_name, value)
+      raise NotImplementedError.new "This isn't completed, not sure how to set it up"
+      return self.instance_eval("#{klass_name.constantize}.find(#{value})")
     end
 
-    def set_instance_for_other(instance_name, value)
+    def return_other_object(klass_name, value)
+      raise NotImplementedError.new "This isn't completed, not sure how to set it up"
       if value.is_a?(String)
-        self.instance_eval("@#{instance_name} = %|#{value}|")
+        return self.instance_eval("%|#{value}|")
       else
-        self.instance_eval("@#{instance_name}=#{value}")
+        return self.instance_eval(":#{instance_name} => #{value}")
       end
+
     end
+
   end
 end

data/lib/resque_safe/convert_to_hash.rb

@@ -5,7 +5,7 @@ module ResqueSafe
 
       args = args.flatten if args.respond_to?(:flatten)
 
-      args.each do |arg|
+      args.each do |arg, index|
         next if arg.blank?
         arg_class = arg.class.name
         if arg.is_a?(Hash)
@@ -18,6 +18,8 @@ module ResqueSafe
           end
         elsif known_models.include?(arg_class) || arg.class.respond_to?(:column_names)
           th[arg_class.underscore.to_sym] = arg.id
+        elsif arg.is_a?(String)
+          th[index] = v
         else
           raise ArgumentError.new("Unknown #{arg_class} passed to resque safe. \n Object #{arg.inspect} \n\n Args #{args} \n\n Known Models #{known_models}")
         end

data/lib/resque_safe.rb

@@ -3,7 +3,8 @@ require 'resque_safe/convert_from_hash'
 require 'resque_safe/util'
 
 module ResqueSafe
-  extend Util
-  extend ConvertFromHash
-  extend ConvertToHash
+  extend ResqueSafe::Util
+  extend ResqueSafe::ConvertFromHash
+  extend ResqueSafe::ConvertToHash
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_safe
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5.5
 platform: ruby
 authors:
 - Robert R. Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport