parliament-utils 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2504e7de24d05b087cf9ea9bf3cde72ec598da85
-  data.tar.gz: 627a166006535486f8df00678e78b119a6bc5f37
+  metadata.gz: 0cb432daa9677919ecd34cd9775baa536dff7e18
+  data.tar.gz: d34c734e9ec1af9840100f1abac03d55b5a54fcd
 SHA512:
-  metadata.gz: a601b2ed3fc5e6dbba9850883dc3d7e92db360fd29084da22140151d5663da7b20bafb6215c6acbb42534cc94b6c558f8e0ad6a5601afa670e97432990e38b1d
-  data.tar.gz: f55cb7ff4855549cd59eaeba9f810f2babc547677cba9d8fc5ecc0588e2308472aff3ac356e8e05f54b6cb988e08d1447c8ac8f8288d7638c9438b61359b52e5
+  metadata.gz: c441f4bca5f06c89e9a79cf47cda7f08860fd15386637a637a5a8231d1827d825edcdef9562ef1c2dba6aab5a3d9415c89dcc04b88a49e5f7a10b9187cd40e05
+  data.tar.gz: 4843f4ba860cd812f84eafa6a71dc9099598b727bd5b112014c83fa415209f70383885acaeab299e3af605b6e77b49c3a4f656c7e1bdf0f2f7315555aa9d898d

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

@@ -14,6 +14,7 @@ module Parliament
         # If they are, transparently redirect them with a '302: Found' status code
         def data_check
           # Check format to see if it is available from the data API
+          # We DO NOT offer data formats for constituency maps
           return if !Parliament::Utils::Helpers::FormatHelper::DATA_FORMATS.include?(request.formats.first) || (params[:controller] == 'constituencies' && params[:action] == 'map')
 
           # Find the current controller/action's API url
@@ -23,13 +24,13 @@ module Parliament
           raise StandardError, 'Data URL does not exist' if @data_url.nil?
 
           response.headers['Accept'] = request.formats.first
-          # Store format_type if format in url is json or xml
-          request.path_parameters[:format] == 'json' || request.path_parameters[:format] == 'xml' ? format_type = request.path_parameters[:format] : format_type = nil
+          # Get the file extension for a given type
+          format_type = Parliament::Utils::Helpers::FormatHelper::DATA_FORMATS[request.formats.first]
+
           # Set redirect_url as URI object
           redirect_url = URI(@data_url.call(params).query_url)
-          # add format_type to path if format in url is json or xml
-          redirect_url.path = redirect_url.path + '.' + format_type if format_type
-          redirect_to(redirect_url.to_s) && return
+          redirect_url.path += ".#{format_type}"
+          return redirect_to(redirect_url.to_s)
         end
 
         # Get the data URL for our current controller and action OR raise a StandardError
@@ -55,7 +56,12 @@ module Parliament
           alternates = []
 
           Parliament::Utils::Helpers::FormatHelper::DATA_FORMATS.each do |format|
-            alternates << { type: format, href: url }
+            uri =  URI.parse(url)
+
+            uri_form = URI.decode_www_form(String(uri.query)) << ['format',format]
+
+            uri.query = URI.encode_www_form(uri_form)
+            alternates << { type: format, href: uri.to_s }
           end
 
           Pugin.alternates = alternates

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

@@ -2,16 +2,21 @@ module Parliament
   module Utils
     module Helpers
       module FormatHelper
-        DATA_FORMATS = ['text/csv',
-          'text/vnd.graphviz',
-          'text/n3',
-          'application/json',
-          'application/n-triples',
-          'application/rdf+xml',
-          'application/rdf+json',
-          'application/xml',
-          'text/tab-separated-values',
-          'text/turtle'].freeze
+        DATA_FORMATS = %w(
+            application/n-triples
+            text/turtle
+            text/n3
+            application/n-quads
+            application/x-trig
+            application/trix
+            application/sparql-results+xml
+            application/sparql-results+json
+            application/rdf+xml
+            application/json
+            text/csv
+            text/tab-separated-values
+            text/vnd.graphviz
+        ).freeze
         end
       end
     end

data/lib/parliament/utils/test_helpers.rb

@@ -1,7 +1,7 @@
 require_relative './test_helpers/rails_helper' if defined?(::Rails)
 require_relative './test_helpers/rspec_helper'
 require_relative './test_helpers/simplecov_helper'
-require_relative './test_helpers/vcr_helper' if defined?(::VCR) || ENV['RUN_VCR_IN_GEM']
+require_relative './test_helpers/vcr_helper'
 require_relative './test_helpers/webmock_helper'
 require_relative './test_helpers/bandiera_helper'
 
@@ -11,7 +11,7 @@ module Parliament
       include Parliament::Utils::TestHelpers::RailsHelper if defined?(::Rails)
       include Parliament::Utils::TestHelpers::RSpecHelper
       include Parliament::Utils::TestHelpers::SimpleCovHelper
-      include Parliament::Utils::TestHelpers::VCRHelper if defined?(::VCR) || ENV['RUN_VCR_IN_GEM']
+      include Parliament::Utils::TestHelpers::VCRHelper
       include Parliament::Utils::TestHelpers::WebmockHelper
       include Parliament::Utils::TestHelpers::BandieraHelper
     end

data/lib/parliament/utils/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module Utils
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.3.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Rebecca Appleyard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parliament-ruby