restpack_service 0.0.67 → 0.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31d15c963dd38c98efe2bed43bd29a860b75dadd
-  data.tar.gz: 0b5e96fb57785ec34af5abffa34a629b6e4928ad
+  metadata.gz: e0f9e8b4c16a16101ef2a668bcf7a3daeae92dcd
+  data.tar.gz: 7e381efa954dc5b2f0ca30120126bb9e5fc5e6c3
 SHA512:
-  metadata.gz: fe43fad9ec714e4966a649e78a5e830ea693ecea2f5417e0a810cf630dfecde7193587ff8fc1601153b3af4bc8a3f995aa2f47af2c80804c1fcd3f911c8cce83
-  data.tar.gz: 2bbadd095f455abb26756a1c61bb53aa113373f066e186558154d013edb39b970b4ecc4569325744c202d6f2b11727bb21e52ed73f6b165d841315938d76e5ce
+  metadata.gz: 74847cc12dd7ffae0943ef26c9e590924cdb86bea04d0a73127ad03f2ba0ffd9f202310fe1b0580ae661e475e28144ddc3c7f55c71fdca46663d0e07ff0a8b87
+  data.tar.gz: 63ab3e2370ada81a80720beaee94827a8bb3cc4cf4024b61948d985ca7375103c2862b412d36d64db416d9e752f0bf3e2342c7eeedb4c2a584ab0ca22f851358

data/lib/restpack_service/command.rb

@@ -1,6 +1,6 @@
 require 'modularize'
 
-module RestPack
+module RestPack::Service
   class Command < Mutations::Command
     attr_accessor :response
 
@@ -113,125 +113,125 @@ module RestPack
 end
 
 #TODO: GJ: remove this legacy class
