pacer 2.0.18-java → 2.0.19-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d7905ddf1c56bda34240a62c39a2c089269ee52
-  data.tar.gz: 992588158de779cc22d9fc56376d85ae3274ec98
+  metadata.gz: 50f9f48f941e86e98b7155587e62f6477812edd9
+  data.tar.gz: 99f7b7c8e1265d73c9bc2f9cdcebbcaedb8749a6
 SHA512:
-  metadata.gz: b0ff0dd02bdaa3949d244ba7eb61542f09794d2b3278f1bfb113a5a30a6c94747cdc0387e560335068bf65aa2302b68be1f62075b07f15e98adf51f763bb3186
-  data.tar.gz: 60c4e5f8e19a89e4606afd0c320988f1cba8264704e991904194a87100c8d5bcc9665fd62b737ee63ae70257dced51af3e224734d08b2a870acfc75952c3dc92
+  metadata.gz: fb477cd2ffdbaca86421c856a0c5d61c79eeb581086bfca05097d30d1f0e966b820acd9aedf26206d76cdabb82c166b6ccf9b4f2fffabea61b7e29817bebc70c
+  data.tar.gz: 299290b76f510049a74d8c155366d8289aa315e3a919988c26f04252d4aa704a0f6a23cbc38c71beb0519e15b4e04b141450a01a46844291fe8e76c60f7339c0

data/lib/pacer/transform/sort_section.rb

@@ -2,13 +2,13 @@ module Pacer
   module Routes
     module RouteOperations
       # Arity 2 uses custom sort logic. Arity 1 uses sort_by logic.
-      def sort_section(section = nil, &block)
+      def sort_section(section = nil, opts = {}, &block)
         if not block
-          chain_route transform: :sort_section, section: section
+          chain_route opts.merge(transform: :sort_section, section: section)
         elsif block.arity == 2
-          chain_route transform: :sort_section, custom_sort_block: block, section: section
+          chain_route opts.merge(transform: :sort_section, custom_sort_block: block, section: section)
         else
-          chain_route transform: :sort_section, sort_by_block: block, section: section
+          chain_route opts.merge(transform: :sort_section, sort_by_block: block, section: section)
         end
       end
 
@@ -29,6 +29,12 @@ module Pacer
 
       attr_accessor :sort_by_block
       attr_accessor :custom_sort_block
+      attr_accessor :nil_value
+
+      def nil_sort_value(value)
+        @nil_value = nil_value
+        self
+      end
 
       protected
 
@@ -38,23 +44,24 @@ module Pacer
           pipe = CustomSortPipe.new(self, section_visitor, custom_sort_block, graph, wrapper)
         else # sort_by_block
           pf = Pacer::Wrappers::WrappingPipeFunction.new self, sort_by_block if sort_by_block
-          pipe = SortBySectionPipe.new(self, section_visitor, pf)
+          pipe = SortBySectionPipe.new(self, section_visitor, pf, nil_value)
         end
         pipe.setStarts end_pipe if end_pipe
         pipe
       end
 
       class SortBySectionPipe < Pacer::Pipes::RubyPipe
-        attr_reader :pf_1, :pf_2, :to_sort, :to_emit, :section, :route
+        attr_reader :pf_1, :pf_2, :to_sort, :to_emit, :section, :route, :nil_value
         attr_reader :getPathToHere
 
-        def initialize(route, visitor_pipe, pipe_function)
+        def initialize(route, visitor_pipe, pipe_function, nil_value)
           super()
           @to_emit = []
           @visitor_pipe = visitor_pipe
           @route = route
           @to_sort = []
           @paths = []
+          @nil_value = nil_value
           if visitor_pipe
             visitor_pipe.visitor = self
           else
@@ -106,16 +113,42 @@ module Pacer
         def after_element
           if to_sort.any?
             if pf_1
-              sorted = to_sort.sort_by do |element, path|
-                pf_1.call element
+              if nil_value
+                sorted = to_sort.sort_by do |element, path|
+                  v = pf_1.call element
+                  if v.nil?
+                    nil_value
+                  else
+                    v
+                  end
+                end
+              else
+                sorted = to_sort.sort_by do |element, path|
+                  pf_1.call element
+                end
               end
             elsif pf_2
-              sorted = to_sort.sort_by do |element, path|
-                pf_2.call_with_args element, @section_element, pf_2.wrap_path(path)
+              if nil_value
+                sorted = to_sort.sort_by do |element, path|
+                  v = pf_2.call_with_args element, @section_element, pf_2.wrap_path(path)
+                  if v.nil?
+                    nil_value
+                  else
+                    v
+                  end
+                end
+              else
+                sorted = to_sort.sort_by do |element, path|
+                  pf_2.call_with_args element, @section_element, pf_2.wrap_path(path)
+                end
               end
             else
               sorted = to_sort.sort_by do |element, path|
-                element
+                if element.nil?
+                  nil_value
+                else
+                  element
+                end
               end
             end
             to_emit.concat sorted
@@ -128,7 +161,7 @@ module Pacer
         attr_reader :sort_block
 
         def initialize(route, visitor_pipe, sort_block, graph, wrapper)
-          super route, visitor_pipe, nil
+          super route, visitor_pipe, nil, nil
           @sort_block = sort_block
           @graph = graph
           @wrapper = wrapper

data/lib/pacer/version.rb

@@ -1,5 +1,5 @@
 module Pacer
-  VERSION = "2.0.18"
+  VERSION = "2.0.19"
   # Clients may optionally define the following constants in the Pacer namespace:
   # - LOAD_JARS : set to false to manage jar loading in the client. Be sure to load the jars defined in JARFILES.
   # - LOCKJAR_LOCK_OPTS : set some options to be passed to LockJar.lock (ie. :lockfile, :download_artifacts, :local_repo)

data/spec/pacer/transform/sort_section_spec.rb

@@ -57,6 +57,22 @@ Run.tg :read_only do
     end
   end
 
+  describe 'sort by with nil' do
+    let(:by_name) do
+      graph.v.section(:x).out.out.sort_section(:x, nil_value: 'x') { |v| nil }
+    end
+
+    it 'should have the same elements' do
+      by_name.group_count.should == unsorted.group_count
+    end
+
+    it 'should have 3 elements in the path' do
+      by_name.paths.each do |path|
+        path.length.should == 3
+      end
+    end
+  end
+
   describe 'sort with more info' do
     let(:unsorted) { graph.v.out.out }
     let(:with_path) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.19
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lock_jar