restpack_service 0.0.64 → 0.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c13378bcbc9ae398e75165b4ea00a432382175d
-  data.tar.gz: 14c11ae436bd300d79b4c75dd5fdd3ac4ded7752
+  metadata.gz: 49137a729f5b2c815e7ee9c104520ec36fa6266e
+  data.tar.gz: 86451cffa96faae3785f3464827f553bf3511600
 SHA512:
-  metadata.gz: c2c34390c50d5928ba3265b81afd9d9087c67092b89844007a72722e6114349f0089b9ec17bf267aa123c3f91e9585d53e89fcca721b07e86527f8ea77795723
-  data.tar.gz: f5e5fd3b3d24ab020020a41ca5a603218accfeda6e09920d8300334238c12094d57855067c5387b971afa062062cbafd5cbd210418cbf9c0ad42778350b5b8ad
+  metadata.gz: 578bdc4ee648100800538dff93e47cc7b46f5f67a1eebdb73d4bc25f0ae974e9b9b230384a980fbb964023c13aa84f77b7f1c2cc475c4aa4e0312c7fb56e3a71
+  data.tar.gz: 2644f5878ce6e1484c317b3482f5f2a219a3dc8f13d302787348285414027a808ea5922cbd55490117419bf552e8abaae92bc8e2b930a0a657e66018e2c44316

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Gavin Joyce
+Copyright (c) 2013, 2014 Gavin Joyce
 
 MIT License
 

data/lib/restpack_service/command.rb

@@ -1,11 +1,11 @@
 require 'modularize'
 
-module RestPack::Service
+module RestPack
   class Command < Mutations::Command
     attr_accessor :response
 
     def run
-      @response = Response.new
+      @response = RestPack::Service::Response.new
 
       begin
         init
@@ -56,41 +56,6 @@ module RestPack::Service
       add_error key, key, message
     end
 
-    def get
-      identifier = service_identifiers[:resources]
-      result = serializer_klass.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 self.inherited(command)
       namespaces = command.to_s.split('::') # eg. GroupService::Commands::Group::Create
 
@@ -136,6 +101,102 @@ module RestPack::Service
         namespaces.take(namespaces.length - 1).join('::').safe_constantize #Commands::Group
       end
     end
+  end
+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)

data/lib/restpack_service/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Service
-    VERSION = "0.0.64"
+    VERSION = "0.0.65"
   end
 end

data/restpack_service.gemspec

@@ -18,16 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mutations",            "~> 0.6.0"
-  spec.add_dependency "yajl-ruby",            "~> 1.1.0"
-  spec.add_dependency "protected_attributes", "~> 1.0.3"
-  spec.add_dependency "require_all",          "~> 1.3.0"
+  spec.add_dependency "mutations",            "~> 0.7"
+  spec.add_dependency "yajl-ruby",            "~> 1.2"
+  spec.add_dependency "protected_attributes", "~> 1.0"
+  spec.add_dependency "require_all",          "~> 1.3"
   spec.add_dependency "restpack_serializer"
   spec.add_dependency "restpack_gem"
   spec.add_dependency "modularize"
-  spec.add_dependency "sinatra",              "~> 1.4.3"
-  spec.add_dependency "pg",                   "~> 0.16.0"
-  spec.add_dependency "sidekiq",              "~> 2.15.1"
+  spec.add_dependency "sinatra",              "~> 1.4"
+  spec.add_dependency "pg",                   "~> 0.17"
+  spec.add_dependency "sidekiq",              "~> 3.2"
 
   spec.add_development_dependency "bundler",  "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/command_spec.rb

@@ -1,28 +1,26 @@
 require 'spec_helper'
 
-describe RestPack::Service::Command do
+describe RestPack::Command do
   context 'with a commands in a namespace like TextService::Commands::Text::Reverse' do
     it 'defines sugar methods' do
-      TextService::Text.respond_to?(:reverse).should == true
-      TextService::Text.respond_to?(:reverse!).should == true
-      TextService::Text.reverse!(text: 'gavin').should == 'nivag'
+      expect(TextService::Text).to respond_to(:reverse, :reverse!)
+      expect(TextService::Text.reverse!(text: 'gavin')).to eq('nivag')
     end
 
     it 'defines aliases' do
       command = TextService::Commands::Text::Reverse
 
-      command::Model.should == TextService::Models::Text
-      command::Serializer.should == TextService::Serializers::Text
-      command::Commands.should == TextService::Commands
-      command::Models.should == TextService::Models
+      expect(command::Model).to eq(TextService::Models::Text)
+      expect(command::Serializer).to eq(TextService::Serializers::Text)
+      expect(command::Commands).to eq(TextService::Commands)
+      expect(command::Models).to eq(TextService::Models)
     end
   end
 
   context 'with a commands in a namespace like Commands::Template::Create' do
     it 'defines sugar methods' do
-      Commands::Math.respond_to?(:add).should == true
-      Commands::Math.respond_to?(:add!).should == true
-      Commands::Math.add!(a: 1, b: 2).should == 3
+      expect(Commands::Math).to respond_to(:add, :add!)
+      expect(Commands::Math.add!(a: 1, b: 2)).to eq(3)
     end
   end
 end

data/spec/configuration_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe RestPack::Service::Configuration do
   subject { RestPack::Service::Configuration.new }
 
-  it "has defaults" do
-    subject.application_id.should == 1
+  it 'has defaults' do
+    expect(subject.application_id).to eq(1)
   end
 end

data/spec/response_spec.rb

@@ -1,18 +1,16 @@
 require 'spec_helper'
 
 describe RestPack::Service::Response do
-  pending "Write some specs"
-
-  describe "#from_rest" do
-    it "parses a successful response" do
+  describe '#from_rest' do
+    it 'parses a successful response' do
       response = RestPack::Service::Response.from_rest(
         double(code: 200, body: '{ "key": "value" }')
       )
 
-      response.status.should == :ok
-      response.code.should == 200
-      response.success?.should == true
-      response.result.should == { key: "value" }
+      expect(response.status).to eq(:ok)
+      expect(response.code).to eq(200)
+      expect(response.success?).to eq(true)
+      expect(response.result).to eq({ key: "value" })
     end
 
     it "extracts errors from response body" do
@@ -22,26 +20,26 @@ describe RestPack::Service::Response do
         } }')
       )
 
-      response.success?.should == false
-      response.result.should == { key: "value" }
-      response.errors.should == { name: ["error 1", "error 2"] }
+      expect(response.success?).to eq(false)
+      expect(response.result).to eq({ key: "value" })
+      expect(response.errors).to eq({ name: ["error 1", "error 2"] })
     end
 
   end
 
   describe RestPack::Service::Response::Status do
-    describe "#from_code" do
-      context "valid status" do
-        it "maps a code to a status" do
-          RestPack::Service::Response::Status.from_code(200).should == :ok
+    describe '#from_code' do
+      context 'valid status' do
+        it 'maps a code to a status' do
+          expect(RestPack::Service::Response::Status.from_code(200)).to eq(:ok)
         end
       end
 
-      context "invalid status" do
-        it "raises an exception" do
+      context 'invalid status' do
+        it 'raises an exception' do
           expect {
             RestPack::Service::Response::Status.from_code(999)
-          }.to raise_exception("Invalid Status Code: 999")
+          }.to raise_exception('Invalid Status Code: 999')
         end
       end
     end

data/spec/support/fixtures.rb

@@ -11,7 +11,7 @@ module TextService
 
   module Commands
     module Text
-      class Reverse < RestPack::Service::Command
+      class Reverse < RestPack::Command
         required do
           string :text
         end
@@ -27,7 +27,7 @@ end
 
 module Commands
   module Math
-    class Add < RestPack::Service::Command
+    class Add < RestPack::Command
       required do
         integer :a
         integer :b

metadata

@@ -1,209 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: restpack_service
 version: !ruby/object:Gem::Version
-  version: 0.0.64
+  version: 0.0.65
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mutations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: protected_attributes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: restpack_serializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: restpack_gem
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: modularize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.1
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.1
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RestPack service base
@@ -213,9 +213,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -251,17 +251,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A base for RestPack services