restpack_service 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fccc635463c097450ec18bd8b93f28bd9aa770e7
-  data.tar.gz: 7603f27dd19425b7407b891223d0d74810a9f0e6
+  metadata.gz: accd5beb595134902b3ff0449ae03e09934b444e
+  data.tar.gz: 50f99564d3de69c02ba4d09ed10c8cf71e8e6e1b
 SHA512:
-  metadata.gz: 4af0651557c054af80f29c0498f9a244f5c934c8891bb1d4daa9c4c17156a5aa0afd5f32261c012101ebd1388094f34371ad63dbb41c1747372e2e41bac0801c
-  data.tar.gz: 399c04a95dc434872016d2469d943c0eb94d660916638a24a05a8695eb7da958f27c3c69f9ccc3e6e15e6ffd9c69e91dbd48fc99f37ac8d59b90fc309278ebc2
+  metadata.gz: aece65215619a601282861a331fbbd3a6cffbebf15d3ef92fd2f31ae56b7c33f6ced6589a00137d8a933a35b2f6471343e54560da045e50a1544744b6824a4ed
+  data.tar.gz: c3c81a29c029dab386958edd88752032d19e50660146c84ca0ad3d34d0cfa948b2262862628047079d1523441a20d9b1b006fb1f0e4f2416e3b7572c83d0b737

data/Rakefile

@@ -16,10 +16,10 @@ end
 
 
 task :gem do
-  ["gem:bump", "gem:tag", "gem:build", "gem:push"].each do |task|
-    Rake::Task[task].reenable
-    Rake::Task[task].invoke
-  end
+  Rake::Task["gem:bump"].invoke
+  Rake::Task["gem:tag"].invoke
+  Rake::Task["gem:build"].invoke
+  Rake::Task["gem:push"].invoke
 end
 
 namespace :gem do

data/lib/restpack_service.rb

@@ -1,4 +1,5 @@
 require "mutations"
+require "yajl"
 
 require "restpack_service/version"
 require "restpack_service/error"

data/lib/restpack_service/response.rb

@@ -3,15 +3,62 @@ module RestPack
     attr_accessor :result, :errors, :status
 
     def initialize
-      @errors = []
+      @result = {}
+      @errors = {}
     end
 
     def success?
-      @errors.empty? and @status == :success
+      @errors.empty? and @status == :ok
     end
 
-    def field_errors(key)
-      @errors.select { |error| error.key.to_sym == key.to_sym }
+    def code
+      Status.from_status(status)
+    end
+
+    def add_error(field, message)
+      @errors[field] ||= []
+      @errors[field] << message
+    end
+
+    def self.from_rest(rest_response)
+      response = new
+      response.status = Status.from_code(rest_response.code)
+      response.result = Yajl::Parser.parse(rest_response.body, :symbolize_keys => true)
+
+      if response.result[:errors]
+        response.result[:errors].each do |field, errors|
+          response.errors[field.to_sym] = errors
+        end
+
+        response.result.delete :errors
+      end
+
+      response
+    end
+
+    class Status
+      @@map = {
+        200 => :ok,
+        404 => :not_found,
+        422 => :unprocessable_entity,
+        500 => :internal_service_error
+      }
+
+      def self.from_code(code)
+        if @@map.has_key?(code)
+          @@map[code]
+        else
+          raise "Invalid Status Code: #{code}"
+        end
+      end
+
+      def self.from_status(status)
+        if @@map.has_value?(status)
+          @@map.key(status)
+        else
+          raise "Invalid Status: #{status}"
+        end
+      end
     end
   end
 end

data/lib/restpack_service/service.rb

@@ -11,19 +11,21 @@ module RestPack
 
         if mutation.errors
           mutation.errors.message.each do |error|
-            @response.errors << Error.new(error[0], error[1].gsub(error[0].capitalize, ''))
+            @response.add_error(error[0], error[1].gsub(error[0].capitalize, ''))
           end
 
           @response.status ||= :unprocessable_entity
         else
-          @response.status ||= :success
+          @response.status ||= :ok
         end
 
-        if @response.status == :success
-          @response.result = mutation.result
+        if @response.status == :ok
+          @response.result = mutation.result if mutation.result
         end
-      rescue
-        @response.errors << Error.new(:base, 'Service Error')
+      rescue Exception => e
+        p e.message #TODO: GJ: logging
+
+        @response.add_error(:base, 'Service Error')
         @response.status = :internal_service_error
       end
 

data/lib/restpack_service/version.rb

@@ -1,3 +1,3 @@
 module RestpackService
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/restpack_service.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mutations", "~> 0.6.0"
+  spec.add_dependency "yajl-ruby", "~> 1.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "bump", "~> 0.4"
+  spec.add_development_dependency "bump"
 end

data/spec/response_spec.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_service
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mutations
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +84,16 @@ dependencies:
   name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 description: RestPack service base
 email:
 - gavinjoyce@gmail.com