pebbles-uid 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f1bf5b61101cf67c6f0ef169d4cd9233db7f9ec
-  data.tar.gz: 530393b0ea0648008ac270b41ac98a79eb90a9b8
+  metadata.gz: 98fe8a6033359135f0ecf19a028fa6df1ced9089
+  data.tar.gz: abce3cd9356eceebacbe10d4c30651930db04d71
 SHA512:
-  metadata.gz: 433861dfdd24ec9dc4e03363a3c208d00e1177f98a2246f4e8d2871ba3c57b9e6b79f2e32adb066deeaa1b98968a28580a7efcac2be43d38a5f86431afe1112e
-  data.tar.gz: 7e808508c3028bc0649c0ba37c7d5d36419c2104b96e42ef9bb99b037e583d9e5d866d0cc587c1de913674a917ce88aed8bcddd0315308955fa8296aa95cbe52
+  metadata.gz: efec10260b9dd0e9baf4673d3c35b1899c48c47f8282ced747443ca7e89600f1f9ce1d61b5c148f39afdbf981533875095800b14beea953a9f1ddc8fca9e5b0f
+  data.tar.gz: 1764799c02510c39eb7551b4c8fad90da34d55cd0e0e73741bdb0663b0c9c8f326457d59bf787d9ae1421a05a2d7b7f46a0a58c7623c9f9c1e1732ead8b2448c

data/lib/pebbles-uid/query.rb

@@ -1,3 +1,4 @@
+require "its";
 module Pebbles
   class Uid
     class Query
@@ -13,7 +14,9 @@ module Pebbles
         @suffix = options[:suffix]
         @stop = options.fetch(:stop) { NO_MARKER }
 
-        if wildcard_query?
+        if multi_oid_query?
+          @terms = expand_uid(term)
+        elsif wildcard_query?
           @terms = [term]
         else
           @terms = extract_terms
@@ -118,6 +121,27 @@ module Pebbles
         false
       end
 
+      def multi_oid_query?
+        _, _, oid = Pebbles::Uid.parse(term)
+        oid and oid.include?('|')
+      end
+
+      def expand_uid(uid)
+        _species, _path, _oid = Pebbles::Uid.parse(uid)
+        path_labels = Labels.new(_path)
+        oid_box = Oid.new(_oid)
+
+        raise ArgumentError.new('Realm must be specified') if path_labels.empty? || path_labels.first == '*'
+
+        if oid_box.multiple?
+          _oid.split('|').map do |s|
+            "#{_species}:#{_path}$#{s}"
+        end
+        else
+          uid
+        end
+      end
+
       def extract_terms
         term.split(',').map do |uid|
           _species, _path, _oid = Pebbles::Uid.parse(uid)

data/lib/pebbles-uid/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   class Uid
-    VERSION = "0.0.19"
+    VERSION = "0.0.20"
   end
 end

data/spec/query_spec.rb

@@ -67,8 +67,12 @@ describe Pebbles::Uid::Query do
       query.cache_keys.should eq(['post:area51.*$abc', 'post:area51.*$xyz'])
     end
 
-    it "bails without realm" do
-      ->{ Pebbles::Uid::Query.new('post:*$abc,post:*$xyz') }.should raise_error(ArgumentError)
+    it "works with wildcard as class" do
+      Pebbles::Uid::Query.new('*:area51.*$abc|xyz').list?.should == true
+    end
+
+    it "works with a trailing pipe on oid" do
+      Pebbles::Uid::Query.new('*:area51.*$abc|').list?.should == true
     end
 
     it "must have only one realm" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-uid
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Katrina Owen