parliament-ruby 0.5.17 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b3c8c824743e8fc39a983cca382e33f4b60d51c
-  data.tar.gz: 519ba032619e1efce25f5d1879257326bab01fec
+  metadata.gz: c3501f4829d180b5911b6c708883ea068a9f6fb6
+  data.tar.gz: c9b7f748e43e0ab6030e0b26bf4fee33937d5742
 SHA512:
-  metadata.gz: e807d62ce5a058cc4aac67975d64040455af7a6e1583496f3f576e3cb70eeae5c2f675b64c2af0db3d0cf1a24d34f6bd293e7600cc29aa90a8e4719759bf951c
-  data.tar.gz: 339d5a6f9ce41bfe1ff9cef9a75688d25e31a0d668307b73c18b4649f6c6e8565dadc8071978aa661aeca18da5cac0115e632f42db2790b75ea6295086fa147f
+  metadata.gz: 88f09fafba3a44800dffd57f58011e9c7eb3ba1ad9fb9cad43bf1fd3e0d816ce70c00d3b5b270c87f21ad6c0eae4d92c389cd095a2f71bbc1eedf3de6158e0c4
+  data.tar.gz: e8f14118976032573c758784e8ed0024a3cc19e4098fc90dba076402a059924bacf8ca40d81e4bf097d564e7fcf7401a4a4c0738861dd87941edc676c3cebc92

data/README.md

@@ -72,7 +72,7 @@ Parliament::Request.new.base_url #=> 'http://example.com'
 ### Building an 'endpoint'
 Now that we have a `base_url` set, we will want to build an 'endpoint' such as: `http://test.com/parties/current`.
 
-An endpoint is effectively just a full URL to an n-triple file on a remote server..
+An endpoint is effectively just a full URL to an n-triple file on a remote server.
 
 Building an endpoint is simple, once you have a Parliament::Request object, you do something like this:
 ```ruby

data/Rakefile

@@ -0,0 +1,6 @@
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/parliament/decorators/person.rb

@@ -25,11 +25,7 @@ module Parliament
       end
 
       def incumbencies
-        if respond_to?(:memberHasIncumbency)
-          memberHasIncumbency.select { |inc| inc.type == 'http://id.ukpds.org/schema/Incumbency' }
-        else
-          []
-        end
+        respond_to?(:memberHasIncumbency) ? memberHasIncumbency : []
       end
 
       def seat_incumbencies

data/lib/parliament/response.rb

@@ -36,20 +36,17 @@ module Parliament
     end
 
     def sort_by(*parameters)
-      rejected = []
-      grom_nodes = @nodes.dup
-      grom_nodes.delete_if { |node| rejected << node unless parameters.all? { |param| node.respond_to?(param) } }
-      grom_nodes.sort_by! do |node|
-        parameters.map do |param|
-          node.send(param).is_a?(String) ? I18n.transliterate(node.send(param)).downcase : node.send(param)
-        end
-      end
-
-      rejected.concat(grom_nodes)
+      Parliament::Utils.sort_by({
+        list:       @nodes,
+        parameters: parameters
+      })
     end
 
     def reverse_sort_by(*parameters)
-      sort_by(*parameters).reverse!
+      Parliament::Utils.reverse_sort_by({
+        list:       @nodes,
+        parameters: parameters
+      })
     end
   end
 end

data/lib/parliament/utils.rb

@@ -0,0 +1,35 @@
+module Parliament
+  module Utils
+    def self.sort_by(args)
+      rejected = []
+      args = sort_defaults.merge(args)
+      list = args[:list].dup
+      parameters = args[:parameters]
+
+      list.delete_if do |object|
+        rejected << object unless parameters.all? { |param| !object.send(param).nil? if object.respond_to?(param) }
+      end
+
+      list.sort_by! do |object|
+        parameters.map do |param|
+          object.send(param).is_a?(String) ? I18n.transliterate(object.send(param)).downcase : object.send(param)
+        end
+      end
+
+      # 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
+
+    def self.reverse_sort_by(args)
+      Parliament::Utils.sort_by(args).reverse!
+    end
+
+    private_class_method
+
+    def self.sort_defaults
+      {
+        prepend_rejected: true
+      }
+    end
+  end
+end

data/lib/parliament/version.rb

@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '0.5.17'.freeze
+  VERSION = '0.5.18'.freeze
 end

data/lib/parliament.rb

@@ -4,6 +4,7 @@ require 'grom'
 require 'parliament/version'
 require 'parliament/request'
 require 'parliament/response'
+require 'parliament/utils'
 require 'parliament/no_content_error'
 
 # require all the decorators

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.18
 platform: ruby
 authors:
 - Matt Rayner
@@ -138,8 +138,8 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
-- Makefile
 - README.md
+- Rakefile
 - bin/console
 - bin/setup
 - lib/parliament.rb
@@ -160,6 +160,7 @@ files:
 - lib/parliament/no_content_error.rb
 - lib/parliament/request.rb
 - lib/parliament/response.rb
+- lib/parliament/utils.rb
 - lib/parliament/version.rb
 - parliament-ruby.gemspec
 homepage: http://github.com/ukparliament/parliament_ruby
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Internal parliamentary data API wrapper for ruby

data/Makefile

@@ -1,15 +0,0 @@
-
-test:
-	bundle exec rspec spec
-
-build:
-	gem build parliament-ruby.gemspec
-
-deploy:
-	gem push parliament-ruby-*.gem
-
-clean:
-	rm parliament-ruby-*.gem
-
-release: build deploy clean
-