attribution 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abcb3ede33930d68c99d76201000eea2a878ba72
-  data.tar.gz: 78d1eb1a1e21148853afbd7edc6b7c4e67bdc0a7
+  metadata.gz: 12280ee9715f6fab2bb30351d1bb4db0fb7ff3b8
+  data.tar.gz: d90c899d05ae2475a49b4acd971041c2517b066f
 SHA512:
-  metadata.gz: f3c00d1d2eaa859e537daf1fc2b73f3a17a327b3d19efcd686308584ed090792fe0efa4f47483d04805b5bc31f0919ca3f8934fd985e5f407543e3da1f7a2f33
-  data.tar.gz: 6da0d3f42ae5c6d1f1483c75157509d16ac0947d1f0cffab831d80fdd23cd2a0acca833f12f5d79c463a49025d4f27a491560e4420f17efee419cdbec1de6897
+  metadata.gz: d896f36c33b15cf12912f07453dfadf4894e80044ed1e975f94ef8965a3d72a3f6fc8e1b55fa4208a0eb2eae8b67c4eb6b8ca6e6fc000363dbb5d601e32b5081
+  data.tar.gz: 8ec63499d6ed0238ae23990fb5e3f5d89f1d3ee4ec48ee06839e4a72ab882c7b26aec3ccff48ec026bb860555b583d7c372a325625227469da020b41d5fe8fe3

data/attribution.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "attribution"
-  gem.version       = "0.6.5"
+  gem.version       = "0.7.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.6.5"
+  VERSION = "0.7.0"
 end

data/lib/attribution.rb

@@ -197,6 +197,10 @@ module Attribution
       end
     end
 
+    def autoload_associations?
+      true
+    end
+
     # Association macros
 
     # Defines an attribute that is a reference to another Attribution class.
@@ -236,14 +240,13 @@ module Attribution
           instance_variable_get("@#{association_name}")
         elsif id = instance_variable_get("@#{association_name}_id")
 
-          # TODO: Support a more generic version of lazy-loading
           begin
             association_class = Object.const_get(association_class_name)
           rescue NameError => ex
             raise ArgumentError.new("Association #{association_name} in #{self.class} is invalid because #{association_class_name} does not exist")
           end
 
-          if association_class.respond_to?(:find)
+          if self.class.autoload_associations? && association_class.respond_to?(:find)
             instance_variable_set("@#{association_name}", association_class.find(id))
           end
         else
@@ -290,11 +293,11 @@ module Attribution
           ivar = "@#{association_name}"
           if instance_variable_defined?(ivar)
             instance_variable_get(ivar)
-          elsif association_class.respond_to?(:all)
+          elsif self.class.autoload_associations? && 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)
+          if self.class.autoload_associations? && association_class.respond_to?(:all)
             Array(association_class.all({"#{self.class.name.demodulize.underscore}_id" => id}.merge(query.first)))
           end
         end

data/test/attribution_model_test.rb

@@ -4,12 +4,12 @@ require 'attribution/model'
 class Article
   include Attribution::Model
 
-  string :title, required: true, format: { with: /\A\w/, message: "must start with a letter" }, length: 4..20
+  string :title, :required => true, :format => { :with => /\A\w/, :message => "must start with a letter" }, :length => 4..20
 end
 
 class AttributionModelTest < Test::Unit::TestCase
   def test_model
-    article = Article.new(id: 1, created_at: Time.now, updated_at: Time.now)
+    article = Article.new(:id => 1, :created_at => Time.now, :updated_at => Time.now)
     assert !article.valid?
     assert_equal ["can't be blank", "must start with a letter", "is too short (minimum is 4 characters)"], article.errors[:title]
   end

data/test/attribution_test.rb

@@ -42,6 +42,9 @@ class Book
   belongs_to :book
   has_many :chapters
   has_many :readers
+
+  def self.find(*args)
+  end
 end
 
 class Reader
@@ -65,6 +68,10 @@ class Chapter
 
   belongs_to :book
   has_many :pages
+
+  def self.all(*args)
+    []
+  end
 end
 
 class Page
@@ -120,6 +127,22 @@ module Music
   end
 end
 
+class StoreModel
+  include Attribution
+
+  def self.autoload_associations?
+    false
+  end
+end
+
+class Product < StoreModel
+  has_many :orders
+end
+
+class Order < StoreModel
+  belongs_to :product
+end
+
 class AttributionTest < Test::Unit::TestCase
 
   def test_create
@@ -274,7 +297,7 @@ class AttributionTest < Test::Unit::TestCase
   end
 
   def test_to_json_should_only_include_attibutes
-    book = Book.new(id: 1, foo: 'bar')
+    book = Book.new(:id => 1, :foo => 'bar')
     assert_equal nil, JSON.parse(book.to_json)['foo']
     assert JSON.parse(book.to_json).key?('title'), 'to_json sohuld include attributes that have no value assigned to them'
   end
@@ -289,12 +312,37 @@ class AttributionTest < Test::Unit::TestCase
   end
 
   def test_namespaced_belongs_to
-    track = Music::Track.new(number: 1, title: "Elevator Music", album: { artist: "Beck", title: "The Information" })
+    track = Music::Track.new(:number => 1, :title => "Elevator Music", :album => { :artist => "Beck", :title => "The Information" })
     assert_equal "Beck", track.album.artist
   end
 
   def test_namespaced_has_many
-    album = Music::Album.new(artist: "Beck", title: "The Information", tracks: [ { number: 1, title: "Elevator Music" } ])
+    album = Music::Album.new(:artist => "Beck", :title => "The Information", :tracks => [ { :number => 1, :title => "Elevator Music" } ])
     assert_equal "Elevator Music", album.tracks.first.title
   end
+
+  def test_autoload_belongs_to_associations
+    chapter = Chapter.new(:book_id => 42)
+    Book.expects(:find).with(42)
+    chapter.book
+  end
+
+  def test_autoload_has_many_associations
+    book = Book.new(:id => 42)
+    Chapter.expects(:all).with("book_id" => 42)
+    book.chapters
+  end
+
+  def test_disabled_autoload_belongs_to_associations
+    order = Order.new
+    Product.expects(:find).never
+    order.product
+  end
+
+  def test_disabled_autoload_has_many_associations
+    product = Product.new
+    Order.expects(:all).never
+    product.orders
+  end
+
 end

data/test/test_helper.rb

@@ -1,2 +1,3 @@
 require 'test/unit'
+require 'mocha/setup'
 require 'attribution'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attribution
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Paul Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport