pugin 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a131a610b391cf0318d30878f84519ee02c6c7ee
-  data.tar.gz: cc47f2e8f9304a5b117652e8040f28f142b37ad3
+  metadata.gz: a4003605171e28623ed5871a47b138d3d0ddbfbe
+  data.tar.gz: 95f814695e3e164f29453af7379742739d582ac4
 SHA512:
-  metadata.gz: 0b96572f136176a7c1fcb10224710090e2b26ab43eb343685d9baba67799e9bc4920b8cc14cb59e5330f853f400760321078748bc34c41dfd1f4eca66646023b
-  data.tar.gz: 9844ae13b44f52b3d2f9c10ff18e3101eb4c91bdd0e7effe995015426ea9cc5e1a9a80de878b60c0e30a4e7c85f72c52075fe48b7b91c6da8279188dded8a6dc
+  metadata.gz: 02f32b8fdd83990f9eac4390791ca1af75a2cb8fa5103b4a5d04ed84f1691da6a89f4f53b89e7678ef325951cc19c9825ac1b457cfb69add4a8ba12988e3e013
+  data.tar.gz: 307e139d4dbeec6103c7cbaf0969309af12649a653bdbe90812de4e3f4cdc1679a9bb1f84c7ecaf59b59a7db2fba4b9e3b8679f5ade33a398a8917b3bd7d690d

data/config/locales/en.yml

@@ -1,9 +1,17 @@
 en:
   #global people translations
   house_of_lords: 'House of Lords'
+  date:
+    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
   time:
     formats:
       year_only: "%Y"
+      default: '%-d %b %Y'
   pugin:
     hints:
       beta: 'beta'

data/lib/pugin.rb

@@ -1,7 +1,7 @@
 require 'pugin/version'
 
 module Pugin
-  ASSET_VERSION = '1.9.1'.freeze
+  ASSET_VERSION = '1.9.0'.freeze
   ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.pugin-website')
   STATIC_ASSET_LOCATION_URL = ENV.fetch('STATIC_ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.static-assets')
   STATIC_ASSET_PUBLIC_LOCATION_URL = ENV.fetch('STATIC_ASSET_PUBLIC_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.static-assets-public')

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.8.2'.freeze
 end

data/spec/views/pugin/people/list/member/_member.html.haml_spec.rb

@@ -82,8 +82,8 @@ describe 'pugin/people/list/member/_member.html.haml', type: :view do
       allow(parliament_mp_constituency).to receive(:name).and_return('constituency1')
 
       allow(parliament_mp_seat_incumbency).to receive(:current?).and_return(false)
-      allow(parliament_mp_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2017,2,3,4,5,6))
-      allow(parliament_mp_seat_incumbency).to receive(:end_date).and_return(DateTime.new(2017,2,3,4,5,6))
+      allow(parliament_mp_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2017,2,3,4,0,0))
+      allow(parliament_mp_seat_incumbency).to receive(:end_date).and_return(DateTime.new(2018,3,16,3,0,0))
       allow(parliament_mp_seat_incumbency).to receive(:constituency).and_return(parliament_mp_constituency)
 
       allow(parliament_mp_party).to receive(:name).and_return('Green Party')
@@ -103,10 +103,27 @@ describe 'pugin/people/list/member/_member.html.haml', type: :view do
       render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
       expect(response).to include("<a href='/people/123'>parliamentmp1</a>")
       expect(response).to include("<p>
-constituency1 from Fri, 03 Feb 2017 04:05:06 +0000
-- Fri, 03 Feb 2017 04:05:06 +0000
+constituency1 from 3 Feb 2017
+- 16 Mar 2018
 </p>")
       expect(response).to include("<p>Green Party</p>")
     end
+
+    context 'current' do
+      before :each do
+        allow(@people.first.current_seat_incumbency).to receive(:end_date).and_return(nil)
+      end
+
+      it "renders the parliament MP data" do
+        render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
+        expect(response).to include("<a href='/people/123'>parliamentmp1</a>")
+        expect(response).to include("<p>
+constituency1 from 3 Feb 2017
+to present
+</p>")
+        expect(response).to include("<p>Green Party</p>")
+      end
+
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails