parliament-utils 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bfd58f4e43c7457d71d7d033aac8db3c32ca1b1
-  data.tar.gz: 3fcd31d03ccc53d0436f9a309dd9bac4131dcac0
+  metadata.gz: 795764a9bbba4f5338d6062d7b30899743128074
+  data.tar.gz: '09539ae176e8968d3bcbe22d7ea2098157f6b4c6'
 SHA512:
-  metadata.gz: f932ab505c62375e0abf1d73b46564e22ae99b349fd28f9c04d6c75f1468a3bad7f73946002d592ac690e8475951c3f31b009025417801ed3f3f4f733c60e955
-  data.tar.gz: 07ecfb06baa85a9ddb41c1bed39fc098b76c0d3c7244d29195f9f296a94920c49d369c3b01f3185671bb770df4fa2886e68932e479acd7cdf9200f04edf0f23d
+  metadata.gz: d417b23d8c431e696573625dec1f65a7d849dfb47465aadb0cb7d399d498b3bf5efeb623fc4a407238783d9cc396f68b4170dfb29d7300e382afd4389fe04c61
+  data.tar.gz: 05a2a5b4a30b2c46ab802f799ade84f8407dd624efb3bd152f4d75fef8c0a74b00348360417b96e2aaabdb3e340abc2762c3162aec3d3482a44bb1a00347de4e

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

@@ -4,7 +4,7 @@ module Parliament
       module HousesHelper
         # Checks if house is the House of Commons and sets @commons_id and @lords_id if not already set.
         #
-        # @param [Grom::Node] house a Grom::Node with type http://id.ukpds.org/schema/House.
+        # @param [Grom::Node] house a Grom::Node with type https://id.parliament.uk/schema/House.
         # @return [Boolean] boolean depending on whether the house has the same id as the House of Commons.
         def self.commons?(house)
           set_ids
@@ -14,7 +14,7 @@ module Parliament
 
         # Checks if house is the House of Lords and sets @commons_id and @lords_id if not already set.
         #
-        # @param [Grom::Node] house a Grom::Node with type http://id.ukpds.org/schema/House.
+        # @param [Grom::Node] house a Grom::Node with type https://id.parliament.uk/schema/House.
         # @return [Boolean] boolean depending on whether the house has the same id as the House of Lords.
         def self.lords?(house)
           !commons?(house)
@@ -69,7 +69,7 @@ module Parliament
 
         def self.set_ids
           return if @commons_id && @lords_id
-          houses = Parliament::Utils::Helpers::ParliamentHelper.parliament_request.house_index.get.filter('http://id.ukpds.org/schema/House').sort_by(:name)
+          houses = Parliament::Utils::Helpers::ParliamentHelper.parliament_request.house_index.get.filter('https://id.parliament.uk/schema/House').sort_by(:name)
 
           @commons_id = houses.first.graph_id
           @lords_id = houses.last.graph_id

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

@@ -3,6 +3,9 @@ module Parliament
   module Utils
     module Helpers
       module RequestHelper
+        # The base namespace used for filtering parliamentary data within sparql queries
+        NAMESPACE_URI = 'https://id.parliament.uk'.freeze
+
         # Takes a Parliament::Request and calls the #get method.
         # Then maps the #value method on the resulting response.
         #
@@ -24,6 +27,31 @@ module Parliament
           response = request.get
           response.filter(*filters)
         end
+
+        # Returns the base namespace used for filtering parliamentary data within sparql queries
+        #
+        # @return [String]
+        def self.namespace_uri
+          NAMESPACE_URI
+        end
+
+        # Returns uri with specific path added for filtering parliamentary data within sparql queries
+        #
+        # @param [String] Path string to append to the base uri
+        #
+        # @return [String] uri with specific path added for filtering parliamentary data within sparql queries
+        def self.namespace_uri_path(path)
+          self.namespace_uri + path
+        end
+
+        # Returns uri with schema path and specific type added for filtering parliamentary data within sparql queries
+        #
+        # @param [String] Type string to append to the schema uri
+        #
+        # @return [String] uri with schema path and specific type added for filtering parliamentary data within sparql queries
+        def self.namespace_uri_schema_path(type)
+          self.namespace_uri_path("/schema/#{type}")
+        end
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Parliament
       module VCardHelper
         # Generates a vcard for the given contact point.
         #
-        # @param [Grom::Node] contact_point a Grom::Node with type: http://id.ukpds.org/schema/ContactPoint.
+        # @param [Grom::Node] contact_point a Grom::Node with type: https://id.parliament.uk/schema/ContactPoint.
         # @return [Vcard::Vcard] a vcard with person, postal address and contact details set.
         def create_vcard(contact_point)
           Vcard::Vcard::Maker.make2 do |maker|
@@ -19,7 +19,7 @@ module Parliament
 
         # Sets the contact details of a vcard.
         #
-        # @param [Grom::Node] contact_point a Grom::Node with type: http://id.ukpds.org/schema/ContactPoint.
+        # @param [Grom::Node] contact_point a Grom::Node with type: https://id.parliament.uk/schema/ContactPoint.
         # @param [Vcard::Vcard::Maker] maker a Vcard builder.
         # @return [Vcard::Vcard::Maker] a Vcard maker with contact details set.
         def contacts_set(contact_point, maker)
@@ -30,7 +30,7 @@ module Parliament
 
         # Sets the postal address of a vcard.
         #
-        # @param [Grom::Node] contact_point a Grom::Node with type: http://id.ukpds.org/schema/ContactPoint.
+        # @param [Grom::Node] contact_point a Grom::Node with type: https://id.parliament.uk/schema/ContactPoint.
         # @param [Vcard::Vcard::Maker] maker a Vcard builder.
         # @return [Vcard::Vcard::Maker, Boolean] a Vcard maker with postal address set or false if the contact point has no postal addresses.
         def postal_address_set(contact_point, maker)
@@ -43,7 +43,7 @@ module Parliament
 
         # Sets the person details of a vcard.
         #
-        # @param [Grom::Node] contact_point a Grom::Node with type: http://id.ukpds.org/schema/ContactPoint.
+        # @param [Grom::Node] contact_point a Grom::Node with type: https://id.parliament.uk/schema/ContactPoint.
         # @param [Object] name a Vcard::Name.
         # @return [Vcard::Vcard::Maker, Boolean] a Vcard maker with person details set or false if the contact point is not associated with a person.
         def person_set(contact_point, name)

data/lib/parliament/utils/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module Utils
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parliament-ruby
@@ -241,6 +241,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -256,6 +257,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/.DS_Store
 - config/locales/en.yml
 - config/puma.rb
 - lib/parliament/utils.rb