active_data 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb124e56b71b295485dcfb70315f109b89b4e48793343bd241ef6c70e0d6247
-  data.tar.gz: 15adc0c5b026993a18a04a6cdc94dba0d76adafcac5aaffc1ec0e22f9a435975
+  metadata.gz: 5de412d5036c1e3192c87b9c7c7cc553cccaa5d53dc48adb32d992c3cf9fca25
+  data.tar.gz: 52c67fb161d13a2f7b4791f048c662962b2f0355b77fb8f10d434e6e5279692f
 SHA512:
-  metadata.gz: 28aaf1fa3d6c7fb6604ae5b6e3bb380f78983aba6626e2b7981c4127f5b92ce991611d20f41f4901183d6e3f6a9b2a2891197f94d7aecef6685befc7afbe56fa
-  data.tar.gz: 7547903a22f346ca54d5a3cc8227b1bb3bb19256f5966e6610f3a1ca8ea06952beeb16cb687ddfa00bd1f54d6b6b20f1d314eca72b47b213318d6a323aae011d
+  metadata.gz: a804cb81e49839e78dbd9de0bd7c670bfde5b34c46651009f15bc70b890edae3a2148d0fd48251179fe83068769c6ddb950969cb2f8eb06b116e1c184d2724e2
+  data.tar.gz: 6b8277845088785bb3a4cd95eb2c56882a7ece7c1cb395e04106717a1ec7ace440709b70c7bec9150be2c9b48626cbb458e8c6882ab01ac808067e428f1a55c3

data/.rubocop.yml

@@ -49,6 +49,7 @@ Metrics/BlockLength:
 Metrics/ModuleLength:
   Exclude:
     - '**/*_spec.rb'
+    - 'lib/active_data.rb'
 
 Style/Alias:
   EnforcedStyle: prefer_alias_method

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # master
 
+# Version 1.1.7
+
+* Add typecasting from `ActionController::Parameters` to `Hash` (#73)
+
 # Version 1.1.6
 
 * Fix Ruby 2.6 deprecations (#72)

data/active_data.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = ActiveData::VERSION
 
+  gem.add_development_dependency 'actionpack', '>= 4.0'
   gem.add_development_dependency 'activerecord', '>= 4.0'
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'database_cleaner'

data/lib/active_data.rb

@@ -61,6 +61,16 @@ module ActiveData
       value
     end
   end
+  ActiveSupport.on_load :action_controller do
+    ActiveData.typecaster('Hash') do |value|
+      case value
+      when ActionController::Parameters
+        value.to_h if value.permitted?
+      when ::Hash then
+        value
+      end
+    end
+  end
   typecaster('Date') do |value|
     begin
       value.to_date

data/lib/active_data/version.rb

@@ -1,3 +1,3 @@
 module ActiveData
-  VERSION = '1.1.6'.freeze
+  VERSION = '1.1.7'.freeze
 end

data/spec/lib/active_data/model/attributes/attribute_spec.rb

@@ -58,9 +58,48 @@ describe ActiveData::Model::Attributes::Attribute do
   end
 
   describe '#typecast' do
-    specify { expect(attribute.typecast(:hello)).to eq(:hello) }
-    specify { expect(attribute(type: Integer).typecast(42)).to eq(42) }
-    specify { expect(attribute(type: Integer).typecast('42')).to eq(42) }
+    context 'when Object' do
+      specify { expect(attribute.typecast(:hello)).to eq(:hello) }
+    end
+
+    context 'when Integer' do
+      specify { expect(attribute(type: Integer).typecast(42)).to eq(42) }
+      specify { expect(attribute(type: Integer).typecast('42')).to eq(42) }
+    end
+
+    context 'when Hash' do
+      let(:to_h) { {'x' => {'foo' => 'bar'}, 'y' => 2} }
+      let(:parameters) { ActionController::Parameters.new(to_h) }
+
+      before(:all) do
+        @default_hash_typecaster = ActiveData.typecaster('Hash')
+        require 'action_controller'
+        Class.new(ActionController::Base)
+        @action_controller_hash_typecaster = ActiveData.typecaster('Hash')
+      end
+
+      context 'when ActionController is loaded' do
+        before { ActiveData.typecaster('Hash', &@action_controller_hash_typecaster) }
+        after { ActiveData.typecaster('Hash', &@default_hash_typecaster) }
+
+        specify { expect(attribute(type: Hash).typecast(nil)).to be_nil }
+        specify { expect(attribute(type: Hash).typecast(to_h)).to eq(to_h) }
+        specify { expect(attribute(type: Hash).typecast(parameters)).to be_nil }
+        specify { expect(attribute(type: Hash).typecast(parameters.permit(:y, x: [:foo]))).to eq(to_h) }
+      end
+
+      context 'when ActionController is not loaded' do
+        before { ActiveData.typecaster('Hash', &@default_hash_typecaster) }
+
+        specify { expect(attribute(type: Hash).typecast(nil)).to be_nil }
+        specify { expect(attribute(type: Hash).typecast(to_h)).to eq(to_h) }
+        if ActiveSupport.version > Gem::Version.new('4.3')
+          specify { expect(attribute(type: Hash).typecast(parameters.permit(:y, x: [:foo]))).to be_nil }
+        else
+          specify { expect(attribute(type: Hash).typecast(parameters.permit(:y, x: [:foo]))).to eq(to_h) }
+        end
+      end
+    end
   end
 
   describe '#enum' do

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ Bundler.require
 
 require 'rspec/its'
 require 'active_record'
+require 'rack/test'
+require 'action_controller/metal/strong_parameters'
 require 'database_cleaner'
 
 require 'support/model_helpers'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_data
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - pyromaniac
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -316,7 +330,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -331,8 +345,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Working with hashes in AR style
 test_files: