active_hash 0.9.5 → 0.9.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+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)
+
 2011-06-07
   - fixed bug where .find would not work if you defined your ids as strings
 

data/README.md

@@ -167,9 +167,11 @@ To clear all records from the in-memory array, call delete_all:
 
     Country.delete_all  # => does not affect the yaml files in any way - just clears the in-memory array which can be useful for testing
 
-## Associations
+## Referencing ActiveHash objects from ActiveRecord Associations
 
-You can create has_many and belongs_to associations to and from ActiveRecord.  Out of the box, you can create .belongs_to associations from rails objects, like so:
+One common use case for ActiveHash is to have top-level objects in memory that ActiveRecord objects belong to.
+
+In versions of ActiveRecord previous to 3.1, you should be able to do the following:
 
     class Country < ActiveHash::Base
     end
@@ -178,7 +180,17 @@ You can create has_many and belongs_to associations to and from ActiveRecord.  O
       belongs_to :country
     end
 
-ActiveHash will also work as a polymorphic parent:
+However, as of ActiveRecord 3.1 support for ActiveRecord's `belong_to` is broken.  Instead, you must use the `belongs_to_active_hash` method:
+
+    class Country < ActiveHash::Base
+    end
+
+    class Person < ActiveRecord::Base
+      extend ActiveHash::Associations::ActiveRecordExtensions
+      belongs_to_active_hash :country
+    end
+
+With ActiveRecord versions < 3.1, ActiveHash will also work as a polymorphic parent:
 
     class Country < ActiveHash::Base
     end
@@ -192,10 +204,14 @@ ActiveHash will also work as a polymorphic parent:
     person.save
     person.location # => Country.first
 
+However, as of ActiveRecord 3.1 this will not work.  If you need support for that, please open an issue.
+
 You can also use standard rails view helpers, like #collection_select:
 
     <%= collection_select :person, :country_id, Country.all, :id, :name %>
 
+## Referencing ActiveRecord objects from ActiveHash
+
 If you include the ActiveHash::Associations module, you can also create associations from your ActiveHash classes, like so:
 
     class Country < ActiveHash::Base
@@ -225,8 +241,6 @@ Once you define a belongs to, you also get the setter method:
 
 NOTE:  You cannot use ActiveHash objects as children of ActiveRecord and I don't plan on adding support for that.  It doesn't really make any sense, since you'd have to hard-code your database ids in your class or yaml files, which is a dependency inversion.
 
-Also, the implementation of has_many and belongs_to is very simple - I hope to add better support for it later - it will only work in the trivial cases for now.
-
 Thanks to baldwindavid for the ideas and code on that one.
 
 ## ActiveYaml

data/active_hash.gemspec

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

data/lib/active_hash/base.rb

@@ -24,6 +24,11 @@ module ActiveHash
     end
 
     class << self
+
+      def primary_key
+        "id"
+      end
+
       def field_names
         @field_names ||= []
       end

data/lib/active_hash/version.rb

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

data/lib/associations/associations.rb

@@ -1,6 +1,25 @@
 module ActiveHash
   module Associations
 
+    module ActiveRecordExtensions
+
+      def belongs_to_active_hash(association_id, options = {})
+        options = {
+          :class_name => association_id.to_s.classify,
+          :foreign_key => association_id.to_s.foreign_key
+        }.merge(options)
+
+        define_method(association_id) do
+          options[:class_name].constantize.find_by_id(send(options[:foreign_key]))
+        end
+
+        define_method("#{association_id}=") do |new_value|
+          attributes[options[:foreign_key].to_sym] = new_value ? new_value.id : nil
+        end
+      end
+
+    end
+
     def self.included(base)
       base.extend Methods
     end
@@ -17,7 +36,7 @@ module ActiveHash
           klass = options[:class_name].constantize
 
           if klass.respond_to?(:scoped)
-            klass.scoped(:conditions => { options[:foreign_key] => id })
+            klass.scoped(:conditions => {options[:foreign_key] => id})
           else
             klass.send("find_all_by_#{options[:foreign_key]}", id)
           end
@@ -38,7 +57,7 @@ module ActiveHash
         end
 
         define_method("#{association_id}=") do |new_value|
-          attributes[ options[:foreign_key].to_sym ] = new_value ? new_value.id : nil
+          attributes[options[:foreign_key].to_sym] = new_value ? new_value.id : nil
         end
 
       end

data/spec/associations/associations_spec.rb

@@ -1,14 +1,17 @@
 require 'spec_helper'
+require 'active_record'
 
 describe ActiveHash::Base, "associations" do
 
   before do
     class Country < ActiveRecord::Base
+      extend ActiveHash::Associations::ActiveRecordExtensions
       establish_connection :adapter => "sqlite3", :database => ":memory:"
       connection.create_table(:countries, :force => true) {}
     end
 
     class School < ActiveRecord::Base
+      extend ActiveHash::Associations::ActiveRecordExtensions
       establish_connection :adapter => "sqlite3", :database => ":memory:"
       connection.create_table(:schools, :force => true) do |t|
         t.integer :city_id
@@ -91,23 +94,27 @@ describe ActiveHash::Base, "associations" do
 
   end
 
-  describe "#belongs_to" do
+  describe ActiveHash::Associations::ActiveRecordExtensions do
 
-    context "with an ActiveRecord child" do
+    describe "#belongs_to_active_hash" do
       it "finds the correct records" do
-        School.belongs_to :city
+        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 :city
-        school = School.create :city_id => nil
+        School.belongs_to_active_hash :city
+        school = School.create! :city_id => nil
         school.city.should be_nil
       end
     end
 
+  end
+
+  describe "#belongs_to" do
+
     context "with an ActiveRecord parent" do
       it "find the correct records" do
         City.belongs_to :country

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Jeff Dean
@@ -30,11 +30,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -07:00
+date: 2011-08-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,10 +47,8 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
-  requirement: *id001
-  prerelease: false
   type: :runtime
-  name: activesupport
+  version_requirements: *id001
 description: 
 email: jeff@zilkey.com
 executables: []