goldiloader 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7414c0de13b4e9b5c87d8106cedfdb2028a3640
-  data.tar.gz: 2a0650488a2ebdc94d665fa12b3dc7d88282c791
+  metadata.gz: de665e9942d28b42bbc8358aef8a0988a6790916
+  data.tar.gz: ce84f8c27963cd4232cee01952143e5d2d6555e5
 SHA512:
-  metadata.gz: 46d11df02dbae98f7915b06df38937ba93937671433403ff1f161def9568b92cb1a310eb55eed6c9edb073e5851660bb890d7c324cafca12c99585d269ebd0e9
-  data.tar.gz: '09179806ac8786f88f059d0c3cba83c4a85acd7f9fe1794dca06ac6672da948b854264263c709911425689493c2932d7f242504a2b0d0d5f9818d0487b58da17'
+  metadata.gz: bc34b71e88333002565cfb97c2841318782e5e38a3255338f9a70a871d7828f1f8ea2308a7400280949d8893a083ed4fc12a86cf2af921ca35e093aba34c40eb
+  data.tar.gz: 89187ce69caf6a448c1bb887a7e33c7b9bee434376d53f62376069923572f3bac86f12b3a21238ff8411b0a4ea7292f4c1abb1de479700950c58d6a758d46bcc

data/lib/goldiloader.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 require 'active_support/all'
 require 'active_record'

data/lib/goldiloader/active_record_patches.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Goldiloader
   module BasePatch

data/lib/goldiloader/association_info.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Goldiloader
   class AssociationInfo
@@ -9,7 +9,7 @@ module Goldiloader
 
     delegate :association_scope, :reflection, to: :@association
 
-    def has_one?
+    def has_one? # rubocop:disable Naming/PredicateName
       reflection.has_one?
     end
 

data/lib/goldiloader/association_loader.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Goldiloader
   module AssociationLoader
@@ -35,7 +35,7 @@ module Goldiloader
         model.association(association_name).auto_include?
     end
 
-    def has_association?(model, association_name)
+    def has_association?(model, association_name) # rubocop:disable Naming/PredicateName
       model.class.reflect_on_association(association_name).present?
     end
   end

data/lib/goldiloader/association_options.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Goldiloader
   module AssociationOptions
@@ -24,8 +24,6 @@ module Goldiloader
         ActiveRecord::Associations::Builder::Association.valid_options.concat(OPTIONS)
       end
     end
-
-    private
   end
 end
 

data/lib/goldiloader/auto_include_context.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Goldiloader
   class AutoIncludeContext
@@ -13,10 +13,16 @@ module Goldiloader
       auto_include_context.register_models(models)
 
       Array.wrap(included_associations).each do |included_association|
-        associations = included_association.is_a?(Hash) ?
-            included_association.keys : Array.wrap(included_association)
-        nested_associations = included_association.is_a?(Hash) ?
-            included_association : Hash.new([])
+        associations = if included_association.is_a?(Hash)
+                         included_association.keys
+                       else
+                         Array.wrap(included_association)
+                       end
+        nested_associations = if included_association.is_a?(Hash)
+                                included_association
+                              else
+                                Hash.new([])
+                              end
 
         associations.each do |association|
           nested_models = models.flat_map do |model|

data/lib/goldiloader/compatibility.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Goldiloader
   module Compatibility

data/lib/goldiloader/version.rb

@@ -1,5 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Goldiloader
-  VERSION = '2.1.2'.freeze
+  VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-07 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -92,6 +92,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -121,21 +135,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: salsify_rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1.1
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -194,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="