parliament-grom-decorators 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2284725eedcbe141757e23efef3d93bdc7b57a
-  data.tar.gz: 890e53b09b2ec33cf9e46ff140883fb119430bf1
+  metadata.gz: c1f63912e3e943808a3c19b71aaf4d91e4779392
+  data.tar.gz: 23e7cab82e27341e5cc054d0afacf314caa4c4bf
 SHA512:
-  metadata.gz: 47318c2cda6ef0d1cb72a7738300d45156aeb77e9d55cb945b157464bdf1b9a3ee5bbc7f1824325dbc22293a3f5ac3e0394482bdf4ffdb5e4012ef6781a6fb4a
-  data.tar.gz: cb0e84d27ae3b1ee9d7eb6f19ed4ca65c5ec2ea7783ec78a519a1dd811fade37480ff4f229af102d1cc9e3d102ab13f456f0f1fd9b2dde057ce114d4dafac3b3
+  metadata.gz: 2b007328ad5f76db1d2ac219f527c1ab00986841d92a9f092b8e74898209889eb57bd8085087400d97a036bf1cdd90928409c912bed25de258836d40c450d4ad
+  data.tar.gz: af910edb99fced421aa1953972010fca15fc63df8f9e5413f8250abc77a83d20f5daad9e4997d636001ee3295f2be4fb58e04ef48ee62c8dfbf89b4e45de5370

data/config/locales/en.yml

@@ -20,6 +20,8 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
+  to_present: 'to present'
+  to: 'to'
   person:
     current:
       mp: 'Current MP'

data/lib/parliament/grom/decorator.rb

@@ -1,4 +1,5 @@
 require 'parliament/grom/decorator/version'
+require 'parliament/grom/decorator/helpers'
 require 'parliament/grom/decorator/constituency_area'
 require 'parliament/grom/decorator/constituency_group'
 require 'parliament/grom/decorator/contact_point'
@@ -13,6 +14,7 @@ require 'parliament/grom/decorator/party_membership'
 require 'parliament/grom/decorator/person'
 require 'parliament/grom/decorator/postal_address'
 require 'parliament/grom/decorator/seat_incumbency'
+require 'parliament/grom/decorator/parliaments'
 
 # Namespace for classes and modules that handle connections to, and processing of data from the parliamentary API.
 # @since 0.1.0

data/lib/parliament/grom/decorator/constituency_group.rb

@@ -5,6 +5,8 @@ module Parliament
       #
       # attr [Boolean] correct verifies that the Grom::Node is the expected constituency.  This is used in conjunction with postcode lookup to verify if the Grom::Node is the expected constituency.
       module ConstituencyGroup
+        include Helpers::DateHelper
+
         attr_accessor :correct
         # Alias constituencyGroupName with fallback.
         #
@@ -123,9 +125,9 @@ module Parliament
           else
             @party_name = nil
           end
-            @party_name
-        end
 
+          @party_name
+        end
       end
     end
   end

data/lib/parliament/grom/decorator/helpers.rb

@@ -0,0 +1,10 @@
+require 'parliament/grom/decorator/helpers/date_helper'
+module Parliament
+  module Grom
+    module Decorator
+      # Namespace for helper modules
+      module Helpers
+      end
+    end
+  end
+end

data/lib/parliament/grom/decorator/helpers/date_helper.rb

@@ -0,0 +1,23 @@
+module Parliament
+  module Grom
+    module Decorator
+      module Helpers
+        # Namespace for date helper methods
+        module DateHelper
+          # Format start_date and end_date into a readable string
+          # @param [String] date_format a string that represents the format we want to use for the date
+          # @example Format a node with an end_date with the date format YYYY-MM-DD
+          #   "grom_node_instance.date_range('%Y-%m-%d)" #=> "2010-01-01 to 2015-01-01"
+          def date_range(date_format: '%-e %b %Y')
+            return '[Date unavailable]' if start_date.nil?
+            if end_date
+              "#{I18n.l(start_date, format: date_format)} #{I18n.t('to')} #{I18n.l(end_date, format: date_format)}"
+            else
+              "#{I18n.l(start_date, format: date_format)} #{I18n.t('to_present')}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/parliament/grom/decorator/house_incumbency.rb

@@ -3,6 +3,8 @@ module Parliament
     module Decorator
       # Decorator namespace for Grom::Node instances with type: http://id.ukpds.org/schema/HouseIncumbency
       module HouseIncumbency
+        include Helpers::DateHelper
+
         # Alias incumbencyStartDate with fallback.
         #
         # @return [DateTime, nil] the start date of the Grom::Node or nil.

data/lib/parliament/grom/decorator/incumbency.rb

@@ -3,6 +3,8 @@ module Parliament
     module Decorator
       # Decorator namespace for Grom::Node instances with type: http://id.ukpds.org/schema/Incumbency
       module Incumbency
+        include Helpers::DateHelper
+
         # Alias incumbencyStartDate with fallback.
         #
         # @return [DateTime, nil] the start date of the Grom::Node or nil.

data/lib/parliament/grom/decorator/parliaments.rb

@@ -0,0 +1,45 @@
+module Parliament
+  module Grom
+    module Decorator
+      # Decorator namespace for Grom::Node instances with type: http://id.ukpds.org/schema/Parliaments
+      module ParliamentPeriod
+        include Helpers::DateHelper
+
+        # Alias parliamentPeriodStartDate with fallback.
+        #
+        # @return [DateTime, nil] the start date of the Grom::Node or nil.
+        def start_date
+          @start_date ||= respond_to?(:parliamentPeriodStartDate) ? DateTime.parse(parliamentPeriodStartDate) : nil
+        end
+
+        # Alias parliamentPeriodEndDate with fallback.
+        #
+        # @return [DateTime, nil] the end date of the Grom::Node or nil.
+        def end_date
+          @end_date ||= respond_to?(:parliamentPeriodEndDate) ? DateTime.parse(parliamentPeriodEndDate) : nil
+        end
+
+        # Alias parliamentPeriodNumber with fallback.
+        #
+        # @return [Integer, nil] the incremented number of the parliament
+        def number
+          @number ||= respond_to?(:parliamentPeriodNumber) ? parliamentPeriodNumber.to_i : nil
+        end
+
+        # Checks whether ParliamentPeriod has a next Parliament
+        #
+        # @return [true, false]
+        def next_parliament?
+          respond_to?(:parliamentPeriodHasImmediatelyFollowingParliamentPeriod)
+        end
+
+        # Checks whether ParliamentPeriod has a previous Parliament
+        #
+        # @return [true, false]
+        def previous_parliament?
+          respond_to?(:parliamentPeriodHasImmediatelyPreviousParliamentPeriod)
+        end
+      end
+    end
+  end
+end

data/lib/parliament/grom/decorator/party_membership.rb

@@ -3,6 +3,8 @@ module Parliament
     module Decorator
       # Decorator namespace for Grom::Node instances with type: http://id.ukpds.org/schema/PartyMembership
       module PartyMembership
+        include Helpers::DateHelper
+
         # Alias partyMembershipHasParty with fallback.
         #
         # @return [Grom::Node, nil] the party of the Grom::Node or nil.

data/lib/parliament/grom/decorator/person.rb

@@ -4,6 +4,8 @@ module Parliament
       # Decorator namespace for Grom::Node instances with type: http://id.ukpds.org/schema/Person.
       # rubocop:disable ModuleLength
       module Person
+        include Helpers::DateHelper
+
         # Alias personGivenName with fallback.
         #
         # @return [String, String] the given name of the Grom::Node or an empty string.

data/lib/parliament/grom/decorator/seat_incumbency.rb

@@ -3,6 +3,7 @@ module Parliament
     module Decorator
       # Decorator namespace for Grom::Node instances with type: http://id.ukpds.org/schema/SeatIncumbency
       module SeatIncumbency
+        include Helpers::DateHelper
         # Alias incumbencyStartDate with fallback.
         #
         # @return [DateTime, nil] the start date of the Grom::Node or nil.

data/lib/parliament/grom/decorator/version.rb

@@ -1,7 +1,7 @@
 module Parliament
   module Grom
     module Decorator
-      VERSION = '0.1.6'.freeze
+      VERSION = '0.1.7'.freeze
     end
   end
 end

data/parliament-grom-decorators.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~> 2.3'
   spec.add_development_dependency 'parliament-ruby'
   spec.add_development_dependency 'parliament-ntriple', '~> 0.1'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-grom-decorators
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Parliamentary Grom decorator
 email:
 - rklappleyard@gmail.com
@@ -162,10 +176,13 @@ files:
 - lib/parliament/grom/decorator/contact_point.rb
 - lib/parliament/grom/decorator/gender.rb
 - lib/parliament/grom/decorator/gender_identity.rb
+- lib/parliament/grom/decorator/helpers.rb
+- lib/parliament/grom/decorator/helpers/date_helper.rb
 - lib/parliament/grom/decorator/house.rb
 - lib/parliament/grom/decorator/house_incumbency.rb
 - lib/parliament/grom/decorator/house_seat.rb
 - lib/parliament/grom/decorator/incumbency.rb
+- lib/parliament/grom/decorator/parliaments.rb
 - lib/parliament/grom/decorator/party.rb
 - lib/parliament/grom/decorator/party_membership.rb
 - lib/parliament/grom/decorator/person.rb
@@ -192,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Parliamentary Grom decorator