activerecord-belongs_to_if 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b347c9c2111c2e040954dda8c232ba5a62b48def
-  data.tar.gz: ac4763891784d667f286dabc3e27afca8203e965
+  metadata.gz: 6796349f183521b9cff4226df8fd7598b41b8116
+  data.tar.gz: 6b40fb266cee832d080186b6a84c467af184fbec
 SHA512:
-  metadata.gz: 9e820489c1ffc41f39b3341af2b5e1c06cdec9c966e297a54c3b0ae5a297183998b56ead4b3306ca7657fb551af96d1467df86337effd9541ea0ec6e046cc79b
-  data.tar.gz: cbdfeef27048428d2a2fe535f416da648a14b0de7a8b1ce232481343cda5db34ef6a6ae5fe139ed36dbb57dd7b1b49e045d571a6a4419e53a8d7410c50d574f1
+  metadata.gz: 0f09841658c576895e6afaf3b185bcafa39804aeffc5b8d1e94404e8d3bc7166e5f88013b77adae9753e7f75d88c5184c8bb30519be71511bf1b42a80d1c5d50
+  data.tar.gz: 30c4e6be29eca223e738afbdf64bc512ef62a0c6e52b162f406c99e3744bcf16a01799bce3f08c6955396343509908e3b0cd2378725a0a4e55c0a705d9a0e883

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.0
+
+- Support ActiveRecord 5.0.0
+
 ## 0.0.4
 - Support ActiveRecord 4.2.0
 

data/lib/active_record/belongs_to_if/builder_extension.rb

@@ -1,9 +1,22 @@
 module ActiveRecord
   module BelongsToIf
     module BuilderExtension
+      # To keep compatibility with Rails > 4
       def valid_options
         super + [:if]
       end
+
+      module ClassMethods
+        def valid_options(options)
+          super + [:if]
+        end
+      end
+
+      def self.prepended(base)
+        class << base
+          prepend ClassMethods
+        end
+      end
     end
   end
 end

data/lib/active_record/belongs_to_if/preloader_extension.rb

@@ -28,28 +28,40 @@ module ActiveRecord
 
       # @note Override to change `records_by_owner` so that empty array is used.
       def associated_records_by_owner(preloader)
-        owners_map = owners_by_key
-        owner_keys = owners_map.keys.compact
-
         # Each record may have multiple owners, and vice-versa
         records_by_owner = Hash.new do |hash, key|
           hash[key] = []
         end
 
-        if owner_keys.any?
-          # Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
-          # Make several smaller queries if necessary or make one query if the adapter supports it
-          sliced  = owner_keys.each_slice(klass.connection.in_clause_length || owner_keys.size)
+        # To keep compatibility with Rails > 4
+        if ::ActiveRecord::VERSION::MAJOR > 4
+          records = load_records
+          records_by_owner = Hash.new do |hash, key|
+            hash[key] = []
+          end
+          owners.each_with_object(records_by_owner) do |owner, result|
+            result[owner] = records[convert_key(owner[owner_key_name])] || []
+          end
+        else
+          owners_map = owners_by_key
+          owner_keys = owners_map.keys.compact
+
 
-          records = load_slices sliced
-          records.each do |record, owner_key|
-            owners_map[owner_key].each do |owner|
-              records_by_owner[owner] << record
+          if owner_keys.any?
+            # Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
+            # Make several smaller queries if necessary or make one query if the adapter supports it
+            sliced  = owner_keys.each_slice(klass.connection.in_clause_length || owner_keys.size)
+
+            records = load_slices sliced
+            records.each do |record, owner_key|
+              owners_map[owner_key].each do |owner|
+                records_by_owner[owner] << record
+              end
             end
           end
-        end
 
-        records_by_owner
+          records_by_owner
+        end
       end
 
       # @return [Proc, String, Symbol, nil] The value :if option passed to belongs_to.

data/lib/active_record/belongs_to_if/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module BelongsToIf
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-belongs_to_if
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -105,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Allows you to manage preload condition by `:if` condition.
 test_files: []
-has_rdoc: