shamu 0.0.9 → 0.0.11

data/spec/lib/shamu/json_api/rails/controller_spec.rb

@@ -16,6 +16,8 @@ module JsonApiControllerSpec
       def present
         builder.identifier :resource, resource.id
         builder.attribute name: resource.name
+
+        builder.link :self, "somewhere"
       end
     end
   end
@@ -25,12 +27,38 @@ end
 describe JsonApiControllerSpec::ResourcesController, type: :controller do
   controller JsonApiControllerSpec::ResourcesController do
     def show
-      resource = resources.first
-      render json: json_resource( resource )
+      render_resource resources.first
     end
 
     def index
-      render json: json_collection( resources )
+      render_collection resources
+    end
+
+    def create
+      result = Shamu::Services::Result.new resources.first
+      render_result result
+    end
+
+    def update
+      result = Shamu::Services::Result.new resources.first
+      render_result result
+    end
+
+    def destroy
+      result = Shamu::Services::Result.new resources.first
+      render_result result
+    end
+
+    def invalid
+      result = Shamu::Services::Result.new
+      result.errors.add :base, "nope"
+
+      render_result result
+    end
+
+    def no_entity
+      result = Shamu::Services::Result.new
+      render_result result
     end
 
     def nope
@@ -51,7 +79,7 @@ describe JsonApiControllerSpec::ResourcesController, type: :controller do
 
   describe "#json_resource" do
     subject do
-      get :show, id: 1, format: :json
+      get :show, params: { id: 1, format: :json }
       JSON.parse( response.body )
     end
 
@@ -59,19 +87,70 @@ describe JsonApiControllerSpec::ResourcesController, type: :controller do
     it { is_expected.to include "data" => hash_including( "attributes" => kind_of( Hash ) ) }
 
     it "reflects fields param to meta" do
-      get :show, id: 1, fields: { people: "id,name" }
+      get :show, params: { id: 1, fields: { people: "id,name" } }
       json = JSON.parse( response.body )
       expect( json ).to include "meta" => hash_including( "fields" )
     end
 
     it "fails when 'include' paramter is given" do
-      get :show, id: 1, include: :contact
+      get :show, params: { id: 1, include: :contact }
 
       expect( response.code ).to eq "400"
       expect( response.body ).to include "include"
     end
   end
 
+  describe "#render_resource" do
+    it "adds Location header" do
+      get :show, params: { id: 1 }
+      expect( response.headers ).to include 'Location'
+    end
+  end
+
+  describe "#render_result" do
+    it "returns status created on #create" do
+      post :create, params: { name: 'example' }
+      expect( response.status ).to eq 201
+      expect( response.body ).to include "data"
+    end
+
+    it "returns status ok on #update" do
+      put :update, params: { id: 1 }
+
+      expect( response.status ).to eq 200
+      expect( response.body ).to include "data"
+    end
+
+    it "returns status no_content on delete" do
+      delete :destroy, params: { id: 1 }
+
+      expect( response.status ).to eq 204
+    end
+
+    it "returns status bad_request on error" do
+      routes.draw do
+        post "invalid" => "json_api_controller_spec/resources#invalid"
+      end
+
+      post :invalid
+
+      expect( response.status ).to be 422
+      expect( response.body ).to include "errors"
+    end
+
+    it "returns status no_content on success without entity" do
+      routes.draw do
+        post "no_entity" => "json_api_controller_spec/resources#no_entity"
+      end
+
+      post :no_entity
+
+      expect( response.status ).to eq 204
+      expect( response.body ).to be_blank
+    end
+
+  end
+
   describe "#json_collection" do
     before( :each ) do
       allow( controller.resources ).to receive( :current_page ).and_return 1
@@ -115,4 +194,59 @@ describe JsonApiControllerSpec::ResourcesController, type: :controller do
     end
   end
 
-end
+  describe "#request_params" do
+    let( :body ) do
+      {
+        data: {
+          attributes: {
+            name: "Example"
+          },
+          relationships: {
+            book: {
+              data: { type: "book", id: "5", attributes: { title: "Bibliography" }  }
+            },
+            stores: {
+              data: [
+                { "type": "store", id: "56", attributes: { title: "First Street" } }
+              ]
+            }
+          }
+        }
+      }
+    end
+
+    before( :each ) do
+      expect( request ).to receive( :body ) { StringIO.new( body.to_json ) }
+    end
+
+    it "maps data attributes" do
+      expect( controller.send( :request_params, :example ) ).to include name: "Example"
+    end
+
+    it "maps relationship ids to root attributes" do
+      expect( controller.send( :request_params, :example ) ).to include book_id: "5"
+      expect( controller.send( :request_params, :example ) ).to include store_ids: [ "56" ]
+    end
+
+    it "maps relationship data to root attributes" do
+      expect( controller.send( :request_params, :example ) ).to include book: { id: "5", title: "Bibliography" }
+      expect( controller.send( :request_params, :example ) ).to include stores: [ { id: "56", title: "First Street" } ]
+    end
+
+    it "maps data id if available" do
+      body[ :data ][ :id ] = "73"
+
+      expect( controller.send( :request_params, :example ) ).to include id: "73"
+    end
+
+    it "maps id request params if available" do
+      allow( controller.request ).to receive( :params ).and_return( { id: "90" }.with_indifferent_access )
+
+      expect( controller.send( :request_params, :example ) ).to include id: "90"
+    end
+
+    it "returns relationship directly if matching param key" do
+      expect( controller.send( :request_params, :book ) ).to include id: "5", title: "Bibliography"
+    end
+  end
+end

data/spec/lib/shamu/json_api/rails/responder_spec.rb

@@ -60,7 +60,7 @@ describe JsonApiResponderSpec::ResourcesController, type: :controller do
 
   let( :resource )  { JsonApiResponderSpec::Resource.new( id: 562, name: "Example" ) }
   let( :resources ) { [ resource ] }
-  let( :body )      { JSON.load( response.body, nil, symbolize_names: true ) }
+  let( :body )      { JSON.parse( response.body, symbolize_names: true ) }
 
   before( :each ) do
     allow( controller ).to receive( :_routes ).and_return @routes
@@ -69,12 +69,12 @@ describe JsonApiResponderSpec::ResourcesController, type: :controller do
 
   describe "#show" do
     it "has JSON content_type" do
-      get :show, id: 1
+      get :show, params: { id: 1 }
       expect( response.content_type ).to eq Shamu::JsonApi::MIME_TYPE
     end
 
     it "renders JSON API response" do
-      get :show, id: 1
+      get :show, params: { id: 1 }
       expect( body ).to include data: hash_including( id: resource.id.to_s )
     end
 
@@ -84,7 +84,7 @@ describe JsonApiResponderSpec::ResourcesController, type: :controller do
       allow( resource ).to receive( :errors ).and_return errors
       allow( resource ).to receive( :valid? ).and_return false
 
-      get :show, id: 1
+      get :show, params: { id: 1 }
       expect( body ).to include :errors
     end
   end
@@ -113,22 +113,22 @@ describe JsonApiResponderSpec::ResourcesController, type: :controller do
 
   describe "#update" do
     it "has JSON content_type" do
-      put :update, id: 1
+      put :update, params: { id: 1 }
       expect( response.content_type ).to eq Shamu::JsonApi::MIME_TYPE
     end
 
     it "includes location header" do
-      post :update, id: 1
+      post :update, params: { id: 1 }
       expect( response.location ).to be_present
     end
 
     it "returns 200 status code" do
-      put :update, id: 1
+      put :update, params: { id: 1 }
       expect( response.status ).to eq 200
     end
 
     it "includes the json entity" do
-      put :update, id: 1
+      put :update, params: { id: 1 }
       expect( body ).to include data: hash_including( id: resource.id.to_s )
     end
   end
@@ -150,4 +150,4 @@ describe JsonApiResponderSpec::ResourcesController, type: :controller do
     end
   end
 
-end
+end

data/spec/lib/shamu/rails/controller_spec.rb

@@ -18,7 +18,7 @@ describe Shamu::Rails::Controller, type: :controller do
     public :services, :secure_services, :permit?
 
     def show
-      render text: ""
+      render plain: ""
     end
   end
 
@@ -47,10 +47,10 @@ describe Shamu::Rails::Controller, type: :controller do
 
       expect( controller ).to receive( :show ) do
         expect( scorpion.fetch( Shamu::Security::Principal ).user_id ).to eq 945
-        controller.render( text: "" )
+        controller.render( plain: "" )
       end
 
-      get :show, id: 5
+      get :show, params: { id: 5 }
     end
   end
 
@@ -71,4 +71,4 @@ describe Shamu::Rails::Controller, type: :controller do
       expect( controller ).not_to be_permitted_to :read, :something
     end
   end
-end
+end

data/spec/lib/shamu/rails/entity_spec.rb

@@ -15,8 +15,6 @@ module LoadEntitySpec
 
     def authorize!( * )
     end
-
-
   end
 
   class ExampleEntity < Shamu::Entities::Entity
@@ -34,20 +32,24 @@ describe Shamu::Rails::Entity, type: :controller do
   hunt( :example_service, LoadEntitySpec::Service ) { scorpion.new LoadEntitySpec::Service }
 
   controller ActionController::Base do
-    service :example_service, LoadEntitySpec::Service
+    service :examples_service, LoadEntitySpec::Service
     entity LoadEntitySpec::ExampleEntity
 
     def show
-      render text: ""
+      render plain: ""
     end
 
     def index
-      render text: ""
+      render plain: ""
     end
 
     def new
+      render plan: ""
+    end
+
+    def create
       example_request
-      render text: ""
+      render plain: ""
     end
 
   end
@@ -62,6 +64,7 @@ describe Shamu::Rails::Entity, type: :controller do
 
   it "loads the entity from the service" do
     expect( example_service ).to receive( :find )
+    controller.params[:id] = 1
     controller.send :example
   end
 
@@ -83,7 +86,7 @@ describe Shamu::Rails::Entity, type: :controller do
 
   it "loads the entity before the request" do
     expect( controller ).to receive( :example ).and_call_original
-    get :show, id: 1
+    get :show, params: { id: 1 }
   end
 
   it "invokes list for index types" do
@@ -94,7 +97,13 @@ describe Shamu::Rails::Entity, type: :controller do
   it "authorizes action for entity request" do
     expect( example_service ).to receive( :authorize! )
 
-    get :new
+    post :create
+  end
+
+  it "doesn't load entity on create actions" do
+    expect( controller ).not_to receive( :example )
+
+    post :create
   end
 
   context "only some actions" do
@@ -103,21 +112,26 @@ describe Shamu::Rails::Entity, type: :controller do
       entity LoadEntitySpec::ExampleEntity, only: :show
 
       def show
-        render text: ""
+        render plain: ""
       end
 
       def new
-        render text: ""
+        render plain: ""
+      end
+
+      def create
+        render plain: ""
       end
     end
 
     it "loads on show" do
       expect( controller ).to receive( :example )
-      get :show, id: 1
+      get :show, params: { id: 1 }
     end
 
     it "doesn't load on new" do
       expect( controller ).not_to receive( :example )
+      post :create
       get :new
     end
   end
@@ -128,23 +142,27 @@ describe Shamu::Rails::Entity, type: :controller do
       entity LoadEntitySpec::ExampleEntity, except: :show
 
       def show
-        render text: ""
+        render plain: ""
       end
 
       def new
-        render text: ""
+        render plain: ""
+      end
+
+      def create
+        render plain: ""
       end
     end
 
     it "loads on show" do
       expect( controller ).not_to receive( :example )
-      get :show, id: 1
+      get :show, params: { id: 1 }
     end
 
     it "doesn't load on new" do
-      expect( controller ).to receive( :example )
+      expect( controller ).not_to receive( :example )
       get :new
     end
   end
 
-end
+end

data/spec/lib/shamu/rails/features_spec.rb

@@ -6,7 +6,7 @@ describe Shamu::Rails::Features, type: :controller do
     public :feature_enabled?
 
     def show
-      render text: ""
+      render plain: ""
     end
   end
 
@@ -22,10 +22,10 @@ describe Shamu::Rails::Features, type: :controller do
 
     expect( controller ).to receive( :show ) do
       expect( controller.feature_enabled?( "shopping/nux" ) ).to be_truthy
-      controller.render text: ""
+      controller.render plain: ""
     end
 
-    get :show, id: 1
+    get :show, params: { id: 1 }
   end
 
   it "allows toggles to be overridden by query param" do
@@ -36,10 +36,10 @@ describe Shamu::Rails::Features, type: :controller do
 
     expect( controller ).to receive( :show ) do
       expect( controller.feature_enabled?( "shopping/discounts" ) ).to be_truthy
-      controller.render text: ""
+      controller.render plain: ""
     end
 
-    get :show, id: 1, Shamu::Features::EnvStore::RACK_PARAMS_KEY => override
+    get :show, params: { id: 1, Shamu::Features::EnvStore::RACK_PARAMS_KEY => override } 
   end
 
-end
+end

data/spec/lib/shamu/services/active_record_crud_spec.rb

@@ -65,8 +65,8 @@ describe Shamu::Services::ActiveRecordCrud do
       expect( klass.model_class ).to eq ActiveRecordSpec::Favorite
     end
 
-    it "defines a build_entity method" do
-      expect( klass.new.respond_to?( :build_entity, true ) ).to be_truthy
+    it "defines a build_entities method" do
+      expect( klass.new.respond_to?( :build_entities, true ) ).to be_truthy
     end
 
     Shamu::Services::ActiveRecordCrud::DSL_METHODS.each do |method|
@@ -76,7 +76,7 @@ describe Shamu::Services::ActiveRecordCrud do
       end
     end
 
-    it "takes a block defining #build_entity" do
+    it "takes a block defining #build_entities" do
       expect do |b|
         yield_klass = Class.new( klass ) do
           resource( ActiveRecordCrudSpec::FavoriteEntity, ActiveRecordSpec::Favorite, &b )
@@ -223,6 +223,8 @@ describe Shamu::Services::ActiveRecordCrud do
     end
 
     it "calls #authorize!" do
+      entity
+
       expect( service ).to receive( :authorize! ).with(
         :update,
         kind_of( ActiveRecordCrudSpec::FavoriteEntity ),
@@ -434,7 +436,7 @@ describe Shamu::Services::ActiveRecordCrud do
     end
   end
 
-  describe ".build_entity" do
+  describe ".build_entities" do
     let!( :entity ) { service.create( name: "Example", label: "Books" ).entity }
     let( :entity_class ) do
       Class.new( Shamu::Entities::Entity ) do
@@ -444,9 +446,12 @@ describe Shamu::Services::ActiveRecordCrud do
     let( :klass ) do
       ec = entity_class
       Class.new( super() ) do
-        build_entity do |record, _ = nil|
-          scorpion.fetch ec, { record: record }, {}
+        build_entities do |records|
+          records.map do |record|
+            scorpion.fetch ec, { record: record }, {}
+          end
         end
+        public :build_entities
         public :build_entity
       end
     end
@@ -457,4 +462,4 @@ describe Shamu::Services::ActiveRecordCrud do
     end
 
   end
-end
+end

data/spec/lib/shamu/services/lazy_transform_spec.rb

@@ -3,77 +3,86 @@ require "spec_helper"
 describe Shamu::Services::LazyTransform do
   let( :source ) { [ 1, 2, 3 ] }
 
+  def transformer( &block  )
+    ->( records ) {
+      records.map do |r|
+        yield
+        r
+      end
+    }
+  end
+
   it "short-circuits count" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       expect( transformed.count ).to eq source.count
     end.not_to yield_control
   end
 
   it "delegates when count has an arg" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       expect( transformed.count( 1000 ) ).to eq 0
     end.to yield_control
   end
 
   it "delegates when count has a block given" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       expect( transformed.count { true } ).to eq source.count
     end.to yield_control
   end
 
   it "short-circuits first" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       transformed.first
     end.to yield_control.once
   end
 
   it "doesn't short-circuit first(n)" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       transformed.first( 2 )
     end.to yield_control.exactly(3)
   end
 
   it "short-circuits empty?" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       expect( transformed ).not_to be_empty
     end.not_to yield_control
   end
 
   it "short-circuits present?" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       transformed.present?
     end.not_to yield_control
   end
 
   it "transforms when enumerated" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       transformed.to_a
     end.to yield_control.exactly( 3 )
   end
 
   it "yields transformed values" do
-    transformed = Shamu::Services::LazyTransform.new( source ) { |v| v * v }
+    transformed = Shamu::Services::LazyTransform.new( source ) { |vs| vs.map { |v| v * v  } }
     expect( transformed.to_a ).to eq [ 1, 4, 9 ]
   end
 
   it "short-circuits drop" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       transformed.drop( 2 ).to_a
     end.to yield_control.exactly( 1 )
   end
 
   it "uses existing transformed on drop if avaialable" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       transformed.to_a
       transformed.drop( 2 ).to_a
     end.to yield_control.exactly( 3 )
@@ -81,16 +90,16 @@ describe Shamu::Services::LazyTransform do
 
   it "short-circuits take" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       transformed.take( 2 ).to_a
     end.to yield_control.exactly( 2 )
   end
 
   it "users existing transformed on take if avaialable" do
     expect do |block|
-      transformed = Shamu::Services::LazyTransform.new( source, &block )
+      transformed = Shamu::Services::LazyTransform.new( source, &transformer( &block ) )
       transformed.to_a
       transformed.take( 2 ).to_a
     end.to yield_control.exactly( 3 )
   end
-end
+end

data/spec/lib/shamu/services/request_support_spec.rb

@@ -49,6 +49,15 @@ module RequestSupportSpec
     attribute :level, on: :record
     attribute :amount, on: :record
   end
+
+  class UsersService < Shamu::Services::Service
+    include Shamu::Services::RequestSupport
+  end
+
+  module UserRequest
+    class Change < Shamu::Services::Request
+    end
+  end
 end
 
 describe Shamu::Services::RequestSupport do
@@ -72,6 +81,11 @@ describe Shamu::Services::RequestSupport do
         end.request_class( :change )
       end.to raise_error Shamu::Services::IncompleteSetupError, /Request/
     end
+    
+    it "singularizes service namespace" do
+      service = scorpion.new RequestSupportSpec::UsersService
+      expect( service.request_class( :change ) ).to be RequestSupportSpec::UserRequest::Change
+    end
 
     it "uses common alias fallback new -> create" do
       expect( service.request_class( :new ) ).to be RequestSupportSpec::Request::Create
@@ -150,4 +164,4 @@ describe Shamu::Services::RequestSupport do
       expect( request ).to be_a Shamu::Services::Request
     end
   end
-end
+end