activeadmin_settings_cached 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 603aca9e3f4f9203e5615d4d1a6de0971c712bd0
-  data.tar.gz: 9479bedf926819b92387a229c3a86f82d0bc47d3
+SHA256:
+  metadata.gz: 6a36186f3620c9f433f3ae6623aee9ac7f41aa6eba6f09c1d6258e3c85fff4ff
+  data.tar.gz: 8df7671e910503777e8db5ef684ccbe75188e7ff813f57f8674fcbdbbf7dc67f
 SHA512:
-  metadata.gz: 93838c32f20dffc07cd5089f91b5c95587286b078ca8769b0768b55c40d90c36b22b332edcb6c58805a6fd6bf58bb4504e58b5bfcecf49c1f1faa644255ad17b
-  data.tar.gz: 2c7b7968c14440954dce41f50b02ac8b3f2e2ef787e02512212a6c2df7fb9fc38d56928b4ad17c39726037e9e6dde55a849191edc1d863667500ffbb1f53560e
+  metadata.gz: 62a56fafb8fbc35413d980bcbc4e56c8ed8651adb51f9c5af9431f312d30d9b7b3b0f6594d09e53342c236b3721a846ad0c4eae820fd6553031b51efe380c242
+  data.tar.gz: 18fa494be363505eb265ea9031a4eca53931f2f23e222681d0449caac04fa3d1097fa4f6c27587b51c00c93df5ca272230d44b8ca8fa9048ba16dd5a4fce9871

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.3.1 2018-05-22
+
+## Changed
+
+- Remove dry-types dependency
+
+## Fixed
+- Breaking change in dry-types: Rename Types::Form to Types::Params (Julien FLAJOLLET)
+
 # v2.2.0 2017-12-22
 
 ## Added

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 
 group :test do
   gem 'pry-byebug'
+  gem 'puma'
   gem 'therubyracer'
 end
 

data/Makefile

@@ -1,5 +1,11 @@
+RUN := run --rm
+DOCKER_COMPOSE_RUN := docker-compose $(RUN)
+
 default: test
 
+compose-bash:
+	${DOCKER_COMPOSE_RUN} app bash
+
 rake:
 	bundle exec rake ${T}
 

data/README.md

@@ -84,7 +84,7 @@ You can localize settings keys in local file
 en:
   settings:
     attributes:
