napa 0.1.6 → 0.1.7

data/lib/napa/grape_extensions/error_formatter.rb

@@ -0,0 +1,18 @@
+if defined?(Grape)
+  module Grape
+    module ErrorFormatter
+      module Json
+        class << self
+          def call(message, backtrace, options = {}, env = nil)
+            result = message.is_a?(Napa::JsonError) ? message : Napa::JsonError.new(:api_error, message)
+
+            if (options[:rescue_options] || {})[:backtrace] && backtrace && !backtrace.empty?
+              result = result.merge(backtrace: backtrace)
+            end
+            MultiJson.dump(result)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/napa/grape_extensions/error_presenter.rb

@@ -0,0 +1,10 @@
+module Napa
+  module ErrorPresenter
+    def present_error(code, message = '')
+      Napa::JsonError.new(code, message)
+    end
+
+    # extend all endpoints to include this
+    Grape::Endpoint.send :include, self
+  end
+end

data/lib/napa/json_error.rb

@@ -0,0 +1,17 @@
+module Napa
+  class JsonError
+    def initialize(code, message)
+      @code = code
+      @message = message
+    end
+
+    def to_json(options = {})
+      {
+        error: {
+          code: @code,
+          message: @message
+        }
+      }.to_json
+    end
+  end
+end

data/lib/napa/version.rb

@@ -1,5 +1,5 @@
 module Napa
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 
   class Version
     class << self

data/lib/napa.rb

@@ -4,12 +4,16 @@ require 'dotenv'
 require 'logging'
 require 'octokit'
 require 'grape'
+require 'json'
 
 # require internal files
 require 'napa/version'
 require 'napa/logger/logger'
 require 'napa/logger/log_transaction'
 require 'napa/identity'
+require 'napa/json_error'
+require 'napa/grape_extensions/error_formatter'
+require 'napa/grape_extensions/error_presenter'
 require 'napa/middleware/logger'
 require 'napa/middleware/app_monitor'
 require 'napa/activerecord'

data/spec/grape_extensions/error_formatter_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'napa/grape_extensions/error_formatter'
+
+describe Grape::ErrorFormatter::Json do
+  context '#call' do
+    it 'returns an api_error for plain error messages' do
+      error = Grape::ErrorFormatter::Json.call('test message', nil)
+      parsed = JSON.parse(error)
+      parsed['error']['code'].should eq('api_error')
+      parsed['error']['message'].should eq('test message')
+    end
+
+    it 'returns a specified error when given a Napa::JsonError object' do
+      json_error = Napa::JsonError.new(:foo, 'bar')
+      error = Grape::ErrorFormatter::Json.call(json_error, nil)
+      parsed = JSON.parse(error)
+      parsed['error']['code'].should eq('foo')
+      parsed['error']['message'].should eq('bar')
+    end
+  end
+end

data/spec/json_error_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'napa/json_error'
+
+describe Napa::JsonError do
+  context '#to_json' do
+    it 'returns a json hash with the error data' do
+      error = Napa::JsonError.new(:code, 'message').to_json
+      parsed = JSON.parse(error)
+
+      parsed['error']['code'].should eq('code')
+      parsed['error']['message'].should eq('message')
+    end
+  end
+end

metadata

@@ -1,60 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: napa
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
+  prerelease: 
 platform: ruby
 authors:
 - Darby Frey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,113 +78,129 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: grape-swagger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple framework for building APIs with Grape
@@ -215,7 +240,10 @@ files:
 - lib/napa.rb
 - lib/napa/activerecord.rb
 - lib/napa/grape_api.rb
+- lib/napa/grape_extensions/error_formatter.rb
+- lib/napa/grape_extensions/error_presenter.rb
 - lib/napa/identity.rb
+- lib/napa/json_error.rb
 - lib/napa/logger/log_transaction.rb
 - lib/napa/logger/logger.rb
 - lib/napa/middleware/app_monitor.rb
@@ -226,36 +254,47 @@ files:
 - lib/tasks/git.rake
 - lib/tasks/routes.rake
 - napa.gemspec
+- spec/grape_extensions/error_formatter_spec.rb
 - spec/identity_spec.rb
+- spec/json_error_spec.rb
 - spec/logger/log_transaction_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb
 - tasks/version.rake
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1127754833673535971
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1127754833673535971
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A simple framework for building APIs with Grape
 test_files:
+- spec/grape_extensions/error_formatter_spec.rb
 - spec/identity_spec.rb
+- spec/json_error_spec.rb
 - spec/logger/log_transaction_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4fe0fa94a5dd767848ebc3aa7cd844852d337fe0
-  data.tar.gz: c3a75f4bc02be82326a6b4c84a5b7a822e5053dd
-SHA512:
-  metadata.gz: 120c728a6838492420a2c97b5e4aa35e0c6ce1cf1be1223076d60f0a6304211a67d919c0433a3abce911d2e1991ff3694c3a17682239832bf673797cb83d8107
-  data.tar.gz: 8c745d7661deba0db7ccdb4bb163f880cae94306f4d01949a7a15d11cd4bb42396792f09e1694d4252aae98fe0f2b195d7923a473c05d5265113f83bd12d30be