ransack-enum 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7549f0d615e6836ad8d5c1ecbeb5da477c53cab979f47fe797b577fe7563d3e3
-  data.tar.gz: 3cf5ba60975e996fc3e2589c3fd4f0de56069c0f0333fa83ef2f207055fa78b0
+  metadata.gz: 6240a0e80bbe84b028e7f40500d0aa9a66dc688d90f49795e634e8b4448a7119
+  data.tar.gz: b88afa56b2dff2b1154d71d2af2315c7e0e6c7d0913ce546a871fff53559b9b5
 SHA512:
-  metadata.gz: 6e079c505e13f75b63896be2d0339bf74e9df8a85d358094067231513202234e1b332fd62fef230099401c6619b74c9757ca45b71a4e5a45f355309378e40672
-  data.tar.gz: cc9a1e2c3bf288ab36e3e7dd3f26a35d194e9f4a85ea69cd65fc8ac7af02f25846dd3b0c290710e79a189de19e3908988700a6430849235054ec8a04749cbfc8
+  metadata.gz: 130d09f69ec1232da41416e141c5b16ab569e1724d3f832beab8ce353ac76300f14850bdfb59952eb6d5ac98d1ca57770659b2e30d4b9d018a46948da516aa67
+  data.tar.gz: 6eaf58d828ef8bfcb4511159c78234e7dc62846bbdb7009e778030804cf7bb1f55726115fa999d20c680ad1f8e04b864db10b915487e233b36d2e6a0948128d7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.2.0 / 2019-12-02
+### New features
+- Enable / Disable in ransack configuration
+
 ## 0.1.2 / 2019-12-01
 ### Hotfix
 - Fix dependencies

data/README.md

@@ -7,7 +7,7 @@ Allow Enum values to be used in [Ransack](https://github.com/activerecord-hacker
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'ransack-enum'
+gem 'ransack-enum', '~> 0.2'
 ```
 
 And then execute:
@@ -43,9 +43,29 @@ Post.ransack(status_in: [0, 1]).result.to_sql
 # SELECT "posts".* FROM "posts" WHERE "posts"."status" IN (0, 1)
 ```
 
+### Configuration
+
+Enable / Disable enum value search in the configuration.
+Default is enabled.
+
+```ruby
+# config/initializers/ransack.rb
+
+Ransack.configure do |config|
+  # ...
+end
+
+Ransack::Enum.configure do |config|
+  # enabled
+  config.enabled = true
+
+  # disabled
+  # config.enabled = false
+end
+```
+
 ## Feature
 
-- Enable / Disable in ransack configuration
 - Enable to convert enum i18n value to search value
 
 ## Development

data/lib/ransack/enum.rb

@@ -3,10 +3,17 @@
 require 'active_support/core_ext'
 require 'ransack/enum/version'
 require 'ransack/enum/adapters'
+require 'ransack/enum/configuration'
 
 module Ransack
+  # Ransack::Enum
   module Enum
+    extend Configuration
     class Error < StandardError; end
     # Your code goes here...
   end
 end
+
+Ransack::Enum.configure do |config|
+  config.enabled = true
+end

data/lib/ransack/enum/adapters/active_record/base.rb

@@ -8,44 +8,35 @@ module Ransack
         module Base
           # @see https://github.com/rails/rails/blob/66cabeda2c46c582d19738e1318be8d59584cc5b/activerecord/lib/active_record/enum.rb#L150
           # @param [Hash] definitions
+          # @return [Hash]
           def enum(definitions)
-            super
-            enum_ransacker(definitions) if respond_to?(:ransacker)
-          end
-
-          # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-          # @param [Hash] definitions
-          def enum_ransacker(definitions)
-            definitions.each do |name, values|
-              fmt = lambda do |v|
-                return values[v.to_sym] if values[v.to_sym]
-
-                case columns_hash[name.to_s]&.type
-                when :integer
-                  v.to_i
-                when :boolean
-                  if ActiveRecord::VERSION::MAJOR >= 5
-                    ActiveRecord::Type::Boolean.new.cast(v)
-                  else
-                    ActiveRecord::Type::Boolean.new.type_cast_from_database(v)
-                  end
-                else
-                  v
-                end
+            result = super(definitions)
+            if respond_to?(:ransacker)
+              definitions.each do |name, values|
+                enum_ransacker name, values
               end
+            end
+            result
+          end
 
-              formatter = proc do |val|
-                if val.is_a?(Array)
-                  val.map { |v| fmt.call(v) }
-                else
-                  fmt.call(val)
-                end
-              end
+          # rubocop:disable Metrics/AbcSize
+          # @param [Symbol] name
+          # @param [Hash] values
+          # @return [Hash]
+          def enum_ransacker(name, values)
+            lmd = lambda do |val|
+              v = values[val.to_sym]
+              return v if Ransack::Enum.options[:enabled] && v
 
-              ransacker name.to_sym, formatter: formatter
+              type = attribute_types[name.to_s]&.type
+              Ransack::Nodes::Value.new(nil, val).cast(type)
             end
+
+            ransacker name.to_sym, formatter: proc { |val|
+              val.is_a?(Array) ? val.map { |v| lmd.call(v) } : lmd.call(val)
+            }
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+          # rubocop:enable Metrics/AbcSize
         end
       end
     end

data/lib/ransack/enum/configuration.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Ransack
+  module Enum
+    # Ransack::Enum::Configuration
+    module Configuration
+      mattr_accessor :options
+
+      self.options = {
+        enabled: true
+      }
+
+      def configure
+        yield self
+      end
+
+      # @param [TrueClass, FalseClass] boolean
+      def enabled=(boolean)
+        options[:enabled] = boolean
+      end
+    end
+  end
+end

data/lib/ransack/enum/version.rb

@@ -2,6 +2,6 @@
 
 module Ransack
   module Enum
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ransack-enum
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - shoma07
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
@@ -102,6 +102,7 @@ files:
 - lib/ransack/enum/adapters.rb
 - lib/ransack/enum/adapters/active_record.rb
 - lib/ransack/enum/adapters/active_record/base.rb
+- lib/ransack/enum/configuration.rb
 - lib/ransack/enum/version.rb
 - ransack-enum.gemspec
 homepage: https://github.com/shoma07/ransack-enum
@@ -110,7 +111,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/shoma07/ransack-enum
   source_code_uri: https://github.com/shoma07/ransack-enum
-  changelog_uri: https://github.com/shoma07/ransack-enum/blob/v0.1.2/CHANGELOG.md
+  changelog_uri: https://github.com/shoma07/ransack-enum/blob/v0.2.0/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: