hoodoo 1.9.1 → 1.9.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTI0YTQ0YmNkMzAxZjU3ZWUwZmExZTBlODJlNzkzNjg1NDgwNzA5NA==
+    ODE5N2QwMWIyMWIxNDgxYTliZmUyODdjZThkZmFlOTFiYzEzYWEyMg==
   data.tar.gz: !binary |-
-    NDAzOWM3ODQwYTM1ZjUwNDBhMjRlMWFkOTBjNzBiOGY3NTBlNzJjNg==
+    OGVmODcxY2UxYzNiNTE0NmFlODhhYjhlZjFlZjhiZDA4OGY0MjNkYg==
 SHA512:
   metadata.gz: !binary |-
-    OGM5ODcxOGMwYjQ4Y2FmYWQ3ODdlOTRjZWEyMWEzN2JiZDQxMzdhOTEyN2Mz
-    ZTA4ZTEwNzgxNjQ1ZTAyNjMwYTQyMzM2Yjc3YmVkNzY2Njg5YjBhMTJjOTU0
-    Y2I0ZTcxODIxYzA2YjQwYjQ4NDJmZmM4MDJjNjI2Y2Q5ZmQwYmQ=
+    NmZiODc1NjM5MDYxMzI4NWRmYjEyOTNmNGQyN2YxNmU5MGNlMmQ4NjEzMzZl
+    Y2YzZjAzMjBjZWMxZDgwNTkzN2M1M2M5Y2Y3OWZlYTJhMGM3NTkwY2NmNzgx
+    OGJmODhhOTQxZmJmNGFiMzUyOTI3NGExYmJiYTNhOTM2NGY3YTE=
   data.tar.gz: !binary |-
-    NTkyNjNjNTAwYmViNjczMmI4YjA2OTA3ZDE0NGVhNDRlMDFmMzBjMjIyMWY5
-    ZmRhNDRhYjI1ZjRmMDUxMzExMDNmODIxN2NiOTc1ZGE2YjY4MzcyNzFiZDEz
-    YjQyMmU3YTNmN2I1Y2I4ODZlNzk4OTA0OWM0NTkyMjM2M2VmMWY=
+    ODA0YmQ2ZmZjOTgwMGFkZGNhZWVkZTA3MzI5ZjVmZTE2ZTE2ZTVlYWQ1NDJi
+    MGU0MWJhZmU4MmVkMWFmMzMwOWFhNTQwNDRlMjEwYjQ0YTIzOTBhNjgwODIz
+    YWNiODZkN2FhMjc1MjRjYmM1MmNmMDhhMGNjNGVjMTI0NDFkYzg=

data/lib/hoodoo/active/active_record/writer.rb

@@ -85,8 +85,8 @@ module Hoodoo
       # As an instance-based method, the return value and error handling
       # semantics differ from the class-based counterpart. Instead of
       # checking "persisted?", check the return value of +persist_in+. This
-      # means you can also use +persist_in+ to save a previousl persisted, but
-      # now updated record, should you so wish.
+      # means you can also use +persist_in+ to save a previously persisted,
+      # but now updated record, should you so wish.
       #
       #     def create( context )
       #       attributes = mapping_of( context.request.body )
@@ -217,7 +217,7 @@ module Hoodoo
         # must-be-unique fields (within your defined scope) automatically.
         #
         # Using this method for data storage instead of plain ActiveRecord
-        # +send+ or <tt>send!</tt> will also help your code auto-inherit any
+        # +save+ or <tt>save!</tt> will also help your code auto-inherit any
         # additional future write-related enhancements in Hoodoo should they
         # arise, without necessarily needing service code changes.
         #

data/lib/hoodoo/services/middleware/middleware.rb

@@ -2637,11 +2637,13 @@ module Hoodoo; module Services
         end
       end
 
-      # Flatten the resulting sub-arrays and make sure values are unique.
+      # Flatten remaining sub-arrays and make sure values are unique. Sort
+      # keys and sort directions are deduplicated intelligently within the
+      # #process_query_hash method.
 
       query_hash.each do | key, value |
         value.flatten!
-        value.uniq!
+        value.uniq! unless key == 'sort' || key == 'direction'
       end
 
       # For search and filter strings, decode the key/value pairs as a
@@ -2720,11 +2722,11 @@ module Hoodoo; module Services
       #   0 created  asc
       #   1 name     desc
       #   2 title
-      #   => as specified with default direction for sort key 'title'
+      #   => mismatched sort vs direction list length
       #
       #   0 created asc
       #   1         desc
-      #   => error as there's no way to guess the sort key for the 'desc'
+      #   => mismatched sort vs direction list length
 
       sort_keys       = query_hash[ 'sort'      ] || [ interface.to_list.default_sort_key ]
       sort_directions = query_hash[ 'direction' ] || []

data/lib/hoodoo/version.rb

@@ -12,6 +12,6 @@ module Hoodoo
   # The Hoodoo gem version. If this changes, ensure that the date in
   # "hoodoo.gemspec" is correct and run "bundle install" (or "update").
   #
-  VERSION = '1.9.1'
+  VERSION = '1.9.2'
 
 end

data/spec/files/regenerate.rb

@@ -0,0 +1,37 @@
+# Adapted from https://gist.github.com/nickyp/886884.
+
+require 'rubygems'
+require 'openssl'
+
+certd = File.join( File.dirname( __FILE__ ), 'ssl.pem' )
+keyd  = File.join( File.dirname( __FILE__ ), 'ssl.key' )
+
+key = OpenSSL::PKey::RSA.new(2048)
+public_key = key.public_key
+
+subject = "/C=BE/O=127.0.0.1/OU=127.0.0.1/CN=127.0.0.1"
+
+cert = OpenSSL::X509::Certificate.new
+cert.subject = cert.issuer = OpenSSL::X509::Name.parse(subject)
+cert.not_before = Time.now
+cert.not_after = Time.now + 365 * 24 * 60 * 60 * 99
+cert.public_key = public_key
+cert.serial = 0x0
+cert.version = 2
+
+ef = OpenSSL::X509::ExtensionFactory.new
+ef.subject_certificate = cert
+ef.issuer_certificate = cert
+cert.extensions = [
+  ef.create_extension("basicConstraints","CA:TRUE", true),
+  ef.create_extension("subjectKeyIdentifier", "hash"),
+]
+cert.add_extension ef.create_extension("authorityKeyIdentifier",
+                                       "keyid:always,issuer:always")
+
+cert.sign key, OpenSSL::Digest::SHA256.new
+
+open  keyd, 'w' do |io| io.write  key.to_pem end
+open certd, 'w' do |io| io.write cert.to_pem end
+
+puts "OK"

data/spec/services/middleware/middleware_spec.rb

@@ -29,7 +29,8 @@ class RSpecTestServiceStubInterface < Hoodoo::Services::Interface
     endpoint :rspec_test_service_stub, RSpecTestServiceStubImplementation
     embeds :emb, :embs
     to_list do
-      sort :extra => [:up, :down]
+      sort :extra        => [:up, :down]
+      sort :conventional => [:asc, :desc]
       search :foo, :bar
       filter :baz, :boo
     end
@@ -681,16 +682,43 @@ describe Hoodoo::Services::Middleware do
           expect(context.request.list.sort_data).to eq({'extra'=>'up', 'created_at'=>'desc'})
         end
 
-        get '/v2/rspec_test_service_stub?sort=extra&sort=created_at&direction=up,desc', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        get '/v2/rspec_test_service_stub?sort=extra&sort=created_at&direction=up&direction=desc', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        expect(last_response.status).to eq(200)
+      end
+
+      it 'should handle legitimate duplicated sort values (form 1)' do
+        expect_any_instance_of(RSpecTestServiceStubImplementation).to receive(:list).once do | ignored_rspec_mock_instance, context |
+          expect(context.request.list.sort_data).to eq({'conventional' => 'desc', 'extra'=>'up', 'created_at'=>'desc'})
+        end
+
+        get '/v2/rspec_test_service_stub?sort=conventional,extra,created_at&direction=desc,up,desc', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        expect(last_response.status).to eq(200)
+      end
+
+      it 'should handle legitimate duplicated sort values (form 2)' do
+        expect_any_instance_of(RSpecTestServiceStubImplementation).to receive(:list).once do | ignored_rspec_mock_instance, context |
+                expect(context.request.list.sort_data).to eq({'conventional' => 'desc', 'extra'=>'up', 'created_at'=>'desc'})
+        end
+
+        get '/v2/rspec_test_service_stub?sort=conventional&direction=desc&sort=extra&sort=created_at&direction=up&direction=desc', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        expect(last_response.status).to eq(200)
+      end
+
+      it 'should handle a mixture of sort forms' do
+        expect_any_instance_of(RSpecTestServiceStubImplementation).to receive(:list).once do | ignored_rspec_mock_instance, context |
+                expect(context.request.list.sort_data).to eq({'conventional' => 'desc', 'extra'=>'up', 'created_at'=>'desc'})
+        end
+
+        get '/v2/rspec_test_service_stub?sort=conventional&direction=desc&sort=extra,created_at&direction=up,desc', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
         expect(last_response.status).to eq(200)
       end
 
-      it 'should respond to several sort query parameters, with duplicates' do
+      it 'should de-duplicate unnecessarily duplicated sort query parameters' do
         expect_any_instance_of(RSpecTestServiceStubImplementation).to receive(:list).once do | ignored_rspec_mock_instance, context |
-          expect(context.request.list.sort_data).to eq({'created_at'=>'desc', 'extra'=>'up'})
+          expect(context.request.list.sort_data).to eq({'created_at'=>'desc', 'extra'=>'down', 'conventional' => 'desc'})
         end
 
-        get '/v2/rspec_test_service_stub?sort=extra,extra&sort=created_at&sort=extra&direction=up,desc', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        get '/v2/rspec_test_service_stub?sort=created_at,extra,extra&sort=conventional&direction=desc,down,down,desc', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
         expect(last_response.status).to eq(200)
       end
 

data/spec/services/services/application_spec.rb

@@ -43,7 +43,7 @@ describe Hoodoo::Services::Service do
 
   it 'should correctly report its component classes' do
     RSpecTestService.comprised_of( RSpecTestInterfaceA,
-                                              RSpecTestInterfaceB )
+                                   RSpecTestInterfaceB )
 
     expect(RSpecTestService.component_interfaces).to eq([
       RSpecTestInterfaceA,

data/spec/services/services/context_spec.rb

@@ -1,19 +1,23 @@
 require 'spec_helper'
 
-class RSpecTestContextImplementation < Hoodoo::Services::Implementation
-end
+describe Hoodoo::Services::Context do
 
-class RSpecTestContextInterface < Hoodoo::Services::Interface
-  interface :RSpecTestResource do
-    endpoint :rspec_test_service_stub, RSpecTestContextImplementation
+  before :all do
+    Hoodoo::Services::Middleware.flush_services_for_test()
   end
-end
 
-class RSpecTestContext < Hoodoo::Services::Service
-  comprised_of RSpecTestContextInterface
-end
+  class RSpecTestContextImplementation < Hoodoo::Services::Implementation
+  end
 
-describe Hoodoo::Services::Context do
+  class RSpecTestContextInterface < Hoodoo::Services::Interface
+    interface :RSpecTestResource do
+      endpoint :rspec_test_service_stub, RSpecTestContextImplementation
+    end
+  end
+
+  class RSpecTestContext < Hoodoo::Services::Service
+    comprised_of RSpecTestContextInterface
+  end
 
   it 'should initialise correctly' do
     ses = Hoodoo::Services::Session.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -409,6 +409,7 @@ files:
 - spec/data/types/permissions_spec.rb
 - spec/errors/error_descriptions_spec.rb
 - spec/errors/errors_spec.rb
+- spec/files/regenerate.rb
 - spec/integration/service_actions_spec.rb
 - spec/logger/fast_writer_spec.rb
 - spec/logger/logger_spec.rb
@@ -541,6 +542,7 @@ test_files:
 - spec/data/types/permissions_spec.rb
 - spec/errors/error_descriptions_spec.rb
 - spec/errors/errors_spec.rb
+- spec/files/regenerate.rb
 - spec/integration/service_actions_spec.rb
 - spec/logger/fast_writer_spec.rb
 - spec/logger/logger_spec.rb