g5_authenticatable 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fafd0add7d0b2d50524234cedb46b4db03da7526
-  data.tar.gz: 501fce66ab149473948e5a87a1c29a013880299e
+SHA256:
+  metadata.gz: 88fd8bc7d1075d2b74f63cf58fe57f0280b2e96b04f8627c63af207e1cdb9a8c
+  data.tar.gz: a9b0ce4501c3dcbe101aa5430dc8209afe1ed60fc919a2f893cabe39deff9286
 SHA512:
-  metadata.gz: 9fd11e97ca4e4551abc0036e994b76e43c533fa65564277e5977f37bbc078aa7a132e23e5f580ae0a73456f827202401761dfdba80371a218d9cb497aafe94b8
-  data.tar.gz: 7e42afc27a541a8bf1ad88154fa3bf84b1a14caee4c1e1512f688eedf6db868428daa88b71e6f605782ca9f7a8550aca67d614d366cca713f872eeeaf9d2bc57
+  metadata.gz: c8af1bdf2cf861593ef2176c2b11d8bba5fe14b297dd1b01af91ba8645f4fb65b2a80f8796428a438a710db3dbe792c54871ec04ec784ecc9d181184aaefc949
+  data.tar.gz: 8e8ba6bceb7b22c1d20c8e91295ba4c3b8a599cd6b14f520f5cca7ff0a18c52bcbecad8a989a010f39883a4c68c397c7b93a08a4559d9ba50210b5f41c4def51

data/.ruby-version

@@ -1 +1 @@
-2.3.4
+2.5.1

data/.travis.yml

@@ -1,19 +1,21 @@
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 gemfile:
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
 matrix:
   exclude:
-    - rvm: 2.4.1
+    - rvm: 2.4.4
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.5.1
       gemfile: gemfiles/rails_4.1.gemfile
-  allow_failures:
-    - rvm: 2.4.1
 dist: trusty
 sudo: false
 cache:

data/Appraisals

@@ -1,17 +1,26 @@
 # frozen_string_literal: true
 
 appraise 'rails-4.1' do
+  gem 'pg', '< 1'
   gem 'rails', '~> 4.1.16'
 end
 
 appraise 'rails-4.2' do
+  gem 'pg', '< 1'
   gem 'rails', '~> 4.2.8'
 end
 
 appraise 'rails-5.0' do
+  gem 'pg', '< 1'
   gem 'rails', '~> 5.0.3'
 end
 
 appraise 'rails-5.1' do
+  gem 'pg', '< 1'
   gem 'rails', '~> 5.1.1'
 end
+
+appraise 'rails-5.2' do
+  gem 'pg', '~> 1.0'
+  gem 'rails', '~> 5.2.0'
+end

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.1.1 (2018-06-21)
+
+* Support rails 5.2 green field apps, including fixes for setting the default
+  secret key and removing an unnecessary jquery dependency
+  ([#55][https://github.com/G5/g5_authenticatable/pull/55])
+
 ## v1.1.0 (2017-12-08)
 
 * Added support for [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails)

data/Gemfile

@@ -10,9 +10,8 @@ gemspec
 # Gems used by the dummy application
 gem 'active_model_serializers', '<= 0.10.0' # For compatibility with ruby 2.0.0
 gem 'grape'
-gem 'jquery-rails'
 gem 'pg'
-gem 'rails', '~> 5.1.1'
+gem 'rails', '~> 5.2.0'
 
 group :test, :development do
   gem 'appraisal'

data/README.md

@@ -18,7 +18,7 @@ library in isolation.
 
 ## Current Version
 
-1.1.0
+1.1.1
 
 ## Requirements
 
@@ -26,8 +26,10 @@ library in isolation.
 
 ## Installation
 
-1. Set the environment variable `DEVISE_SECRET_KEY` to the value
-   generated by:
+1. By default, devise will use rails' `SECRET_KEY_BASE` environment variable to
+   sign sessions. If for some reason, you wish to use a different secret key
+   for devise and rails, you can override the devise secret key by setting the
+   environment variable `DEVISE_SECRET_KEY` to the value generated by:
 
    ```console
    rake secret

data/config/initializers/devise.rb

@@ -6,7 +6,8 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  config.secret_key = ENV['DEVISE_SECRET_KEY']
+  config.secret_key = ENV['DEVISE_SECRET_KEY'].presence ||
+                      ENV['SECRET_KEY_BASE'].presence
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

data/gemfiles/rails_4.1.gemfile

@@ -4,8 +4,7 @@ source "https://rubygems.org"
 
 gem "active_model_serializers", "<= 0.10.0"
 gem "grape"
-gem "jquery-rails"
-gem "pg"
+gem "pg", "< 1"
 gem "rails", "~> 4.1.16"
 
 group :test, :development do

data/gemfiles/rails_4.2.gemfile

@@ -4,8 +4,7 @@ source "https://rubygems.org"
 
 gem "active_model_serializers", "<= 0.10.0"
 gem "grape"
-gem "jquery-rails"
-gem "pg"
+gem "pg", "< 1"
 gem "rails", "~> 4.2.8"
 
 group :test, :development do

data/gemfiles/rails_5.0.gemfile

@@ -4,8 +4,7 @@ source "https://rubygems.org"
 
 gem "active_model_serializers", "<= 0.10.0"
 gem "grape"
-gem "jquery-rails"
-gem "pg"
+gem "pg", "< 1"
 gem "rails", "~> 5.0.3"
 
 group :test, :development do

data/gemfiles/rails_5.1.gemfile

@@ -4,8 +4,7 @@ source "https://rubygems.org"
 
 gem "active_model_serializers", "<= 0.10.0"
 gem "grape"
-gem "jquery-rails"
-gem "pg"
+gem "pg", "< 1"
 gem "rails", "~> 5.1.1"
 
 group :test, :development do

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,27 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "active_model_serializers", "<= 0.10.0"
+gem "grape"
+gem "pg", "~> 1.0"
+gem "rails", "~> 5.2.0"
+
+group :test, :development do
+  gem "appraisal"
+  gem "dotenv-rails"
+  gem "pry-byebug"
+  gem "rspec-rails", "~> 3.6"
+  gem "web-console", "~> 2.0"
+end
+
+group :test do
+  gem "capybara"
+  gem "codeclimate-test-reporter"
+  gem "generator_spec"
+  gem "rspec-activemodel-mocks"
+  gem "shoulda-matchers", "~> 3.1"
+  gem "simplecov", require: false
+end
+
+gemspec path: "../"

data/lib/g5_authenticatable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module G5Authenticatable
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -10,6 +10,4 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

data/spec/dummy/db/migrate/20180621044005_add_hour_sets.g5_updatable.rb

@@ -0,0 +1,45 @@
+# This migration comes from g5_updatable (originally 20170428000000)
+class AddHourSets < ActiveRecord::Migration[4.2]
+  def change
+    unless table_exists? :g5_updatable_hour_sets
+      create_table :g5_updatable_hour_sets do |t|
+        t.belongs_to :g5_updatable_location
+        t.integer  "location_id"
+        t.string   "name"
+        t.string   "hour_type"
+        t.boolean  "is_active"
+        t.string   "additional_hours_info"
+        t.timestamps
+      end
+      add_index :g5_updatable_hour_sets, :g5_updatable_location_id, name: 'index_g5_updatable_hour_sets_location_id'
+    end
+
+    unless table_exists? :g5_updatable_week_days
+      create_table :g5_updatable_week_days do |t|
+        t.belongs_to :g5_updatable_location
+        t.integer  "hour_set_id"
+        t.integer  "day_of_week"
+        t.string   "hour_description"
+        t.time     "open"
+        t.time     "close"
+        t.boolean  "twenty_four_hours", default: false
+        t.timestamps
+      end
+      add_index :g5_updatable_week_days, :g5_updatable_location_id, name: 'index_g5_updatable_business_days_location_id'
+    end
+
+    unless table_exists? :g5_updatable_special_dates
+      create_table :g5_updatable_special_dates do |t|
+        t.belongs_to :g5_updatable_location
+        t.integer "hour_set_id"
+        t.date    "date"
+        t.string  "hour_description"
+        t.time    "open"
+        t.time    "close"
+        t.boolean "is_regular_hours", default: false
+        t.timestamps
+      end
+      add_index :g5_updatable_special_dates, :g5_updatable_location_id, name: 'index_g5_updatable_special_dates_location_id'
+    end
+  end
+end

data/spec/dummy/db/migrate/20180621044006_add_display_name_to_locations.g5_updatable.rb

@@ -0,0 +1,7 @@
+# This migration comes from g5_updatable (originally 20170720000000)
+class AddDisplayNameToLocations < ActiveRecord::Migration[4.2]
+  # indexes were not made to enforce uniqueness
+  def change
+    add_column :g5_updatable_locations, :display_name, :string
+  end
+end

data/spec/dummy/db/migrate/20180621044007_add_details_to_points_of_interest.g5_updatable.rb

@@ -0,0 +1,8 @@
+# This migration comes from g5_updatable (originally 20170804184206)
+class AddDetailsToPointsOfInterest < ActiveRecord::Migration[4.2]
+  def change
+    add_column :g5_updatable_points_of_interest, :phone_number, :string unless column_exists? :g5_updatable_points_of_interest, :phone_number
+    add_column :g5_updatable_points_of_interest, :website, :string unless column_exists? :g5_updatable_points_of_interest, :website
+    add_column :g5_updatable_points_of_interest, :google_map_url, :string unless column_exists? :g5_updatable_points_of_interest, :google_map_url
+  end
+end

data/spec/dummy/db/migrate/20180621044008_change_fields_for_week_days_and_special_dates.g5_updatable.rb

@@ -0,0 +1,10 @@
+# This migration comes from g5_updatable (originally 20180213184549)
+class ChangeFieldsForWeekDaysAndSpecialDates < ActiveRecord::Migration[4.2]
+  def change
+    remove_column :g5_updatable_week_days, :hour_description, :string if column_exists? :g5_updatable_week_days, :hour_description
+    remove_column :g5_updatable_week_days, :twenty_four_hours, :boolean if column_exists? :g5_updatable_week_days, :twenty_four_hours
+    remove_column :g5_updatable_special_dates, :hour_description, :string if column_exists? :g5_updatable_special_dates, :hour_description
+    add_column :g5_updatable_week_days, :status, :string, default: 'none' unless column_exists? :g5_updatable_week_days, :status
+    add_column :g5_updatable_special_dates, :status, :string, default: 'none' unless column_exists? :g5_updatable_special_dates, :status
+  end
+end

data/spec/dummy/db/migrate/20180621044009_add_indexes_to_week_days.g5_updatable.rb

@@ -0,0 +1,8 @@
+# This migration comes from g5_updatable (originally 20180220203057)
+class AddIndexesToWeekDays < ActiveRecord::Migration[4.2]
+  def change
+    add_index :g5_updatable_week_days, :day_of_week unless index_exists? :g5_updatable_week_days, :day_of_week
+    add_index :g5_updatable_week_days, :hour_set_id unless index_exists? :g5_updatable_week_days, :hour_set_id
+    add_index :g5_updatable_special_dates, :hour_set_id unless index_exists? :g5_updatable_special_dates, :hour_set_id
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,9 +10,10 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170613201436) do
+ActiveRecord::Schema.define(version: 2018_06_21_044009) do
 
   # These are extensions that must be enabled in order to support this database
+  enable_extension "hstore"
   enable_extension "plpgsql"
 
   create_table "g5_authenticatable_roles", id: :serial, force: :cascade do |t|
@@ -64,6 +65,18 @@ ActiveRecord::Schema.define(version: 20170613201436) do
     t.index ["urn"], name: "index_g5_updatable_clients_on_urn", unique: true
   end
 
+  create_table "g5_updatable_hour_sets", id: :serial, force: :cascade do |t|
+    t.integer "g5_updatable_location_id"
+    t.integer "location_id"
+    t.string "name"
+    t.string "hour_type"
+    t.boolean "is_active"
+    t.string "additional_hours_info"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.index ["g5_updatable_location_id"], name: "index_g5_updatable_hour_sets_location_id"
+  end
+
   create_table "g5_updatable_hub_amenities", id: :serial, force: :cascade do |t|
     t.integer "external_id"
     t.string "name"
@@ -94,6 +107,7 @@ ActiveRecord::Schema.define(version: 20170613201436) do
     t.float "longitude"
     t.string "flat_amenity_names"
     t.string "client_urn"
+    t.string "display_name"
     t.index ["client_urn"], name: "index_g5_updatable_locations_on_client_urn"
     t.index ["latitude"], name: "index_g5_updatable_locations_on_latitude"
     t.index ["longitude"], name: "index_g5_updatable_locations_on_longitude"
@@ -115,9 +129,40 @@ ActiveRecord::Schema.define(version: 20170613201436) do
     t.float "longitude"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string "phone_number"
+    t.string "website"
+    t.string "google_map_url"
     t.index ["g5_updatable_location_id"], name: "index_g5_updatable_poi_location_id"
   end
 
+  create_table "g5_updatable_special_dates", id: :serial, force: :cascade do |t|
+    t.integer "g5_updatable_location_id"
+    t.integer "hour_set_id"
+    t.date "date"
+    t.time "open"
+    t.time "close"
+    t.boolean "is_regular_hours", default: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string "status", default: "none"
+    t.index ["g5_updatable_location_id"], name: "index_g5_updatable_special_dates_location_id"
+    t.index ["hour_set_id"], name: "index_g5_updatable_special_dates_on_hour_set_id"
+  end
+
+  create_table "g5_updatable_week_days", id: :serial, force: :cascade do |t|
+    t.integer "g5_updatable_location_id"
+    t.integer "hour_set_id"
+    t.integer "day_of_week"
+    t.time "open"
+    t.time "close"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string "status", default: "none"
+    t.index ["day_of_week"], name: "index_g5_updatable_week_days_on_day_of_week"
+    t.index ["g5_updatable_location_id"], name: "index_g5_updatable_business_days_location_id"
+    t.index ["hour_set_id"], name: "index_g5_updatable_week_days_on_hour_set_id"
+  end
+
   create_table "posts", id: :serial, force: :cascade do |t|
     t.integer "author_id"
     t.string "content"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - maeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_g5_authenticatable
@@ -127,9 +127,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/images/g5_authenticatable/.gitkeep
-- app/assets/javascripts/g5_authenticatable/application.js
-- app/assets/stylesheets/g5_authenticatable/application.css
 - app/controllers/concerns/g5_authenticatable/authorization.rb
 - app/controllers/g5_authenticatable/application_controller.rb
 - app/controllers/g5_authenticatable/error_controller.rb
@@ -155,6 +152,7 @@ files:
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
 - lib/g5_authenticatable.rb
 - lib/g5_authenticatable/engine.rb
 - lib/g5_authenticatable/rspec.rb
@@ -245,6 +243,11 @@ files:
 - spec/dummy/db/migrate/20170613201434_add_client_urn_to_locations.g5_updatable.rb
 - spec/dummy/db/migrate/20170613201435_add_points_of_interest.g5_updatable.rb
 - spec/dummy/db/migrate/20170613201436_add_unique_urn_indexes.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044005_add_hour_sets.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044006_add_display_name_to_locations.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044007_add_details_to_points_of_interest.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044008_change_fields_for_week_days_and_special_dates.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044009_add_indexes_to_week_days.g5_updatable.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
@@ -305,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An authentication engine for G5 applications.
@@ -376,6 +379,11 @@ test_files:
 - spec/dummy/db/migrate/20170613201434_add_client_urn_to_locations.g5_updatable.rb
 - spec/dummy/db/migrate/20170613201435_add_points_of_interest.g5_updatable.rb
 - spec/dummy/db/migrate/20170613201436_add_unique_urn_indexes.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044005_add_hour_sets.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044006_add_display_name_to_locations.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044007_add_details_to_points_of_interest.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044008_change_fields_for_week_days_and_special_dates.g5_updatable.rb
+- spec/dummy/db/migrate/20180621044009_add_indexes_to_week_days.g5_updatable.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep

data/app/assets/javascripts/g5_authenticatable/application.js

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

data/app/assets/stylesheets/g5_authenticatable/application.css

@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */