parliament-ntriple 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3dd09c5be5ce20cb330d49d4965a3a35b48731c
-  data.tar.gz: 611b84fb8051553bd8b0a6e536ff030e6f9759a7
+  metadata.gz: c28f49cd480518c28176b043002dacb7074eb57d
+  data.tar.gz: a1039e64e1bc609d59ea45e1df745dd9512a1e1d
 SHA512:
-  metadata.gz: 132bfbaec83772496778823c557aa4577764acf3d16a9e3e868107cb4cae4cc72fdfc028c7143647fa1c82d0a2853d9c36dcf32f57030ce64abed1452e8b85d3
-  data.tar.gz: 241fb9a82e78f62cb3d53614ae3f40890f8671c09d27fa62db0f067b1d744a67d0460a498e3ce503fceb71a2f8412a03883e346f31e752889fd854bbdc0cb101
+  metadata.gz: e5fd10da414857335e4387c5e79bb41458321c41ce699d6f97e7f07a7fb8d42f593803c834138f14fcbd7de65a2bbaf6078e19da48766b7b31d88190d2c1bbb6
+  data.tar.gz: 87eb07680ee2a8ef2bc2c561f803efcfb479ebd8121cfd86e7cc40a6564448478bba386964061042362042ec4f5cb3db124a2ec5049bb305f627662cca331814

data/lib/parliament/ntriple/utils.rb

@@ -94,6 +94,46 @@ module Parliament
         { prepend_rejected: true }
       end
 
+      # Sort an array of objects in ascending or descending order.
+      #
+      # @example Sorting a list objects by count (descending) and name (ascending)
+      #   response = parliament.houses('123').parties.current.get.filter('http://id.ukpds.org/schema/Party')
+      #
+      #   args = {
+      #     list: response.nodes,
+      #     parameters: { count: :desc, name: :asc }
+      #   }
+      #
+      #   sorted_list = Parliament::NTriple::Util.multi_direction_sort(args)
+      #
+      #   sorted_list.each{ |party| p "#{party.name} - #{party.count}" }
+      #   # http://id.ukpds.org/1837 - Conservative - 220
+      #   # http://id.ukpds.org/3824 - Labour - 220
+      #   # http://id.ukpds.org/7283 - Green Party - 1
+      #   # http://id.ukpds.org/2837 - Independent Liberal Democrat - 1
+      #   # http://id.ukpds.org/3726 - Plaid Cymru - 1
+      #
+      # @param [Hash] args a hash of arguments.
+      # @option args [Array<Object>] :list the 'list' which we are sorting.
+      # @option args [Hash<Symbol>,<Symbol>] :parameters a hash of parameters to sort by as keys and the sort direction as values.
+      # @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.
+      def self.multi_direction_sort(args)
+        rejected = []
+        args = sort_defaults.merge(args)
+
+        list = args[:list].dup
+        sort_directions = args[:parameters]
+
+        list, rejected = prune_list(list, rejected, sort_directions.keys)
+
+        list = multi_sort_list(list, sort_directions)
+
+        # 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)
+      end
+
       # @!method self.prune_list(list, rejected, parameters)
       # Prune all objects that do not respond to a given array of parameters.
       #
@@ -122,7 +162,7 @@ module Parliament
       # @!visibility private
       #
       # @param [Array<Object>] list the 'list' of objects we are pruning from.
-      # @param [Array<Symbol>] parameters an array of parameters we are checking.
+      # @param [Array<Symbol>] parameters a hash of parameters to sort by as keys and the sort direction as values.
       #
       # @return [Array<Object>] our sorted list.
       private_class_method def self.sort_list(list, parameters)
@@ -132,6 +172,29 @@ module Parliament
           end
         end
       end
+
+      # @!method self.multi_sort_list(list, sort_directions)
+      # Sort a given list of objects by a list of parameters and their sort directions.
+      #
+      # @private
+      # @!scope class
+      # @!visibility private
+      #
+      # @param [Array<Object>] list the 'list' of objects we are pruning from.
+      # @param [Hash<Symbol>,<Symbol>] parameters an array of parameters we are checking.
+      #
+      # @return [Array<Object>] our sorted list.
+      private_class_method def self.multi_sort_list(list, sort_directions)
+        directions_hash = { asc: 1, desc: -1 }
+
+        list.sort do |obj1, obj2|
+          sort_values = sort_directions.map do |method_name, direction|
+            directions_hash[direction] * (obj1.send(method_name) <=> obj2.send(method_name))
+          end
+
+          sort_values.find { |value| value != 0 } || 0
+        end
+      end
     end
   end
 end

data/lib/parliament/ntriple/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module NTriple
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.1.2'.freeze
   end
 end

data/lib/parliament/response/ntriple_response.rb

@@ -26,7 +26,7 @@ module Parliament
       #
       # Note: this method assumes all of your nodes include a #type attribute or are blank nodes.
       #
-      # @since 0.2.0
+      # @since 0.1.0
       #
       # @example Filtering for a single type
       #    node_1 = Grom::Node.new
@@ -94,7 +94,7 @@ module Parliament
       #
       # @see Parliament::Utils.sort_by
       #
-      # @since 0.5.0
+      # @since 0.1.0
       #
       # @param [Array<Symbol>] parameters Attributes to sort on - left to right.
       # @return [Array<Grom::Node>] A sorted array of nodes.
@@ -107,11 +107,28 @@ module Parliament
         )
       end
 
+      # Sort the Parliament::Response nodes in ascending or descending order by a set of attributes on each node.
+      #
+      # @see Parliament::Utils.multi_direction_sort
+      #
+      # @since 0.1.2
+      #
+      # @param [Hash<Symbol,Symbol>] parameters Attributes to sort on (left to right) - and their direction of sort(asc or desc).
+      # @return [Array<Grom::Node>] A sorted array of nodes.
+      def multi_direction_sort(parameters)
+        Parliament::NTriple::Utils.multi_direction_sort(
+          {
+            list:       @nodes,
+            parameters: parameters
+          }
+        )
+      end
+
       # Sort the Parliament::Response nodes in descending order by a set of attributes on each node.
       #
       # @see Parliament::Utils.reverse_sort_by
       #
-      # @since 0.5.0
+      # @since 0.1.0
       #
       # @param [Array<Symbol>] parameters Attributes to sort on - left to right.
       # @return [Array<Grom::Node>] A sorted array of nodes.

data/parliament-ntriple.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 2.3'
-  spec.add_development_dependency 'parliament-grom-decorators', '~> 0.1.0'
-  spec.add_development_dependency 'parliament-ruby', '~> 0.7.6'
+  spec.add_development_dependency 'parliament-grom-decorators', '~> 0.1'
+  spec.add_development_dependency 'parliament-ruby', '~> 0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ntriple
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grom
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: parliament-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: '0.7'
 description: Parliamentary NTriple response builder
 email:
 - rklappleyard@gmail.com