activerecord-ignored_columns 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60079b7a4f640136599f6cefae3a7e387c5ccbfa
-  data.tar.gz: bef78372c460f1e85e83319532b02a4a97230442
+  metadata.gz: 4aba07522289d5658e9e56b22fbd7025cbf30804
+  data.tar.gz: 16f5eea27304e811b9d65d3fd75e69aad2a12bbf
 SHA512:
-  metadata.gz: e5e20c3edd7c0c43beccb528038750de607167cfe11176574521ad82be0f2c7a3606d37c308b0c867560a856a818ff9bfe5f5aef29a3511ff23f14c3e0cda93c
-  data.tar.gz: 1a3dfe98983acb3cac9ef4cdf3a9b7c40441bd9fff7b5c78183590cd61796b28a942eae2e47a5cc9bad28238a703e29b98585e2096a30147478cf4d5276b61bf
+  metadata.gz: 8ba55d9fc3effc6716129727d5f419e6891cae01d3174bccf9355c6dbbc034ca5b073458c77210d833c0b573b11c0035b9371e20392e83c6be8b0a62ac1b70f3
+  data.tar.gz: d66c4fab8932a84415f5a5bd66fd68bcfa1e1594a800110f177b0c11754f86945c7246505e8f316d72560963756a24a2543c6306ea1ead6506769acc6501fa95

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## [0.2.1](https://github.com/yasaichi/activerecord-ignored_columns/releases/tag/v0.2.1) (July 6, 2019)
+
+### Compatible changes
+
+- [Overall refactoring](https://github.com/yasaichi/activerecord-ignored_columns/pull/3)
+
 ## [0.2.0](https://github.com/yasaichi/activerecord-ignored_columns/releases/tag/v0.2.0) (July 6, 2019)
 
 ### Enhancements

data/lib/activerecord/ignored_columns.rb

@@ -1,7 +1,16 @@
 # frozen_string_literal: true
 
+require "active_support/lazy_load_hooks"
+require_relative "ignored_columns/model_schema"
+require_relative "ignored_columns/query_methods"
 require_relative "ignored_columns/version"
 
-if defined?(Rails)
-  require_relative "ignored_columns/railtie"
+ActiveSupport.on_load(:active_record) do
+  if ActiveRecord.version < Gem::Version.create("5")
+    include(ActiveRecord::IgnoredColumns::ModelSchema)
+  end
+
+  if ActiveRecord.version < Gem::Version.create("5.1")
+    ActiveRecord::Relation.include(ActiveRecord::IgnoredColumns::QueryMethods)
+  end
 end

data/lib/activerecord/ignored_columns/model_schema.rb

@@ -4,8 +4,8 @@ module ActiveRecord
   module IgnoredColumns
     module ModelSchema
       def self.included(active_record_base)
-        active_record_base.class_exec(ClassMethods) do |class_methods|
-          extend(class_methods)
+        active_record_base.class_exec do
+          extend ClassMethods
           self.ignored_columns = [].freeze
         end
       end

data/lib/activerecord/ignored_columns/query_methods.rb

@@ -3,25 +3,18 @@
 module ActiveRecord
   module IgnoredColumns
     module QueryMethods
-      def self.included(active_record_relation)
-        active_record_relation.prepend(PrependMethods)
-      end
-
-      module PrependMethods
-        # Override
-        private def build_select(arel, selects = [])
-          if !selects.empty? || select_values.any? || !klass.ignored_columns.any?
-            return former_build_select_implementation? ? super : super(arel)
-          end
-
-          arel.project(*klass.column_names.map { |name|
-            table[klass.attribute_aliases[name] || name]
-          })
+      # Override
+      private def build_select(arel, *args)
+        if args.empty? # ActiveRecord 4.1 or later
+          return super(arel) if select_values.any? || !klass.ignored_columns.any?
+        else
+          selects = args.first
+          return super(arel, selects) if !selects.empty? || !klass.ignored_columns.any?
         end
 
-        private def former_build_select_implementation?
-          @former_build_select_implementation ||= method(:build_select).super_method.arity == 2
-        end
+        arel.project(*klass.column_names.map { |name|
+          table[klass.attribute_aliases[name.to_s] || name] # arel_attribute(name)
+        })
       end
     end
   end

data/lib/activerecord/ignored_columns/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module IgnoredColumns
-    VERSION = "0.2.0".freeze
+    VERSION = "0.2.1".freeze  # rubocop:disable Style/RedundantFreeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-ignored_columns
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yuichi Goto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: reek
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +176,6 @@ files:
 - lib/activerecord/ignored_columns.rb
 - lib/activerecord/ignored_columns/model_schema.rb
 - lib/activerecord/ignored_columns/query_methods.rb
-- lib/activerecord/ignored_columns/railtie.rb
 - lib/activerecord/ignored_columns/version.rb
 homepage: https://github.com/yasaichi/activerecord-ignored_columns
 licenses:

data/lib/activerecord/ignored_columns/railtie.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/lazy_load_hooks"
-require "rails/railtie"
-require_relative "model_schema"
-require_relative "query_methods"
-
-module ActiveRecord
-  module IgnoredColumns
-    class Railtie < ::Rails::Railtie
-      initializer "active_record.ignored_columns" do
-        ::ActiveSupport.on_load(:active_record) do
-          rails_version = ::Rails.respond_to?(:gem_version) ?
-            ::Rails.gem_version : ::Gem::Version.create(::Rails.version)
-
-          if rails_version < ::Gem::Version.create("5")
-            include ::ActiveRecord::IgnoredColumns::ModelSchema
-          end
-
-          if rails_version < ::Gem::Version.create("5.1")
-            ::ActiveRecord::Relation.include(::ActiveRecord::IgnoredColumns::QueryMethods)
-          end
-        end
-      end
-    end
-  end
-end