trusty-multi-site-extension 1.2.1 → 2.0.0.pre.beta

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjAwODNiMzcxZGU0NDUyMDFlYzMwZDliNTMyZDQ3ZjA1M2UxZWE3MA==
+    YWIxODlhMmY0ODI2ODU0NTRiYTMzN2RmOGI2ZDU5ZDcxODQxNDJjYQ==
   data.tar.gz: !binary |-
-    MTliZGM2NTY3MTRmMTFhYzY1ZGMzNWFmYjhkYjJiZWNmZGFmNDU3OA==
+    MzUyN2E3ZWNjYzNjZGU2YmIyMjM3OGJhN2Y1Yzg0NTljODhlNmE5Yg==
 SHA512:
   metadata.gz: !binary |-
-    Y2VkMmZkMDlhMDkzNDBlMjU5MTg1NWJhYTI2ZjYwMTY4MmYzMTM3NWVhMmVj
-    YTA0YTBkNzIwOWJjZmMzNTIzNzY4NjkwZTE3MzJhNjk5OTk0MmNhYWFhNmFk
-    MTcyZGFkOGNhMTE4MDFlZGM0N2VkOGUxNGYxZTNiNzY2NzQzNmQ=
+    ZGFkNmQ2NjQwZjRjNjQzM2YzMjdhMWM3Y2I2Y2U1ZWZkYmU2YTUwY2FjYWU0
+    NTBjODMyMWZhMDgxMWEwNjcwMjQxNzg3NzAxY2I5NzZkMGY4MDU3NDFjN2Mz
+    MmMyODI2OTJlNjg5ODQxNmVmZDFiOTRjODlhNmZlNGU5NDMxZTI=
   data.tar.gz: !binary |-
-    NWNmYWQ1NGZlYTAxZTk4YmZhMjViNmVhY2I2MDc3NWNkMTdhOWZkMmVkZWY5
-    NmJlMTQ4OTZiMTMwMTMwNWY1NzMzMTA0MTMxZGM4OGExNjY0NWJmZjhkZGI2
-    ODA1NmE0ODQ5MzBhNTQ2NDMzMzU3MzY2OTkxMjcxZDE4NTNkN2Q=
+    NTk3MzI1Y2YxMjJmNWEyYTU5MzAyYzQ5MjA3NGMyNDM4NmRhMjdiNWNiOTdi
+    MGVjOTEyZjE5Yjc0ZjVmNTRlMzQ2NDlkOGM2NDFiN2ZiY2Q4M2JhNDMwZTM4
+    ODgyOTZhYjA1N2YwMDk3NDJhZTI2ZGI0YmFkNDAwZDMxMmFjYmQ=

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'trustygems', '~> 0.1.0'

data/Gemfile.lock

@@ -0,0 +1,12 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.4.2)
+    trustygems (0.1.0)
+      rake
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  trustygems (~> 0.1.0)

data/Rakefile

@@ -1,120 +1,122 @@
-# I think this is the one that should be moved to the extension Rakefile template
+require 'trustygems'
 
-# In rails 1.2, plugins aren't available in the path until they're loaded.
-# Check to see if the rspec plugin is installed first and require
-# it if it is.  If not, use the gem version.
-
-# Determine where the RSpec plugin is by loading the boot
-unless defined? TRUSTY_CMS_ROOT
-  ENV["RAILS_ENV"] = "test"
-  case
-  when ENV["TRUSTY_ENV_FILE"]
-    require File.dirname(ENV["TRUSTY_ENV_FILE"]) + "/boot"
-  when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
-    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot"
-  else
-    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot"
-  end
-end
-
-require 'rake'
-require 'rake/rdoctask'
-require 'rake/testtask'
-
-rspec_base = File.expand_path(TRUSTY_CMS_ROOT + '/vendor/plugins/rspec/lib')
-$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
-require 'spec/rake/spectask'
-# require 'spec/translator'
-
-# Cleanup the TRUSTY_CMS_ROOT constant so specs will load the environment
-Object.send(:remove_const, :TRUSTY_CMS_ROOT)
-
-extension_root = File.expand_path(File.dirname(__FILE__))
-
-task :default => :spec
-task :stats => "spec:statsetup"
-
-desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-namespace :spec do
-  desc "Run all specs in spec directory with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec', '--rails']
-  end
-  
-  desc "Print Specdoc for all specs"
-  Spec::Rake::SpecTask.new(:doc) do |t|
-    t.spec_opts = ["--format", "specdoc", "--dry-run"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-  end
-
-  [:models, :controllers, :views, :helpers].each do |sub|
-    desc "Run the specs under spec/#{sub}"
-    Spec::Rake::SpecTask.new(sub) do |t|
-      t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
-    end
-  end
-  
-  # Hopefully no one has written their extensions in pre-0.9 style
-  # desc "Translate specs from pre-0.9 to 0.9 style"
-  # task :translate do
-  #   translator = ::Spec::Translator.new
-  #   dir = RAILS_ROOT + '/spec'
-  #   translator.translate(dir, dir)
-  # end
-
-  # Setup specs for stats
-  task :statsetup do
-    require 'code_statistics'
-    ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
-    ::STATS_DIRECTORIES << %w(View\ specs spec/views)
-    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
-    ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
-    ::CodeStatistics::TEST_TYPES << "Model specs"
-    ::CodeStatistics::TEST_TYPES << "View specs"
-    ::CodeStatistics::TEST_TYPES << "Controller specs"
-    ::CodeStatistics::TEST_TYPES << "Helper specs"
-    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
-  end
-
-  namespace :db do
-    namespace :fixtures do
-      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
-      task :load => :environment do
-        require 'active_record/fixtures'
-        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
-        end
-      end
-    end
-  end
-end
-
-desc 'Generate documentation for the <%= file_name %> extension.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = '<%= class_name %>'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-# For extensions that are in transition
-desc 'Test the <%= file_name %> extension.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-# Load any custom rakefiles for extension
-Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }
+# # I think this is the one that should be moved to the extension Rakefile template
+#
+# # In rails 1.2, plugins aren't available in the path until they're loaded.
+# # Check to see if the rspec plugin is installed first and require
+# # it if it is.  If not, use the gem version.
+#
+# # Determine where the RSpec plugin is by loading the boot
+# unless defined? TRUSTY_CMS_ROOT
+#   ENV["RAILS_ENV"] = "test"
+#   case
+#   when ENV["TRUSTY_ENV_FILE"]
+#     require File.dirname(ENV["TRUSTY_ENV_FILE"]) + "/boot"
+#   when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
+#     require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot"
+#   else
+#     require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot"
+#   end
+# end
+#
+# require 'rake'
+# require 'rake/rdoctask'
+# require 'rake/testtask'
+#
+# rspec_base = File.expand_path(TRUSTY_CMS_ROOT + '/vendor/plugins/rspec/lib')
+# $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
+# require 'spec/rake/spectask'
+# # require 'spec/translator'
+#
+# # Cleanup the TRUSTY_CMS_ROOT constant so specs will load the environment
+# Object.send(:remove_const, :TRUSTY_CMS_ROOT)
+#
+# extension_root = File.expand_path(File.dirname(__FILE__))
+#
+# task :default => :spec
+# task :stats => "spec:statsetup"
+#
+# desc "Run all specs in spec directory"
+# Spec::Rake::SpecTask.new(:spec) do |t|
+#   t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+#   t.spec_files = FileList['spec/**/*_spec.rb']
+# end
+#
+# namespace :spec do
+#   desc "Run all specs in spec directory with RCov"
+#   Spec::Rake::SpecTask.new(:rcov) do |t|
+#     t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+#     t.spec_files = FileList['spec/**/*_spec.rb']
+#     t.rcov = true
+#     t.rcov_opts = ['--exclude', 'spec', '--rails']
+#   end
+#
+#   desc "Print Specdoc for all specs"
+#   Spec::Rake::SpecTask.new(:doc) do |t|
+#     t.spec_opts = ["--format", "specdoc", "--dry-run"]
+#     t.spec_files = FileList['spec/**/*_spec.rb']
+#   end
+#
+#   [:models, :controllers, :views, :helpers].each do |sub|
+#     desc "Run the specs under spec/#{sub}"
+#     Spec::Rake::SpecTask.new(sub) do |t|
+#       t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+#       t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+#     end
+#   end
+#
+#   # Hopefully no one has written their extensions in pre-0.9 style
+#   # desc "Translate specs from pre-0.9 to 0.9 style"
+#   # task :translate do
+#   #   translator = ::Spec::Translator.new
+#   #   dir = RAILS_ROOT + '/spec'
+#   #   translator.translate(dir, dir)
+#   # end
+#
+#   # Setup specs for stats
+#   task :statsetup do
+#     require 'code_statistics'
+#     ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
+#     ::STATS_DIRECTORIES << %w(View\ specs spec/views)
+#     ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
+#     ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
+#     ::CodeStatistics::TEST_TYPES << "Model specs"
+#     ::CodeStatistics::TEST_TYPES << "View specs"
+#     ::CodeStatistics::TEST_TYPES << "Controller specs"
+#     ::CodeStatistics::TEST_TYPES << "Helper specs"
+#     ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+#   end
+#
+#   namespace :db do
+#     namespace :fixtures do
+#       desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+#       task :load => :environment do
+#         require 'active_record/fixtures'
+#         ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+#         (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+#           Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+#         end
+#       end
+#     end
+#   end
+# end
+#
+# desc 'Generate documentation for the <%= file_name %> extension.'
+# Rake::RDocTask.new(:rdoc) do |rdoc|
+#   rdoc.rdoc_dir = 'rdoc'
+#   rdoc.title    = '<%= class_name %>'
+#   rdoc.options << '--line-numbers' << '--inline-source'
+#   rdoc.rdoc_files.include('README')
+#   rdoc.rdoc_files.include('lib/**/*.rb')
+# end
+#
+# # For extensions that are in transition
+# desc 'Test the <%= file_name %> extension.'
+# Rake::TestTask.new(:test) do |t|
+#   t.libs << 'lib'
+#   t.pattern = 'test/**/*_test.rb'
+#   t.verbose = true
+# end
+#
+# # Load any custom rakefiles for extension
+# Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }

data/app/models/site.rb

@@ -7,7 +7,7 @@ class Site < ActiveRecord::Base
   belongs_to :updated_by, :class_name => 'User'
   belongs_to :production_homepage , :class_name => 'ProductionPage'
 
-  default_scope :order => 'position ASC'
+  default_scope {order('position ASC')}
 
   class << self
     attr_accessor :several
@@ -16,7 +16,7 @@ class Site < ActiveRecord::Base
     
     def find_for_host(hostname = '')
       return default if hostname.blank?
-      sites = all(:conditions => "domain IS NOT NULL and domain != ''")
+      sites = where("domain IS NOT NULL")
       site = sites.find { |site| hostname == site.base_domain || hostname =~ Regexp.compile(site.domain) }
       site || default
     end

data/app/views/admin/layouts/_choose_site.html.haml

@@ -2,7 +2,7 @@
   %p{:style => 'float: left; margin-right: 32px'}
     %label{:for=>"layout_site_id", :Class => "admin_only"}
       Site
-    - sites = Site.find(:all).map { |s| [s.name, s.id] }
+    - sites = Site.all.map { |s| [s.name, s.id] }
     - selection = {:include_blank => Layout.is_shareable?}
     - selection[:selected] = current_site.id if @layout.new_record? && ! Layout.is_shareable?
     = select :layout, :site_id, sites, selection

data/app/views/admin/snippets/_choose_site.html.haml

@@ -2,5 +2,5 @@
   %p{:style => 'float: left; margin-right: 32px'}
     %label{:for=>"snippet_site_id", :Class => "admin_only"}
       Site
-      - sites = Site.find(:all).map { |s| [s.name, s.id] }
+      - sites = Site.all.map { |s| [s.name, s.id] }
       = select :snippet, :site_id, sites, :include_blank => Snippet.is_shareable?, :selected => @snippet.site_id || current_site.id

data/app/views/admin/users/_choose_site.html.haml

@@ -3,6 +3,6 @@
     %th.label
       %label{:for=>"user_admin"} Can edit site
     %td.field{:style => 'text-align: left;'}
-      = select :user, :site_id, [['<any>', '']] + Site.find(:all).map { |s| [s.name, s.id] }
+      = select :user, :site_id, [['<any>', '']] + Site.all.map { |s| [s.name, s.id] }
     %td.help
       A user with no site is able to act (to whatever extent their status allows) on any site.

data/config/trustygems.yml

@@ -0,0 +1,2 @@
+gemspec: trusty-multi-site-extension.gemspec
+deploy_command: gem push

data/lib/multi_site/scoped_model.rb

@@ -25,6 +25,7 @@ module MultiSite
         }.merge(options)
 
         class_eval <<-EO
+          default_scope {where(site_scope_condition)}
           extend MultiSite::ScopedModel::ScopedClassMethods
           include MultiSite::ScopedModel::ScopedInstanceMethods
         EO
@@ -37,8 +38,6 @@ module MultiSite
 
         class << self
           attr_accessor :shareable
-          alias_method_chain :all, :site
-          alias_method_chain :where, :site
           alias_method_chain :paginate, :site
           %w{count average minimum maximum sum}.each do |getter|
             alias_method_chain getter.intern, :site
@@ -50,23 +49,11 @@ module MultiSite
     end
 
     module ScopedClassMethods
-      def all_with_site(options = {})
-        return all_without_site(options) unless sites?
-        with_scope(:find => {:conditions => site_scope_condition}) do
-          all_without_site(options)
-        end
-      end
 
-      def where_with_site(options = {})
-        return where_without_site(options) unless sites?
-        with_scope(:find => {:conditions => site_scope_condition}) do
-          where_without_site(options)
-        end
-      end
 
       def paginate_with_site(options={})
         return paginate_without_site(options) unless sites?
-        with_scope(:find => {:conditions => site_scope_condition}) do
+        where(site_scope_condition) do
           paginate_without_site(options)
         end
       end

data/lib/multi_site/site_chooser_helper.rb

@@ -2,7 +2,7 @@ module MultiSite::SiteChooserHelper
 
 def sites_chooser_thing
   return "" unless admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
-  options = Site.find(:all).map{ |site| "<li>" + link_to( site.name, "#{request.path}?site_id=#{site.id}", :class => site == current_site ? 'fg' : '') + "</li>" }.join("")
+  options = Site.all.map{ |site| "<li>" + link_to( site.name, "#{request.path}?site_id=#{site.id}", :class => site == current_site ? 'fg' : '') + "</li>" }.join("")
   chooser = %{<div id="site_chooser">}
   #chooser << link_to("sites", admin_sites_url, {:id => 'show_site_list', :class => 'expandable'})
   chooser << %{<ul id="nav"><li>Current Site: #{current_site.name}}

data/trusty-multi-site-extension.gemspec

@@ -4,10 +4,9 @@ require "trusty-multi-site-extension"
 
 Gem::Specification.new do |s|
   s.name        = "trusty-multi-site-extension"
-  s.version = "1.2.1"
+  s.version = "2.0.0-beta"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Eric Sipple"]
-  s.date = %q{2014-10-07}
+  s.authors = ["Sean Cribbs", "Eric Sipple", "Danielle Greaves"]
   s.description = %q{Extends Trusty CMS Layouts to support multiple sites, defined by domain}
   s.email = %q{sipple@trustarts.org}
   s.homepage = %q{https://github.com/pgharts/trusty-multi-site-extension}
@@ -23,6 +22,6 @@ Gem::Specification.new do |s|
   # s.executables   = Dir['bin/*'] - ignores
   s.require_paths = ["lib"]
   s.add_dependency "acts_as_list", "0.4.0"
-  s.add_dependency "trusty-snippets-extension", "~> 1.0"
-  s.add_dependency "trusty-cms",   "~> 1.2"
+  s.add_dependency "trusty-snippets-extension", "~> 2.0.0-beta"
+  s.add_dependency "trusty-cms",   "~> 2.0.0-beta"
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: trusty-multi-site-extension
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0.pre.beta
 platform: ruby
 authors:
+- Sean Cribbs
 - Eric Sipple
+- Danielle Greaves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -30,34 +32,36 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0.pre.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0.pre.beta
 - !ruby/object:Gem::Dependency
   name: trusty-cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.0.0.pre.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.0.0.pre.beta
 description: Extends Trusty CMS Layouts to support multiple sites, defined by domain
 email: sipple@trustarts.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
 - README.markdown
 - Rakefile
 - app/assets/images/admin/move_higher.png
@@ -82,6 +86,7 @@ files:
 - app/views/site/not_configured.html.haml
 - config/initializers/radiant_config.rb
 - config/routes.rb
+- config/trustygems.yml
 - db/migrate/001_create_sites.rb
 - db/migrate/002_add_order_to_sites.rb
 - db/migrate/003_add_base_domain_to_sites.rb