-      my_awesome_settings: 'My Awesome Lolaized Setting'
+      my_awesome_settings: 'My Awesome Localized Setting'
 ```
 ## Model name
 

data/activeadmin_settings_cached.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'activeadmin'
-  s.add_dependency 'dry-types', '>= 0.8.1'
   s.add_dependency 'rails-settings-cached', '>= 0.5.3', '< 0.6.7'
 
   s.add_development_dependency 'appraisal'

data/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3.3'
 
 services:
   app:
@@ -6,8 +6,7 @@ services:
     command: 'make test'
     volumes:
       - '.:/app'
-      - gems:/usr/local/bundle
+      - bundler-data:/usr/local/bundle/:cached
 
 volumes:
-  gems:
-    external: true
+  bundler-data:

data/gemfiles/rails4.2.gemfile

@@ -6,6 +6,7 @@ gem "rails", "~> 4.2.0"
 
 group :test do
   gem "pry-byebug"
+  gem "puma"
   gem "therubyracer"
 end
 

data/gemfiles/rails5.0.gemfile

@@ -8,6 +8,7 @@ gem "listen"
 
 group :test do
   gem "pry-byebug"
+  gem "puma"
   gem "therubyracer"
 end
 

data/gemfiles/rails5.1.gemfile

@@ -8,6 +8,7 @@ gem "listen"
 
 group :test do
   gem "pry-byebug"
+  gem "puma"
   gem "therubyracer"
 end
 

data/lib/activeadmin_settings_cached/coercions.rb

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
-require 'dry-types'
-
 module ActiveadminSettingsCached
   # Coerce user input values to defined types
   #
   # @api private
   class Coercions
+    TRUE_VALUES = %w[1 on On ON t true True TRUE T y yes Yes YES Y].freeze
+    FALSE_VALUES = %w[0 off Off OFF f false False FALSE F n no No NO N].freeze
+    BOOLEAN_MAP = ::Hash[
+      TRUE_VALUES.product([true]) + FALSE_VALUES.product([false])
+    ].freeze
+
     attr_reader :defaults, :display
 
     def initialize(defaults, display)
       @defaults = defaults
-      @display = display
+      @display  = display
     end
 
     def cast_params(params)
@@ -28,14 +32,14 @@ module ActiveadminSettingsCached
 
     private
 
-    def cast_value(name, value)
+    def cast_value(name, value) # rubocop:disable Metrics/MethodLength
       case defaults[name]
       when TrueClass, FalseClass
-        -> { value_or_default('bool', value, false) }
+        -> { BOOLEAN_MAP.fetch(value, false) }
       when Integer
-        -> { value_or_default('int', value, 0) }
+        -> { value_or_default(0) { Integer(value) } }
       when Float
-        -> { value_or_default('float', value, 0.0) }
+        -> { value_or_default(0.0) { Float(value) } }
       when Hash, 'ActiveSupport::HashWithIndifferentAccess'
         nil
       when Symbol
@@ -45,13 +49,10 @@ module ActiveadminSettingsCached
       end
     end
 
-    def value_or_default(type, value, default)
-      result = Dry::Types["form.#{type}"].call(value)
-      if Dry::Types[type].valid?(result)
-        result
-      else
-        default
-      end
+    def value_or_default(default)
+      yield
+    rescue ArgumentError, TypeError
+      default
     end
   end
 end

data/lib/activeadmin_settings_cached/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveadminSettingsCached
-  VERSION = '2.2.0'
+  VERSION = '2.3.1'.freeze
 end

data/spec/coercions_spec.rb

@@ -21,60 +21,66 @@ RSpec.describe ActiveadminSettingsCached::Coercions do
       'base.five_setting'     => :aaa,
       'second.first_setting'  => false,
       'second.second_setting' => 'BBB',
-      'some'                  => Hash.new
+      'some'                  => {}
     ].with_indifferent_access
   end
 
-  let(:right_params) do
-    ActionController::Parameters.new(
-      Hash[
-        'base.first_setting'    => 'BBB',
-        'base.second_setting'   => 'false',
-        'base.third_setting'    => '155',
-        'base.four_setting'     => '55.5',
-        'base.five_setting'     => 'bbb',
-        'second.first_setting'  => 'true',
-        'second.second_setting' => 'AAA'
-      ]
-    )
-  end
-
-  let(:wrong_params) do
-    ActionController::Parameters.new(
-      Hash['base.second_setting'  => 'hjgj',
-           'base.third_setting'   => 'fhfh',
-           'base.four_setting'    => 'gjfhg',
-           'second.first_setting' => 'ggf',
-           'some'                 => Hash.new
-    ])
-  end
-
-  let(:no_params) { ActionController::Parameters.new(Hash[]) }
-
   subject(:coercions) do
     ActiveadminSettingsCached::Coercions.new(defaults, display)
   end
 
-  it 'when good params' do
-    expect { |b| coercions.cast_params(right_params, &b) }
-      .to yield_successive_args(['base.first_setting', 'BBB'],
-                                ['base.second_setting', false],
-                                ['base.third_setting', 155],
-                                ['base.four_setting', 55.5],
-                                ['base.five_setting', :bbb],
-                                ['second.first_setting', true],
-                                ['second.second_setting', 'AAA'])
+  context 'when params is valid' do
+    let(:params) do
+      ActionController::Parameters.new(
+        Hash[
+          'base.first_setting'    => 'BBB',
+          'base.second_setting'   => 'false',
+          'base.third_setting'    => '155',
+          'base.four_setting'     => '55.5',
+          'base.five_setting'     => 'bbb',
+          'second.first_setting'  => 'true',
+          'second.second_setting' => 'AAA'
+        ]
+      )
+    end
+
+    it 'casts params' do
+      expect { |b| coercions.cast_params(params, &b) }
+        .to yield_successive_args(['base.first_setting', 'BBB'],
+                                  ['base.second_setting', false],
+                                  ['base.third_setting', 155],
+                                  ['base.four_setting', 55.5],
+                                  ['base.five_setting', :bbb],
+                                  ['second.first_setting', true],
+                                  ['second.second_setting', 'AAA'])
+    end
   end
 
-  it 'when wrong params' do
-    expect { |b| coercions.cast_params(wrong_params, &b) }
-      .to yield_successive_args(['base.second_setting', false],
-                                ['base.third_setting', 0],
-                                ['base.four_setting', 0.0],
-                                ['second.first_setting', false])
+  context 'when params is wrong' do
+    let(:params) do
+      ActionController::Parameters.new(
+        Hash[
+          'base.second_setting'  => 'hjgj',
+          'base.third_setting'   => 'fhfh',
+          'base.four_setting'    => 'gjfhg',
+          'second.first_setting' => 'ggf',
+          'some'                 => {}
+        ]
+      )
+    end
+
+    it 'returns default values' do
+      expect { |b| coercions.cast_params(params, &b) }
+        .to yield_successive_args(['base.second_setting', false],
+                                  ['base.third_setting', 0],
+                                  ['base.four_setting', 0.0],
+                                  ['second.first_setting', false])
+    end
   end
 
-  it 'when no params' do
-    expect { |b| coercions.cast_params(no_params, &b) }.not_to yield_control
+  context 'when params is empty' do
+    let(:params) { ActionController::Parameters.new(Hash[]) }
+
+    it { expect { |b| coercions.cast_params(params, &b) }.not_to yield_control }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_settings_cached
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Semyon Pupkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rails-settings-cached
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: UI interface for rails-settings-cached in active admin