edge_rider 0.3.2 → 2.0.0

data/Rakefile

@@ -7,4 +7,4 @@ rescue LoadError
   puts 'Run `gem install gemika` for additional tasks'
 end
 
-task :default => 'matrix:spec'
+task default: 'matrix:spec'

data/edge_rider.gemspec

@@ -1,20 +1,29 @@
-$:.push File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "edge_rider/version"
 
-Gem::Specification.new do |s|
-  s.name = 'edge_rider'
-  s.version = EdgeRider::VERSION
-  s.authors = ["Henning Koch"]
-  s.email = 'henning.koch@makandra.de'
-  s.homepage = 'https://github.com/makandra/edge_rider'
-  s.summary = 'Power tools for ActiveRecord relations (scopes)'
-  s.description = s.summary
-  s.license = 'MIT'
+Gem::Specification.new do |spec|
+  spec.name = 'edge_rider'
+  spec.version = EdgeRider::VERSION
+  spec.required_ruby_version = '>= 2.3.0'
+  spec.authors = ['Henning Koch']
+  spec.email = ['henning.koch@makandra.de']
 
-  s.files         = `git ls-files`.split("\n").select { |path| File.exist?(path) && !File.symlink?(path) }
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n").select { |path| File.exist?(path) && !File.symlink?(path) }
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  spec.summary = 'Power tools for ActiveRecord relations (scopes)'
+  spec.description = spec.summary
+  spec.homepage = 'https://github.com/makandra/edge_rider'
+  spec.license = 'MIT'
 
-  s.add_dependency('activerecord')
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r(^exe/)) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_dependency('activerecord', '>=3.2')
+
+  # Development dependencies are defined in the Gemfile (therefore no `spec.add_development_dependency` directives)
 end

data/lib/edge_rider/collect_column.rb

@@ -4,23 +4,16 @@ module EdgeRider
     def collect_column(column_name, find_options = {})
       distinct = find_options.delete(:distinct)
       qualified_column_name = EdgeRider::Util.qualify_column_name(self, column_name)
-      if respond_to?(:pluck) # Rails 3.2+
-        scope = scoped({})
-        if distinct
-          if ActiveRecord::VERSION::MAJOR < 5
-            scope = scope.uniq
-          else
-            scope = scope.distinct
-          end
+
+      scope = scoped({})
+      if distinct
+        if ActiveRecord::VERSION::MAJOR < 5
+          scope = scope.uniq
+        else
+          scope = scope.distinct
         end
-        scope.pluck(qualified_column_name)
-      else # Rails 2
-        select = distinct ? "DISTINCT #{qualified_column_name}" : qualified_column_name
-        query = scoped(find_options.merge(:select => select)).to_sql
-        raw_values = connection.select_values(query)
-        column = columns_hash[column_name.to_s] or raise "Could not retrieve column information: #{column_name}"
-        raw_values.collect { |value| column.type_cast(value) }
       end
+      scope.pluck(qualified_column_name)
     end
 
     ActiveRecord::Base.extend(self)

data/lib/edge_rider/origin_class.rb

@@ -3,16 +3,8 @@ module EdgeRider
 
     def origin_class
       scope = scoped({})
-      if Util.activerecord2?
-        # Rails 2
-        while scope.respond_to?(:proxy_scope, true)
-          scope = scope.proxy_scope
-        end
-      else
-        # Rails 3
-        while scope.respond_to?(:klass, true)
-          scope = scope.klass
-        end
+      while scope.respond_to?(:klass, true)
+        scope = scope.klass
       end
       scope
     end

data/lib/edge_rider/preload_associations.rb

@@ -1,5 +1,10 @@
 module EdgeRider
   module PreloadAssociations
+    module PreloadAssociationsInstanceMethod
+      def preload_associations(*args)
+        self.class.preload_associations([self], *args)
+      end
+    end
 
     def preload_associations(*args)
       preloader = ActiveRecord::Associations::Preloader
@@ -21,5 +26,7 @@ module EdgeRider
       ActiveRecord::Base.send(:extend, self)
     end
 
+    ActiveRecord::Base.send(:include, PreloadAssociationsInstanceMethod)
+
   end
 end

data/lib/edge_rider/scoped.rb

@@ -3,7 +3,7 @@ module EdgeRider
     
     VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset,
                            :order, :select, :readonly, :group, :having, :from, :lock ]
-    
+
     def scoped(options = nil)
       options ||= {}
       relation = all

data/lib/edge_rider/to_id_query.rb

@@ -3,7 +3,7 @@ module EdgeRider
 
     def to_id_query
       ids = collect_ids
-      EdgeRider::Util.exclusive_query(self, :id => ids)
+      EdgeRider::Util.exclusive_query(self, id: ids)
     end
 
     ActiveRecord::Base.send(:extend, self)

data/lib/edge_rider/traverse_association.rb

@@ -8,7 +8,7 @@ module EdgeRider
 
       scope = scoped({})
 
-      associations.each_with_index do |association, index|
+      associations.each do |association|
 
         reflection = scope.reflect_on_association(association) or raise UnknownAssociation, "Could not find association: #{self.name}##{association}"
         foreign_key = reflection.respond_to?(:foreign_key) ? reflection.foreign_key : reflection.primary_key_name
@@ -18,14 +18,18 @@ module EdgeRider
         raise NotImplementedError if reflection.options[:conditions] or (reflection.respond_to?(:scope) && reflection.scope)
            
         if reflection.macro == :belongs_to # belongs_to
-          ids = scope.collect_column(foreign_key, :distinct => true)
-          scope = EdgeRider::Util.exclusive_query(reflection.klass, :id => ids)
+          ids = scope.collect_column(foreign_key, distinct: true)
+          scope = EdgeRider::Util.exclusive_query(reflection.klass, id: ids)
         elsif reflection.macro == :has_many || reflection.macro == :has_one
           if reflection.through_reflection # has_many :through
             scope = scope.traverse_association(reflection.through_reflection.name, reflection.source_reflection.name)
           else # has_many or has_one
-            ids = scope.collect_ids
-            scope = EdgeRider::Util.exclusive_query(reflection.klass, foreign_key => ids)
+            conditions = {}
+            # A polymorphic association has a type attribute, e.g. record_type, that needs to be added to condition.
+            conditions[reflection.type] = self.name if reflection.type.present?
+            conditions[foreign_key] = scope.collect_ids
+
+            scope = EdgeRider::Util.exclusive_query(reflection.klass, conditions)
           end
         else
           raise UnsupportedAssociation, "Unsupport association type: #{reflection.macro}"

data/lib/edge_rider/util.rb

@@ -7,21 +7,21 @@ module EdgeRider
     def qualify_column_name(model, column_name)
       column_name = column_name.to_s
       unless column_name.include?('.')
-        quoted_table_name = model.connection.quote_table_name(model.table_name)
-        quoted_column_name = model.connection.quote_column_name(column_name)
-        column_name = "#{quoted_table_name}.#{quoted_column_name}"
+        column_name = if ActiveRecord::VERSION::MAJOR < 4
+          quoted_table_name = model.connection.quote_table_name(model.table_name)
+          quoted_column_name = model.connection.quote_column_name(column_name)
+          "#{quoted_table_name}.#{quoted_column_name}"
+        else
+          # Rails 4+ will quote correctly and Rails 5.2 will print
+          # deprecation warnings if there are surplus quotes
+          "#{model.table_name}.#{column_name}"
+        end
       end
       column_name
     end
 
     def exclusive_query(model, conditions)
-      if activerecord2?
-        model.send(:with_exclusive_scope) do
-          model.scoped(:conditions => conditions)
-        end
-      else
-        model.unscoped.where(conditions)
-      end
+      model.unscoped.where(conditions)
     end
 
     def scope?(object)
@@ -29,13 +29,16 @@ module EdgeRider
     end
     
     def define_scope(klass, name, lambda)
-      if ActiveRecord::VERSION::MAJOR < 4 # Rails 2/3
-        scope_definition = ActiveRecord::VERSION::MAJOR < 3 ? :named_scope : :scope
-        klass.send scope_definition, name, lambda
+      if ActiveRecord::VERSION::MAJOR == 3
+        klass.send :scope, name, lambda
       else
         klass.send :scope, name, lambda { |*args|
           options = lambda.call(*args)
-          klass.scoped(options.slice :conditions)
+          if ActiveRecord::VERSION::MAJOR < 6
+            klass.scoped(options.slice :conditions)
+          else
+            scoped(options.slice :conditions)
+          end
         }
       end      
     end
@@ -49,7 +52,7 @@ module EdgeRider
         # but Rails 2 does not have it.
         other_options = options.slice!(:conditions)
         scope = lambda { |*args| scoped(options) }
-        owner.send association, target, scope, other_options
+        owner.send association, target, scope, **other_options
       end
     end
 
@@ -57,10 +60,6 @@ module EdgeRider
       ActiveRecord::VERSION::MAJOR
     end
 
-    def activerecord2?
-      active_record_version < 3
-    end
-
     def rspec_version
       if defined?(Spec)
         1

data/lib/edge_rider/version.rb

@@ -1,3 +1,3 @@
 module EdgeRider
-  VERSION = '0.3.2'
+  VERSION = '2.0.0'
 end

data/lib/edge_rider.rb

@@ -12,4 +12,3 @@ require 'edge_rider/origin_class'
 require 'edge_rider/scoped'
 require 'edge_rider/traverse_association'
 require 'edge_rider/to_id_query'
-require 'edge_rider/to_sql'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge_rider
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,39 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 description: Power tools for ActiveRecord relations (scopes)
-email: henning.koch@makandra.de
+email:
+- henning.koch@makandra.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
-- ".travis.yml"
+- CHANGELOG.md
+- Gemfile
+- Gemfile.4.2.mysql2
+- Gemfile.4.2.mysql2.lock
+- Gemfile.4.2.pg
+- Gemfile.4.2.pg.lock
+- Gemfile.5.2.mysql2
+- Gemfile.5.2.mysql2.lock
+- Gemfile.5.2.pg
+- Gemfile.5.2.pg.lock
+- Gemfile.6.1.pg
+- Gemfile.6.1.pg.lock
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - edge_rider.gemspec
-- gemfiles/Gemfile.2.3.mysql2
-- gemfiles/Gemfile.2.3.mysql2.lock
-- gemfiles/Gemfile.3.2.mysql2
-- gemfiles/Gemfile.3.2.mysql2.lock
-- gemfiles/Gemfile.4.2.mysql2
-- gemfiles/Gemfile.4.2.mysql2.lock
-- gemfiles/Gemfile.4.2.pg
-- gemfiles/Gemfile.4.2.pg.lock
-- gemfiles/Gemfile.5.1.mysql2
-- gemfiles/Gemfile.5.1.mysql2.lock
-- gemfiles/Gemfile.5.1.pg
-- gemfiles/Gemfile.5.1.pg.lock
 - lib/edge_rider.rb
 - lib/edge_rider/collect_column.rb
 - lib/edge_rider/collect_ids.rb
@@ -57,24 +60,9 @@ files:
 - lib/edge_rider/preload_associations.rb
 - lib/edge_rider/scoped.rb
 - lib/edge_rider/to_id_query.rb
-- lib/edge_rider/to_sql.rb
 - lib/edge_rider/traverse_association.rb
 - lib/edge_rider/util.rb
 - lib/edge_rider/version.rb
-- spec/edge_rider/collect_column_spec.rb
-- spec/edge_rider/collect_ids_spec.rb
-- spec/edge_rider/origin_class_spec.rb
-- spec/edge_rider/preload_associations_spec.rb
-- spec/edge_rider/scoped_spec.rb
-- spec/edge_rider/to_id_query_spec.rb
-- spec/edge_rider/to_sql_spec.rb
-- spec/edge_rider/traverse_association_spec.rb
-- spec/edge_rider/util_spec.rb
-- spec/spec_helper.rb
-- spec/support/database.rb
-- spec/support/database.sample.yml
-- spec/support/database.travis.yml
-- spec/support/models.rb
 homepage: https://github.com/makandra/edge_rider
 licenses:
 - MIT
@@ -87,15 +75,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.2.26
 signing_key: 
 specification_version: 4
 summary: Power tools for ActiveRecord relations (scopes)

data/.travis.yml

@@ -1,68 +0,0 @@
-language: ruby
-
-rvm:
-  - '1.8.7'
-  - '2.1.8'
-  - '2.2.4'
-  - '2.3.1'
-  - '2.4.1'
-
-gemfile:
-  - 'gemfiles/Gemfile.2.3.mysql2'
-  - 'gemfiles/Gemfile.3.2.mysql2'
-  - 'gemfiles/Gemfile.4.2.mysql2'
-  - 'gemfiles/Gemfile.4.2.pg'
-  - 'gemfiles/Gemfile.5.1.mysql2'
-  - 'gemfiles/Gemfile.5.1.pg'
-
-matrix:
-  exclude:
-    - gemfile: 'gemfiles/Gemfile.2.3.mysql2'
-      rvm: '2.1.8'
-    - gemfile: 'gemfiles/Gemfile.2.3.mysql2'
-      rvm: '2.2.4'
-    - gemfile: 'gemfiles/Gemfile.3.2.mysql2'
-      rvm: '2.3.1'
-    - gemfile: 'gemfiles/Gemfile.2.3.mysql2'
-      rvm: '2.3.1'
-    - gemfile: 'gemfiles/Gemfile.2.3.mysql2'
-      rvm: '2.4.1'
-    - gemfile: 'gemfiles/Gemfile.3.2.mysql2'
-      rvm: '2.4.1'
-    - gemfile: 'gemfiles/Gemfile.4.2.mysql2'
-      rvm: '1.8.7'
-    - gemfile: 'gemfiles/Gemfile.4.2.pg'
-      rvm: '1.8.7'
-    - gemfile: 'gemfiles/Gemfile.4.2.mysql2'
-      rvm: '2.4.1'
-    - gemfile: 'gemfiles/Gemfile.4.2.pg'
-      rvm: '2.4.1'
-    - gemfile: 'gemfiles/Gemfile.5.1.mysql2'
-      rvm: '1.8.7'
-    - gemfile: 'gemfiles/Gemfile.5.1.mysql2'
-      rvm: '2.1.8'
-    - gemfile: 'gemfiles/Gemfile.5.1.pg'
-      rvm: '1.8.7'
-    - gemfile: 'gemfiles/Gemfile.5.1.pg'
-      rvm: '2.1.8'
-
-services:
-  - mysql
-
-install:
-  # Shave yaks
-  - gem uninstall bundler -I -x --force
-  # Old Travis CI bundler explodes when lockfile version doesn't match recently bumped version
-  - gem install bundler --version='=1.12.5'
-  # This is the default Travis CI install step
-  - bundle install --jobs=3 --retry=3 --deployment --path=${BUNDLE_PATH:-vendor/bundle}
-
-before_script:
-  - psql -c 'create database edge_rider_test;' -U postgres
-  - mysql -e 'create database IF NOT EXISTS edge_rider_test;'
-
-script: bundle exec rake current_rspec
-
-notifications:
-  email:
-    - fail@makandra.de