active_hash 0.9.6 → 0.9.7

data/CHANGELOG

@@ -1,3 +1,6 @@
+2011-09-18 (v0.9.7)
+  - Fixing the setting of a belongs_to_active_hash association by association (not id).
+
 2011-08-31
   - added a module which adds a .belongs_to_active_hash method to ActiveRecord, since it was broken for Rails 3.1 (thanks to felixclack for pointing this issue out)
 

data/README.md

@@ -4,7 +4,7 @@ ActiveHash is a simple base class that allows you to use a ruby hash as a readon
 
 ActiveHash assumes that every hash has an :id key, which is what you would probably store in a database.  This allows you to seemlessly upgrade from ActiveHash objects to full ActiveRecord objects without having to change any code in your app, or any foreign keys in your database.
 
-It also allows you to use #has_many and #belongs_to in your AR objects.
+It also allows you to use #has_many and #belongs_to (via belongs_to_active_hash) in your AR objects.
 
 ActiveHash can also be useful to create simple test classes that run without a database - ideal for testing plugins or gems that rely on simple AR behavior, but don't want to deal with databases or migrations for the spec suite.
 

data/active_hash.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
     "Vladimir Andrijevik",
     "Adam Anderson"
   ]
-  s.date = %q{2011-08-31}
+  s.date = %q{2011-09-18}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "0.9.6"
+    VERSION = "0.9.7"
   end
 end

data/lib/associations/associations.rb

@@ -14,7 +14,7 @@ module ActiveHash
         end
 
         define_method("#{association_id}=") do |new_value|
-          attributes[options[:foreign_key].to_sym] = new_value ? new_value.id : nil
+          send "#{options[:foreign_key]}=", new_value ? new_value.id : nil
         end
       end
 

data/spec/associations/associations_spec.rb

@@ -97,20 +97,36 @@ describe ActiveHash::Base, "associations" do
   describe ActiveHash::Associations::ActiveRecordExtensions do
 
     describe "#belongs_to_active_hash" do
-      it "finds the correct records" do
-        School.belongs_to_active_hash :city
-        city = City.create
-        school = School.create :city_id => city.id
-        school.city.should == city
-      end
-
-      it "returns nil when the record does not exist" do
-        School.belongs_to_active_hash :city
-        school = School.create! :city_id => nil
-        school.city.should be_nil
+      context "setting by id" do
+        it "finds the correct records" do
+          School.belongs_to_active_hash :city
+          city = City.create
+          school = School.create :city_id => city.id
+          school.city.should == city
+        end
+
+        it "returns nil when the record does not exist" do
+          School.belongs_to_active_hash :city
+          school = School.create! :city_id => nil
+          school.city.should be_nil
+        end
+      end
+
+      context "setting by association" do
+        it "finds the correct records" do
+          School.belongs_to_active_hash :city
+          city = City.create
+          school = School.create :city => city
+          school.city.should == city
+        end
+
+        it "returns nil when the record does not exist" do
+          School.belongs_to_active_hash :city
+          school = School.create! :city => nil
+          school.city.should be_nil
+        end
       end
     end
-
   end
 
   describe "#belongs_to" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Jeff Dean
@@ -30,7 +30,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -06:00
+date: 2011-09-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,13 +63,13 @@ files:
 - LICENSE
 - README.md
 - active_hash.gemspec
-- lib/active_file/base.rb
-- lib/active_hash/base.rb
-- lib/active_hash/version.rb
+- lib/enum/enum.rb
 - lib/active_hash.rb
 - lib/active_yaml/base.rb
+- lib/active_file/base.rb
+- lib/active_hash/version.rb
+- lib/active_hash/base.rb
 - lib/associations/associations.rb
-- lib/enum/enum.rb
 - Gemfile
 - spec/active_file/base_spec.rb
 - spec/active_hash/base_spec.rb
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource