trusty-multi-site-extension 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877d368dd287154bc9f2e2e515a6534f8cae8d7c
-  data.tar.gz: dde29d83b5a15dccd6796f87427e91e4b9205643
+  metadata.gz: 46a5a17c76089b31f9d1ad5446ba5da154a3a22e
+  data.tar.gz: 71d96399fde64f163cf874750c8e095ddf6ef8ab
 SHA512:
-  metadata.gz: 9a1f4ad2da09fb226b5f8f7b59f7aea57129212564de962e495087d8cf2623363a0054876c482194b8df195da5e7035424359299ce593a8f45f3c56bac0a58fe
-  data.tar.gz: 8f1ac3e4a540e0d14b6c360190b928d919fad668f0029c4d33b853bdec1919831aec80d64a60d119a5d74cb322530901328cd99485c53a2add6f1af3980e016e
+  metadata.gz: 62b9ecff2f7ffc97c43abdeaf6bf35e76db5ac3b56bcdb236f11d803170b3e1d14c4b274ca7a046dfd25965eedea8ee9a38e8ac9569e3397f2ed83dc74e684ea
+  data.tar.gz: f1447146de857ec3a44c4fe91ef3d6ad68d1fa9357ce5513a650544ceac7c6576b17785e21f282b6613d3dfa25b981fc612ac1274e01cb1f9432ab89dac72688

data/Gemfile

@@ -12,15 +12,12 @@ gem 'trustygems', '~> 0.2.0'
 gemspec
 
 group :development, :test do
-  gem 'thin',             '~> 1.6.2'
   gem 'pry',              '~> 0.10.0'
   gem 'capybara',         '~> 2.14.0'
   gem 'rspec-rails'
   gem 'launchy',          '~> 2.4.2'
   gem 'database_cleaner', '~> 1.3.0'
   gem 'poltergeist',      '~> 1.5.1'
-  gem 'factory_girl_rails', '~> 4.5.0'
-  gem 'rails-observers', :git => 'https://github.com/rails/rails-observers'
-  gem 'protected_attributes_continued'
+  gem 'factory_girl_rails'
   gem "pry-byebug"
 end

data/Gemfile.lock

@@ -1,56 +1,49 @@
-GIT
-  remote: https://github.com/rails/rails-observers
-  revision: 7d3c9c331242d58ed8ebdbd2eff1f7d6f68a1b2c
-  specs:
-    rails-observers (0.1.3.alpha)
-      activemodel (>= 4.0, < 5.1)
-
 PATH
   remote: .
   specs:
-    trusty-multi-site-extension (3.0.2)
+    trusty-multi-site-extension (3.1.0)
       acts_as_list (= 0.9.5)
       rake (< 11.0)
-      trusty-cms (~> 3.0.0)
-      trusty-snippets-extension (~> 3.0.0)
+      trusty-cms (~> 3.1.0)
+      trusty-snippets-extension (~> 3.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.1.3)
+      actionpack (= 5.1.3)
+      nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actionmailer (5.1.3)
+      actionpack (= 5.1.3)
+      actionview (= 5.1.3)
+      activejob (= 5.1.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.1.3)
+      actionview (= 5.1.3)
+      activesupport (= 5.1.3)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.1.3)
+      activesupport (= 5.1.3)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+    activejob (5.1.3)
+      activesupport (= 5.1.3)
       globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
