requisite 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718f7a0ac2ca20c100cf6e5c119c4a9b4bafd5f4
-  data.tar.gz: 0da1427c7209923071d6667610ddc6473a2464fa
+  metadata.gz: d6b64e1b0c71c849d17375adc03eb2704586aa34
+  data.tar.gz: fb200944d39969a6b5d3e61d76e37803812ed98b
 SHA512:
-  metadata.gz: c5b84bf2d04e682405cb7aac06bb6ef786b12c6976cda1bed69fa7aefbba941b4e97e6bbe8ca0c0bf3e84cab14d3ef637a65cbf5bdade19dfeac39c9e373b761
-  data.tar.gz: 5c218d74d921330a280d908bc5cf7683408ad0a32e9685b5f95a99c8961de0fba6f03f8dddbb1e7d7f4411ef5302e203de045bf7361cd5291777c8f1e886adb7
+  metadata.gz: d6cf2087d2ee9dae26585859335529305b3e3852ec977f1814d8db1e919f47143e5a70a8e488f5df36ca2fda329a3a0e6e3111375aa10319897bc8163c54febc
+  data.tar.gz: 5800a2eb21bb387067cfad863a654fde52d988f0a11084e3e946b60755ac1b5c1ad2da5ef8edba1d8c23a96a74985f33b00ea89108d717eab1e145b85ca86048

data/Gemfile.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: .
+  specs:
+    requisite (0.4.0)
+      actionpack (>= 4.2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (5.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    crass (1.0.3)
+    erubi (1.7.1)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    rack (2.0.4)
+    rack-test (0.8.3)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rake (12.3.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  minitest
+  rake
+  requisite!
+
+BUNDLED WITH
+   1.16.1

data/lib/requisite.rb

@@ -4,3 +4,4 @@ require 'requisite/boolean'
 require 'requisite/api_model'
 require 'requisite/bad_request_error'
 require 'requisite/bad_type_error'
+require 'action_controller'

data/lib/requisite/api_model.rb

@@ -5,7 +5,14 @@ module Requisite
     attr_reader :model
 
     def initialize(model={})
-      @model = model.kind_of?(Hash) ? Hash[model.map{ |k, v| [k.to_sym, v] }] : model
+      @model = case model
+      when ActionController::Parameters
+        Hash[model.to_unsafe_h.map { |k, v| [k.to_sym, v] }]
+      when Hash
+        Hash[model.map { |k, v| [k.to_sym, v] }]
+      else
+        model
+      end
     end
 
     def convert(name)
@@ -28,9 +35,9 @@ module Requisite
     def to_hash(show_nil: false)
       preprocess_model
       {}.tap do |result|
-        self.class.attribute_keys_with_inheritance.each do |meth|
-          value = self.send(meth)
-          result.merge!({meth => value}) if show_nil || !value.nil?
+        self.class.attribute_keys_with_inheritance.each do |key|
+          value = self.send(key)
+          result[key] = value if show_nil || !value.nil?
         end
       end
     end
@@ -88,7 +95,6 @@ module Requisite
       nil
     end
 
-
     def model_responds_to_attribute_query?(name)
       if @model.kind_of?(Hash)
         @model[name] != nil
@@ -97,10 +103,6 @@ module Requisite
       end
     end
 
-    def merge_attribute_if_exists!(to_merge, attribute_name)
-      attribute_from_model(attribute_name) ? to_merge.merge!(attribute_from_model(attribute_name)) : to_merge
-    end
-
     def preprocess_model
       # noop
     end

data/lib/requisite/boundary_object.rb

@@ -15,7 +15,7 @@ module Requisite
           result
         end
       end
-      
+
       def attribute!(name, options={})
         attribute_keys << name
         define_method(name) do
@@ -29,7 +29,7 @@ module Requisite
           result
         end
       end
-      
+
       def serialized_attributes(&block)
         @attribute_keys = []
         instance_eval(&block)
@@ -45,10 +45,10 @@ module Requisite
     end
 
     private
-    
+
     self.singleton_class.send(:alias_method, :a, :attribute)
     self.singleton_class.send(:alias_method, :a!, :attribute!)
-    
+
     def raise_bad_type_if_type_mismatch(value, desired_type)
       raise BadTypeError.new(value, desired_type) unless (value.kind_of?(desired_type)) || ((value.kind_of?(TrueClass) || value.kind_of?(TrueClass)) && desired_type == Requisite::Boolean)
     end
@@ -56,7 +56,7 @@ module Requisite
     def raise_not_implemented_for_attribute(name)
       raise NotImplementedError.new("'#{name}' method not implemented")
     end
-    
+
     def empty_result?(result)
       result.nil? || result == {}
     end

data/lib/requisite/version.rb

@@ -1,3 +1,3 @@
 module Requisite
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/requisite.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://www.intercom.io'
   gem.license       = 'Apache License Version 2.0'
   gem.add_development_dependency "minitest"
+  gem.add_development_dependency "rake"
+  gem.add_runtime_dependency "actionpack", ">= 4.2.0"
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/test/requisite/api_model_test.rb

@@ -180,6 +180,13 @@ module Requisite
       response.to_hash.must_equal(:num => 12)
     end
 
+    it 'works with ActionController::Parameters' do
+      DummyApiModel.serialized_attributes { attribute :num }
+      params = ActionController::Parameters.new(num: 12)
+      response = DummyApiModel.new(params)
+      response.to_hash.must_equal(:num => 12)
+    end
+
     describe 'with nested structures' do
 
       describe 'with typed arrays' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requisite
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Osler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 description: " Requisite is an elegant way of strongly defining request and response
   models for serialization "
 email:
@@ -35,6 +63,7 @@ files:
 - ".gitignore"
 - CHANGES.md
 - Gemfile
+- Gemfile.lock
 - LICENCE.txt
 - README.md
 - Rakefile
@@ -70,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Strongly defined models for HTTP APIs
@@ -79,4 +108,3 @@ test_files:
 - test/requisite/api_model_test.rb
 - test/requisite/api_user_test.rb
 - test/test_helper.rb
-has_rdoc: