sliver 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20b809608f86609cc795b28a114f3c812dec65e8
-  data.tar.gz: 4bf292bffbc5d19991d0fa7e29d2ced1005b6732
+  metadata.gz: 1f21cd8c5684c1df5a750b1fcde9d8686c201e78
+  data.tar.gz: dcbb2635b735629e359ed533049d13f6cc5eec79
 SHA512:
-  metadata.gz: 6f33a1f81c5222b877ef334d98f386abc7d1c64bc47d8e97587e533ebfcaefaf7ae0ebb774434ac305b8049d624522121a08c154eb893cb8de13432b3fd7cc96
-  data.tar.gz: c2496802b022d43a351ef992c38188f61f2f170e8ad52abe1c4f3e562a6012c332f2521fd76c29085ea418f884ce2f449cd4d1b22827b262d1c877cc521cad53
+  metadata.gz: 98a1a1a0d96f341afe028cc3125e4b05591688e645fea36457e23c87aa8b2ec0ae0522e271d4863705ad7551da72dc8713389371dbe939e6ba71f6ca0a1168a8
+  data.tar.gz: 75de6c573a1299a6ca44317c1701dcb19acc411ac385860475815212547730b6df2fcc5b79434614f7895669892bf0aa1e3c46e3e05cdbe83dfc5dac4cd8288e

data/README.md

@@ -11,7 +11,7 @@ Early days of development, so things may change dramatically. Or not. Who knows.
 Add it to your Gemfile like any other gem, or install it manually.
 
 ```ruby
-gem 'sliver', '~> 0.0.2'
+gem 'sliver', '~> 0.0.3'
 ```
 
 ## Usage
@@ -30,9 +30,6 @@ the standard Rack response. Each instance of a class that mixes in
 
 ```ruby
 app = Sliver::API.new do |api|
-  #Endpoints can be namespaced by a path - for example, a version.
-  api.path = '/v1'
-
   # GET /v1/
   api.connect :get, '/', lambda { |environment|
     [200, {}, ['How dare the Premier ignore my invitations?']]
@@ -45,6 +42,18 @@ end
 class ChangeAction
   include Sliver::Action
 
+  # You don't *need* to implement this method - the underlying implementation
+  # returns false.
+  def skip?
+    return false unless environment['user'].nil?
+
+    # In this case, the call method is never invoked.
+    response.status = 401
+    response.body   = ['Unauthorised']
+
+    true
+  end
+
   def call
     # Change the status:
     response.status = 404

data/lib/sliver/action.rb

@@ -6,7 +6,9 @@ module Sliver::Action
   module ClassMethods
     def call(environment)
       response = Sliver::Response.new
-      new(environment, response).call
+
+      action = new(environment, response)
+      action.call unless action.skip?
 
       response.to_a
     end
@@ -16,6 +18,10 @@ module Sliver::Action
     @environment, @response = environment, response
   end
 
+  def skip?
+    false
+  end
+
   private
 
   attr_reader :environment, :response

data/lib/sliver/api.rb

@@ -1,19 +1,16 @@
 class Sliver::API
   NOT_FOUND = lambda { |environment| [404, {}, ['Not Found']] }
 
-  attr_accessor :path
-
   def initialize(&block)
     @endpoints = Hash.new { |hash, key| hash[key] = Sliver::Endpoints.new }
-    @path      = ''
 
     block.call self
   end
 
   def call(environment)
-    method    = environment['REQUEST_METHOD']
-    path_info = environment['PATH_INFO'].gsub(/\A#{path}/, '')
-    endpoint  = endpoints[method].find(path_info) || NOT_FOUND
+    method   = environment['REQUEST_METHOD']
+    path     = environment['PATH_INFO']
+    endpoint = endpoints[method].find(path) || NOT_FOUND
 
     endpoint.call environment
   end

data/sliver.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'sliver'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['Pat Allan']
   spec.email         = ['pat@freelancing-gods.com']
   spec.summary       = %q{Lightweight, simple Rack APIs}

data/spec/acceptance/class_api_spec.rb

@@ -28,6 +28,20 @@ class AdditionAction
   end
 end
 
+class SkippedAction
+  include Sliver::Action
+
+  def skip?
+    response.status = 400
+    response.body   = ['Invalid']
+  end
+
+  def call
+    response.status = 200
+    response.body   = ['Success']
+  end
+end
+
 describe 'Class-based Sliver API' do
   include Rack::Test::Methods
 
@@ -35,6 +49,7 @@ describe 'Class-based Sliver API' do
     api.connect :get, '/',         GetAction
     api.connect :put, '/echo',     EchoAction
     api.connect :get, '/addition', AdditionAction
+    api.connect :get, '/skip',     SkippedAction
   end }
 
   it 'constructs responses' do
@@ -56,4 +71,11 @@ describe 'Class-based Sliver API' do
 
     expect(last_response.body).to eq('8')
   end
+
+  it 'allows standard responses to be skipped' do
+    get '/skip'
+
+    expect(last_response.status).to eq(400)
+    expect(last_response.body).to eq('Invalid')
+  end
 end

data/spec/acceptance/lambda_api_spec.rb

@@ -55,21 +55,3 @@ describe 'Basic Sliver API' do
     expect(last_response.body).to eq('removed')
   end
 end
-
-describe 'Basic lambda API with a path prefix' do
-  include Rack::Test::Methods
-
-  let(:app) { Sliver::API.new do |api|
-    api.path = '/v1'
-
-    api.connect :get, '/', lambda { |environment|
-      [200, {'Content-Type' => 'text/plain'}, ['foo']]
-    }
-  end }
-
-  it 'responds to GET requests' do
-    get '/v1/'
-
-    expect(last_response.body).to eq('foo')
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sliver
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -102,4 +102,3 @@ test_files:
 - spec/acceptance/class_api_spec.rb
 - spec/acceptance/lambda_api_spec.rb
 - spec/spec_helper.rb
-has_rdoc: