attribution 0.3.2 → 0.4.0

data/attribution.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "attribution"
-  gem.version       = "0.3.2"
+  gem.version       = "0.4.0"
   gem.authors       = ["Paul Barry"]
   gem.email         = ["mail@paulbarry.com"]
   gem.description   = %q{Add attributes to Ruby objects}

data/lib/attribution/version.rb

@@ -1,3 +1,3 @@
 module Attribution
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/attribution.rb

@@ -9,16 +9,8 @@ module Attribution
     cls.extend(ClassMethods)
   end
 
-  def initialize(attrs={})
-    attrs = JSON.parse(attrs) if attrs.is_a?(String)
-    attrs.each do |k,v|
-      setter = "#{k}="
-      if respond_to?(setter)
-        send(setter, v)
-      else
-        instance_variable_set("@#{k}", v)
-      end
-    end
+  def initialize(attributes={})
+    self.attributes = attributes
   end
 
   # TODO: Use associations argument as a way to specify which associations should be included
@@ -29,6 +21,20 @@ module Attribution
     end
   end
 
+  def attributes=(attributes)
+    if attributes
+      attributes = JSON.parse(attributes) if attributes.is_a?(String)
+      attributes.each do |k,v|
+        setter = "#{k}="
+        if respond_to?(setter)
+          send(setter, v)
+        else
+          instance_variable_set("@#{k}", v)
+        end
+      end
+    end
+  end
+
   module ClassMethods
     def cast(obj)
       case obj
@@ -195,21 +201,26 @@ module Attribution
 
     def has_many(association_name)
       # foos
-      define_method(association_name) do
-        ivar = "@#{association_name}"
-        if instance_variable_defined?(ivar)
-          instance_variable_get(ivar)
-        else
-          # TODO: Support a more generic version of lazy-loading
-          begin
-            association_class = association_name.to_s.singularize.classify.constantize
-          rescue NameError => ex
-            raise ArgumentError.new("Association #{association_name} in #{self.class} is invalid because #{association_name.to_s.classify} does not exist")
-          end
+      define_method(association_name) do |*query|
 
-          if association_class.respond_to?(:all)
+        # TODO: Support a more generic version of lazy-loading
+        begin
+          association_class = association_name.to_s.singularize.classify.constantize
+        rescue NameError => ex
+          raise ArgumentError.new("Association #{association_name} in #{self.class} is invalid because #{association_name.to_s.classify} does not exist")
+        end
+
+        if query.empty? # Ex: Books.all, so we want to cache it.
+          ivar = "@#{association_name}"
+          if instance_variable_defined?(ivar)
+            instance_variable_get(ivar)
+          elsif association_class.respond_to?(:all)
             instance_variable_set(ivar, Array(association_class.all("#{self.class.name.underscore}_id" => id)))
           end
+        else # Ex: Book.all(:name => "The..."), so we do not want to cache it
+          if association_class.respond_to?(:all)
+            Array(association_class.all({"#{self.class.name.underscore}_id" => id}.merge(query.first)))
+          end
         end
       end
 

data/test/attribution_test.rb

@@ -28,6 +28,18 @@ class Book
 
   belongs_to :book
   has_many :chapters
+  has_many :readers
+end
+
+class Reader
+  include Attribution
+
+  integer :id
+
+  def self.all(query = {})
+    query
+  end
+
 end
 
 class Chapter
@@ -100,6 +112,10 @@ class AttributionTest < Test::Unit::TestCase
     assert_equal ActiveSupport::TimeZone["Eastern Time (US & Canada)"], book.time_zone
     assert_equal 1, book.chapters.first.number
     assert_equal 3, book.chapters.size
+    assert_equal ({}), Reader.all
+    assert_equal ([['book_id', 1]]), book.readers
+    assert_equal ([['book_id', 1], [:name,"julio"]]), book.readers(:name => 'julio')
+    assert_equal ([['book_id', 1]]), book.readers # Instance variable caching
     assert_equal book, book.chapters.first.book
   end
 
@@ -182,4 +198,12 @@ class AttributionTest < Test::Unit::TestCase
     assert_equal nil, book.created_at
     assert_equal nil, book.time_zone
   end
+
+  def test_attributes_setter
+    book = Book.new
+    book.attributes = { :title => "Whatever", :price => 50 }
+    assert_equal "Whatever", book.title
+    assert_equal BigDecimal.new("50"), book.price
+    assert_equal nil, book.id
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribution
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport