pliny 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b3d302c95bbb9e4efdc88a49e8a5b776e6da923
-  data.tar.gz: dd49138a22449f1ac5311ecface0e021e3a61e2c
+  metadata.gz: 59e9993f316b4360e09b0e9e60c9227daad19a00
+  data.tar.gz: 4de44f2103e728082c0c611d97d5e4a43695588e
 SHA512:
-  metadata.gz: 114580f793a3db337e548ca506e85019d35376d4d6d59fcbc0501c45e3e6b52a7495e5074bdaaf58f5f54d19e10c68ebb478f346d36a2ccc1be713293cd07301
-  data.tar.gz: 60e5461d06bce0f370b6a2640731709623154e3bdaee6a7f6676f04898e194f1b1f662638c3cdd585a6a155a1d7bf4ca749750e6bed2e67611f2b6e15fbf4a6d
+  metadata.gz: 4361dee922785399136ce3a3a76e3ac6ec6d075700a4eb485fe6f6536bd9535676bee13424d41e7593110d8ef55843d9de23cce7da8c0ee155645f1ea1951fbf
+  data.tar.gz: 1a72822bb718edb5d5c5918b18b8b032272cc4c19c25c415cfb50a0cd1fa19700822bb1a01683034bd4f73922e8c3756f2b6ea09b1a134e4f58a764170d6540f

data/lib/pliny/errors.rb

@@ -3,6 +3,12 @@ module Pliny
     class Error < StandardError
       attr_accessor :id
 
+      def self.render(error)
+        headers = { "Content-Type" => "application/json; charset=utf-8" }
+        data = { id: error.id, message: error.message, status: error.status }
+        [error.status, headers, [MultiJson.encode(data)]]
+      end
+
       def initialize(message, id)
         @id = id
         super(message)
@@ -10,10 +16,7 @@ module Pliny
     end
 
     class HTTPStatusError < Error
-      attr_reader :status
-
-      # so that Sinatra respects are status code when catching an exception
-      alias :http_status :status
+      attr_accessor :status
 
       def initialize(message = nil, id = nil, status = nil)
         meta    = Pliny::Errors::META[self.class]

data/lib/pliny/middleware/rescue_errors.rb

@@ -8,13 +8,13 @@ module Pliny::Middleware
     def call(env)
       @app.call(env)
     rescue Pliny::Errors::Error => e
-      render(e, env)
+      Pliny::Errors::Error.render(e)
     rescue Exception => e
       if @raise
         raise
       else
         dump_error(e, env)
-        render(Pliny::Errors::InternalServerError.new, env)
+        Pliny::Errors::Error.render(Pliny::Errors::InternalServerError.new)
       end
     end
 
@@ -25,11 +25,5 @@ module Pliny::Middleware
       message = ["#{e.class} - #{e.message}:", *e.backtrace].join("\n\t")
       env['rack.errors'].puts(message)
     end
-
-    def render(e, env)
-      headers = { "Content-Type" => "application/json; charset=utf-8" }
-      error = { id: e.id, message: e.message, status: e.status }
-      [e.status, headers, [MultiJson.encode(error)]]
-    end
   end
 end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/template/lib/endpoints/base.rb

@@ -14,6 +14,10 @@ module Endpoints
       register Sinatra::Reloader
     end
 
+    error Pliny::Errors::Error do
+      Pliny::Errors::Error.render(env["sinatra.error"])
+    end
+
     not_found do
       content_type :json
       status 404

data/test/extensions/instruments_test.rb

@@ -6,6 +6,10 @@ describe Pliny::Extensions::Instruments do
       run Sinatra.new {
         register Pliny::Extensions::Instruments
 
+        error Pliny::Errors::Error do
+          Pliny::Errors::Error.render(env["sinatra.error"])
+        end
+
         get "/apps/:id" do
           status 201
           "hi"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Brandur Leach
@@ -175,6 +175,9 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
@@ -182,6 +185,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
@@ -189,6 +195,9 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
@@ -196,6 +205,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
@@ -203,6 +215,9 @@ dependencies:
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
@@ -210,6 +225,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
@@ -217,6 +235,9 @@ dependencies:
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
@@ -224,6 +245,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1