pebblebed 0.0.26 → 0.0.27

data/Gemfile

@@ -1,4 +1,8 @@
 source "http://rubygems.org"
 
+group :development, :test do
+  gem "memcache_mock", :git => "git://github.com/fguillen/MemcacheMock.git"
+end
+
 # Specify your gem's dependencies in pebblebed.gemspec
 gemspec

data/lib/pebblebed/http.rb

@@ -9,7 +9,7 @@ require 'pathbuilder'
 require 'active_support'
 
 module Pebblebed
-  class HttpError < Exception
+  class HttpError < StandardError
     attr_reader :status, :message
 
     def initialize(message, status = nil)

data/lib/pebblebed/security/access_data.rb

@@ -74,8 +74,8 @@ module Pebblebed
         memberships_record['memberships'].each do |membership|
           @group_ids << membership['membership']['group_id']
         end
-        memberships_record['groups'].each do |group|
-          group['group']['subtrees'].each do |subtree|
+        memberships_record['access_groups'].each do |group|
+          group['access_group']['subtrees'].each do |subtree|
             @subtrees << subtree.split('.')
           end
         end

data/lib/pebblebed/security/listener.rb

@@ -6,7 +6,9 @@ module Pebblebed
 
       def initialize(options)
         @app_name = options[:app_name]
-        @handlers = {:group => {}, :group_membership => {}, :group_subtree => {}}
+        @handlers = {:access_group => {},
+          :access_group_membership => {},
+          :access_group_subtree => {}}
       end
 
       def start
@@ -21,30 +23,30 @@ module Pebblebed
       end
 
       def on_group_declared(&block)
-        @handlers[:group][:create] = block
-        @handlers[:group][:update] = block
+        @handlers[:access_group][:create] = block
+        @handlers[:access_group][:update] = block
       end
 
       def on_group_removed(&block)
-        @handlers[:group][:delete] = block
+        @handlers[:access_group][:delete] = block
       end
 
       def on_subtree_declared(&block)
-        @handlers[:group_subtree][:create] = block
-        @handlers[:group_subtree][:update] = block
+        @handlers[:access_group_subtree][:create] = block
+        @handlers[:access_group_subtree][:update] = block
       end
 
       def on_subtree_removed(&block)
-        @handlers[:group_subtree][:delete] = block
+        @handlers[:access_group_subtree][:delete] = block
       end
 
       def on_membership_declared(&block)
-        @handlers[:group_membership][:create] = block
-        @handlers[:group_membership][:update] = block
+        @handlers[:access_group_membership][:create] = block
+        @handlers[:access_group_membership][:update] = block
       end
 
       def on_membership_removed(&block)
-        @handlers[:group_membership][:delete] = block
+        @handlers[:access_group_membership][:delete] = block
       end
 
       private
@@ -55,12 +57,12 @@ module Pebblebed
         queue_options =  {
           :name => "#{@app_name}.security_listener",
           :path => '**',
-          :klass => 'group|group_membership|group_subtree',
+          :klass => 'access_group|access_group_membership|access_group_subtree',
           :event => '**',
           :interval => 1
         }
         queue = river.queue queue_options
-        queue.subscribe(ack: true) do |message|
+        queue.subscribe(:ack => true) do |message|
           consider message
         end
       end
@@ -79,12 +81,12 @@ module Pebblebed
         event_handler = @handlers[klass.to_sym][event.to_sym]
         return unless event_handler
         case klass
-        when 'group'
+        when 'access_group'
           event_handler.call(:id => attributes['id'], :label => attributes['label'])
-        when 'group_membership'
+        when 'access_group_membership'
           event_handler.call(:group_id => attributes['group_id'],
             :identity_id => attributes['identity_id'])
-        when 'group_subtree'
+        when 'access_group_subtree'
           event_handler.call(:group_id => attributes['group_id'],
             :location => attributes['location'])
         end

data/lib/pebblebed/sinatra.rb

@@ -33,9 +33,20 @@ module Sinatra
       end
 
       def current_identity
+        return nil unless current_session
         return @identity if @identity_checked
         @identity_checked = true
-        @identity = pebbles.checkpoint.get("/identities/me")[:identity]
+        if cache_current_identity?
+          @identity = ::Pebblebed.memcached.fetch("identity-for-session-#{current_session}", ttl = 60) do
+            pebbles.checkpoint.get("/identities/me")[:identity]
+          end
+        else
+          @identity = pebbles.checkpoint.get("/identities/me")[:identity]
+        end
+      end
+
+      def cache_current_identity?
+        settings.respond_to?(:cache_current_identity) && settings.cache_current_identity
       end
 
       def require_identity

data/lib/pebblebed/version.rb

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

data/pebblebed.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   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"
   s.add_runtime_dependency "yajl-ruby"

data/spec/security/access_data_spec.rb

@@ -5,7 +5,7 @@ require 'pebblebed/security/access_data'
 describe Pebblebed::Security::AccessData do
   let :access_data do
     Pebblebed::Security::AccessData.new(
-      :groups => [1,2,3],
+      :access_groups => [1,2,3],
       :subtrees => ['a.b', 'a.b.c.d.e', 'a.c.d', 'a.c.e.f']
     )
   end
@@ -28,9 +28,9 @@ describe Pebblebed::Security::AccessData do
         {'membership' => {'id' => 10, 'group_id' => 1, 'identity_id' => 1}},
         {'membership' => {'id' => 20, 'group_id' => 2, 'identity_id' => 1}},
       ],
-      'groups' => [
-        {'group' => {'id' => 1, 'label' => "group_1", 'subtrees' => ["a.b.c"]}},
-        {'group' => {'id' => 2, 'label' => "group_2", 'subtrees' => ["a.c.d.c"]}}
+      'access_groups' => [
+        {'access_group' => {'id' => 1, 'label' => "group_1", 'subtrees' => ["a.b.c"]}},
+        {'access_group' => {'id' => 2, 'label' => "group_2", 'subtrees' => ["a.c.d.c"]}}
       ]
     }
     ad = Pebblebed::Security::AccessData.new(record)

data/spec/security/client_spec.rb

@@ -11,12 +11,12 @@ describe Pebblebed::Security::Client do
   let :sample_memberships_record do
     {
       'memberships' => [
-        {'membership' => {'id' => 10, 'group_id' => 1, 'identity_id' => 1}},
-        {'membership' => {'id' => 20, 'group_id' => 2, 'identity_id' => 1}},
+        {'membership' => {'id' => 10, 'access_group_id' => 1, 'identity_id' => 1}},
+        {'membership' => {'id' => 20, 'access_group_id' => 2, 'identity_id' => 1}},
       ],
-      'groups' => [
-        {'group' => {'id' => 1, 'label' => "group_1", 'subtrees' => ["a.b.c"]}},
-        {'group' => {'id' => 2, 'label' => "group_2", 'subtrees' => ["a.c.d.c"]}}
+      'access_groups' => [
+        {'access_group' => {'id' => 1, 'label' => "group_1", 'subtrees' => ["a.b.c"]}},
+        {'access_group' => {'id' => 2, 'label' => "group_2", 'subtrees' => ["a.c.d.c"]}}
       ]
     }
   end

data/spec/security/listener_spec.rb

@@ -14,7 +14,7 @@ describe Pebblebed::Security::Listener do
     end
     message = {:payload => {
       'event' => 'create',
-      'uid' => 'group:abc.groups$10',
+      'uid' => 'access_group:abc.access_groups$10',
       'attributes' => {
         'id' => 10,
         'label' => 'the_label'

data/spec/sinatra_spec.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require 'pebblebed'
 require 'pebblebed/sinatra'
 require 'sinatra/base'
@@ -51,6 +50,13 @@ describe Sinatra::Pebblebed do
     Pebblebed::Connector.any_instance.stub(:checkpoint).and_return checkpoint
   end
 
+  let(:random_session) { rand(36**128).to_s(36) }
+
+  before :each do
+    # Make sure the app get an uniqie session key for every received request
+    TestApp.any_instance.stub(:current_session) { random_session }
+  end
+
   context "a guest" do
     let(:identity) { guest }
 
@@ -125,4 +131,22 @@ describe Sinatra::Pebblebed do
       last_response.body.should == 'Not found /nonexistant'
     end
   end
+
+  describe "current identity caching" do
+    let(:identity) { alice }
+
+    it "will not cache current_identity by default" do
+      checkpoint.should_receive(:get).twice
+      get '/private'
+      get '/private'
+    end
+
+    it "can be configured to cache current identity" do
+      session = random_session
+      app.set :cache_current_identity, true
+      checkpoint.should_receive(:get).once
+      get '/private'
+      get '/private'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,14 +5,16 @@ SimpleCov.add_filter 'spec'
 SimpleCov.add_filter 'config'
 SimpleCov.start
 
-require './spec/mockcached'
+require 'memcache_mock'
 require './spec/mock_pebble'
 
 RSpec.configure do |c|
   c.mock_with :rspec
+  c.before(:each) do
+    ::Pebblebed.memcached = MemcacheMock.new
+  end
   c.around(:each) do |example|
     clear_cookies if respond_to?(:clear_cookies)
-    $memcached = Mockcached.new
     example.run
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70127313138320 !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: *70127313138320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70127313137220 !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: *70127313137220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70127313136580 !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: *70127313136580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70127313135380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127313135380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70127313134840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127313134840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deepstruct
-  requirement: &70127313134000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70127313134000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70127313132320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: 0.7.14
   type: :runtime
   prerelease: false
-  version_requirements: *70127313132320
+  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: &70127313130020 !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: *70127313130020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: queryparams
-  requirement: &70127313128400 !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: *70127313128400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: futurevalue
-  requirement: &70127313127340 !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: *70127313127340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pathbuilder
-  requirement: &70127313125940 !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: *70127313125940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70127313124680 !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: *70127313124680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70127313122960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +214,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70127313122960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70127313121480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +230,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70127313121480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70127313118900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +246,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70127313118900
+  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
@@ -215,7 +290,6 @@ files:
 - spec/http_spec.rb
 - spec/labels_spec.rb
 - spec/mock_pebble.rb
-- spec/mockcached.rb
 - spec/river_spec.rb
 - spec/river_subscription_spec.rb
 - spec/security/access_data_spec.rb
@@ -236,15 +310,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1631620775838906147
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1631620775838906147
 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
@@ -255,7 +335,6 @@ test_files:
 - spec/http_spec.rb
 - spec/labels_spec.rb
 - spec/mock_pebble.rb
-- spec/mockcached.rb
 - spec/river_spec.rb
 - spec/river_subscription_spec.rb
 - spec/security/access_data_spec.rb

data/spec/mockcached.rb

@@ -1,25 +0,0 @@
-class Mockcached
-  def initialize
-    @store = {}
-  end
-
-  def set(*args)
-    @store[args[0]] = args[1]
-  end
-
-  def get(*args)
-    @store[args[0]]
-  end
-
-  def get_multi(*keys)
-    result = {}
-    keys.each do |key|
-      result[key] = get(key) if @store.has_key?(key)
-    end
-    result
-  end
-
-  def delete(*args)
-    @store.delete(args[0])
-  end
-end