pebblebed 0.0.16 → 0.0.17

data/lib/pebblebed/clients/generic_client.rb

@@ -17,9 +17,18 @@ module Pebblebed
       end
     end
 
-    def service_url(url)
+    def service_url(url, params = nil)
       result = @root_url.dup
       result.path = result.path.sub(/\/+$/, "") + url
+      if params
+        result.query << '&' if result.query
+        result.query ||= ''
+        result.query << if params.is_a?(Hash)
+          params.entries.map { |k, v| CGI.escape(k.to_s) + '=' + CGI.escape(v.to_s) }.join('&')
+        else
+          params
+        end
+      end
       result
     end
 

data/lib/pebblebed/uid_query.rb

@@ -0,0 +1,31 @@
+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/lib/pebblebed/version.rb

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

data/lib/pebblebed.rb

@@ -3,6 +3,7 @@ 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/checkpoint_client'

data/spec/generic_client_spec.rb

@@ -15,6 +15,7 @@ describe Pebblebed::GenericClient do
     client = Pebblebed::GenericClient.new("session_key", "http://example.org/")
     client.service_url("/test").to_s.should eq "http://example.org/test"
     client.service_url("").to_s.should eq "http://example.org"
+    client.service_url("/test", :foo => 'bar').to_s.should eq "http://example.org/test?foo=bar"
   end
 
   it "wraps JSON-results in a deep struct" do

data/spec/uid_query_spec.rb

@@ -0,0 +1,50 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70227836596560 !ruby/object:Gem::Requirement
+  requirement: &70306887832940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227836596560
+  version_requirements: *70306887832940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70227836595980 !ruby/object:Gem::Requirement
+  requirement: &70306887832320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227836595980
+  version_requirements: *70306887832320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70227836595040 !ruby/object:Gem::Requirement
+  requirement: &70306887831520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227836595040
+  version_requirements: *70306887831520
 - !ruby/object:Gem::Dependency
   name: deepstruct
-  requirement: &70227836594380 !ruby/object:Gem::Requirement
+  requirement: &70306887830640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227836594380
+  version_requirements: *70306887830640
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70227836593660 !ruby/object:Gem::Requirement
+  requirement: &70306887829680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70227836593660
+  version_requirements: *70306887829680
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70227836628500 !ruby/object:Gem::Requirement
+  requirement: &70306887829040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227836628500
+  version_requirements: *70306887829040
 - !ruby/object:Gem::Dependency
   name: queryparams
-  requirement: &70227836634040 !ruby/object:Gem::Requirement
+  requirement: &70306887828360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227836634040
+  version_requirements: *70306887828360
 - !ruby/object:Gem::Dependency
   name: futurevalue
-  requirement: &70227836637420 !ruby/object:Gem::Requirement
+  requirement: &70306887827660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227836637420
+  version_requirements: *70306887827660
 - !ruby/object:Gem::Dependency
   name: pathbuilder
-  requirement: &70227836642820 !ruby/object:Gem::Requirement
+  requirement: &70306887827160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227836642820
+  version_requirements: *70306887827160
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70227836646700 !ruby/object:Gem::Requirement
+  requirement: &70306887826500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227836646700
+  version_requirements: *70306887826500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70227836873840 !ruby/object:Gem::Requirement
+  requirement: &70306887819280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227836873840
+  version_requirements: *70306887819280
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70227837080040 !ruby/object:Gem::Requirement
+  requirement: &70306887818520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227837080040
+  version_requirements: *70306887818520
 description: Development tools for working with Pebblebed
 email:
 - katrina@bengler.no
@@ -168,6 +168,7 @@ files:
 - lib/pebblebed/parts.rb
 - lib/pebblebed/sinatra.rb
 - lib/pebblebed/uid.rb
+- lib/pebblebed/uid_query.rb
 - lib/pebblebed/version.rb
 - pebblebed.gemspec
 - spec/checkpoint_client_spec.rb
@@ -178,6 +179,7 @@ files:
 - spec/mock_pebble.rb
 - spec/mockcached.rb
 - spec/spec_helper.rb
+- spec/uid_query_spec.rb
 - spec/uid_spec.rb
 homepage: ''
 licenses: []
@@ -212,4 +214,5 @@ test_files:
 - spec/mock_pebble.rb
 - spec/mockcached.rb
 - spec/spec_helper.rb
+- spec/uid_query_spec.rb
 - spec/uid_spec.rb