-      arel (~> 7.0)
-    activesupport (5.0.2)
+    activemodel (5.1.3)
+      activesupport (= 5.1.3)
+    activerecord (5.1.3)
+      activemodel (= 5.1.3)
+      activesupport (= 5.1.3)
+      arel (~> 8.0)
+    activesupport (5.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -61,10 +54,10 @@ GEM
       activerecord (>= 3.0.0)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
+    arel (8.0.0)
     builder (3.2.3)
     byebug (9.0.6)
-    capybara (2.14.0)
+    capybara (2.14.4)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -99,18 +92,17 @@ GEM
     concurrent-ruby (1.0.5)
     css_parser (1.5.0)
       addressable
-    daemons (1.2.4)
     database_cleaner (1.3.0)
     delocalize (0.4.0)
       rails (>= 3.0)
     diff-lcs (1.3)
+    erubi (1.6.1)
     erubis (2.7.0)
-    eventmachine (1.2.3)
     execjs (2.7.0)
-    factory_girl (4.5.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.5.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
     ffi (1.9.18)
     globalid (0.4.0)
@@ -130,7 +122,7 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (0.8.1)
+    i18n (0.8.6)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -146,21 +138,19 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
     multi_json (1.12.1)
     mysql2 (0.4.8)
     nio4r (2.1.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     orm_adapter (0.5.0)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    protected_attributes_continued (1.3.0)
-      activemodel (~> 5.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -169,32 +159,32 @@ GEM
       byebug (~> 9.0)
       pry (~> 0.10)
     public_suffix (2.0.5)
-    rack (2.0.2)
+    rack (2.0.3)
     rack-cache (1.7.0)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     radius (0.7.4)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+    rails (5.1.3)
+      actioncable (= 5.1.3)
+      actionmailer (= 5.1.3)
+      actionpack (= 5.1.3)
+      actionview (= 5.1.3)
+      activejob (= 5.1.3)
+      activemodel (= 5.1.3)
+      activerecord (= 5.1.3)
+      activesupport (= 5.1.3)
+      bundler (>= 1.3.0)
+      railties (= 5.1.3)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    railties (5.1.3)
+      actionpack (= 5.1.3)
+      activesupport (= 5.1.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -250,14 +240,10 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thin (1.6.2)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    trusty-cms (3.0.9)
+    trusty-cms (3.1.0)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.6.1)
       bundler (~> 1.7)
@@ -273,7 +259,7 @@ GEM
       rack (~> 2.0.1)
       rack-cache (~> 1.7)
       radius (~> 0.7)
-      rails (~> 5.0.1)
+      rails (~> 5.1)
       rake (< 11.0)
       rdoc (~> 5.1)
       roadie-rails (~> 1.2.1)
@@ -283,9 +269,9 @@ GEM
       tzinfo (~> 1.2.3)
       uglifier (~> 3.2)
       will_paginate (~> 3.0)
-    trusty-snippets-extension (3.0.0)
+    trusty-snippets-extension (3.1.0)
       rake (< 11.0)
-      trusty-cms (~> 3.0.0)
+      trusty-cms (~> 3.1.0)
     trustygems (0.2.1)
       rake
     tzinfo (1.2.3)
@@ -296,7 +282,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     will_paginate (3.1.6)
-    xpath (2.0.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -305,15 +291,12 @@ PLATFORMS
 DEPENDENCIES
   capybara (~> 2.14.0)
   database_cleaner (~> 1.3.0)
-  factory_girl_rails (~> 4.5.0)
+  factory_girl_rails
   launchy (~> 2.4.2)
   poltergeist (~> 1.5.1)
-  protected_attributes_continued
   pry (~> 0.10.0)
   pry-byebug
-  rails-observers!
   rspec-rails
-  thin (~> 1.6.2)
   trusty-multi-site-extension!
   trustygems (~> 0.2.0)
 

data/db/migrate/001_create_sites.rb

@@ -1,4 +1,4 @@
-class CreateSites < ActiveRecord::Migration
+class CreateSites < ActiveRecord::Migration[5.1]
   def self.up
     create_table :sites do |t|
       t.column :name, :string

data/db/migrate/002_add_order_to_sites.rb

@@ -1,4 +1,4 @@
-class AddOrderToSites < ActiveRecord::Migration
+class AddOrderToSites < ActiveRecord::Migration[5.1]
   def self.up
     add_column :sites, :position, :integer, :default => 0
   end

data/db/migrate/003_add_base_domain_to_sites.rb

@@ -1,4 +1,4 @@
-class AddBaseDomainToSites < ActiveRecord::Migration
+class AddBaseDomainToSites < ActiveRecord::Migration[5.1]
   def self.up
     add_column :sites, :base_domain, :string
   end

data/db/migrate/004_add_admin_fields_to_sites.rb

@@ -1,4 +1,4 @@
-class AddAdminFieldsToSites < ActiveRecord::Migration
+class AddAdminFieldsToSites < ActiveRecord::Migration[5.1]
   def self.up
     add_column :sites, :created_by_id, :integer
     add_column :sites, :created_at, :datetime

data/db/migrate/005_add_sites.rb

@@ -1,4 +1,4 @@
-class AddSites < ActiveRecord::Migration
+class AddSites < ActiveRecord::Migration[5.1]
   def self.up
     [:layouts, :snippets, :users].each do |table|
       add_column table, :site_id, :integer

data/db/migrate/006_remove_user_login_index.rb

@@ -1,4 +1,4 @@
-class RemoveUserLoginIndex < ActiveRecord::Migration
+class RemoveUserLoginIndex < ActiveRecord::Migration[5.1]
   def self.up
     remove_index "users", :name => "login"
   end

data/db/migrate/20090810145840_site_abbreviation.rb

@@ -1,4 +1,4 @@
-class SiteAbbreviation < ActiveRecord::Migration
+class SiteAbbreviation < ActiveRecord::Migration[5.1]
   def self.up
     add_column :sites, :abbreviation, :string
   end

data/db/migrate/201411031415046078_recreate_non_unique_index_on_snippets_name.rb

@@ -1,4 +1,4 @@
-class RecreateNonUniqueIndexOnSnippetsName < ActiveRecord::Migration
+class RecreateNonUniqueIndexOnSnippetsName < ActiveRecord::Migration[5.1]
   def self.up
     remove_index :snippets, :name => "name"
     add_index :snippets, [:name, :site_id ], :name => "name_site_id", :unique => true

data/db/migrate/2015032011031415046078_add_site_id_to_pages.rb

@@ -1,4 +1,4 @@
-class AddSiteIdToPages < ActiveRecord::Migration
+class AddSiteIdToPages < ActiveRecord::Migration[5.1]
   def self.up
     add_column :pages, :site_id, :integer, required: true
     add_index :pages, :site_id

data/trusty-multi-site-extension.gemspec

@@ -4,7 +4,7 @@ require "trusty-multi-site-extension"
 
 Gem::Specification.new do |s|
   s.name        = "trusty-multi-site-extension"
-  s.version = "3.0.2"
+  s.version = "3.1.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs", "Eric Sipple", "Danielle Greaves", "Brittany Martin"]
   s.description = %q{Extends Trusty CMS Layouts to support multiple sites, defined by domain}
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   # s.executables   = Dir['bin/*'] - ignores
   s.require_paths = ["lib"]
   s.add_dependency "acts_as_list", "0.9.5"
-  s.add_dependency "trusty-snippets-extension", "~> 3.0.0"
-  s.add_dependency "trusty-cms",   "~> 3.0.0"
+  s.add_dependency "trusty-snippets-extension", "~> 3.1.0"
+  s.add_dependency "trusty-cms",   "~> 3.1.0"
   s.add_dependency "rake",         "< 11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-multi-site-extension
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Sean Cribbs
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -33,28 +33,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: trusty-cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement