pebblebed 0.0.19 → 0.0.20

data/README.md

@@ -55,7 +55,6 @@ Other helper methods provided by this extension:
     pebbles                                 # Common entrypoint for the Pebblebed::Connector
     current_identity                        # Returns the a DeepStruct record with the vital data for the current user
     require_identity                        # Halts with 403 if there is no current user
-    current_identity_is?(identity_id)       # Halts with 403 if the current user is neither the provided user or a god
     require_god                             # Halts with 403 if the current user is not a god
     require_parameters(parameters, *keys)   # Halts with 409 if the at least one of the provided keys is not in the params-hash
 

data/lib/pebblebed/clients/quorum_client.rb

@@ -5,6 +5,7 @@ require 'futurevalue'
 module Pebblebed
   class QuorumClient < AbstractClient
     def initialize(services, session_key)
+      LOGGER.warn "DEPRECATED: The Pebblebed::QuorumClient is no longer supported."
       @clients = Hash[services.map do |service|
         [service, Pebblebed::GenericClient.new(session_key, Pebblebed.root_url_for(service))]
       end]
@@ -27,4 +28,4 @@ module Pebblebed
       Hash[results.map{|service, response| [service, response.value]}]
     end
   end
-end
+end

data/lib/pebblebed/http.rb

@@ -13,7 +13,7 @@ module Pebblebed
     attr_reader :status, :message
     def initialize(message, status = nil)
       @message = message
-      @status = status      
+      @status = status
     end
 
     def not_found?
@@ -49,7 +49,7 @@ module Pebblebed
     end
 
     def self.get(url = nil, params = nil, &block)
-      url, params = url_and_params_from_args(url, params, &block)      
+      url, params = url_and_params_from_args(url, params, &block)
       handle_curl_response(Curl::Easy.perform(url_with_params(url, params)))
     end
 
@@ -63,7 +63,7 @@ module Pebblebed
     end
 
     def self.put(url, params, &block)
-      url, params = url_and_params_from_args(url, params, &block)      
+      url, params = url_and_params_from_args(url, params, &block)
       content_type, body = serialize_params(params)
       handle_curl_response(Curl::Easy.http_put(url.to_s, body) do |curl|
         curl.headers['Accept'] = 'application/json'
@@ -72,7 +72,7 @@ module Pebblebed
     end
 
     def self.delete(url, params, &block)
-      url, params = url_and_params_from_args(url, params, &block)      
+      url, params = url_and_params_from_args(url, params, &block)
       handle_curl_response(Curl::Easy.http_delete(url_with_params(url, params)))
     end
 
@@ -94,17 +94,18 @@ module Pebblebed
       if 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) 
+        puts errmsg
+        raise HttpError.new(ActiveSupport::SafeBuffer.new(errmsg), result.status)
         # ActiveSupport::SafeBuffer.new is the same as errmsg.html_safe in rails
       end
       result
     end
 
-    def self.handle_curl_response(curl_response)      
+    def self.handle_curl_response(curl_response)
       handle_http_errors(CurlResult.new(curl_response))
     end
 
-    def self.url_with_params(url, params)      
+    def self.url_with_params(url, params)
       url.query = QueryParams.encode(params || {})
       url.to_s
     end

data/lib/pebblebed/labels.rb

@@ -0,0 +1,47 @@
+module Pebblebed
+  class Labels
+
+    NO_MARKER = Class.new
+
+    attr_reader :path, :prefix, :suffix, :stop
+    def initialize(path, options = {})
+      @path = path
+      @base_path = path.split('.').select {|label| Uid.valid_label?(label)}.join('.')
+      @wildcard = !!Uid.wildcard_path?(path)
+      @prefix = options.fetch(:prefix) { 'label' }
+      @suffix = options.fetch(:suffix) { nil }
+      @stop = options.fetch(:stop) { NO_MARKER }
+    end
+
+    def next
+      label(expanded.length)
+    end
+
+    def wildcard?
+      @wildcard
+    end
+
+    def expanded
+      unless @expanded
+        values = {}
+        @base_path.split('.').each_with_index do |label, i|
+          values[label(i)] = label
+        end
+        if use_stop_marker?
+          values[label(values.length)] = stop
+        end
+        @expanded = values
+      end
+      @expanded
+    end
+
+    def label(i)
+      [prefix, i, suffix].compact.join('_')
+    end
+
+    def use_stop_marker?
+      stop != NO_MARKER
+    end
+  end
+
+end

data/lib/pebblebed/sinatra.rb

@@ -33,7 +33,9 @@ module Sinatra
       end
 
       def current_identity
-        pebbles.checkpoint.me
+        return @current_identity if @identity_checked
+        @identity_checked = true
+        @current_identity = get("/identities/me")[:identity]
       end
 
       def require_identity
@@ -42,13 +44,6 @@ module Sinatra
         end
       end
 
-      def current_identity_is?(identity_id)
-        require_identity
-        unless (current_identity.id == identity_id || current_identity.god)
-          halt 403, "Private resource"
-        end
-      end
-
       def require_god
         require_identity
         halt 403, "Current identity #{current_identity.id} is not god" unless current_identity.god
@@ -82,5 +77,27 @@ module Sinatra
       set :service_name, service_name
     end
 
+    ##
+    # Adds a before filter to ensure all visitors gets assigned a provisional identity. The options hash takes an
+    # optional key "unless" which can be used to specify a lambda/proc that yields true if
+    # the request should *not* trigger a redirect to checkpoint
+    #
+    # TODO: Also implement a guard against infinite redirect loops
+    #
+    # Usage example:
+    #
+    #   assign_provisional_identity :unless => lambda {
+    #    request.path_info == '/ping' || BotDetector.bot?(request.user_agent)
+    #  }
+    #
+    def assign_provisional_identity(opts={})
+      before do
+        skip = opts.has_key?(:unless) && instance_exec(&opts[:unless])
+        if !skip && current_identity.nil?
+          redirect pebbles.checkpoint.service_url("/login/anonymous", :redirect_to => request.path).to_s
+        end
+      end
+    end
+
   end
 end

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/lib/pebblebed.rb

@@ -10,3 +10,4 @@ require 'pebblebed/clients/checkpoint_client'
 require 'pebblebed/clients/quorum_client'
 require 'pebblebed/parts'
 require 'pebblebed/river'
+require 'pebblebed/labels'

data/spec/connector_spec.rb

@@ -3,7 +3,7 @@ require 'pebblebed/config'
 require 'pebblebed/connector'
 require 'pebblebed/clients/abstract_client'
 require 'pebblebed/clients/generic_client'
-require 'pebblebed/clients/checkpoint_client'
+require 'pebblebed/clients/quorum_client'
 
 describe "Pebblebed::Connector" do
   it "can configure clients for any service" do
@@ -19,12 +19,6 @@ describe "Pebblebed::Connector" do
     connector['foobar'].should eq connector['foobar']
   end
 
-  it "fetches specific client implementations if one is provided" do
-    connector = Pebblebed::Connector.new("session_key")
-    connector['checkpoint'].class.name.should eq "Pebblebed::CheckpointClient"
-    connector['foobar'].class.name.should eq "Pebblebed::GenericClient"
-  end
-
   it "has key getter and setter" do
     connector = Pebblebed::Connector.new("session_key")
     connector.key.should == "session_key"

data/spec/labels_spec.rb

@@ -0,0 +1,33 @@
+require 'pebblebed/uid'
+require 'pebblebed/labels'
+
+describe Pebblebed::Labels do
+
+  describe "default labels" do
+    subject { Pebblebed::Labels.new('a.b.c') }
+    its(:expanded) {  should eq('label_0' => "a", 'label_1' => "b", 'label_2' => "c") }
+    its(:wildcard?) { should == false }
+  end
+
+  describe "with a stop label" do
+    subject { Pebblebed::Labels.new('a.b.c', :stop => nil) }
+    its(:expanded) {  should eq('label_0' => "a", 'label_1' => "b", 'label_2' => "c", 'label_3' => nil) }
+  end
+
+  describe "customized labels" do
+    subject { Pebblebed::Labels.new('p.r.q', :prefix => 'dot', :suffix => '', :stop => '<END>') }
+    its(:expanded) { should eq('dot_0_' => 'p', 'dot_1_' => 'r', 'dot_2_' => 'q', 'dot_3_' => '<END>') }
+  end
+
+  describe "next label" do
+    subject { Pebblebed::Labels.new('a.b.c', :prefix => 'thing') }
+    its(:next) { should eq('thing_3') }
+  end
+
+  describe "with wildcard *" do
+    subject { Pebblebed::Labels.new('a.b.c.*') }
+    its(:expanded) { should eq('label_0' => "a", 'label_1' => "b", 'label_2' => "c") }
+    its(:wildcard?) { should == true }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70357357304320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357357304320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70357357303880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357357303880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70357357303420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357357303420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deepstruct
-  requirement: &70357357302880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70357357302880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70357357302320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: 0.7.14
   type: :runtime
   prerelease: false
-  version_requirements: *70357357302320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.14
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70357357318260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357357318260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: queryparams
-  requirement: &70357357317720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357357317720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: futurevalue
-  requirement: &70357357317160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357357317160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pathbuilder
-  requirement: &70357357316580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +150,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357357316580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70357357315620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357357315620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70357357315180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +182,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357357315180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70357357314700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +198,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357357314700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70357357314080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +214,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357357314080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Development tools for working with Pebblebed
 email:
 - katrina@bengler.no
@@ -171,12 +236,12 @@ files:
 - integration/river_spec.rb
 - lib/pebblebed.rb
 - lib/pebblebed/clients/abstract_client.rb
-- lib/pebblebed/clients/checkpoint_client.rb
 - lib/pebblebed/clients/generic_client.rb
 - lib/pebblebed/clients/quorum_client.rb
 - lib/pebblebed/config.rb
 - lib/pebblebed/connector.rb
 - lib/pebblebed/http.rb
+- lib/pebblebed/labels.rb
 - lib/pebblebed/parts.rb
 - lib/pebblebed/river.rb
 - lib/pebblebed/river/subscription.rb
@@ -185,11 +250,11 @@ files:
 - lib/pebblebed/uid_query.rb
 - lib/pebblebed/version.rb
 - pebblebed.gemspec
-- spec/checkpoint_client_spec.rb
 - spec/config_spec.rb
 - spec/connector_spec.rb
 - spec/generic_client_spec.rb
 - spec/http_spec.rb
+- spec/labels_spec.rb
 - spec/mock_pebble.rb
 - spec/mockcached.rb
 - spec/river_spec.rb
@@ -209,24 +274,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 900091083955383393
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 900091083955383393
 requirements: []
 rubyforge_project: pebblebed
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Development tools for working with Pebblebed
 test_files:
-- spec/checkpoint_client_spec.rb
 - spec/config_spec.rb
 - spec/connector_spec.rb
 - spec/generic_client_spec.rb
 - spec/http_spec.rb
+- spec/labels_spec.rb
 - spec/mock_pebble.rb
 - spec/mockcached.rb
 - spec/river_spec.rb

data/lib/pebblebed/clients/checkpoint_client.rb

@@ -1,27 +0,0 @@
-module Pebblebed 
-  class CheckpointClient < Pebblebed::GenericClient
-    def me
-      return @identity if @identity_checked
-      @identity_checked = true
-      @identity = get("/identities/me")[:identity]
-    end
-
-    # Given a list of identity IDs it returns each identity or an empty hash for identities that doesnt exists.
-    # If pebbles are configured with memcached, results will be cached.
-    # Params: ids a list of identities
-    def find_identities(ids)
-
-      result = {}
-      request = get("/identities/#{ids.join(',')},")
-      ids.each_with_index do |id, i|
-        identity = request.identities[i].identity.unwrap
-        result[id] = identity
-      end
-      return DeepStruct.wrap(ids.collect {|id| result[id]})
-    end
-
-    def god?
-      me.god if me
-    end
-  end
-end

data/spec/checkpoint_client_spec.rb

@@ -1,61 +0,0 @@
-require 'spec_helper'
-require 'pebblebed/config'
-require 'pebblebed/connector'
-require 'pebblebed/http'
-require 'pebblebed/clients/abstract_client'
-require 'pebblebed/clients/generic_client'
-require 'pebblebed/clients/checkpoint_client'
-
-describe Pebblebed::CheckpointClient do
-
-  let(:checkpoint_client) { Pebblebed::Connector.new('session_key')[:checkpoint] }
-
-  describe "me" do
-    let(:canned_response_for_me) {
-          DeepStruct.wrap({:body=>{:identity => {:id => 1, :god => true}}.to_json})
-        }
-
-    it "returns current user identity upon request and caches it as an instance variable" do
-      checkpoint_client = Pebblebed::Connector.new('session_key')[:checkpoint]
-
-      Pebblebed::Http.should_receive(:get) { |url|
-                url.path.should match("/identities/me")
-                canned_response_for_me
-              }.once
-      checkpoint_client.me
-      checkpoint_client.me
-    end
-
-    it "tells us whether we are dealing with god allmighty himself or just another average joe" do
-      checkpoint_client = Pebblebed::Connector.new('session_key')[:checkpoint]
-      Pebblebed::Http.should_receive(:get) { |url|
-                url.path.should match("/identities/me")
-                canned_response_for_me
-              }.once
-      checkpoint_client.god?.should eq true
-    end
-  end
-
-  describe "find_identities" do
-    let(:canned_response) {
-      DeepStruct.wrap({:body=>
-                         {:identities =>
-                            [{:identity => {:id => 1}}, {:identity => {}}, {:identity => {:id => 3}}, {:identity => {}}]
-                         }.to_json
-                      })
-    }
-
-    before(:each) do
-      Pebblebed.config do
-        host "checkpoint.dev"
-        service :checkpoint
-      end
-    end
-
-    it "issues an http request every time" do
-      Pebblebed::Http.should_receive(:get).twice.and_return canned_response
-      checkpoint_client.find_identities([1, 2])
-      checkpoint_client.find_identities([1, 2])
-    end
-  end
-end