pebbles-uid 0.0.9 → 0.0.11

data/lib/pebbles-uid.rb

@@ -6,6 +6,7 @@ require 'pebbles-uid/query'
 require "pebbles-uid/conditions"
 require "pebbles-uid/labels"
 require "pebbles-uid/oid"
+require "pebbles-uid/roots"
 
 module Pebbles
   class Uid

data/lib/pebbles-uid/class_methods.rb

@@ -4,7 +4,7 @@ module Pebbles
 
       def parse(s)
         /^(?<species>.*):(?<path>[^\$]*)\$?(?<oid>.*)$/ =~ s
-        [species, path, oid.empty? ? nil : oid]
+        [species, path, oid && oid.empty? ? nil : oid]
       end
 
       def build(species, path, oid)

data/lib/pebbles-uid/labels.rb

@@ -1,6 +1,7 @@
 module Pebbles
   class Uid
     class Labels
+      include Enumerable
 
       NO_MARKER = Class.new
 
@@ -15,14 +16,22 @@ module Pebbles
         @max_depth = options[:max_depth]
       end
 
-      def first
-        values.first
+      def each(&block)
+        values.each {|value| yield value}
       end
 
       def tail
         values[1..-1]
       end
 
+      def parent_of?(other)
+        parent = true
+        values.each_with_index do |value, i|
+          parent = false unless value == other.values[i]
+        end
+        parent
+      end
+
       def ambiguous?
         value == '*' || values.empty? || wildcard?
       end
@@ -35,10 +44,6 @@ module Pebbles
         values.size
       end
 
-      def to_a
-        values
-      end
-
       def to_s
         values.join('.')
       end

data/lib/pebbles-uid/query.rb

@@ -19,7 +19,9 @@ module Pebbles
           @terms = extract_terms
         end
 
-        if !list?
+        if list?
+          @species, @path, _ = Pebbles::Uid.parse(terms.first)
+        else
           @species, @path, @oid = Pebbles::Uid.parse(term)
         end
       end
@@ -55,6 +57,10 @@ module Pebbles
         !species_wrapper.tail.empty?
       end
 
+      def genus
+        species.split('.').first
+      end
+
       def epiteth
         species_wrapper.tail.join('.')
       end

data/lib/pebbles-uid/roots.rb

@@ -0,0 +1,14 @@
+module Pebbles
+  class Uid
+    def self.root_paths(uids)
+      paths = uids.map { |uid| Labels.new(Pebbles::Uid.path(uid)) }
+      roots = [paths.first]
+      paths[1..-1].each { |path|
+        roots.each { |root|
+          roots << path unless root.parent_of?(path)
+        }
+      }
+      roots.map(&:to_s)
+    end
+  end
+end

data/lib/pebbles-uid/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   class Uid
-    VERSION = "0.0.9"
+    VERSION = "0.0.11"
   end
 end

data/spec/labels_spec.rb

@@ -44,4 +44,15 @@ describe Pebbles::Uid::Labels do
     it { subject.valid_with?(/[a-z]/).should == true }
   end
 
+  context "parent_of?" do
+    let(:a) { Pebbles::Uid::Labels.new('a') }
+    let(:a_b_c) { Pebbles::Uid::Labels.new('a.b.c') }
+    let(:a_b_d) { Pebbles::Uid::Labels.new('a.b.d') }
+
+    it "works" do
+      a.parent_of?(a_b_c).should == true
+      a_b_c.parent_of?(a_b_d).should == false
+    end
+  end
+
 end

data/spec/query_spec.rb

@@ -3,7 +3,7 @@ require 'pebbles-uid'
 describe Pebbles::Uid::Query do
 
   context "for a single resource" do
-    let(:term) { "post:area51$abc" }
+    let(:term) { "post.doc:area51$abc" }
     subject { Pebbles::Uid::Query.new(term, :suffix => '') }
 
     its(:term) { should == term }
@@ -11,8 +11,12 @@ describe Pebbles::Uid::Query do
     its(:for_one?) { should == true }
     its(:list?) { should == false }
     its(:collection?) { should == false }
-    its(:cache_keys) { should eq(['post:area51.*$abc']) }
-    its(:to_hash) { should eq(:species_0_ => 'post', :path_0_ => 'area51', :oid_ => 'abc') }
+    its(:cache_keys) { should eq(['post.doc:area51.*$abc']) }
+    its(:to_hash) { should eq(:species_0_ => 'post', :species_1_ => 'doc', :path_0_ => 'area51', :oid_ => 'abc') }
+    its(:genus) { should == 'post' }
+    its(:species) { should == 'post.doc' }
+    its(:path) { should == 'area51' }
+    its(:oid) { should == 'abc' }
 
     it "handles a wildcard path if realm is given" do
       query = Pebbles::Uid::Query.new('post:area51.*$abc')
@@ -35,14 +39,17 @@ describe Pebbles::Uid::Query do
   end
 
   context "for a list of resources" do
-    let(:term) { "post:area51$abc,post:area51$xyz" }
+    let(:term) { "post.doc:area51$abc,post.doc:area51$xyz" }
     subject { Pebbles::Uid::Query.new(term) }
 
     its(:for_one?) { should == false }
     its(:list?) { should == true }
     its(:collection?) { should == false }
+    its(:genus) { should == 'post' }
 
-    its(:cache_keys) { should eq(['post:area51.*$abc', 'post:area51.*$xyz']) }
+    its(:cache_keys) { should eq(['post.doc:area51.*$abc', 'post.doc:area51.*$xyz']) }
+
+    it "only accepts one single genus"
 
     context "by oid" do
       subject { Pebbles::Uid::Query.new("post:area51$abc|xyz") }

data/spec/roots_spec.rb

@@ -0,0 +1,21 @@
+require 'pebbles-uid'
+
+describe Pebbles::Uid do
+
+  specify "single node" do
+    Pebbles::Uid.root_paths(['person:a$1']).should eq(['a'])
+  end
+
+  specify "occluded node" do
+    Pebbles::Uid.root_paths(['person:a$1', 'person:a.b$2']).should eq(['a'])
+  end
+
+  specify "non-intersecting nodes" do
+    Pebbles::Uid.root_paths(['person:a.b$1', 'person:a.c$2']).should eq(['a.b', 'a.c'])
+  end
+
+  specify "weird non-intersecting nodes" do
+    Pebbles::Uid.root_paths(['person:a.b.c$1', 'person:a.c.d$2']).should eq(['a.b.c', 'a.c.d'])
+  end
+
+end

data/spec/uid_spec.rb

@@ -12,7 +12,7 @@ describe Pebbles::Uid do
     end
   end
 
-  describe "extracts elements" do
+  describe "extracts" do
     specify "genus" do
       Pebbles::Uid.genus(uid).should eq('post')
     end
@@ -33,8 +33,22 @@ describe Pebbles::Uid do
       Pebbles::Uid.oid(uid).should eq('1234')
     end
 
-    specify "non-existant oid" do
-      Pebbles::Uid.oid('post:a.b.c').should be_nil
+    describe "when oid is non-existant" do
+      it "returns nil oid" do
+        Pebbles::Uid.oid('post:a.b.c').should be_nil
+      end
+    end
+
+    describe "when oid is empty" do
+      it "returns nil oid" do
+        Pebbles::Uid.oid('post:a.b.c$').should be_nil
+      end
+    end
+
+    describe "when uid is invalid" do
+      it "returns nil oid" do
+        Pebbles::Uid.oid('1').should be_nil
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-uid
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70250797645480 !ruby/object:Gem::Requirement
+  requirement: &70189435613420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250797645480
+  version_requirements: *70189435613420
 description: Handle pebble UIDs conveniently.
 email:
 - katrina.owen@gmail.com
@@ -40,6 +40,7 @@ files:
 - lib/pebbles-uid/labels.rb
 - lib/pebbles-uid/oid.rb
 - lib/pebbles-uid/query.rb
+- lib/pebbles-uid/roots.rb
 - lib/pebbles-uid/version.rb
 - lib/pebbles-uid/wildcard.rb
 - lib/pebbles/uid.rb
@@ -48,6 +49,7 @@ files:
 - spec/labels_spec.rb
 - spec/oid_spec.rb
 - spec/query_spec.rb
+- spec/roots_spec.rb
 - spec/uid_spec.rb
 - spec/wildcard_spec.rb
 homepage: ''
@@ -80,5 +82,7 @@ test_files:
 - spec/labels_spec.rb
 - spec/oid_spec.rb
 - spec/query_spec.rb
+- spec/roots_spec.rb
 - spec/uid_spec.rb
 - spec/wildcard_spec.rb
+has_rdoc: