pebblebed 0.0.17 → 0.0.18

data/.gitignore

@@ -6,3 +6,5 @@ pkg/*
 tmp/
 coverage
 .powder
+/*.sublime-*
+.idea

data/lib/pebblebed/clients/checkpoint_client.rb

@@ -6,35 +6,16 @@ module Pebblebed
       @identity = get("/identities/me")[:identity]
     end
 
-    def cache_key_for_identity_id(id)
-      "identity:#{id}"
-    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 = {}
-      uncached = ids
-
-      if Pebblebed.memcached
-        cache_keys = ids.collect {|id| cache_key_for_identity_id(id) }
-        result = Hash[Pebblebed.memcached.get_multi(*cache_keys).map { |key, identity|
-          if key =~ /identity:(\d+)/
-            [$1.to_i, identity]
-          end
-        }]
-        uncached = ids-result.keys
-      end
-
-      if uncached.size > 0
-        request = get("/identities/#{uncached.join(',')},")
-        uncached.each_with_index do |id, i|
-          identity = request.identities[i].identity.unwrap
-          result[id] = identity
-          Pebblebed.memcached.set(cache_key_for_identity_id(id), identity, ttl=60*15) if Pebblebed.memcached
-        end
+      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
@@ -43,4 +24,4 @@ module Pebblebed
       me.god if me
     end
   end
-end
+end

data/lib/pebblebed/clients/generic_client.rb

@@ -11,8 +11,8 @@ module Pebblebed
     def perform(method, url = '', params = {}, &block)
       begin
         result = Pebblebed::Http.send(method, service_url(url), service_params(params), &block)
-        return DeepStruct.wrap(Yajl::Parser.parse(result.body))        
-      rescue Yajl::ParseError
+        return DeepStruct.wrap(JSON.parse(result.body))        
+      rescue JSON::ParserError
         return result.body
       end
     end
@@ -33,8 +33,14 @@ module Pebblebed
     end
 
     def service_params(params)
-      params ||= {}
-      params['session'] ||= @session_key if @session_key
+      if (key = @session_key) and (params.nil? or not params[:session])
+        if params
+          params = params.dup  # Make sure we don't modify it
+        else
+          params = {}
+        end
+        params['session'] = key
+      end
       params
     end
 

data/lib/pebblebed/connector.rb

@@ -2,6 +2,7 @@ require 'active_support/inflector'
 
 module Pebblebed 
   class Connector 
+    attr_accessor :key
     def initialize(key = nil, url_opts = {})
       @key = key
       @clients = {}
@@ -23,7 +24,7 @@ module Pebblebed
   
       
     def parts
-      @parts ||= Pebblebed::Parts.new(self)
+      @@parts ||= Pebblebed::Parts.new(self)
     end
 
     def self.client_class_for(service)

data/lib/pebblebed/http.rb

@@ -2,7 +2,7 @@
 
 require 'uri'
 require 'curl'
-require 'yajl'
+require 'yajl/json_gem'
 require 'queryparams'
 require 'nokogiri'
 require 'pathbuilder'
@@ -55,19 +55,19 @@ module Pebblebed
 
     def self.post(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)
-      body = params.is_a?(String) ? params : params.to_json
+      content_type, body = serialize_params(params)
       handle_curl_response(Curl::Easy.http_post(url.to_s, body) do |curl|
         curl.headers['Accept'] = 'application/json'
-        curl.headers['Content-Type'] = params.is_a?(String) ? 'text/plain' : 'application/json'
+        curl.headers['Content-Type'] = content_type
       end)
     end
 
     def self.put(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)      
-      body = params.is_a?(String) ? params : params.to_json
+      content_type, body = serialize_params(params)
       handle_curl_response(Curl::Easy.http_put(url.to_s, body) do |curl|
         curl.headers['Accept'] = 'application/json'
-        curl.headers['Content-Type'] = params.is_a?(String) ? 'text/plain' : 'application/json'
+        curl.headers['Content-Type'] = content_type
       end)
     end
 
@@ -78,6 +78,18 @@ module Pebblebed
 
     private
 
+    def self.serialize_params(params)
+      if String === params
+        content_type, body = 'text/plain', params
+      else
+        content_type, body = 'application/json', JSON.dump(params)
+      end
+      if body.respond_to?(:encoding) and body.encoding != Encoding::UTF_8
+        content_type << "; charset=#{body.encoding}"
+      end
+      return content_type, body
+    end
+
     def self.handle_http_errors(result)
       if result.status >= 400
         errmsg = "Service request to '#{result.url}' failed (#{result.status}):"

data/lib/pebblebed/parts.rb

@@ -121,6 +121,6 @@ Pebblebed::Parts.register_composition_strategy :direct do |url, params|
   begin
     Pebblebed::Connector.new.get(url, params)
   rescue HttpError => e
-    "<span class='pebbles_error'>'#{url}' with parameters #{params.to_json} failed (#{e.status}): #{e.message}</span>"
+    "<span class='pebbles_error'>'#{url}' with parameters #{JSON.dump(params)} failed (#{e.status}): #{e.message}</span>"
   end
 end

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/pebblebed.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "simplecov"
   
-  s.add_runtime_dependency "deepstruct"
-  s.add_runtime_dependency "curb", "~> 0.8.0"
+  s.add_runtime_dependency "deepstruct", ">= 0.0.2"
+  s.add_runtime_dependency "curb", ">= 0.7.14"
   s.add_runtime_dependency "yajl-ruby"
   s.add_runtime_dependency "queryparams"
   s.add_runtime_dependency "futurevalue"

data/spec/checkpoint_client_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'json'
 
 describe Pebblebed::CheckpointClient do
 
@@ -31,13 +30,6 @@ describe Pebblebed::CheckpointClient do
     end
   end
 
-  describe "cache_key_for_identity_id" do
-    it "creates a nice looking cache key for memcache" do
-      checkpoint_client = Pebblebed::Connector.new('session_key')[:checkpoint]
-      checkpoint_client.cache_key_for_identity_id(2).should eq "identity:2"
-    end
-  end
-
   describe "find_identities" do
     let(:canned_response) {
       DeepStruct.wrap({:body=>
@@ -47,70 +39,17 @@ describe Pebblebed::CheckpointClient do
                       })
     }
 
-    describe "without memcache configured" do
-      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])
+    before(:each) do
+      Pebblebed.config do
+        host "checkpoint.dev"
+        service :checkpoint
       end
     end
 
-    describe "with memcached configured" do
-      before(:each) do
-        Pebblebed.config do
-          host "checkpoint.dev"
-          memcached $memcached
-          service :checkpoint
-        end
-      end
-
-      it "issues an http request and caches it" do
-        Pebblebed::Http.should_receive(:get).once.and_return(canned_response)
-        checkpoint_client.find_identities([1, 2])
-        checkpoint_client.find_identities([1, 2])
-
-        $memcached.get(checkpoint_client.cache_key_for_identity_id(1)).should eq({"id"=>1})
-        $memcached.get(checkpoint_client.cache_key_for_identity_id(2)).should eq({})
-      end
-
-      it "returns exactly the same data no matter if it is cached or originating from a request" do
-        Pebblebed::Http.should_receive(:get).once.and_return(canned_response)
-
-        http_requested_result = checkpoint_client.find_identities([1, 2, 3])
-        cached_result = checkpoint_client.find_identities([1, 2, 3])
-
-        http_requested_result.unwrap.should eq cached_result.unwrap
-      end
-
-      it "issues a request only for not previously cached identities" do
-        Pebblebed::Http.should_receive(:get) { |url|
-          url.path.should match("/identities/1,2,4")
-          canned_response
-        }.once
-        checkpoint_client.find_identities([1, 2, 4])
-
-        Pebblebed::Http.should_receive(:get) { |url|
-          url.path.should match("/identities/3,") # Note the extra comma. Will ensure that a list is returned
-          canned_response
-        }.once
-        checkpoint_client.find_identities([1, 2, 3, 4])
-      end
-
-      it "will always return identities in the order they are requested" do
-        Pebblebed::Http.should_receive(:get).once.and_return(canned_response)
-
-        checkpoint_client.find_identities([1, 2, 3, 4])
-        identities = checkpoint_client.find_identities([4, 3, 2, 1])
-        identities[1].id.should eq 3
-        identities[3].id.should eq 1
-      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
+end

data/spec/connector_spec.rb

@@ -20,4 +20,11 @@ describe "Pebblebed::Connector" do
     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"
+    connector.key = "another_key"
+    connector.key.should == "another_key"
+  end
+
 end

data/spec/http_spec.rb

@@ -1,4 +1,7 @@
+# encoding: utf-8
+
 require 'spec_helper'
+require 'yajl/json_gem'
 
 describe Pebblebed::Http do 
 
@@ -47,7 +50,7 @@ describe Pebblebed::Http do
     ['post', 'put'].each do |method|    
       response = Pebblebed::Http.send(method.to_sym, pebble_url, {hello:'world'})
       result = JSON.parse(response.body)
-      result["CONTENT_TYPE"].should eq "application/json"
+      result["CONTENT_TYPE"].should =~ %r{^application/json\b}i
       JSON.parse(result["BODY"])['hello'].should eq 'world'
     end
   end
@@ -56,7 +59,7 @@ describe Pebblebed::Http do
     ['post', 'put'].each do |method|    
       response = Pebblebed::Http.send(method.to_sym, pebble_url, "Hello world")
       result = JSON.parse(response.body)
-      result["CONTENT_TYPE"].should eq "text/plain"
+      result["CONTENT_TYPE"].should =~ %r{^text/plain\b}i
       result["BODY"].should eq "Hello world"
     end
   end

data/spec/mock_pebble.rb

@@ -3,7 +3,7 @@
 # http://localhost:8666/api/mock/v1
 
 require 'webrick'
-require 'json'
+require 'yajl/json_gem'
 
 class MockPebble
   class Servlet < WEBrick::HTTPServlet::AbstractServlet

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70306887832940 !ruby/object:Gem::Requirement
+  requirement: &70098584984600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306887832940
+  version_requirements: *70098584984600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70306887832320 !ruby/object:Gem::Requirement
+  requirement: &70098584984180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306887832320
+  version_requirements: *70098584984180
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70306887831520 !ruby/object:Gem::Requirement
+  requirement: &70098584983740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,32 +44,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306887831520
+  version_requirements: *70098584983740
 - !ruby/object:Gem::Dependency
   name: deepstruct
-  requirement: &70306887830640 !ruby/object:Gem::Requirement
+  requirement: &70098584983120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70306887830640
+  version_requirements: *70098584983120
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70306887829680 !ruby/object:Gem::Requirement
+  requirement: &70098584982480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.7.14
   type: :runtime
   prerelease: false
-  version_requirements: *70306887829680
+  version_requirements: *70098584982480
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70306887829040 !ruby/object:Gem::Requirement
+  requirement: &70098584998200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306887829040
+  version_requirements: *70098584998200
 - !ruby/object:Gem::Dependency
   name: queryparams
-  requirement: &70306887828360 !ruby/object:Gem::Requirement
+  requirement: &70098584997700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306887828360
+  version_requirements: *70098584997700
 - !ruby/object:Gem::Dependency
   name: futurevalue
-  requirement: &70306887827660 !ruby/object:Gem::Requirement
+  requirement: &70098584997260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306887827660
+  version_requirements: *70098584997260
 - !ruby/object:Gem::Dependency
   name: pathbuilder
-  requirement: &70306887827160 !ruby/object:Gem::Requirement
+  requirement: &70098584996820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306887827160
+  version_requirements: *70098584996820
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70306887826500 !ruby/object:Gem::Requirement
+  requirement: &70098584996160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306887826500
+  version_requirements: *70098584996160
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70306887819280 !ruby/object:Gem::Requirement
+  requirement: &70098584995420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306887819280
+  version_requirements: *70098584995420
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70306887818520 !ruby/object:Gem::Requirement
+  requirement: &70098584992940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306887818520
+  version_requirements: *70098584992940
 description: Development tools for working with Pebblebed
 email:
 - katrina@bengler.no
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pebblebed
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Development tools for working with Pebblebed