parliament-utils 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf7a1e70bcdc34a8eee422e58139b702129923f
-  data.tar.gz: 35b65d62db6d438f29597088aaeb3920ab5c7f51
+  metadata.gz: 3b1bc71c1a239694b68c057e362302dadfd7b18a
+  data.tar.gz: f27aa41311b6129bd759fc49dd9472fff871e6d6
 SHA512:
-  metadata.gz: 1ff11e1eea29d06a256ecb4722921b965af6e994c5c81b83c0564acc04ca9d6354ed07a63641ff648d7d79bc579f225f4ea5805db299f1cc137c51135ade70fd
-  data.tar.gz: b92e06674a3c6aad5fa6fe2007ae4c2b4cec5fc7b0575a3ede9603acea3b4feff31bf52f4b633a963753b26036fa9b33910f641daa89623ebfca2b73023c4c7e
+  metadata.gz: 819087efb47d3873b5e153c658f8ae1cdb8410caa76bb421f2cd735f2409147e9e3e3ec6ddfa60e765fb9194532e61a0f20e03d3e368d6e7e436dee3930114d2
+  data.tar.gz: 7ebc1412f95ec4c9922df5f6f81109787cfecf896de39cef44c336a6603794738b9442f09300734cb70e67b2108b851e67fa859e4f01e4efee6e5adcdfb18e06

data/.travis.yml

@@ -3,3 +3,5 @@ language: ruby
 rvm:
   - 2.4.0
 before_install: gem install bundler -v 1.15.1
+env:
+  - PARLIAMENT_BASE_URL=https://api.parliament.uk/Staging/fixed-query

data/lib/parliament/utils/helpers.rb

@@ -6,6 +6,7 @@ require_relative './helpers/parliament_helper'
 require_relative './helpers/postcode_helper'
 require_relative './helpers/request_helper'
 require_relative './helpers/v_card_helper'
+require_relative './helpers/filter_helper'
 
 require 'parliament/grom/decorator'
 

data/lib/parliament/utils/helpers/filter_helper.rb

@@ -0,0 +1,52 @@
+# Namespace for Parliament::Filter helper methods.
+module Parliament
+  module Utils
+    module Helpers
+      module FilterHelper
+        # Takes a request object and a variable amount of types for filtering, gets types_to_filter using #filter_types method, and calls RequestHelper.filter_response_data to return filtered NTriple Object
+        #
+        # @param [Parliament::Request] request a Parliament::Request object
+        # @param [String] *types a variable amount of types to filter by
+        #
+        # @return [Parliament::Response::NTripleResponse] Ntriple response filtered by types
+        def self.filter(request, *types)
+          types_to_filter = self.filter_types(*types)
+          Parliament::Utils::Helpers::RequestHelper.filter_response_data(
+            request, *types_to_filter
+          )
+        end
+
+        # Takes variable amount of types for filtering, checks if type is 'ordnance', and returns array of types to filter
+        #
+        # @param [String] *types a variable amount of types to filter by
+        #
+        # @return [Array] array of types to filter by
+        def self.filter_types(*types)
+          types_to_filter = []
+          types.each do |type|
+            type == 'ordnance' ? types_to_filter << 'http://data.ordnancesurvey.co.uk/ontology/admingeo/EuropeanRegion' : types_to_filter << Parliament::Utils::Helpers::RequestHelper.namespace_uri_schema_path(type)
+          end
+          types_to_filter
+        end
+
+        # Takes a request, sort type, type to sort and letters to sort by.
+        # Calls the #filter method to define type and letters
+        # Sorts type by sort type
+        # Maps letters using #value
+        # Returns type and letters
+        # @param [Parliament::Request] request a Parliament::Request object
+        # @param [Symbol] sort_type how to sort type
+        # @param [String] type the type to filter
+        # @param [Grom::Node] letters Grom::Node to filter type by letters
+        #
+        # @return [Parliament::Response::NTripleResponse] Ntriple response filtered by letters
+        def self.filter_sort(request, sort_type, type, letters)
+          type, letters = self.filter(request, type, letters)
+          type = type.sort_by(sort_type)
+          letters = letters.map(&:value)
+          return type, letters
+        end
+      end
+    end
+  end
+end

data/lib/parliament/utils/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module Utils
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

data/parliament-utils.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'parliament-ruby', '~> 0.7'
+  spec.add_dependency 'parliament-ruby', '~> 0.10'
   spec.add_dependency 'parliament-grom-decorators', '~> 0.10'
   spec.add_dependency 'parliament-ntriple'
   spec.add_dependency 'i18n'
@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pugin'
   spec.add_dependency 'haml'
 
+  spec.add_development_dependency 'parliament-ruby', '~> 0.10'
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-utils
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parliament-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: parliament-grom-decorators
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parliament-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +290,7 @@ files:
 - lib/parliament/utils/config/initializers/wrap_parameters.rb
 - lib/parliament/utils/helpers.rb
 - lib/parliament/utils/helpers/application_helper.rb
+- lib/parliament/utils/helpers/filter_helper.rb
 - lib/parliament/utils/helpers/flag_helper.rb
 - lib/parliament/utils/helpers/format_helper.rb
 - lib/parliament/utils/helpers/houses_helper.rb
@@ -314,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Parliament Utils gem.