requisite 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf15247190df240348bbf154bac1485d5e93b6a
-  data.tar.gz: 32d1748aff1b074f8b5f9b9639249697176c7c58
+  metadata.gz: 0900379bbe4e112f2e983138cba06a3f4c399d8b
+  data.tar.gz: 30ee7ec731114380f827676e2e881510b860d38e
 SHA512:
-  metadata.gz: 569dae2fbad28fae97b4c5013f34290f24702494eddbfb560f3279f07387e3df679d74bd1a8ee3c52c5531e193d240008a12454c8f70d20304fe58f064de8a5d
-  data.tar.gz: c66308ee9e74ec995613b5c7d35202c76e645725d77d72bbbc406e0380cc43c78d34b3519adbec9da9c82d45e7662d558671c2676a03058ce2d627a34a1a6786
+  metadata.gz: 3d979fd487435e6ef9b025db1d4ed6f7d09a6c897a1bf2f440bd19e4328f8b0e5ca663a2582cba8827a4bc5fcc0cfbebb959f18e3a6621ba2339228ac378bcbd
+  data.tar.gz: b4b83bf22163cc36b6dbd144cafbacf9f803e52076b9a969e001c167f608d387a394e8d124260379de44c5c27b55c5992a0acb0fe73e7d7151170a9f7d7e72e5

data/CHANGES.md

@@ -1,3 +1,6 @@
+### 0.2.1 (5th March 2015):
+  - Fix false in hash inputs
+
 ### 0.2.0 (17th November 2014):
   - Add inheritance of serialized attributes
 

data/lib/requisite/api_model.rb

@@ -3,22 +3,31 @@ require 'json'
 module Requisite
   class ApiModel < BoundaryObject
     attr_reader :model
-    
+
     def initialize(model={})
       @model = model.kind_of?(Hash) ? Hash[model.map{ |k, v| [k.to_sym, v] }] : model
     end
-    
+
     def convert(name)
       attribute_from_model(name)
     end
-    
+
     def convert!(name)
-      attribute_from_model(name) || (raise NotImplementedError.new("'#{name}' not found on model"))
+      raise NotImplementedError.new("'#{name}' not found on model") unless model_responds_to_attribute_query?(name)
+      attribute_from_model(name)
     end
 
     def attribute_from_model(name)
       if @model.kind_of?(Hash)
         @model[name]
+      else
+        @model.send(name)
+      end
+    end
+
+    def model_responds_to_attribute_query?(name)
+      if @model.kind_of?(Hash)
+        @model[name] != nil
       else
         @model.send(name) if @model.respond_to?(name)
       end
@@ -37,11 +46,11 @@ module Requisite
         end
       end
     end
-    
+
     def to_json
       to_hash.to_json
     end
-    
+
     def parse_typed_hash(name, hash)
       {}.tap do |result|
         passed_hash = attribute_from_model(name)
@@ -52,7 +61,7 @@ module Requisite
         end
       end
     end
-    
+
     def parse_scalar_hash(name)
       {}.tap do |result|
         passed_hash = attribute_from_model(name) || {}
@@ -62,7 +71,7 @@ module Requisite
         end
       end
     end
-    
+
     def parse_typed_array(name, type)
       [].tap do |result|
         passed_array = attribute_from_model(name) || []
@@ -72,13 +81,13 @@ module Requisite
         end
       end
     end
-    
+
     def with_type!(desired_type)
       yield.tap do |value|
         raise_bad_type_if_type_mismatch(value, desired_type) if value
       end
     end
-    
+
     def first_attribute_from_model(*attributes)
       attributes.each do |attribute|
         value = attribute_from_model(attribute)
@@ -88,7 +97,7 @@ module Requisite
       end
       nil
     end
-    
+
     private
 
     def preprocess_model

data/lib/requisite/version.rb

@@ -1,3 +1,3 @@
 module Requisite
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/test/requisite/api_model_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 module Requisite
   class DummyApiModel < Requisite::ApiModel
   end
-  
+
   describe ApiModel do
     it 'creates methods from serialized_attributes block' do
       DummyApiModel.serialized_attributes { attribute :a; attribute :b }
@@ -15,7 +15,7 @@ module Requisite
       response.must_respond_to :a
       response.must_respond_to :b
     end
-    
+
     it 'attribute provides a default implementation of calling a hash model' do
       DummyApiModel.serialized_attributes { attribute :c }
       mock = {:c => 'C'}
@@ -24,7 +24,7 @@ module Requisite
     end
 
     let(:params_hash) { {:c => 'C', :num => 12} }
-    
+
     it 'attribute provides a default implementation of calling a model' do
       DummyApiModel.serialized_attributes { attribute :c }
       response = DummyApiModel.new(params_hash)
@@ -36,77 +36,77 @@ module Requisite
       response = DummyApiModel.new
       response.to_hash.must_equal(:c => 'see')
     end
-    
+
     it 'ignores default if value given' do
       DummyApiModel.serialized_attributes { attribute :num, default: 0 }
       response = DummyApiModel.new(params_hash)
       response.to_hash.must_equal(:num => 12)
     end
-    
+
     it 'attribute can be set to stringify fields' do
       DummyApiModel.serialized_attributes { attribute :num, stringify: true }
       response = DummyApiModel.new(params_hash)
       response.to_hash.must_equal(:num => '12')
     end
-    
+
     it 'attribute can be set to rename fields' do
       DummyApiModel.serialized_attributes { attribute :my_num, rename: :num }
       response = DummyApiModel.new(params_hash)
       response.to_hash.must_equal(:my_num => 12)
     end
-    
+
     it 'attribute can assert type of a field' do
       DummyApiModel.serialized_attributes { attribute :num, type: String }
       response = DummyApiModel.new(params_hash)
       proc { response.to_hash }.must_raise(BadTypeError)
     end
-    
+
     it 'with_type! helper raises on mismatched type' do
       model = DummyApiModel.new()
       proc { model.with_type!(String) { 1 + 2 }}.must_raise(Requisite::BadTypeError)
     end
-    
+
     it 'first_attribute_from_model helper finds first matching attriubute' do
       model = DummyApiModel.new(:oh => 12, :a => nil, :b => 'B', :c => 'C')
       model.first_attribute_from_model(:a, :b, :c).must_equal('B')
     end
-    
+
     it 'attribute can assert type of a boolean field' do
       DummyApiModel.serialized_attributes { attribute :truthy_val, type: Requisite::Boolean }
       response = DummyApiModel.new(:truthy_val => false)
       response.to_hash.must_equal(:truthy_val => false)
     end
-    
+
     it 'attribute does not include values of nil' do
       DummyApiModel.serialized_attributes { attribute :num, type: String }
       response = DummyApiModel.new({:num => nil})
       response.to_hash.must_equal({})
     end
-    
+
     it 'attribute can be stringified and renamed with default fields' do
       DummyApiModel.serialized_attributes { attribute :my_num, rename: :num, stringify: true, default: 22 }
       response = DummyApiModel.new
       response.to_hash.must_equal(:my_num => '22')
     end
-    
+
     it 'attribute can be stringified after type check' do
       DummyApiModel.serialized_attributes { attribute :num, stringify: true, type: Fixnum }
       response = DummyApiModel.new(params_hash)
       response.to_hash.must_equal(:num => '12')
     end
-    
+
     it 'attribute type checks after rename' do
       DummyApiModel.serialized_attributes { attribute :my_num, rename: :num, type: String }
       response = DummyApiModel.new(params_hash)
       proc { response.to_hash }.must_raise(BadTypeError)
     end
-    
+
     it 'attribute can be stringified, renamed, defaulted and have type checking on a field' do
       DummyApiModel.serialized_attributes { attribute :my_num, rename: :num, stringify: true, default: 22, type: String }
       response = DummyApiModel.new
       proc { response.to_hash }.must_raise(BadTypeError)
     end
-    
+
     let(:invalid_params_hash) { {:d => nil} }
 
     it "attribute! raises an error if not found on model" do
@@ -114,13 +114,20 @@ module Requisite
       response = DummyApiModel.new(invalid_params_hash)
       proc { response.to_hash }.must_raise(NotImplementedError, "'d' not found on model")
     end
-        
+
+    it 'attribute! does not raise an error if value on model is false' do
+      params_hash = {:d => false}
+      DummyApiModel.serialized_attributes { attribute! :d }
+      response = DummyApiModel.new(params_hash)
+      response.to_hash.must_equal({d: false})
+    end
+
     it 'attribute! can be set to stringify fields' do
       DummyApiModel.serialized_attributes { attribute! :num, stringify: true }
       response = DummyApiModel.new(params_hash)
       response.to_hash.must_equal(:num => '12')
     end
-    
+
     it 'attribute! can be set to rename fields' do
       DummyApiModel.serialized_attributes { attribute! :my_num, rename: :num }
       response = DummyApiModel.new(params_hash)
@@ -132,7 +139,7 @@ module Requisite
       response = DummyApiModel.new(params_hash)
       response.model.must_equal(params_hash)
     end
-    
+
     it 'sets the model from an object' do
       mc = MockClass.new
       mc.a = 'a'
@@ -142,109 +149,109 @@ module Requisite
       response.model.must_equal(mc)
       response.to_hash.must_equal(:a => 'a')
     end
-    
+
     it 'has alias a for attribute' do
       DummyApiModel.serialized_attributes { a :num }
       response = DummyApiModel.new(params_hash)
       response.to_hash.must_equal(:num => 12)
     end
-    
+
     it 'has alias a! for attribute!' do
       DummyApiModel.serialized_attributes { a! :num }
       response = DummyApiModel.new(params_hash)
       response.to_hash.must_equal(:num => 12)
     end
-    
+
     it 'can convert to json' do
       DummyApiModel.serialized_attributes { a! :num }
       response = DummyApiModel.new(params_hash)
       response.to_json.must_equal("{\"num\":12}")
     end
-    
+
     it 'drops non-listed parameters' do
       DummyApiModel.serialized_attributes { attribute :num }
       response = DummyApiModel.new({num: 12, other: 'value'})
       response.to_hash.must_equal(:num => 12)
     end
-    
+
     describe 'with nested structures' do
-      
+
       describe 'with typed arrays' do
         it 'allows arrays of one type' do
           DummyApiModel.serialized_attributes { attribute :ids, typed_array: Fixnum }
           response = DummyApiModel.new({ids: [1, 2, 3]})
           response.to_hash.must_equal(:ids => [1, 2, 3])
         end
-        
+
         it 'raises errors when array has a wrongly typed value' do
           DummyApiModel.serialized_attributes { attribute :ids, typed_array: Requisite::Boolean }
           response = DummyApiModel.new({ids: [true, 'value', false]})
           Proc.new {response.to_hash}.must_raise(BadTypeError)
         end
       end
-      
+
       describe 'with typed nested hashes' do
         it 'drops non listed parameters in nested hashes' do
           DummyApiModel.serialized_attributes { attribute :data, typed_hash: { num: Numeric, bool: Requisite::Boolean } }
           response = DummyApiModel.new({data: { num: 12, value: 'x', bool: true }})
           response.to_hash.must_equal(:data => { :num => 12, :bool => true })
         end
-        
+
         it 'can stringify nested hashes' do
           DummyApiModel.serialized_attributes { attribute :data, typed_hash: { num: Numeric }, stringify: true }
           response = DummyApiModel.new({data: { num: 12, value: 'x' }})
           response.to_hash.must_equal(:data => "{:num=>12}")
         end
-        
+
         it 'raises an error when nested hash values of the wrong type' do
           DummyApiModel.serialized_attributes { attribute :data, typed_hash: { num: Numeric } }
           Proc.new {DummyApiModel.new({data: { num: '12'}}).to_hash}.must_raise(BadTypeError)
         end
-              
+
         it 'can rename param and work with nested hashes' do
           DummyApiModel.serialized_attributes { attribute :my_data, typed_hash: { num: Numeric }, rename: :data }
           response = DummyApiModel.new({data: { num: 12, value: 'x' }})
           response.to_hash.must_equal(:my_data => { :num => 12 })
         end
-        
+
         it 'can set a default value for a nested hash' do
           DummyApiModel.serialized_attributes { attribute :data, typed_hash: { num: Numeric }, default: { num: 4 } }
           response = DummyApiModel.new({data: { value: 'x' }})
           response.to_hash.must_equal(:data => { :num => 4 })
         end
-        
+
         it 'drops non listed fields with attribute!' do
           DummyApiModel.serialized_attributes { attribute! :data, typed_hash: { num: Numeric } }
           response = DummyApiModel.new({data: { num: 12, value: 'x' }})
           response.to_hash.must_equal(:data => { :num => 12 })
         end
-        
+
         it 'attribute! does not raise an error with missing values in hash' do
           DummyApiModel.serialized_attributes { attribute! :data, typed_hash: { num: Numeric } }
           response = DummyApiModel.new({data: { value: 'x' }})
           response.to_hash.must_equal(:data => { })
         end
       end
-      
+
       describe 'with scalar only nested hashes' do
         it 'should parse scalar hashes permitting anything scalar' do
           DummyApiModel.serialized_attributes { attribute :data, scalar_hash: true }
           response = DummyApiModel.new({data: { num: 12, value: 'x', :truthy => false }})
           response.to_hash.must_equal(:data => { :num => 12, :value => 'x', :truthy => false })
         end
-        
+
         it 'should parse a renamed scalar hash' do
           DummyApiModel.serialized_attributes { attribute :my_data, scalar_hash: true, rename: :data }
           response = DummyApiModel.new({data: { num: 12, value: 'x' }})
           response.to_hash.must_equal(:my_data => { :num => 12, :value => 'x' })
         end
-        
+
         it 'should stringify a scalar hash' do
           DummyApiModel.serialized_attributes { attribute :data, scalar_hash: true, stringify: true }
           response = DummyApiModel.new({data: { num: 12, value: 'x' }})
           response.to_hash.must_equal(:data => "{:num=>12, :value=>\"x\"}")
         end
-        
+
         it 'should parse scalar hashes permitting anything scalar with object' do
           mc = MockClass.new
           mc.a = 'a'
@@ -253,13 +260,13 @@ module Requisite
           response = DummyApiModel.new(mc)
           response.to_hash.must_equal(:b => { :num => 12, :value => 'x' })
         end
-        
+
         it 'should fail to parse scalar hashes when non scalar values present' do
           DummyApiModel.serialized_attributes { attribute :data, scalar_hash: true }
           Proc.new { DummyApiModel.new({data: { num: 12, value: { nested: 'value' } }}).to_hash}.must_raise(BadTypeError)
           Proc.new { DummyApiModel.new({data: { num: 12, value: ['array value'] }}).to_hash}.must_raise(BadTypeError)
         end
-        
+
         it 'should fail to parse scalar hashes permitting anything scalar with object' do
           mc = MockClass.new
           mc.a = 'a'
@@ -268,19 +275,19 @@ module Requisite
           response = DummyApiModel.new(mc)
           Proc.new { response.to_hash }.must_raise(BadTypeError)
         end
-        
+
         it 'can set a default value for a scalar hash' do
           DummyApiModel.serialized_attributes { attribute :data, scalar_hash: true, default: { num: 9, value: 'y' } }
           response = DummyApiModel.new({data: { }})
           response.to_hash.must_equal(:data => { :num => 9, :value => 'y' })
         end
-        
+
         it 'doesnt raise with attribute! when an empty hash passed' do
           DummyApiModel.serialized_attributes { attribute! :data, scalar_hash: true }
           response = DummyApiModel.new({data: {}})
           response.to_hash.must_equal(:data => {})
         end
-        
+
         it 'raises with attribute! when nil is passed' do
           DummyApiModel.serialized_attributes { attribute! :data, scalar_hash: true }
           response = DummyApiModel.new({data: nil})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requisite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Osler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -79,4 +79,3 @@ test_files:
 - test/requisite/api_model_test.rb
 - test/requisite/api_user_test.rb
 - test/test_helper.rb
-has_rdoc: