parliament-ntriple 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 959375f5bbe02076050c514ba6e4f7def9aacbd3
-  data.tar.gz: 682b57eac0049bd9a92a8d3aca7e4024393892a2
+SHA256:
+  metadata.gz: 8bca56b0fd2e5d632150f373039d94c28902225e3fcc9394b0b6b8cab5184329
+  data.tar.gz: c05ec7fe015bc0eba75973167b870ea2425fdaef96d4bc60aeda72fd06c9194c
 SHA512:
-  metadata.gz: ceb92a6eba55fda689d0cef11988833563220aa6ba9eb3db6f183245b88a5fe0ab7b2641c5070428fe2ab85146e8e91c3eaf313b088bf0b282b6c88a991de1fb
-  data.tar.gz: 23796e4da1efbe568b5f0d2c9bb40f0ba312f0d10ddbceecea652f4686fdcbaf31ba45cb7450f03d9ac874879a49358d26b2c1fb936979299a8ab477e615aabf
+  metadata.gz: d9ffb8c15378f94485bf2ba9dc16a7d987731d6edff3edb463f4414736d780ad97666dfe4512434e5ec448889e98c01ddc392c17863bf7c8357aaf91c8ed2691
+  data.tar.gz: 1d9e477300e2575ce4e2b4622af3923c35445c5e6eb5d147e3a6b5f360f048b5325e2ab5a7df70f55db9033a80e7b1003976943005d1285b13c44230285f47fb

data/lib/parliament/ntriple/utils.rb

@@ -32,6 +32,7 @@ module Parliament
       # @param [Hash] args a hash of arguments.
       # @option args [Array<Object>] :list the 'list' which we are sorting.
       # @option args [Array<Symbol>] :parameters an array of parameters we are sorting by.
+      # @option args [Proc] :block a block used to sort.
       # @option args [Boolean] :prepend_rejected (true) should objects that do not respond to our parameters be prepended?
       #
       # @return [Array<Object>] a sorted array of objects using the args passed in.
@@ -40,10 +41,11 @@ module Parliament
         args = sort_defaults.merge(args)
         list = args[:list].dup
         parameters = args[:parameters]
+        block = args[:block]
 
-        list, rejected = prune_list(list, rejected, parameters)
+        list, rejected = prune_list(list, rejected, parameters, block)
 
-        list = sort_list(list, parameters)
+        list = sort_list(list, parameters, block)
 
         # Any rejected (nil) values will be added to the start of the result unless specified otherwise
         args[:prepend_rejected] ? rejected.concat(list) : list.concat(rejected)
@@ -77,6 +79,7 @@ module Parliament
       # @param [Hash] args a hash of arguments.
       # @option args [Array<Object>] :list the 'list' which we are sorting.
       # @option args [Array<Symbol>] :parameters an array of parameters we are sorting by.
+      # @option args [Proc] :block a block used to sort.
       # @option args [Boolean] :prepend_rejected (true) should objects that do not respond to our parameters be prepended?
       #
       # @return [Array<Object>] a sorted array of objects using the args passed in.
@@ -126,7 +129,7 @@ module Parliament
         list = args[:list].dup
         sort_directions = args[:parameters]
 
-        list, rejected = prune_list(list, rejected, sort_directions.keys)
+        list, rejected = prune_list(list, rejected, sort_directions.keys, nil)
 
         list = multi_sort_list(list, sort_directions)
 
@@ -144,13 +147,24 @@ module Parliament
       # @param [Array<Object>] list the 'list' of objects we are pruning from.
       # @param [Array<Object>] rejected the objects we have pruned from list.
       # @param [Array<Symbol>] parameters an array of parameters we are checking.
+      # @param [Proc] block a block used to cjecl
       #
       # @return [Array<Array<Object>, Array<Object>>] an array containing first, the pruned list and secondly, the rejected list.
-      private_class_method def self.prune_list(list, rejected, parameters)
-        list.delete_if do |object|
-          rejected << object unless parameters.all? { |param| !object.send(param).nil? if object.respond_to?(param) }
+      private_class_method def self.prune_list(list, rejected, parameters, block)
+        if parameters
+          rejection_block = proc do |object|
+            rejected << object unless parameters.all? { |param| !object.send(param).nil? if object.respond_to?(param) }
+          end
+        end
+
+        if block
+          rejection_block = proc do |object|
+            rejected << object if block.call(object).nil?
+          end
         end
 
+        list.delete_if { |object| rejection_block.call(object) } if rejection_block
+
         [list, rejected]
       end
 
@@ -163,14 +177,23 @@ module Parliament
       #
       # @param [Array<Object>] list the 'list' of objects we are pruning from.
       # @param [Array<Symbol>] parameters a hash of parameters to sort by as keys and the sort direction as values.
+      # @param [Proc] block a block used to sort.
       #
       # @return [Array<Object>] our sorted list.
-      private_class_method def self.sort_list(list, parameters)
-        list.sort_by! do |object|
-          parameters.map do |param|
-            object.send(param).is_a?(String) ? I18n.transliterate(object.send(param)).downcase : object.send(param)
+      private_class_method def self.sort_list(list, parameters, block)
+        if parameters
+          sort_block = proc do |object|
+            parameters.map do |param|
+              object.send(param).is_a?(String) ? I18n.transliterate(object.send(param)).downcase : object.send(param)
+            end
           end
         end
+
+        sort_block = block if block
+
+        return list if sort_block.nil?
+
+        list.sort_by! { |object| sort_block.call(object) }
       end
 
       # @!method self.multi_sort_list(list, sort_directions)

data/lib/parliament/ntriple/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module NTriple
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ntriple
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grom
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Parliamentary NTriple response builder