pacer 1.5.1-java → 1.5.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73b5792b368e7fd7337c32ccceeb591ed47ab3a8
-  data.tar.gz: cb32f1e5e53c44accced47e77ee7fe6177eafeb4
+  metadata.gz: 68c8b58f48b477c95dc1e6c900bf08da80757ab5
+  data.tar.gz: c2be8f1ed37cf34e6094be7dc1b5281bcce5fb67
 SHA512:
-  metadata.gz: 3eb2c7a98df23b0cce4a79343e601363970bb3a96deb4c4d50982daab3f683ce4d97cd7a957475b8df6ecd6fde41756383bf3fa9c5fef70ad1efd08a44944c01
-  data.tar.gz: aff44e7a64e456465a5e15fe093ed04410d7139f63213bdecddf1ae265cf6cd4fdab1fbcbba25d26b67d20453f3b60e79d2c31479845e795c24cf86895a0e16d
+  metadata.gz: e124987bdd52b1168c9c59094367594619e1393fe5ce5306217088ab30fc62eb0a8131e258214d04b53b34bfcd84c43f235cfee8be20535ee615bbd0eac3c8b9
+  data.tar.gz: 3c4f4227638b57ba0c0e733d2c4433e3c00bfa3ed9911c680f048221d0cd46debbf68441f49ecf052bb4c30bea336263ecbfd2d6fd0519f98634eabcdf81d965

data/lib/pacer/graph/graph_transactions_mixin.rb

@@ -61,7 +61,7 @@ module Pacer
       rtd = tgi[:read_tx_depth] -= 1
       if rtd == 0 and tgi[:tx_depth] == 0 and blueprints_graph.is_a? TransactionalGraph
         # rollback after the bottom read transaction (no changes outside a real transaction block should have been possible)
-        blueprints_graph.stopTransaction TransactionalGraph::Conclusion::FAILURE
+        blueprints_graph.rollback
       end
     end
 
@@ -99,11 +99,11 @@ module Pacer
     end
 
     def rollback_implicit_transaction
-      blueprints_graph.stopTransaction TransactionalGraph::Conclusion::FAILURE
+      blueprints_graph.rollback
     end
 
     def commit_implicit_transaction
-      blueprints_graph.stopTransaction TransactionalGraph::Conclusion::SUCCESS
+      blueprints_graph.commit
     end
 
     attr_reader :on_commit_block
@@ -158,13 +158,13 @@ module Pacer
           fail InternalError, 'Can not commit transaction outside its original block'
         end
         puts "transaction committed" if Pacer.verbose == :very
-        blueprints_graph.stopTransaction TransactionalGraph::Conclusion::SUCCESS
+        blueprints_graph.commit
         reopen_read_transaction
         on_commit_block.call if on_commit_block
       end
       rollback = ->(message = nil) do
         puts ["transaction rolled back", message].compact.join(': ') if Pacer.verbose == :very
-        blueprints_graph.stopTransaction TransactionalGraph::Conclusion::FAILURE
+        blueprints_graph.rollback
         reopen_read_transaction
       end
       [commit, rollback]

data/lib/pacer/graph/yaml_encoder.rb

@@ -21,8 +21,17 @@ module Pacer
         end
       when true, false
         value.to_java
-      when DateTime, Time, Date
-        value.strftime ' time %Y-%m-%d %H:%M:%S.%L %z'
+      when DateTime
+        # rfc3339 drops the millisecond
+        value.new_offset(0).strftime ' utcT %Y-%m-%d %H:%M:%S.%L'
+      when Time
+        if value.utc?
+          value.getutc.strftime ' utcT %Y-%m-%d %H:%M:%S.%L'
+        else
+          value.strftime ' time %Y-%m-%d %H:%M:%S.%L %z'
+        end
+      when Date
+        value.strftime ' date %Y-%m-%d'
       when Array
         if value.length == 0
           value_type = Fixnum
@@ -55,9 +64,14 @@ module Pacer
 
     def self.decode_property(value)
       if value.is_a? String and value[0, 1] == ' '
-        if value[1, 4] == 'time'
+        marker = value[1, 4]
+        if marker == 'utcT'
           # FIXME: we lose the milliseconds here...
