active_hash 1.0.2 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmYzYzMzOTEwZTkwZDgxNGExMTAyMDAzOTk3NTAzOTU1NzI5ZjQ2Yg==
+    MTE0YzI0ZDYzNTQ0OTVmOTI1Zjk4MmZlZWZlNGNlNGVmZjEyMzAxMg==
   data.tar.gz: !binary |-
-    NDVkZmJhOTQ4NGZiZWJjNGYzMmU1ZmJiMzZmZGVmZmJlNWZkMjNiYQ==
-!binary "U0hBNTEy":
+    YTQwOGViNjkwZWJlOTkzZWZiZDgxNGU0NDgwZDVkNzE4OWY2MTE5Nw==
+SHA512:
   metadata.gz: !binary |-
-    MDIzNDE2NGZhZmUzZGNlNzUxOTZlNGUzMzcyMTU3ODg5MTQ2NjhmYzg4ZGFj
-    MDFkYzI5NzY3MTdkZmUzNThkOTFjNmU5ZDEwOGM2YWJhZTViZDkyYzk0YjRi
-    NTAyYzA5YWUxZmU5ZDRlMjgwZDFiYWFlZDQ3NTVkYWU1MGI1NWM=
+    Y2U2MGUzZjdkZDg3ODYyM2Q1NDNmODgyNTY0YjM0N2U2ZTYyOGIzZmFlYWMz
+    MTBmNjBjMTVjZDFhMzU4M2Q5ODcxMmI4NzYxMGNlNWNiNTg2MjZhNGQ1MmZk
+    MmRhYTI0OWIzMzliNWFkN2E3ZjRmMDhmNmViNzg1ZTNlYjZjYjE=
   data.tar.gz: !binary |-
-    MjE0MDlkMjg4MTU4M2Q4Njc5NzlkYTNjYmY4MWVmZWQ4ZDRhMDRiMTgwNjVl
-    ZDQ3ZGEwOWI0MGMxMzBlYjdlMDVjNThkMmJlYWJjMTIzMjk4YTYwOTA5NjYw
-    NGYyMDhiYmViYzM2ZDBkNGQxZTQ2Mzg5ZDk3OGI3ZTJiMTAyZTQ=
+    MTU4NzNmZjdiNzM1MzkyYjA4MTMxOTJjZjhkMzJhNTQ4MTMzYTQ5NGFkOWI1
+    YjRmYzRlZmRhMWRmYzQ1OWY0ZjY1ZWY4NGUyZDZmMjEwNGIwMzNjZjMzZTJl
+    NjhjMzZlNTFkOTA2MDU4YjQwZTMwN2U0ODhjNTY3NWM2ZWIwZmM=

data/CHANGELOG

@@ -1,3 +1,7 @@
+2013-10-01 (v1.2.0)
+  - belongs_to is back!
+  - added support for primary key options for belongs_to (tomtaylor)
+
 2013-09-09 (v1.0.2)
   - `where(nil)` returns all results, like ActiveRecord (kugaevsky)
 

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "1.0.2"
+    VERSION = "1.2.0"
   end
 end

data/lib/associations/associations.rb

@@ -3,20 +3,31 @@ module ActiveHash
 
     module ActiveRecordExtensions
 
+      def belongs_to(name, options = {})
+        options = {:class_name => name.to_s.camelize }.merge(options)
+        klass = options[:class_name].constantize
+        if klass < ActiveHash::Base
+          belongs_to_active_hash(name, options)
+        else
+          super
+        end
+      end
+
       def belongs_to_active_hash(association_id, options = {})
         options = {
           :class_name => association_id.to_s.camelize,
           :foreign_key => association_id.to_s.foreign_key,
+          :primary_key => association_id.to_s.camelize.constantize.primary_key,
           :shortcuts => []
         }.merge(options)
         options[:shortcuts] = [options[:shortcuts]] unless options[:shortcuts].kind_of?(Array)
 
         define_method(association_id) do
-          options[:class_name].constantize.find_by_id(send(options[:foreign_key]))
+          options[:class_name].constantize.send("find_by_#{options[:primary_key]}", send(options[:foreign_key]))
         end
 
         define_method("#{association_id}=") do |new_value|
-          send "#{options[:foreign_key]}=", new_value ? new_value.id : nil
+          send "#{options[:foreign_key]}=", new_value ? new_value.send(options[:primary_key]) : nil
         end
 
         options[:shortcuts].each do |shortcut|
@@ -60,17 +71,19 @@ module ActiveHash
         define_method(association_id) do
           options = {
             :class_name => association_id.to_s.classify,
-            :foreign_key => self.class.to_s.foreign_key
+            :foreign_key => self.class.to_s.foreign_key,
+            :primary_key => self.class.primary_key
           }.merge(options)
 
           klass = options[:class_name].constantize
+          primary_key_value = send(options[:primary_key])
 
           if ActiveRecord.const_defined?(:Relation) && klass.all.class < ActiveRecord::Relation
-            klass.where(options[:foreign_key] => id)
+            klass.where(options[:foreign_key] => primary_key_value)
           elsif klass.respond_to?(:scoped)
-            klass.scoped(:conditions => {options[:foreign_key] => id})
+            klass.scoped(:conditions => {options[:foreign_key] => primary_key_value})
           else
-            klass.send("find_all_by_#{options[:foreign_key]}", id)
+            klass.send("find_all_by_#{options[:foreign_key]}", primary_key_value)
           end
         end
       end
@@ -95,17 +108,18 @@ module ActiveHash
 
         options = {
           :class_name => association_id.to_s.classify,
-          :foreign_key => association_id.to_s.foreign_key
+          :foreign_key => association_id.to_s.foreign_key,
+          :primary_key => "id"
         }.merge(options)
 
         field options[:foreign_key].to_sym
 
         define_method(association_id) do
-          options[:class_name].constantize.find_by_id(send(options[:foreign_key]))
+          options[:class_name].constantize.send("find_by_#{options[:primary_key]}", send(options[:foreign_key]))
         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.send(options[:primary_key]) : nil
         end
 
       end

data/spec/associations/associations_spec.rb

@@ -5,19 +5,20 @@ 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) do |t|
         t.string :name
       end
+      extend ActiveHash::Associations::ActiveRecordExtensions
     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 :country_id
         t.integer :city_id
       end
+      extend ActiveHash::Associations::ActiveRecordExtensions
     end
 
     class City < ActiveHash::Base
@@ -35,6 +36,7 @@ describe ActiveHash::Base, "associations" do
       establish_connection :adapter => "sqlite3", :database => ":memory:"
       connection.create_table(:books, :force => true) do |t|
         t.integer :author_id
+        t.integer :author_code
         t.boolean :published
       end
 
@@ -57,43 +59,117 @@ describe ActiveHash::Base, "associations" do
   describe "#has_many" do
 
     context "with ActiveRecord children" do
-      before do
-        @included_book_1 = Book.create! :author_id => 1, :published => true
-        @included_book_2 = Book.create! :author_id => 1, :published => false
-        @excluded_book = Book.create! :author_id => 2, :published => true
+      context "with default options" do
+        before do
+          @book_1 = Book.create! :author_id => 1, :published => true
+          @book_2 = Book.create! :author_id => 1, :published => false
+          @book_3 = Book.create! :author_id => 2, :published => true
+          Author.has_many :books
+        end
+
+        it "find the correct records" do
+          author = Author.create :id => 1
+          author.books.should == [@book_1, @book_2]
+        end
+
+        it "return a scope so that we can apply further scopes" do
+          author = Author.create :id => 1
+          author.books.published.should == [@book_1]
+        end
       end
 
-      it "find the correct records" do
-        Author.has_many :books
-        author = Author.create :id => 1
-        author.books.should == [@included_book_1, @included_book_2]
+      context "with a primary_key option" do
+        before do
+          @book_1 = Book.create! :author_id => 1, :published => true
+          @book_2 = Book.create! :author_id => 2, :published => false
+          @book_3 = Book.create! :author_id => 2, :published => true
+          Author.field :book_identifier
+          Author.has_many :books, :primary_key => :book_identifier
+        end
+
+        it "should find the correct records" do
+          author = Author.create :id => 1, :book_identifier => 2
+          author.books.should == [@book_2, @book_3]
+        end
+
+        it "return a scope so that we can apply further scopes" do
+          author = Author.create :id => 1, :book_identifier => 2
+          author.books.published.should == [@book_3]
+        end
       end
 
-      it "return a scope so that we can apply further scopes" do
-        Author.has_many :books
-        author = Author.create :id => 1
-        author.books.published.should == [@included_book_1]
+      context "with a foreign_key option" do
+        before do
+          @book_1 = Book.create! :author_code => 1, :published => true
+          @book_2 = Book.create! :author_code => 1, :published => false
+          @book_3 = Book.create! :author_code => 2, :published => true
+          Author.has_many :books, :foreign_key => :author_code
+        end
+
+        it "should find the correct records" do
+          author = Author.create :id => 1
+          author.books.should == [@book_1, @book_2]
+        end
+
+        it "return a scope so that we can apply further scopes" do
+          author = Author.create :id => 1
+          author.books.published.should == [@book_1]
+        end
       end
     end
 
     context "with ActiveHash children" do
-      before do
-        Author.field :city_id
-        @included_author_1 = Author.create :city_id => 1
-        @included_author_2 = Author.create :city_id => 1
-        @excluded_author = Author.create :city_id => 2
+      context "with default options" do
+        before do
+          Author.field :city_id
+          @included_author_1 = Author.create :city_id => 1
+          @included_author_2 = Author.create :city_id => 1
+          @excluded_author = Author.create :city_id => 2
+        end
+
+        it "find the correct records" do
+          City.has_many :authors
+          city = City.create :id => 1
+          city.authors.should == [@included_author_1, @included_author_2]
+        end
+
+        it "uses the correct class name when passed" do
+          City.has_many :writers, :class_name => "Author"
+          city = City.create :id => 1
+          city.writers.should == [@included_author_1, @included_author_2]
+        end
       end
 
-      it "find the correct records" do
-        City.has_many :authors
-        city = City.create :id => 1
-        city.authors.should == [@included_author_1, @included_author_2]
+      context "with a primary_key option" do
+        before do
+          Author.field :city_id
+          City.field :author_identifier
+          @author_1 = Author.create :city_id => 1
+          @author_2 = Author.create :city_id => 10
+          @author_3 = Author.create :city_id => 10
+          City.has_many :authors, :primary_key => :author_identifier
+        end
+
+        it "finds the correct records" do
+          city = City.create :id => 1, :author_identifier => 10
+          city.authors.should == [@author_2, @author_3]
+        end
       end
 
-      it "uses the correct class name when passed" do
-        City.has_many :writers, :class_name => "Author"
-        city = City.create :id => 1
-        city.writers.should == [@included_author_1, @included_author_2]
+      context "with a foreign_key option" do
+        before do
+          Author.field :city_id
+          Author.field :city_identifier
+          @author_1 = Author.create :city_id => 1, :city_identifier => 10
+          @author_2 = Author.create :city_id => 10, :city_identifier => 10
+          @author_3 = Author.create :city_id => 10, :city_identifier => 5
+          City.has_many :authors, :foreign_key => :city_identifier
+        end
+
+        it "finds the correct records" do
+          city = City.create :id => 10
+          city.authors.should == [@author_1, @author_2]
+        end
       end
     end
 
@@ -101,6 +177,27 @@ describe ActiveHash::Base, "associations" do
 
   describe ActiveHash::Associations::ActiveRecordExtensions do
 
+    describe "#belongs_to" do
+      it "sets up an ActiveRecord association for non-ActiveHash objects" do
+        School.belongs_to :country
+        school = School.new
+        country = Country.create!
+        school.country = country
+        school.country.should == country
+        school.country_id.should == country.id
+        school.save!
+        school.reload
+        school.reload.country_id.should == country.id
+      end
+
+      it "calls through to belongs_to_active_hash if it's an ActiveHash object" do
+        School.belongs_to :city
+        city = City.create
+        school = School.create :city_id => city.id
+        school.city.should == city
+      end
+    end
+
     describe "#belongs_to_active_hash" do
       context "setting by id" do
         it "finds the correct records" do
@@ -239,6 +336,20 @@ describe ActiveHash::Base, "associations" do
         author.city_id.should == @city.id
       end
     end
+
+    describe "with a different primary key" do
+      before do
+        City.field :long_identifier
+        Author.belongs_to :city, :primary_key => "long_identifier"
+        @city = City.create :id => 1, :long_identifier => "123"
+      end
+
+      it "works" do
+        author = Author.new
+        author.city = @city
+        author.city_id.should == @city.long_identifier
+      end
+    end
   end
 
   describe "#has_one" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeff Dean
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource