lib/jsup.rb in jsup-0.1.0 vs lib/jsup.rb in jsup-0.1.1

@@ -1,11 +1,12 @@
 require 'version'
+require 'attribute'
 require 'oj'
 
 class Jsup
 
-  attr_reader :attributes
+  attr_reader :attributes, :object
 
   Oj.default_options = {
     allow_blank: true,
     use_as_json: true
   }
@@ -28,20 +29,35 @@
 
   def method_missing(method, *args, &block)
     if args.length == 1
       add_attribute(method.to_s, args.first)
     elsif args.length > 1
-      object = args.first
+      @object = args.first
       attrs = args[1..args.length]
-      attrs.each do |attr|
-        add_attribute(attr.to_s, object.public_send(attr)) if object.respond_to?(attr)
+      if object.is_a?(Hash)
+        extract_from_hash(attrs)
+      else
+        extract_from_object(attrs)
       end
     elsif block_given?
       nested_attributes = Jsup.new.tap { |json| yield json }.attributes
       add_attribute(method.to_s, nested_attributes)
     end
   end
 
+  def extract_from_object(attrs)
+    attrs.each do |attr|
+      add_attribute(attr.to_s, object.public_send(attr)) if object.respond_to?(attr)
+    end
+  end
+
+  def extract_from_hash(attrs)
+    attrs.each do |attr|
+      add_attribute(attr.to_s, object[attr])
+    end
+  end
+
   def add_attribute(method, attribute)
+    #attributes[method] = Attribute.new(attribute)
     attributes[method] = attribute
   end
 end