-module RestPack::Service
-  class Command < Mutations::Command
-    attr_accessor :response
-
-    def run
-      @response = Response.new
-
-      begin
-        init
-        mutation = super
-
-        if mutation.errors
-          mutation.errors.message.each do |error|
-            @response.add_error(error[0], error[1].gsub(error[0].capitalize, ''))
-          end
-
-          @response.status ||= :unprocessable_entity
-        else
-          @response.status ||= :ok
-        end
-
-        if @response.status == :ok
-          @response.result = mutation.result if mutation.result
-        end
-      rescue Exception => e
-        puts "---COMMAND EXCEPTION---"
-        puts e.message #TODO: GJ: logging
-        puts e.backtrace
-        puts "-----------------------"
-
-        @response.add_error(:base, 'Service Error')
-        @response.status = :internal_service_error
-      end
-
-      @response
-    end
-
-    def init
-    end
-
-    def status(status)
-      @response.status = status
-    end
-
-    def valid?
-      !has_errors?
-    end
-
-    def service_error(message)
-      field_error :base, message
-    end
-
-    def field_error(key, message)
-      add_error key, key, message
-    end
-
-    def get
-      identifier = service_identifiers[:resources]
-      result = Serializer.resource(inputs)
-
-      if result[identifier].empty?
-        status :not_found
-      else
-        result
-      end
-    end
-
-    def list
-      serializer_klass.resource(inputs)
-    end
-
-    def create!
-      identifier = service_identifiers[:resources]
-      models = create_models!(inputs[identifier])
-      serialize(models)
-    end
-
-    def single_create!
-      identifier = service_identifiers[:resources]
-      model = model_klass.create!(inputs)
-      as_json(model)
-    end
-
-    def serialize(models)
-      serializer_klass.serialize(models)
-    end
-
-    def as_json(model)
-      serializer_klass.as_json(model)
-    end
-
-
-
-    def create_models!(array)
-      model_klass.create!(array)
-    end
-
-    def serializer_klass
-      "Serializers::#{service_namespace}".constantize
-    end
-
-    def model_klass
-      "Models::#{service_namespace}".constantize
-    end
-
-    def service_namespace
-      identifiers = service_identifiers
-      namespace = "#{identifiers[:service]}::#{identifiers[:resource].capitalize}"
-    end
-
-    def service_identifiers
-      #extract identifiers from ancestor in the form of 'Commands::Core::Application::Get'
-      namespaces = self.class.ancestors.first.to_s.split('::')
-      resource = namespaces[2].downcase
-      return {
-        service: namespaces[1].to_sym,
-        resource: resource.to_sym,
-        resources: resource.pluralize.to_sym
-      }
-    end
-  end
-end
+# module RestPack::Service
+#   class Command < Mutations::Command
+#     attr_accessor :response
+
+#     def run
+#       @response = Response.new
+
+#       begin
+#         init
+#         mutation = super
+
+#         if mutation.errors
+#           mutation.errors.message.each do |error|
+#             @response.add_error(error[0], error[1].gsub(error[0].capitalize, ''))
+#           end
+
+#           @response.status ||= :unprocessable_entity
+#         else
+#           @response.status ||= :ok
+#         end
+
+#         if @response.status == :ok
+#           @response.result = mutation.result if mutation.result
+#         end
+#       rescue Exception => e
+#         puts "---COMMAND EXCEPTION---"
+#         puts e.message #TODO: GJ: logging
+#         puts e.backtrace
+#         puts "-----------------------"
+
+#         @response.add_error(:base, 'Service Error')
+#         @response.status = :internal_service_error
+#       end
+
+#       @response
+#     end
+
+#     def init
+#     end
+
+#     def status(status)
+#       @response.status = status
+#     end
+
+#     def valid?
+#       !has_errors?
+#     end
+
+#     def service_error(message)
+#       field_error :base, message
+#     end
+
+#     def field_error(key, message)
+#       add_error key, key, message
+#     end
+
+#     def get
+#       identifier = service_identifiers[:resources]
+#       result = Serializer.resource(inputs)
+
+#       if result[identifier].empty?
+#         status :not_found
+#       else
+#         result
+#       end
+#     end
+
+#     def list
+#       serializer_klass.resource(inputs)
+#     end
+
+#     def create!
+#       identifier = service_identifiers[:resources]
+#       models = create_models!(inputs[identifier])
+#       serialize(models)
+#     end
+
+#     def single_create!
+#       identifier = service_identifiers[:resources]
+#       model = model_klass.create!(inputs)
+#       as_json(model)
+#     end
+
+#     def serialize(models)
+#       serializer_klass.serialize(models)
+#     end
+
+#     def as_json(model)
+#       serializer_klass.as_json(model)
+#     end
+
+
+
+#     def create_models!(array)
+#       model_klass.create!(array)
+#     end
+
+#     def serializer_klass
+#       "Serializers::#{service_namespace}".constantize
+#     end
+
+#     def model_klass
+#       "Models::#{service_namespace}".constantize
+#     end
+
+#     def service_namespace
+#       identifiers = service_identifiers
+#       namespace = "#{identifiers[:service]}::#{identifiers[:resource].capitalize}"
+#     end
+
+#     def service_identifiers
+#       #extract identifiers from ancestor in the form of 'Commands::Core::Application::Get'
+#       namespaces = self.class.ancestors.first.to_s.split('::')
+#       resource = namespaces[2].downcase
+#       return {
+#         service: namespaces[1].to_sym,
+#         resource: resource.to_sym,
+#         resources: resource.pluralize.to_sym
+#       }
+#     end
+#   end
+# end

data/lib/restpack_service/support/matchers/create_command.rb

@@ -1,40 +1,40 @@
-def it_acts_as_create_command(namespace, type)
-  plural = type.to_s.pluralize.to_sym
-  namespaced_type = "#{namespace.to_s.camelize}::#{type.to_s.camelize}"
-  model_class = "Models::#{namespaced_type}".constantize
-  serializer_class = "Serializers::#{namespaced_type}".constantize
-
+def it_acts_as_create_command
   let(:response) { subject.class.run(params) }
+  let(:resource_plural) { subject.Serializer.plural_key }
+  let(:resource_singular) { subject.Serializer.singular_key }
 
   context "with valid params" do
     context "when creating a single item" do
-      let(:item) { build("api_#{type}".to_sym) }
-      let(:params) { { plural => [item] } }
+      let(:item) { build("api_#{resource_singular}") }
+      let(:params) { { resource_plural => [item] } }
 
-      it "returns the newly created #{type}" do
-        response.success?.should == true
-        response.result.should include(plural), "The reponse should include :#{plural} array"
+      it_succeeds "and returns the newly created resource" do
+        expect(response.result).to include(resource_plural), "The reponse should include an array of :#{resource_plural}"
 
-        response_items = response.result[plural]
-        response_items.length.should == 1
-        response_item = response_items.first
+        response_items = response.result[resource_plural]
+        expect(response_items.length).to eq(1)
 
-        model = model_class.find(response_item[:id])
-        response_item.should == serializer_class.as_json(model)
+        response_item = response_items.first
+        model = subject.Model.find(response_item[:id])
+        expect(response_item).to eq(subject.Serializer.as_json(model))
       end
     end
+  end
+
+  context "when creating multiple items" do
+    let(:item1) { build("api_#{resource_singular}".to_sym) }
+    let(:item2) { build("api_#{resource_singular}".to_sym) }
+    let(:params) { { resource_plural => [item1, item2] } }
 
-    context "when creating multiple items" do
-      let(:item1) { build("api_#{type}".to_sym) }
-      let(:item2) { build("api_#{type}".to_sym) }
-      let(:params) { { plural => [item1, item2] } }
+    it_succeeds "and returns the newly created resources" do
+      expect(response.result).to include(resource_plural), "The reponse should include an array of :#{resource_plural}"
 
-      it "returns the newly created #{type}s" do
-        response.success?.should == true
-        response.result.should include(plural), "The reponse should include :#{plural} array"
+      response_items = response.result[resource_plural]
+      expect(response_items.length).to eq(2)
 
-        response_items = response.result[plural]
-        response_items.length.should == 2
+      response_items.each do |response_item|
+        model = subject.Model.find(response_item[:id])
+        expect(response_item).to eq(subject.Serializer.as_json(model))
       end
     end
   end

data/lib/restpack_service/support/matchers/single_create_command.rb

@@ -1,22 +1,22 @@
-def it_acts_as_single_create_command(namespace, type)
-  plural = type.to_s.pluralize.to_sym
-  namespaced_type = "#{namespace.to_s.camelize}::#{type.to_s.camelize}"
-  model_class = "Models::#{namespaced_type}".constantize
-  serializer_class = "Serializers::#{namespaced_type}".constantize
+# def it_acts_as_single_create_command(namespace, type)
+#   plural = type.to_s.pluralize.to_sym
+#   namespaced_type = "#{namespace.to_s.camelize}::#{type.to_s.camelize}"
+#   model_class = "Models::#{namespaced_type}".constantize
+#   serializer_class = "Serializers::#{namespaced_type}".constantize
 
-  let(:response) { subject.class.run(params) }
+#   let(:response) { subject.class.run(params) }
 
-  context "with valid params" do
-    context "when creating a single item" do
-      let(:item) { build("api_#{type}".to_sym) }
-      let(:params) { item }
+#   context "with valid params" do
+#     context "when creating a single item" do
+#       let(:item) { build("api_#{type}".to_sym) }
+#       let(:params) { item }
 
-      it "returns the newly created #{type}" do
-        response.success?.should == true
-        response.result[:id].should_not == nil
-        model = model_class.find(response.result[:id])
-        response.result.should == serializer_class.as_json(model)
-      end
-    end
-  end
-end
+#       it "returns the newly created #{type}" do
+#         response.success?.should == true
+#         response.result[:id].should_not == nil
+#         model = model_class.find(response.result[:id])
+#         response.result.should == serializer_class.as_json(model)
+#       end
+#     end
+#   end
+# end

data/lib/restpack_service/support/matchers.rb

@@ -33,3 +33,18 @@ def service_should_map(param, map)
     end
   end
 end
+
+def it_is(status)
+  it "is :#{status}" do
+    expect(response.success?).to eq(false)
+    expect(response.result).to eq({})
+    expect(response.status).to eq(:forbidden)
+  end
+end
+
+def it_succeeds(message='succeeds', &block)
+  it message do
+    expect(response.success?).to eq(true)
+    instance_eval(&block)
+  end
+end

data/lib/restpack_service/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Service
-    VERSION = "0.0.67"
+    VERSION = "0.0.68"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restpack_service
 version: !ruby/object:Gem::Version
-  version: 0.0.67
+  version: 0.0.68
 platform: ruby
 authors:
 - Gavin Joyce