active_repository 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77848a1b93e0ada4018bbbe7afe9337ffb8dc4a
-  data.tar.gz: d014d4d6cab9da02be3cabeb82dd1b13cd03a41e
+  metadata.gz: d3682a06da966f35d1d173a4bfd20bf284fd6618
+  data.tar.gz: 842a9c142db9cbb0c31efcf5ac5cefaf6d21f79c
 SHA512:
-  metadata.gz: ca45ee75a46da4e03b32551cfec96921fd96116803cde05488b2ff4dd333879c07b50df00460fd2856066b100147fc5a66aa21314911eea3bfe4ce394402f0e9
-  data.tar.gz: 83d7295e9d5b4ee36eae6cab96bc66df7a651956b2cfe4d438e9e7f02a4f86aa6e1daf03fda2838698b6a63d34d41443df2de1e0240f38559a21e8769d82872b
+  metadata.gz: 6a27dda12a0ce272d9a187ed45c9b9c795e954156c41d366461b80729deeeef8a4318932699b05cf32358966b632800e31e0ec73bc933a62b62a9f75dd0ce963
+  data.tar.gz: 6879de80c9ce5aa1de0cc2094b5e6b506758db4f672198581a801de6afaba9b57cca0c086dc193aa54bc770bf3563f3923eecf403a8c2e8a0b81b87a61f6fdfc

data/lib/active_repository/associations.rb

@@ -15,10 +15,11 @@ module ActiveRepository
       def has_many(association_id, options = {})
         define_method(association_id) do
           options = {
-            class_name:  association_id.to_s.classify
+            class_name:  association_id.to_s.classify,
+            foreign_key: self.class.to_s.foreign_key
           }.merge(options)
 
-          foreign_key = self.class.to_s.foreign_key
+          foreign_key = options[:foreign_key]
           klass = options[:class_name].constantize
 
           klass.where(foreign_key => id)
@@ -28,7 +29,8 @@ module ActiveRepository
       # Defines "has one" type relation between ActiveRepository objects
       def has_one(association_id, options = {})
         options = {
-          class_name:  association_id.to_s.classify
+          class_name:  association_id.to_s.classify,
+          foreign_key: self.to_s.foreign_key
         }.merge(options)
 
         has_one_methods(association_id, options)
@@ -61,7 +63,7 @@ module ActiveRepository
 
       def define_has_one_method(association_id, options)
         define_method(association_id) do
-          foreign_key = self.class.to_s.foreign_key
+          foreign_key = options[:foreign_key]
           klass       = options[:class_name].constantize
 
           klass.where(foreign_key => self.id).first

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/active_repository/associations_spec.rb

@@ -10,6 +10,25 @@ describe ActiveRepository::Base, "associations" do
       connection.create_table(:countries, :force => true) {}
     end
 
+    class CountryRepository < ActiveRepository::Base
+      self.persistence_class = Country
+      self.save_in_memory = false
+    end
+
+    class Mountain < ActiveRecord::Base
+      establish_connection :adapter => "sqlite3", :database => ":memory:"
+      connection.create_table(:mountains, :force => true) do |t|
+        t.integer :country_id
+      end
+    end
+
+    class President < ActiveRecord::Base
+      establish_connection :adapter => "sqlite3", :database => ":memory:"
+      connection.create_table(:presidents, :force => true) do |t|
+        t.integer :country_id
+      end
+    end
+
     class School < ActiveRecord::Base
       establish_connection :adapter => "sqlite3", :database => ":memory:"
       connection.create_table(:schools, :force => true) do |t|
@@ -43,6 +62,9 @@ describe ActiveRepository::Base, "associations" do
     Object.send :remove_const, :City
     Object.send :remove_const, :Author
     Object.send :remove_const, :Country
+    Object.send :remove_const, :CountryRepository
+    Object.send :remove_const, :Mountain
+    Object.send :remove_const, :President
     Object.send :remove_const, :School
     Object.send :remove_const, :Book
   end
@@ -90,6 +112,22 @@ describe ActiveRepository::Base, "associations" do
       end
     end
 
+    context "with ActiveRecord children but different naming scheme requiring foreign_key option" do
+      it "honors foreign_key option to properly fetch child records from has_many" do
+        CountryRepository.has_many :mountains, :foreign_key => "country_id"
+        country = Country.create :id => 1
+        mountain_1 = Mountain.create :country_id => 1, :id => 1
+        expect(CountryRepository.first.mountains).to eq([mountain_1])
+      end
+
+      it "honors foreign_key option to properly fetch child record from has_one" do
+        CountryRepository.has_one :president, :foreign_key => "country_id"
+        country = Country.create :id => 1
+        president_1 = President.create :country_id => 1, :id => 1
+        expect(CountryRepository.first.president).to eq(president_1)
+      end
+    end
+
   end
 
   describe "#belongs_to" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_repository
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash