ama_layout 11.3.1 → 11.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5ac426292bd5100574e426a59712fa6f7e87534bc049acf6590f59c61e614f7
-  data.tar.gz: 60ff7bbb05a639533779504c215e286765f223004f5564ed471a69dae925220c
+  metadata.gz: bdce42e1e72479fb3eaf186229427db6769f7b589851cb6e9b4ba3300242a919
+  data.tar.gz: 39938fcb52b8df2c49a5a6fafa59a5c6776574869a2def36f73c71471cbf890c
 SHA512:
-  metadata.gz: 2fae70965ee80a20ced0f3b970bd5604c12818335e3a5d6fcbdc58139bc6416e083e1df459f17c471a85895e461de7e7a5cda5aab358b2d22bf51c587a917eb2
-  data.tar.gz: 7824c33da279647a06e4e084df8c9f3990e14bf82411d8591c9720253be780347749843f1a79de9c04b8205ff0a69c42a425f8014c35cfd44bd1e01f8a886353
+  metadata.gz: 0ac9377df0287eec02b6b475083e6930d73d6ac711ddac7304a1a820b25a9654d9a31e66e5312c743c39d11e57fa1dd0dcb53b160272fdcf821ccc27584ea188
+  data.tar.gz: 005cf0cee9e64b64159b08f0dc6c30e21258ae2a5ecbce31493311e7bc577a95f7de4dff0f955f8dc14a3862666f791e0a23c643abb8a493db59149a70e5eef2

data/.github/workflows/ci.yml

@@ -21,13 +21,12 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: '10.13.0'
-    - name: Set up Ruby 2.5
+    - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.5.1'
-        bundler: '1.17.3'
+        ruby-version: 2.7
     - name: Install Bundler
-      run: gem install bundler -v '~> 1.17.3'
+      run: gem install bundler
     - name: Install Danger
       run: gem install danger -v 7.0.1
     - name: Execute Danger
@@ -38,8 +37,8 @@ jobs:
       run: sudo apt-get install libsqlite3-dev
     - name: Install Ruby Dependencies
       run: |
-        bundle _1.17.3_ --version
-        bundle _1.17.3_ config set path 'vendor/bundle'
-        bundle _1.17.3_ install --jobs 4 --retry 3
+        bundle --version
+        bundle config set path 'vendor/bundle'
+        bundle install --jobs 4 --retry 3
     - name: Run Tests
-      run: bundle _1.17.3_ exec rake
+      run: bundle exec rake

data/ama_layout.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'breadcrumbs_on_rails', '>= 3'
   spec.add_dependency 'browser', '~> 2.0'
   spec.add_dependency 'foundation-rails', '<= 6.4.3.0'
-  spec.add_dependency 'rails', '>= 4.2'
+  spec.add_dependency 'rails', '>= 4.2', '< 6.1'
   spec.add_dependency 'redis-rails'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'combustion'

data/app/assets/javascripts/ama_layout/mailcheck/email_suggestion.coffee

@@ -49,6 +49,7 @@ class AMALayout.EmailSuggestion
 
   setupEvents: ->
     $('[type="email"]').on 'blur', (e) =>
+      return if $(e.originalEvent.target).data('skip-email-suggestion')
       $(e.originalEvent.target).mailcheck
         domains: @domains
         secondLevelDomains: @secondLevelDomains

data/lib/ama_layout/notification_set.rb

@@ -48,7 +48,8 @@ module AmaLayout
     end
 
     def destroy!
-      data_store.delete(key) && reload!
+      data_store.delete(key)
+      reload!
     end
 
     def delete(*digests)

data/lib/ama_layout/notifications/redis_store.rb

@@ -21,11 +21,11 @@ module AmaLayout
       end
 
       def set(key, value, opts = {})
-        base.write(key, value, opts) == 'OK'
+        base.write(key, value, opts)
       end
 
       def delete(key, opts = {})
-        base.delete(key, opts) == 1
+        base.delete(key, opts)
       end
 
       def transaction

data/lib/ama_layout/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AmaLayout
-  VERSION = '11.3.1'
+  VERSION = '11.4.0'
 end

data/spec/ama_layout/notification_set_spec.rb

@@ -207,12 +207,6 @@ describe AmaLayout::NotificationSet do
         expect(subject.destroy!).to be_empty
       end
     end
-
-    context 'when data is not removed' do
-      it 'returns false' do
-        expect(subject.destroy!).to be false
-      end
-    end
   end
 
   describe '#find' do

data/spec/ama_layout/notifications/redis_store_spec.rb

@@ -43,10 +43,6 @@ describe AmaLayout::Notifications::RedisStore do
       subject.set('test', 'value')
       expect(subject.get('test')).to eq('value')
     end
-
-    it 'returns true' do
-      expect(subject.set('test', 'value')).to be true
-    end
   end
 
   describe '#delete' do
@@ -55,21 +51,11 @@ describe AmaLayout::Notifications::RedisStore do
         subject.set('key', 'value')
       end
 
-      it 'returns true' do
-        expect(subject.delete('key')).to be true
-      end
-
       it 'deletes the key' do
         subject.delete('key')
         expect(subject.get('key')).to be nil
       end
     end
-
-    context 'when a value is not deleted' do
-      it 'returns false' do
-        expect(subject.delete('key')).to be false
-      end
-    end
   end
 
   describe '#transaction' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 11.3.1
+  version: 11.4.0
 platform: ruby
 authors:
 - Darko Dosenovic
@@ -10,10 +10,10 @@ authors:
 - Michael van den Beuken
 - Sinead Errity
 - Zoie Carnegie
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
@@ -64,6 +64,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,6 +74,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: redis-rails
   requirement: !ruby/object:Gem::Requirement
@@ -390,7 +396,7 @@ homepage: https://github.com/amaabca/ama_layout
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -405,8 +411,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: ".ama.ab.ca site layouts"
 test_files: