pacer 1.5.4-java → 1.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a36c9ff57450dc2a925ab700058f7e1dee0b2253
-  data.tar.gz: 4f0b8c63222025399b50a181b641adfd1be2936a
+  metadata.gz: 7e492827750d0f50e895dea5a6b847634f5800d7
+  data.tar.gz: 21025ddf6898e6f432c9466cf61f3ff04b0d286d
 SHA512:
-  metadata.gz: d870f3b0c7e2d191e1a58baf3db06d983fa2b46a7147c9f5b357647f7ca3067b6a5d7cb1391eabe85334224c2a44b489af86ca2423ac6aa56330e73872b46b6c
-  data.tar.gz: 716b3fb946400740c4cd637b588238967eadc8925e0d53c2424ca255ba76a18912c8071d3652819d639de4d3340cc3e6f802fabddd4326568d61e7914d2288a7
+  metadata.gz: e20c5e2ee2b402909c8ade3b8116ea01496d9e2c5947b5cef83abf4680136d78ee05395cc41f18604d49a6e0514ba8538b03b62f3072cedd76beb3e5b3c5bac7
+  data.tar.gz: ef58e5ca6852f6b9ed63ce2386c647c1ae378aa416d9e27d4489bcf2546cc1546b0291cffbe676638545967d4b13467c7cea679826e77ea9f8c936c056c24ddf

data/lib/pacer/filter/loop_filter.rb

@@ -6,8 +6,9 @@ module Pacer
       end
 
       def all(opts = {}, &block)
+        include_self = opts[:include_self]
         loop(opts, &block).while do |e, depth|
-          if depth == 0
+          if depth == 0 and not include_self
             :loop
           else
             :loop_and_recur

data/lib/pacer/filter/property_filter/filters.rb

@@ -60,7 +60,12 @@ module Pacer
         attr_accessor :search_manual_indices
 
         def initialize(graph, filters)
-          @graph = graph
+          if graph.is_a? Pacer::Wrappers::ElementWrapper
+            # this can happen if the starting route is actually a single element.
+            @graph = graph.graph
+          else
+            @graph = graph
+          end
           @properties = []
           @blocks = []
           @extensions = []
@@ -69,6 +74,27 @@ module Pacer
           @non_ext_props = []
           @best_index_value = nil
           add_filters filters, nil
+          combine_sets
+        end
+
+        def combine_sets
+          is_set = properties.group_by { |p| p[1].is_a? Set }
+          sets = is_set[true] # [["x", Set[]] ...]
+          if sets
+            is_multi = sets.group_by { |a| a.count > 1 }
+            multi = is_multi[true]
+            if multi
+              multi = multi.group_by { |m| m.first } # {"x": [["x", Set[]], ...]}
+              result = multi.map do |multi_set|
+                multi_set[1].reduce do |result, pair|
+                  [result[0], result[1].intersection(pair[1])]
+                end
+              end
+              result = result.concat(is_multi[false]) if is_multi[false]
+              result = result.concat(is_set[false]) if is_set[false]
+              @properties = result
+            end
+          end
         end
 
         # Set which graph this filter is currently operating on
@@ -205,7 +231,6 @@ module Pacer
           when Hash
             reset_properties
             filter.each do |k, v|
-              v = v.first if v.is_a? Set and v.length == 1
               self.non_ext_props << [k.to_s, v] unless extension
               self.properties << [k.to_s, v]
             end

data/lib/pacer/version.rb

@@ -1,6 +1,6 @@
 module Pacer
   unless const_defined? :VERSION
-    VERSION = "1.5.4"
+    VERSION = "1.6.0"
 
     JAR = "pacer-#{ VERSION }-standalone.jar"
     JAR_PATH = "lib/#{ JAR }"

data/lib/pacer/wrappers/vertex_wrapper.rb

@@ -78,7 +78,7 @@ module Pacer::Wrappers
       if exts.length == 1 and not exts.first.is_a?(Module) and not exts.first.is_a?(Class) and exts.first
         # NB: oops, I defined route#as to be the same as route#section. If the signature is
         #     matching the section method, then defer to it.
-        section *exts
+        section exts.first
       elsif as?(*exts)
         exts_to_add = extensions_missing(exts)
         extended = exts_to_add.empty? ? self : add_extensions(exts_to_add)
@@ -103,9 +103,18 @@ module Pacer::Wrappers
 
     def as?(*exts)
       has_exts = extensions_missing(exts).all? do |ext|
-        if ext.respond_to? :route_conditions
-          ext.route_conditions(graph).all? do |k, v|
-            self[k] == v
+        rc = if ext.respond_to? :route_conditions
+               ext.route_conditions(graph)
+             elsif ext.respond_to? :lookup
+               ext.lookup(graph)
+             end
+        if rc
+          rc.all? do |k, v|
+            if v.is_a? Set
+              v.include? self[k]
+            else
+              self[k] == v
+            end
           end
         else
           true

data/pom.xml

@@ -8,7 +8,7 @@
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->
     <properties>
       <blueprints.version>2.6.0</blueprints.version>
-      <gem.version>1.5.4</gem.version>
+      <gem.version>1.6.0</gem.version>
       <pipes.version>2.5.0</pipes.version>
     </properties>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-neo4j/version.rb -->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies: []
 description: Pacer defines routes through a graph and then traverses them very quickly.
 email: darrick@innatesoftware.com
@@ -218,7 +218,7 @@ files:
 - spec/support/use_transactions.rb
 - spec/tackle/simple_mixin.rb
 - spec/tackle/tinkerpop_graph_mixins.rb
-- lib/pacer-1.5.4-standalone.jar
+- lib/pacer-1.6.0-standalone.jar
 homepage: http://github.com/pangloss/pacer
 licenses:
 - MIT