pebblebed 0.0.25 → 0.0.26

data/lib/pebblebed.rb

@@ -3,7 +3,6 @@ require 'pebblebed/http'
 require 'pebblebed/connector'
 require 'pebblebed/config'
 require 'pebblebed/uid'
-require 'pebblebed/uid_query'
 require 'pebblebed/clients/abstract_client'
 require 'pebblebed/clients/generic_client'
 require 'pebblebed/clients/quorum_client'

data/lib/pebblebed/http.rb

@@ -11,6 +11,7 @@ require 'active_support'
 module Pebblebed
   class HttpError < Exception
     attr_reader :status, :message
+
     def initialize(message, status = nil)
       @message = message
       @status = status
@@ -21,7 +22,7 @@ module Pebblebed
     end
 
     def to_s
-      "#<Pebblebed::HttpError #{@status} #{message}>"
+      "#<#{self.class.name} #{@status} #{message}>"
     end
 
     def inspect
@@ -29,6 +30,10 @@ module Pebblebed
     end
   end
 
+  class HttpNotFoundError < HttpError
+
+  end
+
   module Http
     class CurlResult
       def initialize(curl_result)
@@ -91,11 +96,15 @@ module Pebblebed
     end
 
     def self.handle_http_errors(result)
-      if result.status >= 400
+      if result.status == 404
+        errmsg = "Resource not found: '#{result.url}'"
+        errmsg << extract_error_summary(result.body)
+        # ActiveSupport::SafeBuffer.new is the same as errmsg.html_safe in rails
+        raise HttpNotFoundError.new(ActiveSupport::SafeBuffer.new(errmsg), result.status)
+      elsif result.status >= 400
         errmsg = "Service request to '#{result.url}' failed (#{result.status}):"
         errmsg << extract_error_summary(result.body)
         raise HttpError.new(ActiveSupport::SafeBuffer.new(errmsg), result.status)
-        # ActiveSupport::SafeBuffer.new is the same as errmsg.html_safe in rails
       end
       result
     end

data/lib/pebblebed/sinatra.rb

@@ -67,6 +67,11 @@ module Sinatra
 
     def self.registered(app)
       app.helpers(Sinatra::Pebblebed::Helpers)
+
+      app.error ::Pebblebed::HttpNotFoundError do
+        [404,  env['sinatra.error'].message]
+      end
+
     end
 
     def declare_pebbles(&block)

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

data/pebblebed.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "sinatra" # for testing purposes
+  s.add_development_dependency "rack-test" # for testing purposes
   
   s.add_runtime_dependency "deepstruct", ">= 0.0.2"
   s.add_runtime_dependency "curb", ">= 0.7.14"

data/spec/http_spec.rb

@@ -22,6 +22,8 @@ describe Pebblebed::Http do
 
   after :all do
     mock_pebble.shutdown
+    # give webrick some time to cool down
+    sleep 0.1
   end
 
   it "knows how to pack params into a http query string" do
@@ -44,8 +46,16 @@ describe Pebblebed::Http do
     url.to_s.should eq "http://example.org/api/foo/bar"
   end
 
-  it "raises an exception if there is a http-error" do
-    -> { Pebblebed::Http.send(:handle_http_errors, DeepStruct.wrap(status:400, url:"/foobar", body:"Oh noes")) }.should raise_error Pebblebed::HttpError
+  it "raises an HttpNotFoundError if there is a 404 error" do
+    -> { Pebblebed::Http.send(:handle_http_errors, DeepStruct.wrap(status: 404, url: "/foobar", body: "Not found")) }.should raise_error Pebblebed::HttpNotFoundError
+  end
+
+  it "includes the url of the failed resource in the error message" do
+    -> { Pebblebed::Http.send(:handle_http_errors, DeepStruct.wrap(status: 404, url: "/nosuchresource", body: "Not found")) }.should raise_error Pebblebed::HttpNotFoundError, /\/nosuchresource/
+  end
+
+  it "raises an HttpError if there is any other http-error" do
+    -> { Pebblebed::Http.send(:handle_http_errors, DeepStruct.wrap(status: 400, url: "/foobar", body: "Oh noes")) }.should raise_error Pebblebed::HttpError
   end
 
   it "encodes posts and puts as json if the params is a hash" do

data/spec/mock_pebble.rb

@@ -46,7 +46,7 @@ class MockPebble
   end
 
   def start
-    @server = WEBrick::HTTPServer.new(:Port => 8666, :AccessLog => [])
+    @server = WEBrick::HTTPServer.new(:Port => 8666, Logger: WEBrick::Log.new("/dev/null"), :AccessLog => [])
     @server.mount "/api/mock/v1", Servlet
     @server_thread = Thread.new do
       @server.start

data/spec/sinatra_spec.rb

@@ -0,0 +1,128 @@
+# encoding: utf-8
+
+require 'pebblebed'
+require 'pebblebed/sinatra'
+require 'sinatra/base'
+require 'rack/test'
+
+class TestApp < Sinatra::Base
+  register Sinatra::Pebblebed
+
+  set :show_exceptions, :after_handler
+
+  assign_provisional_identity :unless => lambda {
+    params[:provisional] != 'yes'
+  }
+
+  get '/public' do
+    "You are a guest here"
+  end
+
+  get '/private' do
+    require_identity
+    "You are logged in"
+  end
+
+  get '/root' do
+    require_god
+    "You are most powerful"
+  end
+
+  get '/nonexistant' do
+    raise Pebblebed::HttpNotFoundError, "Not found /nonexistant"
+  end
+
+end
+
+describe Sinatra::Pebblebed do
+  include Rack::Test::Methods
+
+  def app
+    TestApp
+  end
+
+  let(:guest) { DeepStruct.wrap({}) }
+  let(:alice) { DeepStruct.wrap(:identity => {:id => 1, :god => false}) }
+  let(:odin) { DeepStruct.wrap(:identity => {:id => 2, :god => true}) }
+
+  let(:checkpoint) { stub(:get => identity, :service_url => 'http://example.com') }
+
+  before :each do
+    Pebblebed::Connector.any_instance.stub(:checkpoint).and_return checkpoint
+  end
+
+  context "a guest" do
+    let(:identity) { guest }
+
+    specify "can see public endpoint" do
+      get '/public'
+      last_response.body.should == 'You are a guest here'
+    end
+
+    it "can assign a provisional identity" do
+      get '/public', :provisional => 'yes'
+      last_response.status.should == 302
+    end
+
+    specify "cannot see private endpoints" do
+      get '/private'
+      last_response.status.should == 403
+    end
+
+    it "cannot see root endpoints" do
+      get '/root'
+      last_response.status.should == 403
+    end
+  end
+
+  context "as a user" do
+    let(:identity) { alice }
+
+    specify "can see public endpoint" do
+      get '/public'
+      last_response.body.should == 'You are a guest here'
+    end
+
+    specify "can see private endpoints" do
+      get '/private'
+      last_response.body.should == 'You are logged in'
+    end
+
+    it "cannot see root endpoints" do
+      get '/root'
+      last_response.status.should == 403
+    end
+  end
+
+  context "as a god" do
+    let(:identity) { odin }
+
+    specify "can see public endpoint" do
+      get '/public'
+      last_response.body.should == 'You are a guest here'
+    end
+
+    specify "can see private endpoints" do
+      get '/private'
+      last_response.body.should == 'You are logged in'
+    end
+
+    it "cannot see root endpoints" do
+      get '/root'
+      last_response.body.should == 'You are most powerful'
+    end
+  end
+
+  describe "error handling" do
+    let(:identity) { guest }
+    it "Adds graceful handling of HttpNotFoundError exceptions" do
+      get '/nonexistant'
+      last_response.status.should == 404
+    end
+    it "Gives the error message of HttpNotFoundError as response body" do
+      get '/nonexistant'
+      last_response.status.should == 404
+      last_response.body.should == 'Not found /nonexistant'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70097905491200 !ruby/object:Gem::Requirement
+  requirement: &70127313138320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097905491200
+  version_requirements: *70127313138320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70097905489860 !ruby/object:Gem::Requirement
+  requirement: &70127313137220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097905489860
+  version_requirements: *70127313137220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70097905488820 !ruby/object:Gem::Requirement
+  requirement: &70127313136580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097905488820
+  version_requirements: *70127313136580
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70127313135380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70127313135380
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70127313134840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70127313134840
 - !ruby/object:Gem::Dependency
   name: deepstruct
-  requirement: &70097905487880 !ruby/object:Gem::Requirement
+  requirement: &70127313134000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +77,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70097905487880
+  version_requirements: *70127313134000
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70097905487020 !ruby/object:Gem::Requirement
+  requirement: &70127313132320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +88,10 @@ dependencies:
         version: 0.7.14
   type: :runtime
   prerelease: false
-  version_requirements: *70097905487020
+  version_requirements: *70127313132320
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70097905486260 !ruby/object:Gem::Requirement
+  requirement: &70127313130020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097905486260
+  version_requirements: *70127313130020
 - !ruby/object:Gem::Dependency
   name: queryparams
-  requirement: &70097905485480 !ruby/object:Gem::Requirement
+  requirement: &70127313128400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097905485480
+  version_requirements: *70127313128400
 - !ruby/object:Gem::Dependency
   name: futurevalue
-  requirement: &70097905478360 !ruby/object:Gem::Requirement
+  requirement: &70127313127340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097905478360
+  version_requirements: *70127313127340
 - !ruby/object:Gem::Dependency
   name: pathbuilder
-  requirement: &70097905477600 !ruby/object:Gem::Requirement
+  requirement: &70127313125940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097905477600
+  version_requirements: *70127313125940
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70097905477000 !ruby/object:Gem::Requirement
+  requirement: &70127313124680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097905477000
+  version_requirements: *70127313124680
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70097905476320 !ruby/object:Gem::Requirement
+  requirement: &70127313122960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097905476320
+  version_requirements: *70127313122960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70097905475740 !ruby/object:Gem::Requirement
+  requirement: &70127313121480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097905475740
+  version_requirements: *70127313121480
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70097905475020 !ruby/object:Gem::Requirement
+  requirement: &70127313118900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +176,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097905475020
+  version_requirements: *70127313118900
 description: Development tools for working with Pebblebed
 email:
 - katrina@bengler.no
@@ -185,7 +207,6 @@ files:
 - lib/pebblebed/security/listener.rb
 - lib/pebblebed/sinatra.rb
 - lib/pebblebed/uid.rb
-- lib/pebblebed/uid_query.rb
 - lib/pebblebed/version.rb
 - pebblebed.gemspec
 - spec/config_spec.rb
@@ -200,8 +221,8 @@ files:
 - spec/security/access_data_spec.rb
 - spec/security/client_spec.rb
 - spec/security/listener_spec.rb
+- spec/sinatra_spec.rb
 - spec/spec_helper.rb
-- spec/uid_query_spec.rb
 - spec/uid_spec.rb
 homepage: ''
 licenses: []
@@ -240,6 +261,6 @@ test_files:
 - spec/security/access_data_spec.rb
 - spec/security/client_spec.rb
 - spec/security/listener_spec.rb
+- spec/sinatra_spec.rb
 - spec/spec_helper.rb
-- spec/uid_query_spec.rb
 - spec/uid_spec.rb

data/lib/pebblebed/uid_query.rb

@@ -1,31 +0,0 @@
-module Pebblebed
-  class UIDQuery
-
-    attr_reader :uids, :path, :oid
-    def initialize(uids)
-      @multiple = uids =~ /\,/
-      if list?
-        @uids = uids.split(',')
-      else
-        @klass, @path, @oid = Uid.parse(uids)
-        @uids = uids
-      end
-    end
-
-    def list?
-      !!@multiple
-    end
-
-    def one?
-      !(list? || wildcard?)
-    end
-
-    def wildcard?
-      Uid.valid_wildcard_path?(path) || wildcard_oid?
-    end
-
-    def wildcard_oid?
-      !list? && (oid == '*' || oid.nil?)
-    end
-  end
-end

data/spec/uid_query_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-require 'pebblebed/uid'
-require 'pebblebed/uid_query'
-
-describe Pebblebed::UIDQuery do
-  context "with comma separated uids." do
-    subject { Pebblebed::UIDQuery.new("xyz:a.b.c$1,xyz:a.b.c$2") }
-
-    its(:list?) { should be_true }
-    its(:wildcard?) { should be_false }
-    its(:one?) { should be_false }
-    its(:uids) { should eq(["xyz:a.b.c$1", "xyz:a.b.c$2"]) }
-
-  end
-
-  context "with a wildcard path." do
-    subject { Pebblebed::UIDQuery.new("xyz:a.b.*") }
-
-    its(:list?) { should be_false }
-    its(:wildcard?) { should be_true }
-    its(:one?) { should be_false }
-    its(:uids) { should eq("xyz:a.b.*") }
-  end
-
-  context "without any oid." do
-    subject { Pebblebed::UIDQuery.new("xyz:a.b.c") }
-
-    its(:list?) { should be_false }
-    its(:wildcard?) { should be_true }
-    its(:one?) { should be_false }
-    its(:uids) { should eq("xyz:a.b.c") }
-  end
-
-  context "with a wildcard oid." do
-    subject { Pebblebed::UIDQuery.new("xyz:a.b.c$*") }
-
-    its(:list?) { should be_false }
-    its(:wildcard?) { should be_true }
-    its(:one?) { should be_false }
-    its(:uids) { should eq("xyz:a.b.c$*") }
-  end
-
-  context "with a completely constrained uid" do
-    subject { Pebblebed::UIDQuery.new("xyz:a.b.c$1") }
-
-    its(:list?) { should be_false }
-    its(:wildcard?) { should be_false }
-    its(:one?) { should be_true }
-    its(:uids) { should eq("xyz:a.b.c$1") }
-  end
-end