active_hash 1.2.2 → 1.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2M5ZWI2ZDU5YjUxNjI5N2I3ZWYzNDgyMjdjMjRhODNkZWI0YzRkMA==
+    YjFhNmFkYzdjYTBlYjE0MDM1NWU2YTUwZjY1MWJkN2Q2YmNmNGRiOQ==
   data.tar.gz: !binary |-
-    NGMwOWExMmRhMTZkM2I0ZTk4NGIyYjIwYzg3Yjg0ZTI4ZGM0NGNiNg==
+    M2RiMDQ0ODQxYTBhMDY2YzQ0YmI5OTgxZjVjNDA0OTMwNTA2OThjMA==
 SHA512:
   metadata.gz: !binary |-
-    ZWJhZmY0Yzk3OTZjOWMxNzVkOTRmN2I0M2MwYzRhZWE3MjE0YzdmMWMzMTA5
-    YTdkZTgxMTVhMjZhM2YzMDQwN2Q1N2FlMzMyZjhkMTZmNWRlMDZjZDgzYWQx
-    OGZkMzFjODkyYWZhZWVjOTMzZmJmZDkzNjE0ZTNhMTkwMGVjNDE=
+    NzI2ODRiYTMxYTI3YWNjMjEyM2JjMjU3ZmRiYmRlMjllYTIzYzJmNzMyOGE2
+    MjZjNzM4MGRhYjhhNTcwMDIxZmI4MTdkNTEzYTg2NDZlOWNmOGQ1MjQ0YTgw
+    MTZiZDE2MmM3ZDk5NmM4MDJmODk1YzNiMDQ0OTJiMjhlOWNjNzg=
   data.tar.gz: !binary |-
-    MDU1MTk5ZDM0NGVhZjM2MzI3Y2ExNjAwZGU0MDBhNmZjYzRiZWZkMTJmNTQw
-    ZjdjOTVlYmRhZmY1YmIxYmZhNTdjODFmMTU0ZDM1NmQwZDljOWI0YzMzMDE1
-    MzVmODAwYTljZmJhODlmZmUyYWI5ZWExMTA1OTY1ODM4OGI1ZGU=
+    ZDI3ZjMzM2UwNmM1N2QyY2ExZGRiZDM4MjFmZTBmMzJiNTU5ZmExOTQ3OGU4
+    ZDc5YjYyZDNmMGE3MjlmMjZkODgzZjNhNzkxM2E5YjEzZjJhNGMxZmQxOTVk
+    MzhkN2ZiYjdiODQ2MjliMGEzNjJkNGZmOWQ2ZThjMzkyZjhhODM=

data/CHANGELOG

@@ -1,3 +1,6 @@
+2013-11-29 (v1.2.3)
+  - fix bug where active hash would call `.all` on models when setting has_many (grosser)
+
 2013-11-05 (v1.2.2)
   - fix bug in gemspec that made it impossible to use w/ Rails 4
 

data/active_hash.gemspec

@@ -83,19 +83,22 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.2.0"])
       s.add_development_dependency(*sqlite_gem)
       s.add_development_dependency(%q<activerecord>, supported_rails_versions)
-      s.add_development_dependency(%q<appraisal>)
+      s.add_development_dependency(%q<wwtd>)
+      s.add_development_dependency(%q<rake>)
     else
       s.add_dependency(%q<activesupport>, supported_rails_versions)
       s.add_dependency(%q<rspec>, ["~> 2.2.0"])
       s.add_dependency(*sqlite_gem)
       s.add_dependency(%q<activerecord>, supported_rails_versions)
-      s.add_dependency(%q<appraisal>)
+      s.add_dependency(%q<wwtd>)
+      s.add_dependency(%q<rake>)
     end
   else
     s.add_dependency(%q<activesupport>, supported_rails_versions)
     s.add_dependency(%q<rspec>, ["~> 2.2.0"])
     s.add_dependency(*sqlite_gem)
     s.add_dependency(%q<activerecord>, supported_rails_versions)
-    s.add_dependency(%q<appraisal>)
+    s.add_dependency(%q<wwtd>)
+    s.add_dependency(%q<rake>)
   end
 end

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
   end
 end

data/lib/associations/associations.rb

@@ -82,7 +82,7 @@ module ActiveHash
           klass = options[:class_name].constantize
           primary_key_value = send(options[:primary_key])
 
-          if ActiveRecord.const_defined?(:Relation) && klass.all.class < ActiveRecord::Relation
+          if ActiveRecord.const_defined?(:Relation) && klass < ActiveRecord::Relation
             klass.where(options[:foreign_key] => primary_key_value)
           elsif klass.respond_to?(:scoped)
             klass.scoped(:conditions => {options[:foreign_key] => primary_key_value})

data/spec/associations/associations_spec.rb

@@ -116,6 +116,13 @@ describe ActiveHash::Base, "associations" do
           author.books.published.should == [@book_1]
         end
       end
+
+      it "only uses 1 query" do
+        Author.has_many :books
+        author = Author.create :id => 1
+        Book.should_receive(:find_by_sql)
+        author.books.to_a
+      end
     end
 
     context "with ActiveHash children" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Jeff Dean
@@ -86,7 +86,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.2
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='