-          Time.parse value[6..-1]
+          DateTime.parse(value[6..-1]).to_time.utc
+        elsif marker == 'time'
+          DateTime.parse(value[6..-1]).to_time
+        elsif marker == 'date'
+          Date.parse(value[6..-1])
         else
           YAML.load(value[1..-1])
         end

data/lib/pacer/support/enumerable.rb

@@ -1,6 +1,5 @@
 # Extend the built-in Enumerable module:
 module Enumerable
-
   def one?
     counter = 0
     each do
@@ -19,23 +18,15 @@ module Enumerable
   def to_hashset(method = nil, *args)
     return self if self.is_a? java.util.HashSet and not method
     hs = java.util.HashSet.new
-    iter = self.each rescue nil
-    if not iter and respond_to? :iterator
-      iter = self.iterator
-    end
-    e = iter.next
     if method
-      while true
+      each do |e|
         hs.add e.send(method, *args)
-        e = iter.next
       end
     else
-      while true
+      each do |e|
         hs.add e
-        e = iter.next
       end
     end
-  rescue StopIteration, Pacer::EmptyPipe, java.util.NoSuchElementException
     hs
   end
 

data/lib/pacer/support/hash.rb

@@ -1,8 +1,14 @@
 class Hash
   def to_hash_map
     hm = java.util.HashMap.new
-    each do |key, value|
-      hm.put key, value
+    if block_given?
+      each do |key, value|
+        hm.put(*yield(key, value))
+      end
+    else
+      each do |key, value|
+        hm.put key, value
+      end
     end
     hm
   end

data/lib/pacer/version.rb

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

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-SNAPSHOT</blueprints.version>
-      <gem.version>1.5.1</gem.version>
+      <gem.version>1.5.2</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 -->

data/spec/pacer/graph/pacer_graph_spec.rb

@@ -170,14 +170,18 @@ Run.all :read_write do
 
     describe '#create_edge' do
       let(:use_id) { rand 1000000 }
-      let(:from) { graph.vertex v0.element_id }
-      let(:to) { graph.vertex v1.element_id }
+      let(:from) { v0 }
+      let(:to) { v1 }
 
       before do
         c = example.metadata[:graph_commit]
         c.call if c
       end
 
+      it 'should find the vertex' do
+        graph.vertex(v0.element_id).should == v0
+      end
+
       context 'existing' do
         it 'should raise an exception' do
           if not graph.features.ignoresSuppliedIds
@@ -270,14 +274,8 @@ Run.all :read_write do
         c = example.metadata[:graph_commit]
         c.call if c
       end
-      context 'invalid' do
-        subject { graph.load_edges [e0.element_id, nil, e0.element_id, 'missing'] }
-        it { should == [e0, e0] }
-      end
-
-      context 'valid' do
-        subject { graph.load_edges [e0.element_id] }
-        it { should == [e0] }
+      it 'should only find valid edges' do
+        graph.load_edges([e0.element_id.to_s, nil, e0.element_id, 'missing']).should == [e0, e0]
       end
     end
 

data/spec/pacer/graph/yaml_encoder_spec.rb

@@ -39,7 +39,7 @@ describe Pacer::YamlEncoder do
     end
 
     specify 'dates are custom to enable range queries' do
-      subject[:time].should =~ /^ time \d/
+      subject[:time].should =~ /^ utcT \d/
     end
 
     specify 'everything else should be yaml' do

data/spec/pacer/route/mixin/base_spec.rb

@@ -16,10 +16,10 @@ Run.all do
         it { should be_nil }
       end
 
-      describe '#iterator' do
+      describe '#pipe' do
         use_simple_graph_data
         before { setup_data }
-        subject { graph.v.send(:iterator) }
+        subject { graph.v.pipe }
         its(:next) { should_not be_nil }
       end
     end

data/spec/pacer/wrapper/edge_wrapper_spec.rb

@@ -130,8 +130,8 @@ describe Pacer::Wrappers::EdgeWrapper do
     end
 
     it 'should change the label' do
-      new_e = e0.reverse! label: 'hello!!'
-      new_e.label.should == 'hello!!'
+      new_e = e0.reverse! label: 'hello_there'
+      new_e.label.should == 'hello_there'
     end
 
     it 'should reuse the element id' do

data/spec/pacer/wrapper/vertex_wrapper_spec.rb

@@ -178,6 +178,9 @@ shared_examples_for Pacer::Wrappers::VertexWrapper do
     before { pending 'support temporary hash indices for clone/copy' unless graph.features.supportsIndices }
     let(:dest) { graph2 }
   }) do
+    before do
+      graph.transaction(nesting: true) { setup_data }
+    end
     describe '#clone_into', :transactions => false, read_transaction: true do
       subject { dest.transaction { v0.clone_into(dest) } }
       its(:properties) { should == { 'name' => 'eliza' } }
@@ -192,7 +195,7 @@ shared_examples_for Pacer::Wrappers::VertexWrapper do
     end
   end
 
-  subject { v0 }
+  subject { graph.transaction(nesting: true) { setup_data; v0 } }
   its(:graph) { should equal(graph) }
   its(:display_name) { should be_nil }
   its(:inspect) { should =~ /#<[VM]\[#{Regexp.quote v0.element_id.to_s }\]>/ }

data/spec/spec_helper.rb

@@ -39,10 +39,10 @@ Run = RSpec::GraphRunner.new ENV['GRAPHS']
 
 def use_simple_graph_data
   let(:setup_data) { e0; e1 }
-  let(:v0) { graph.transaction(nesting: true) { graph.create_vertex :name => 'eliza' } }
-  let(:v1) { graph.transaction(nesting: true) { graph.create_vertex :name => 'darrick' } }
-  let(:e0) { graph.transaction(nesting: true) { graph.create_edge nil, v0, v1, :links } }
-  let(:e1) { graph.transaction(nesting: true) { graph.create_edge nil, v0, v1, :relinks } }
+  let(:v0) { graph.create_vertex :name => 'eliza' }
+  let(:v1) { graph.create_vertex :name => 'darrick' }
+  let(:e0) { graph.create_edge nil, v0, v1, :links }
+  let(:e1) { graph.create_edge nil, v0, v1, :relinks }
 end
 
 def use_pacer_graphml_data(usage_style = :read_write)

data/spec/support/graph_runner.rb

@@ -130,7 +130,7 @@ protected
                 end
                 begin
                   g2_rollback.call #rescue nil
-                rescue Pacer::NestedTransactionRollback, Pacer::NestedMockTransactionRollback
+                rescue Pacer::MockTransactionRollback, Pacer::NestedTransactionRollback, Pacer::NestedMockTransactionRollback
                 end
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies: []
 description: Pacer defines routes through a graph and then traverses them very quickly.
 email: darrick@innatesoftware.com
@@ -194,10 +194,6 @@ files:
 - spec/pacer/graph/pacer_graph_spec.rb
 - spec/pacer/graph/simple_encoder_spec.rb
 - spec/pacer/graph/yaml_encoder_spec.rb
-- spec/pacer/pipe/block_filter_pipe_spec.rb
-- spec/pacer/pipe/labels_filter_pipe_spec.rb
-- spec/pacer/pipe/ruby_pipe_spec.rb
-- spec/pacer/pipe/type_filter_pipe_spec.rb
 - spec/pacer/route/mixin/base_spec.rb
 - spec/pacer/route/mixin/bulk_operations_spec.rb
 - spec/pacer/route/mixin/route_operations_spec.rb
@@ -222,7 +218,7 @@ files:
 - spec/support/use_transactions.rb
 - spec/tackle/simple_mixin.rb
 - spec/tackle/tinkerpop_graph_mixins.rb
-- lib/pacer-1.5.1-standalone.jar
+- lib/pacer-1.5.2-standalone.jar
 homepage: http://github.com/pangloss/pacer
 licenses:
 - MIT
@@ -274,10 +270,6 @@ test_files:
 - spec/pacer/graph/pacer_graph_spec.rb
 - spec/pacer/graph/simple_encoder_spec.rb
 - spec/pacer/graph/yaml_encoder_spec.rb
-- spec/pacer/pipe/block_filter_pipe_spec.rb
-- spec/pacer/pipe/labels_filter_pipe_spec.rb
-- spec/pacer/pipe/ruby_pipe_spec.rb
-- spec/pacer/pipe/type_filter_pipe_spec.rb
 - spec/pacer/route/mixin/base_spec.rb
 - spec/pacer/route/mixin/bulk_operations_spec.rb
 - spec/pacer/route/mixin/route_operations_spec.rb