pebblebed 0.0.7 → 0.0.8

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 != "") ? value : nil
+      @oid = (value.strip != "") ? CGI.unescape(value) : nil
     end
 
     def self.raw_parse(string)
@@ -36,7 +36,7 @@ module Pebblebed
     end
 
     def self.valid?(string)
-      begin 
+      begin
         true if new(string)
       rescue InvalidUid
         false
@@ -53,12 +53,17 @@ module Pebblebed
     end
 
     def self.valid_klass?(value)
-      self.valid_label?(value)
+      return false if value =~ /^\.+$/
+      return false if value == ""
+      value.split('.').each do |label|
+        return false unless self.valid_label?(label)
+      end
+      true
     end
 
     def self.valid_path?(value)
       # catches a stupid edge case in ruby where "..".split('.') == [] instead of ["", "", ""]
-      return false if value =~ /^\.+$/ 
+      return false if value =~ /^\.+$/
       value.split('.').each do |label|
         return false unless self.valid_label?(label)
       end
@@ -80,7 +85,15 @@ module Pebblebed
     def to_s
       "#{@klass}:#{@path}$#{@oid}".chomp("$")
     end
-    alias_method :to_uid, :to_s 
+    alias_method :to_uid, :to_s
+
+    def ==(other)
+      self.to_uid == other.to_uid
+    end
+
+    def eql?(other)
+      self == other
+    end
 
   end
 end

data/lib/pebblebed/version.rb

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

data/spec/uid_spec.rb

@@ -43,6 +43,10 @@ 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
@@ -50,19 +54,46 @@ describe Pebblebed::Uid do
     -> { uid.oid = "/" }.should raise_error Pebblebed::InvalidUid
   end
 
-  describe "oid" do
-    it "is valid with pretty much anything" do
-      Pebblebed::Uid.valid_oid?("abc123").should be_true
-      Pebblebed::Uid.valid_oid?("abc123!").should be_true
-      Pebblebed::Uid.valid_oid?("abc 123").should be_true
+  describe "klass" do
+    let(:uid) { Pebblebed::Uid.new("klass:path$oid") }
+
+    it "allows sub-klasses" do
+      ->{ uid.klass = "sub.sub.class" }.should_not raise_error
     end
 
-    it "cannot contain a slash" do
-      Pebblebed::Uid.valid_oid?("abc/123").should be_false
+    describe "is valid" do
+      %w(. - _ 8).each do |nice_character|
+        it "with '#{nice_character}'" do
+          ->{ uid.klass = "a#{nice_character}z" }.should_not raise_error
+        end
+      end
     end
 
-    it "can contain a full uid" do
-      Pebblebed::Uid.new('klass:path$post:some.path$oid').oid.should eq('post:some.path$oid')
+    describe "is invalid" do
+      %w(! / : $ % $).each do |funky_character|
+        specify "with '#{funky_character}'" do
+          ->{ uid.klass = "a#{funky_character}z" }.should raise_error Pebblebed::InvalidUid
+        end
+      end
+    end
+  end
+
+  describe "oid" do
+    [
+      "abc123",
+      "abc123!@\#$%^&*()[]{}",
+      "abc 123",
+      "alice@example.com",
+      "abc/123",
+      "post:some.path$oid",
+    ].each do |oid|
+      specify "'#{oid}' is a valid oid if GCI escaped" do
+        Pebblebed::Uid.valid_oid?(CGI.escape(oid)).should be_true
+      end
+    end
+
+    specify "'abc/123' is an invalid oid" do
+      Pebblebed::Uid.valid_oid?('abc/123').should be_false
     end
 
     it "can be missing" do
@@ -126,4 +157,15 @@ describe Pebblebed::Uid do
     Pebblebed::Uid.new("klass:realm").realm.should eq 'realm'
     Pebblebed::Uid.new("klass:$3").realm.should eq nil
   end
+
+  describe "equality" do
+    let(:uid) { "klass:realm$3" }
+    it "is dependent on the actual uid" do
+      Pebblebed::Uid.new("klass:realm$3").should eq Pebblebed::Uid.new("klass:realm$3")
+    end
+
+    it "also works for eql?" do
+      Pebblebed::Uid.new("klass:realm$3").eql?(Pebblebed::Uid.new("klass:realm$3")).should be_true
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000Z
+date: 2012-02-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70157796499960 !ruby/object:Gem::Requirement
+  requirement: &70100401716200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157796499960
+  version_requirements: *70100401716200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70157796496780 !ruby/object:Gem::Requirement
+  requirement: &70100401695520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157796496780
+  version_requirements: *70100401695520
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70157796494320 !ruby/object:Gem::Requirement
+  requirement: &70100401693340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157796494320
+  version_requirements: *70100401693340
 - !ruby/object:Gem::Dependency
   name: deepstruct
-  requirement: &70157796485300 !ruby/object:Gem::Requirement
+  requirement: &70100401689760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157796485300
+  version_requirements: *70100401689760
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70157796483520 !ruby/object:Gem::Requirement
+  requirement: &70100401686640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70157796483520
+  version_requirements: *70100401686640
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70157796481120 !ruby/object:Gem::Requirement
+  requirement: &70100401685440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157796481120
+  version_requirements: *70100401685440
 - !ruby/object:Gem::Dependency
   name: queryparams
-  requirement: &70157796463760 !ruby/object:Gem::Requirement
+  requirement: &70100401682920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157796463760
+  version_requirements: *70100401682920
 - !ruby/object:Gem::Dependency
   name: futurevalue
-  requirement: &70157796461920 !ruby/object:Gem::Requirement
+  requirement: &70100401673000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157796461920
+  version_requirements: *70100401673000
 - !ruby/object:Gem::Dependency
   name: pathbuilder
-  requirement: &70157796460360 !ruby/object:Gem::Requirement
+  requirement: &70100401670800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157796460360
+  version_requirements: *70100401670800
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70157796459360 !ruby/object:Gem::Requirement
+  requirement: &70100401668060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157796459360
+  version_requirements: *70100401668060
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70157796458080 !ruby/object:Gem::Requirement
+  requirement: &70100401664220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157796458080
+  version_requirements: *70100401664220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70157796456340 !ruby/object:Gem::Requirement
+  requirement: &70100401649520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157796456340
+  version_requirements: *70100401649520
 description: Development tools for working with Pebblebed
 email:
 - katrina@bengler.no
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2763029353640330681
+      hash: -3792666451732932107
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2763029353640330681
+      hash: -3792666451732932107
 requirements: []
 rubyforge_project: pebblebed
 rubygems_version: 1.8.10