pugin 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3a03b412087016f6fca7de2afe5b450467ef342
-  data.tar.gz: 4c3a1c9bda8ecf21c8c00b1441e739accd6af551
+  metadata.gz: 75bfa228f4488a7a594d28eca533641de29643b4
+  data.tar.gz: 031754c0df8efcc3008738ca7ea19e46659c7bf3
 SHA512:
-  metadata.gz: 35ed9ab74b4cab2d647b83fddfc69e04b80277dce33e9ba3424f933471af9affb98dd3187250ccb60b50fe243f15e37483eab2d57685c20f2bc0a11b960e7a90
-  data.tar.gz: 7d771e1399dff71fe102a42f630149299cbf6a23c2394838a360fab444ec3a34e53a0bfc93576c3f11a1578da5c89240f6defd45ad3e6c109ab4e094b953516c
+  metadata.gz: 5035d7e9ab9e4f5e72e55253b9c1aa351ee799eba756c5e4cc6ee72ba61e8e7cdc39eb975a8a8b2ac1488d9da96ef0830aa5e5513cc4a476b1982498b2348aea
+  data.tar.gz: 2f126d54328bbb93d0979a8c75cd03426fba608a6b21799d1169b76c8b7ef5404f1141f72a3c41380443a10e9c4d57b42501e839c9a9276668f19d3bf8615641

data/app/views/pugin/components/_letter-navigation.haml

@@ -5,7 +5,8 @@
   %ul.navigation
     - ('a'..'z').each do |letter|
       %li{ data: { letter: letter }, class: ('active' if (params[:letter] == letter)) }
-        - if @letters.include?(letter.upcase)
+        - unless letter == params[:letter]
           = navigation_link(route_symbol: route_symbol, letter: letter, primary_id: local_assigns.fetch(:primary_id, nil), secondary_id: local_assigns.fetch(:secondary_id, nil))
         - else
           = letter
+

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/lib/pugin.rb

@@ -14,6 +14,13 @@ module Pugin
   		elsif sprockets?
   			register_sprockets
 			end
+
+			# Try and load HAML, raising an error if we are not able to
+			begin
+				require 'haml'
+			rescue LoadError => e
+				raise(LoadError, "pugin requires the 'haml' gem. Please check it is in your Gemfile - #{e.message}")
+			end
 		end
 
 		# Paths

data/spec/dummy/config/application.rb

@@ -11,6 +11,9 @@ require "action_cable/engine"
 require "sprockets/railtie"
 
 Bundler.require(*Rails.groups)
+
+require "haml"
+
 require "pugin"
 
 module Dummy

data/spec/dummy/config/initializers/new_framework_defaults.rb

@@ -18,7 +18,7 @@ ActiveSupport.to_time_preserves_timezone = true
 Rails.application.config.active_record.belongs_to_required_by_default = true
 
 # Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = false
+# ActiveSupport.halt_callback_chains_on_return_false = false
 
 # Configure SSL options to enable HSTS with subdomains. Previous versions had false.
 Rails.application.config.ssl_options = { hsts: { subdomains: true } }

data/spec/views/pugin/cards/_person-list.html.haml_spec.rb

@@ -79,7 +79,7 @@ DATA
       expect(response).to eq(<<DATA
 <ol class='list'>
 <li class='list__item'>
-<p>Sorry there are no results for 'A'</p>
+<p>Sorry there are no results for &#39;A&#39;</p>
 </li>
 </ol>
 DATA

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: Pugin is a component-based pattern design library that holds all of the
   reusable partials, styles and scripts for elements of UK Parliament microservices.
 email: