pebblebed 0.0.8 → 0.0.9

data/lib/pebblebed/http.rb

@@ -55,12 +55,12 @@ module Pebblebed
 
     def self.post(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)      
-      handle_curl_response(Curl::Easy.http_post(url.to_s, *(QueryParams.encode(params).split('&'))))
+      handle_curl_response(Curl::Easy.http_post(url.to_s, params.to_json))
     end
 
     def self.put(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)      
-      handle_curl_response(Curl::Easy.http_put(url.to_s, *(QueryParams.encode(params).split('&'))))
+      handle_curl_response(Curl::Easy.http_put(url.to_s, params.to_json))
     end
 
     def self.delete(url, params, &block)

data/lib/pebblebed/sinatra.rb

@@ -3,7 +3,7 @@ require 'pebblebed'
 
 module Sinatra
   module Pebblebed
-    module Helpers      
+    module Helpers
       # Render the markup for a part. A partspec takes the form
       # "<kit>.<partname>", e.g. "base.post"
       def part(partspec, params = {})
@@ -26,7 +26,7 @@ module Sinatra
       def current_session
         params[:session] || request.cookies['checkpoint.session']
       end
-      alias :checkpoint_session :current_session 
+      alias :checkpoint_session :current_session
 
       def pebbles
         @pebbles ||= ::Pebblebed::Connector.new(checkpoint_session, :host => request.host)
@@ -58,6 +58,16 @@ module Sinatra
         missing = keys.map(&:to_s) - (parameters ? parameters.keys : [])
         halt 409, "missing parameters: #{missing.join(', ')}" unless missing.empty?
       end
+
+      def limit_offset_collection(collection, options)
+        limit = (options[:limit] || 20).to_i
+        offset = (options[:offset] || 0).to_i
+        collection = collection.limit(limit+1).offset(offset)
+        last_page = (collection.size <= limit)
+        metadata = {:limit => limit, :offset => offset, :last_page => last_page}
+        collection = collection[0..limit-1]
+        [collection, metadata]
+      end
     end
 
     def self.registered(app)

data/lib/pebblebed/uid.rb

@@ -27,7 +27,7 @@ module Pebblebed
     def oid=(value)
       return @oid = nil if value == '' || value.nil?
       raise InvalidUid, "Invalid oid '#{value}'" unless self.class.valid_oid?(value)
-      @oid = (value.strip != "") ? CGI.unescape(value) : nil
+      @oid = (value.strip != "") ? value : nil
     end
 
     def self.raw_parse(string)

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/uid_spec.rb

@@ -43,10 +43,6 @@ describe Pebblebed::Uid do
     -> { Pebblebed::Uid.new("!:$298") }.should raise_error Pebblebed::InvalidUid
   end
 
-  it "CGI unescapes the incoming oid" do
-    Pebblebed::Uid.new('klass:path$abc+123').oid.should eq('abc 123')
-  end
-
   it "raises an exception when you modify a uid with an invalid value" do
     uid = Pebblebed::Uid.new("klass:path$oid")
     -> { uid.klass = "!" }.should raise_error Pebblebed::InvalidUid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000Z
+date: 2012-03-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70100401716200 !ruby/object:Gem::Requirement
+  requirement: &70147058469200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100401716200
+  version_requirements: *70147058469200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70100401695520 !ruby/object:Gem::Requirement
+  requirement: &70147058468460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100401695520
+  version_requirements: *70147058468460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70100401693340 !ruby/object:Gem::Requirement
+  requirement: &70147058467840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100401693340
+  version_requirements: *70147058467840
 - !ruby/object:Gem::Dependency
   name: deepstruct
-  requirement: &70100401689760 !ruby/object:Gem::Requirement
+  requirement: &70147058467140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100401689760
+  version_requirements: *70147058467140
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70100401686640 !ruby/object:Gem::Requirement
+  requirement: &70147058465480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70100401686640
+  version_requirements: *70147058465480
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70100401685440 !ruby/object:Gem::Requirement
+  requirement: &70147058464160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100401685440
+  version_requirements: *70147058464160
 - !ruby/object:Gem::Dependency
   name: queryparams
-  requirement: &70100401682920 !ruby/object:Gem::Requirement
+  requirement: &70147058461240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100401682920
+  version_requirements: *70147058461240
 - !ruby/object:Gem::Dependency
   name: futurevalue
-  requirement: &70100401673000 !ruby/object:Gem::Requirement
+  requirement: &70147058459660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100401673000
+  version_requirements: *70147058459660
 - !ruby/object:Gem::Dependency
   name: pathbuilder
-  requirement: &70100401670800 !ruby/object:Gem::Requirement
+  requirement: &70147058459120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100401670800
+  version_requirements: *70147058459120
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70100401668060 !ruby/object:Gem::Requirement
+  requirement: &70147054554240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100401668060
+  version_requirements: *70147054554240
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70100401664220 !ruby/object:Gem::Requirement
+  requirement: &70147054553400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100401664220
+  version_requirements: *70147054553400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70100401649520 !ruby/object:Gem::Requirement
+  requirement: &70147054552500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100401649520
+  version_requirements: *70147054552500
 description: Development tools for working with Pebblebed
 email:
 - katrina@bengler.no
@@ -190,18 +190,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3792666451732932107
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3792666451732932107
 requirements: []
 rubyforge_project: pebblebed
 rubygems_version: 1.8.10