trusty-multi-site-extension 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d625e81aa33f2b824b9d3bc540190f28628140f
-  data.tar.gz: 25589c5a2ebf8c9d64757c0aa97f70c163e73938
+  metadata.gz: 877d368dd287154bc9f2e2e515a6534f8cae8d7c
+  data.tar.gz: dde29d83b5a15dccd6796f87427e91e4b9205643
 SHA512:
-  metadata.gz: d135050e374dba613f722435157faf96df8d59661b0976396053c2e0a6477836957238a72ed5069af5cfaa633289a7333e16171305ed96601dc35d79ca917398
-  data.tar.gz: 32ad7047261bfc7a9cbca19a71a36efc8b0c7e0a869c37c5297996662bc8b47c55c34040d11d93bf11edf909fde40b297081eabfcde3a90ee7747632e58c4fea
+  metadata.gz: 9a1f4ad2da09fb226b5f8f7b59f7aea57129212564de962e495087d8cf2623363a0054876c482194b8df195da5e7035424359299ce593a8f45f3c56bac0a58fe
+  data.tar.gz: 8f1ac3e4a540e0d14b6c360190b928d919fad668f0029c4d33b853bdec1919831aec80d64a60d119a5d74cb322530901328cd99485c53a2add6f1af3980e016e

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    trusty-multi-site-extension (3.0.1)
+    trusty-multi-site-extension (3.0.2)
       acts_as_list (= 0.9.5)
       rake (< 11.0)
       trusty-cms (~> 3.0.0)
@@ -72,7 +72,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     chunky_png (1.3.8)
-    ckeditor (4.2.3)
+    ckeditor (4.2.4)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.2.0)
@@ -97,6 +97,8 @@ GEM
       sass-rails (< 5.1)
       sprockets (< 4.0)
     concurrent-ruby (1.0.5)
+    css_parser (1.5.0)
+      addressable
     daemons (1.2.4)
     database_cleaner (1.3.0)
     delocalize (0.4.0)
@@ -113,7 +115,7 @@ GEM
     ffi (1.9.18)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    haml (5.0.1)
+    haml (5.0.2)
       temple (>= 0.8.0)
       tilt
     haml-rails (1.0.0)
@@ -135,7 +137,7 @@ GEM
       thor (>= 0.14, < 2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.19)
+    libv8 (3.16.14.19-x86_64-darwin-16)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.6)
@@ -147,7 +149,7 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     multi_json (1.12.1)
-    mysql2 (0.4.6)
+    mysql2 (0.4.8)
     nio4r (2.1.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
@@ -197,11 +199,17 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rdoc (5.1.0)
     ref (2.0.0)
+    roadie (3.2.2)
+      css_parser (~> 1.4)
+      nokogiri (~> 1.5)
+    roadie-rails (1.2.1)
+      railties (>= 3.0, < 5.2)
+      roadie (~> 3.1)
     rspec-core (3.6.0)
       rspec-support (~> 3.6.0)
     rspec-expectations (3.6.0)
@@ -219,16 +227,16 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    ruby_parser (3.9.0)
-      sexp_processor (~> 4.1)
-    sass (3.4.24)
+    ruby_parser (3.10.1)
+      sexp_processor (~> 4.9)
+    sass (3.4.25)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.9.0)
+    sexp_processor (4.10.0)
     slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -248,8 +256,8 @@ GEM
       rack (>= 1.0.0)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.7)
-    trusty-cms (3.0.0)
+    tilt (2.0.8)
+    trusty-cms (3.0.9)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.6.1)
       bundler (~> 1.7)
@@ -265,9 +273,10 @@ GEM
       rack (~> 2.0.1)
       rack-cache (~> 1.7)
       radius (~> 0.7)
-      rails (~> 5.0.2)
+      rails (~> 5.0.1)
       rake (< 11.0)
       rdoc (~> 5.1)
+      roadie-rails (~> 1.2.1)
       sass-rails (~> 5.0.6)
       stringex (~> 2.7.1)
       therubyracer (~> 0.12.3)
@@ -309,4 +318,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/lib/multi_site/application_controller_filter_extensions.rb

@@ -2,8 +2,9 @@ module MultiSite::ApplicationControllerFilterExtensions
 
   def self.included(base)
     base.class_eval {
-      prepend_before_filter :set_site
-      alias_method_chain :authenticate, :site
+      prepend_before_action :set_site
+      alias_method :authenticate_without_site, :authenticate
+      alias_method :authenticate, :authenticate_with_site
     }
   end
 
@@ -18,4 +19,4 @@ protected
     true if self.current_site = discover_current_site
   end
 
-end
+end

data/lib/multi_site/page_extensions.rb

@@ -4,7 +4,8 @@ module MultiSite::PageExtensions
   def self.included(base)
     base.class_eval {
       include InstanceMethods
-      alias_method_chain :url, :sites
+      alias_method :url_without_sites, :url
+      alias_method :url, :url_with_sites
       mattr_accessor :current_site
       belongs_to :site
       before_create :associate_with_site

data/lib/multi_site/pages_controller_extensions.rb

@@ -1,10 +1,17 @@
 module MultiSite::PagesControllerExtensions
   def self.included(base)
     base.class_eval {
-      alias_method_chain :discover_current_site, :root
-      alias_method_chain :index, :site
-      alias_method_chain :continue_url, :site
-      alias_method_chain :remove, :back
+      alias_method :discover_current_site_without_root, :discover_current_site
+      alias_method :discover_current_site, :discover_current_site_with_root
+
+      alias_method :index_without_site, :index
+      alias_method :index, :index_with_site
+
+      alias_method :continue_url_without_site, :continue_url
+      alias_method :continue_url, :continue_url_with_site
+
+      alias_method :remove_without_back, :remove
+      alias_method :remove, :remove_with_back
       responses.destroy.default do
         return_url = session[:came_from]
         session[:came_from] = nil
@@ -17,7 +24,7 @@ module MultiSite::PagesControllerExtensions
     }
   end
 
-  # for compatibility with the standard issue of multi_site, 
+  # for compatibility with the standard issue of multi_site,
   # a root parameter overrides other ways of setting site
 
   def discover_current_site_with_root
@@ -41,7 +48,7 @@ module MultiSite::PagesControllerExtensions
     session[:came_from] = request.env["HTTP_REFERER"]
     remove_without_back
   end
-  
+
   def continue_url_with_site(options={})
     options[:redirect_to] || (params[:continue] ? edit_admin_page_url(model) : admin_pages_url(:site_id => model.site.id))
   end

data/lib/multi_site/resource_controller_extensions.rb

@@ -2,7 +2,8 @@ module MultiSite::ResourceControllerExtensions
 
   def self.included(base)
     base.class_eval {
-      alias_method_chain :discover_current_site, :input
+      alias_method :discover_current_site_without_input, :discover_current_site
+      alias_method :discover_current_site, :discover_current_site_with_input
     }
   end
 
@@ -10,21 +11,21 @@ module MultiSite::ResourceControllerExtensions
     Page.current_site = site
     set_session_site
   end
-  
+
   # among other things this determines whether the site chooser is shown in the submenu
 
   def sited_model?
     model_class == Page || model_class.is_site_scoped?
   end
-  
+
 protected
 
   def discover_current_site_with_input
     site_from_param || site_from_session || discover_current_site_without_input
   end
-  
+
   # for interface consistency we want to be able to remember site choices between requests
-  
+
   def set_session_site(site_id=nil)
     site_id ||= current_site.id.to_s if current_site.is_a? Site
     session[:site_id] = site_id

data/lib/multi_site/route_extensions.rb

@@ -2,7 +2,8 @@ module MultiSite
   module RouteExtensions
 
     def self.included(base)
-      base.alias_method_chain(:recognition_conditions, :site)
+      base.alias_method :recognition_conditions_without_site, :recognition_conditions
+      base.alias_method :recognition_conditions, :recognition_conditions_with_site
     end
 
     def recognition_conditions_with_site
@@ -18,4 +19,4 @@ module MultiSite
   end
 end
 
-ActionController::Routing::Route.send :include, MultiSite::RouteExtensions
+ActionController::Routing::Route.send :include, MultiSite::RouteExtensions

data/lib/multi_site/route_set_extensions.rb

@@ -2,7 +2,8 @@ module MultiSite
   module RouteSetExtensions
 
     def self.included(base)
-      base.alias_method_chain :extract_request_environment, :site
+      base.alias_method :extract_request_environment_without_site, :extract_request_environment
+      base.alias_method :extract_request_environment, :extract_request_environment_with_site
     end
 
     def extract_request_environment_with_site(request)
@@ -13,4 +14,4 @@ module MultiSite
   end
 end
 
-ActionController::Routing::RouteSet.send :include, MultiSite::RouteSetExtensions
+ActionController::Routing::RouteSet.send :include, MultiSite::RouteSetExtensions

data/lib/multi_site/scoped_model.rb

@@ -1,25 +1,25 @@
 module MultiSite
-  
+
   module ScopedModel
     def self.included(base)
       base.extend ClassMethods
     end
-  
+
     module ClassMethods
       def is_site_scoped?
         false
       end
-      
+
       # only option at the moment is :shareable, which we take to mean that sites are optional:
       # if true it causes us not to set the site automatically or to validate its presence,
-      # and to extend the scoping conditions so that objects with no site are returned as 
+      # and to extend the scoping conditions so that objects with no site are returned as
       # well as objects with the specified site
       # that is, anything without a site is considered to be shared among all sites
       # the default is false
-      
+
       def is_site_scoped(options={})
         return if is_site_scoped?
-        
+
         options = {
           :shareable => false
         }.merge(options)
@@ -29,7 +29,7 @@ module MultiSite
           extend MultiSite::ScopedModel::ScopedClassMethods
           include MultiSite::ScopedModel::ScopedInstanceMethods
         EO
-        
+
         belongs_to :site
         Site.send(:has_many, plural_symbol_for_class)
 
@@ -38,12 +38,14 @@ module MultiSite
 
         class << self
           attr_accessor :shareable
-          alias_method_chain :paginate, :site
+          alias_method :paginate_without_site, :paginate
+          alias_method :paginate, :paginate_with_site
           %w{count average minimum maximum sum}.each do |getter|
-            alias_method_chain getter.intern, :site
+            alias_method "#{getter}_without_site".intern, getter.intern
+            alias_method getter.intern, "#{getter}_with_site".intern
           end
         end
-        
+
         self.shareable = options[:shareable]
       end
     end
@@ -66,7 +68,7 @@ module MultiSite
           end
         end
       end
-      
+
       # this only works with :all and :first
       # and should only be used in odd cases like migration.
       def find_without_site(*args)
@@ -78,12 +80,12 @@ module MultiSite
           when :all   then all_without_site(options)       # already defined by the alias chain
         end
       end
-      
+
       def find_initial_without_site(options)
         options.update(:limit => 1)
         all_without_site(options).first
       end
-      
+
       def sites?
         Site.table_exists? && Site.several?
       end
@@ -96,22 +98,22 @@ module MultiSite
       def current_site
         Page.current_site
       end
-            
+
       def site_scope_condition
         if self.shareable
           condition = ""
           condition << "#{self.table_name}.site_id = #{self.current_site.id} OR " if self.current_site
-          condition << "#{self.table_name}.site_id IS NULL" 
+          condition << "#{self.table_name}.site_id IS NULL"
         else
           condition = "#{self.table_name}.site_id = #{self.current_site!.id}"
         end
         condition
       end
-    
+
       def plural_symbol_for_class
         self.to_s.pluralize.underscore.intern
       end
-      
+
       def is_site_scoped?
         true
       end
@@ -120,7 +122,7 @@ module MultiSite
         !!self.shareable
       end
     end
-  
+
     module ScopedInstanceMethods
       protected
         def set_site
@@ -129,4 +131,3 @@ module MultiSite
     end
   end
 end
-

data/lib/multi_site/scoped_validation.rb

@@ -3,7 +3,7 @@ module MultiSite::ScopedValidation
   def self.included(base)
 
     base.class_eval do
-      # scoping validations to the site should be very simple 
+      # scoping validations to the site should be very simple
       # all you would normally need is something like this:
       #
       #   validates_uniqueness_of :email, :scope => :site_id
@@ -23,9 +23,10 @@ module MultiSite::ScopedValidation
         validates_uniqueness_of_without_site(*attr)
       end
 
-      alias_method_chain :validates_uniqueness_of, :site
+      alias_method :validates_uniqueness_of_without_site, :validates_uniqueness_of
+      alias_method :validates_uniqueness_of, :validates_uniqueness_of_with_site
     end
-    
+
   end
 end
 

data/lib/multi_site/site_controller_extensions.rb

@@ -1,8 +1,9 @@
 module MultiSite::SiteControllerExtensions
   def self.included(base)
     base.class_eval do
-      before_filter :set_site
-      alias_method_chain :process_page, :home_path
+      before_action :set_site
+      alias_method :process_page_without_home_path, :process_page
+      alias_method :process_page, :process_page_with_home_path
     end
   end
 

data/multi_site_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class MultiSiteExtension < TrustyCms::Extension
-  version "3.0.0"
+  version "3.0.2"
   description %{ Enables virtual sites to be created with associated domain names.
                  Also scopes the sitemap view to any given page (or the root of an
                  individual site) and allows model classes to be scoped by site. }
@@ -11,7 +11,7 @@ class MultiSiteExtension < TrustyCms::Extension
   def activate
     # ActionController::Routing modules are required rather than sent as includes
     # because the routing persists between dev. requests and is not compatible
-    # with multiple alias_method_chain calls.
+    # with multiple alias_method calls.
 
     # likewise for ScopedValidation, which is a pre-emptive hack that shouldn't run more than once.
 

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.1"
+  s.version = "3.0.2"
   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}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-multi-site-extension
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Sean Cribbs
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list