hoodoo 2.12.0 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6cfaed24695383d45ef45ee57241f89f37ef6005247c613014238c59b57f158
-  data.tar.gz: 0547a5c355d815eaf6709f5023fa9878065f613d43c492fe781d87dbcb40b075
+  metadata.gz: 97098d14a63ca3169567bec32d623914a8e04389c0b26a1c513ccfcd3069e101
+  data.tar.gz: 0d673e879ca169f1dbcecd0d1c03bba5c8ec138f377abe99fc7aeccb3c39713d
 SHA512:
-  metadata.gz: af7cd5e04e9ed36530627d80120a43a3f7e5569fda99969cf23c437edb98e509011cd00a83e720d67027bbfedd09a2b3cdc20cbcfcbd7b6d56dfb1a30152122a
-  data.tar.gz: a4cc5ef27dfb5ae7d8f3c8ad555fd96101ca0ac6b864055d4b37534a276ffb47856da28c9b7eacbe6fb93b766b9285c164ae338d76ed268998c209dc5b2446a6
+  metadata.gz: a626927fcbd049c377698fe423550c78cd2feaf1225a54281e63dcc16cfa61093f7d03fbadfa01ef9739ca6987e6a1737fc0e29460a0734ee01536311479dd27
+  data.tar.gz: 056a00f6fb6e7d171a3228d20e931f27e4e95aad9c5813dc91999666e1472b2f379964d87edf34e40adb2bfcb0692bd33fa0db091a6244a25c35b57297abde1e

data/lib/hoodoo/client/endpoint/endpoints/http.rb

@@ -56,7 +56,22 @@ module Hoodoo
 
           # See Hoodoo::Client::Endpoint#show.
           #
+          # In RESTful HTTP, `GET /resources/#{ident = nil}` gets evaluated
+          # as `GET /resources/`, which is of course interpreted as a #list
+          # request. Since this is undesirable behaviour, the +ident+ must be
+          # populated, and this will return `404 Not Found` if it is not.
+          #
           def show( ident, query_hash = nil )
+            if ident.nil?
+              data = response_class_for( :show ).new
+              data.platform_errors.add_error(
+                'platform.not_found',
+                'reference' => {entity_name: 'nil identifier given on :show action'}
+              )
+
+              return data
+            end
+
             d            = @description.dup
             d.action     = :show
             d.ident      = ident

data/lib/hoodoo/presenters/base_dsl.rb

@@ -747,6 +747,10 @@ module Hoodoo
       #   Hoodoo::Presenters::Text
       # [:uuid]
       #   Hoodoo::Presenters::UUID
+      # [:hash]
+      #   Hoodoo::Presenters::Hash
+      # [:object]
+      #   Hoodoo::Presenters::Object
       #
       def type_option_to_class( type )
         case type
@@ -776,6 +780,10 @@ module Hoodoo
             Hoodoo::Presenters::Text
           when :uuid
             Hoodoo::Presenters::UUID
+          when :object
+            Hoodoo::Presenters::Object
+          when :hash
+            Hoodoo::Presenters::Hash
           else
             raise "Unsupported 'type' option value of '#{ type }' in Hoodoo::Presenters::BaseDSL"
         end

data/lib/hoodoo/presenters/types/hash.rb

@@ -58,9 +58,12 @@ module Hoodoo
         end
 
         @specific   = true
-        value_klass = block_given?               ?
-                      Hoodoo::Presenters::Object :
-                      type_option_to_class( options.delete( :type ) )
+
+        # If an explicit type is given, use that. Otherwise, default to Field
+        # if no block is given, or Object is a block is given.
+        #
+        value_klass = !options[:type].blank? ? type_option_to_class( options.delete( :type ) ) :
+                        (block_given? ? Hoodoo::Presenters::Object : Hoodoo::Presenters::Field)
 
         # If we're defining specific keys and some of those keys have fields
         # with defaults, we need to merge those up to provide a whole-Hash

data/lib/hoodoo/version.rb

@@ -12,11 +12,11 @@ module Hoodoo
   # The Hoodoo gem version. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  VERSION = '2.12.0'
+  VERSION = '2.12.2'
 
   # The Hoodoo gem date. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  DATE = '2018-12-17'
+  DATE = '2019-07-11'
 
 end

data/spec/client/client_spec.rb

@@ -388,6 +388,14 @@ describe Hoodoo::Client do
         expect( result.platform_errors.has_errors? ).to eq( false )
         expect( result[ 'kind' ] ).to eq( 'Errors' )
       end
+
+      it 'returns a 404 for show(nil)', :wont_create_net_http do
+        result = @endpoint.show( nil )
+
+        expect( result.platform_errors.has_errors? ).to eq( true )
+        expect( result.platform_errors.errors[ 0 ][ 'code' ] ).to eq( 'platform.not_found' )
+        expect( result.platform_errors.errors[ 0 ][ 'reference' ] ).to eq( 'nil identifier given on :show action' )
+      end
     end
 
     before :each do
@@ -451,6 +459,11 @@ describe Hoodoo::Client do
     end
 
     context 'and with an HTTP proxy via custom discoverer' do
+      around :each do | example |
+        @example_wont_create_net_http = example.metadata[ :wont_create_net_http ]
+        example.run
+      end
+
       before :each do
         base_uri   = "http://localhost:#{ @port }"
         proxy_uri  = 'http://foo:bar@proxyhost:1234'
@@ -459,17 +472,19 @@ describe Hoodoo::Client do
           proxy_uri: proxy_uri
         )
 
-        original_new = Net::HTTP.method( :new )
-
-        expect( Net::HTTP ).to receive( :new ).at_least( :once ) do | host, port, proxy_host, proxy_port, proxy_user, proxy_pass |
-          expect( host       ).to eq( 'localhost' )
-          expect( port       ).to eq( @port       )
-          expect( proxy_host ).to eq( 'proxyhost' )
-          expect( proxy_port ).to eq( 1234        )
-          expect( proxy_user ).to eq( 'foo'       )
-          expect( proxy_pass ).to eq( 'bar'       )
-
-          original_new.call( host, port )
+        if @example_wont_create_net_http
+          expect( Net::HTTP ).not_to receive( :new )
+        else
+          expect( Net::HTTP ).to receive( :new ).at_least( :once ).and_wrap_original do | original_new, host, port, proxy_host, proxy_port, proxy_user, proxy_pass |
+            expect( host       ).to eq( 'localhost' )
+            expect( port       ).to eq( @port       )
+            expect( proxy_host ).to eq( 'proxyhost' )
+            expect( proxy_port ).to eq( 1234        )
+            expect( proxy_user ).to eq( 'foo'       )
+            expect( proxy_pass ).to eq( 'bar'       )
+
+            original_new.call( host, port )
+          end
         end
 
         set_vars_for(

data/spec/presenters/types/hash_spec.rb

@@ -663,6 +663,94 @@ describe Hoodoo::Presenters::Hash do
 
   ############################################################################
 
+  class TestHashKeyWithHashType < Hoodoo::Presenters::Base
+    schema do
+      hash :key_with_hash_type do
+        key :specific_hash, :type => :hash do
+          key :optional_field, required: false
+          key :required_field, required: true
+        end
+        key :generic_hash, :type => :hash do
+          keys :length => 6
+        end
+      end
+    end
+  end
+
+
+  ############################################################################
+
+  context 'specific key with a hash as the type' do
+    context '#render' do
+      it 'renders required fields correctly' do
+        input_data = { 'key_with_hash_type' => {
+          'specific_hash' => {'required_field' => 'foo'}
+        } }
+        expected_data = { 'key_with_hash_type' => {
+          'specific_hash' => {'required_field' => 'foo'}
+        } }
+
+        expect( TestHashKeyWithHashType.render( input_data ) ).to eq( expected_data )
+      end
+
+      it 'renders optional fields correctly' do
+        input_data = { 'key_with_hash_type' => {
+          'specific_hash' => {'required_field' => 'foo', 'optional_field' => 'bar'},
+          'generic_hash' => {'foo' => 'bar', 'somekey' => 'somevalue'}
+        } }
+        expected_data = { 'key_with_hash_type' => {
+          'specific_hash' => {'required_field' => 'foo', 'optional_field' => 'bar'},
+          'generic_hash' => {'foo' => 'bar', 'somekey' => 'somevalue'}
+        } }
+
+        expect( TestHashKeyWithHashType.render( input_data ) ).to eq( expected_data )
+      end
+    end
+
+    context '#validate' do
+      it 'succeeds if the key is optional and absent' do
+        expect( TestHashKeyWithHashType.validate( {} ).errors.size ).to( eql( 0 ) )
+      end
+
+      it 'succeeds if the key is present and its specific required keys are present' do
+        input_data = { 'key_with_hash_type' => {
+          'specific_hash' => {'required_field' => 'foo'}
+        } }
+        expect( TestHashKeyWithHashType.validate( input_data ).errors.size ).to( eql( 0 ) )
+      end
+
+      it 'succeeds if the key is present and its specific required and optional keys are present' do
+        input_data = { 'key_with_hash_type' => {
+          'specific_hash' => {'required_field' => 'foo', 'optional_field' => 'bar'}
+        } }
+        expect( TestHashKeyWithHashType.validate( input_data ).errors.size ).to( eql( 0 ) )
+      end
+
+      it 'fails if the key is present and its specific required keys are missing' do
+        input_data = { 'key_with_hash_type' => {
+          'specific_hash' => {'optional_field' => 'bar'}
+        } }
+        expect( TestHashKeyWithHashType.validate( input_data ).errors.size ).to( eql( 1 ) )
+      end
+
+      it 'succeeds if the key is present and its generic keys are valid' do
+        input_data = { 'key_with_hash_type' => {
+          'generic_hash' => {'foo' => 'bar'}
+        } }
+        expect( TestHashKeyWithHashType.validate( input_data ).errors.size ).to( eql( 0 ) )
+      end
+
+      it 'fails if the key is present and its generic keys are invalid' do
+        input_data = { 'key_with_hash_type' => {
+          'generic_hash' => {'keynametoolong' => 'bar'}
+        } }
+        expect( TestHashKeyWithHashType.validate( input_data ).errors.size ).to( eql( 1 ) )
+      end
+    end
+  end
+
+  ############################################################################
+
   class TestHashGenericKeyPresenterNoValues < Hoodoo::Presenters::Base
     schema do
       hash :generic do

data/spec/utilities/utilities_spec.rb

@@ -678,11 +678,11 @@ describe Hoodoo::Utilities do
     it 'rejects invalid input with an exception' do
       expect {
         Hoodoo::Utilities.rationalise_datetime( "hello" )
-      }.to raise_exception
+      }.to raise_exception( /Invalid parameter 'hello'/ )
 
       expect {
         Hoodoo::Utilities.rationalise_datetime( Array.new )
-      }.to raise_exception
+      }.to raise_exception( /Invalid parameter '\[\]'/ )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.2
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack