site_logic 1.9.4 → 1.9.5

data/VERSION

@@ -1 +1 @@
-1.9.4
+1.9.5

data/app/controllers/pages_controller.rb

@@ -2,7 +2,7 @@ class PagesController < ApplicationController
   def show
     @site = Site.where(:domain => request.host).first || Site.first
 
-    if @page = @site.pages.published.select{ |p| p.slug =~ /#{params[:path]}/i }.first
+    if @page = @site.pages.published.by_slug(params[:path] || '/').first
       render :layout => @site.layout
     else
       raise Mongoid::Errors::DocumentNotFound.new Page, params[:path]

data/app/models/page.rb

@@ -8,11 +8,14 @@ class Page
   STATES = ['draft', 'published']
 
   # Scopes =========================================================================================
+  scope :by_slug, lambda{ |slug| {:where => {:slug => slug}} }
   scope :drafts,      :where => {:state => 'draft'}
   scope :for_sitemap, :where => {:sitemap => true}
   scope :indexed,     :where => {:noindex => false}
+  scope :leading_slash, :where => {:slug => %r{^\/}}
   scope :noindex,     :where => {:noindex => true}
   scope :published,   :where => {:state => 'published'}
+  scope :trailing_slash, :where => {:slug => %r{\/$}}
 
   # Mongoid ========================================================================================
   field :slug
@@ -46,7 +49,7 @@ class Page
   end
 
   after_destroy :delete_tank_indexes
-  after_save :update_tank_indexes
+  after_save :update_tank_indexes unless Rails.application.config.tanker_disabled
 
   # Instance methods ===============================================================================
   def draft?
@@ -74,6 +77,10 @@ class Page
     self.state == 'published'
   end
 
+  def root?
+    self.slug == '/'
+  end
+
   def unpublish!
     self.update_attributes :state => 'draft', :publication_date => nil
   end
@@ -94,6 +101,14 @@ class Page
     self.state ? self.state.capitalize : 'Draft'
   end
 
+  def strip_leading_slash
+    self.slug = self.slug[1..-1] if self.slug.try(:first) == '/' && ! root?
+  end
+
+  def strip_trailing_slash
+    self.slug = self.slug[0..-2] if self.slug.try(:last) == '/' && ! root?
+  end
+
   def window_title
     self[:window_title] || self.page_title
   end
@@ -101,6 +116,8 @@ class Page
   private
 
   def set_slug
-    self.slug = (self.window_title || self.page_title).to_s.to_url if self.slug.blank?
+    self.slug = self.window_title.to_s.to_url if self.slug.blank?
+    self.strip_leading_slash
+    self.strip_trailing_slash
   end
 end

data/app/models/site.rb

@@ -66,6 +66,11 @@ class Site
     ! self.active?
   end
 
+  def normalize_slugs
+    self.pages.leading_slash.map{ |p| p.strip_leading_slash; p.save }
+    self.pages.trailing_slash.map{ |p| p.strip_trailing_slash; p.save }
+  end
+
   def primary_navigation
     self.nav_items.roots.primary.sort_by{|a| a.position.to_i}
   end

data/config/environments/test.rb

@@ -1,39 +1,14 @@
 SiteLogic::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
-
-  # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
-
-  # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
-
-  # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-
-  # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
-
-  # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
-
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
   # tanker gem
   config.index_tank_url = 'http://:PctyyJitroN8iv@82wog.api.indextank.com'
+  config.tanker_disabled = true
   config.tanker_pagination_backend = :kaminari
-end
+end

data/features/support/env.rb

@@ -4,30 +4,48 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
-ENV["RAILS_ENV"] ||= "test"
-require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+require 'cucumber/rails'
 
-require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
-require 'cucumber/rails/rspec'
-require 'cucumber/rails/world'
-require 'cucumber/web/tableish'
-
-require 'capybara/rails'
-require 'capybara/cucumber'
-require 'capybara/session'
-# require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
 
-# How to clean your database when transactions are turned off. See
-# http://github.com/bmabey/database_cleaner for more info.
-if defined?(ActiveRecord::Base)
-  begin
-    require 'database_cleaner'
-    DatabaseCleaner.strategy = :truncation
-  rescue LoadError => ignore_if_database_cleaner_not_present
-  end
-end
+# By default, any exception happening in your Rails application will bubble up
+# to Cucumber so that your scenario will fail. This is a different from how
+# your application behaves in the production environment, where an error page will
+# be rendered instead.
+#
+# Sometimes we want to override this default behaviour and allow Rails to rescue
+# exceptions and display an error page (just like when the app is running in production).
+# Typical scenarios where you want to do this is when you test your error pages.
+# There are two ways to allow Rails to rescue exceptions:
+#
+# 1) Tag your scenario (or feature) with @allow-rescue
+#
+# 2) Set the value below to true. Beware that doing this globally is not
+# recommended as it will mask a lot of errors for you!
+#
+ActionController::Base.allow_rescue = false
+
+# Remove/comment out the lines below if your app doesn't have a database.
+# For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
+DatabaseCleaner.strategy = :truncation
+
+# You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
+# See the DatabaseCleaner documentation for details. Example:
+#
+#   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
+#     DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
+#   end
+#
+#   Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
+#     DatabaseCleaner.strategy = :transaction
+#   end
+#
+
+# Possible values are :truncation and :transaction
+# The :transaction strategy is faster, but might give you threading problems.
+# See https://github.com/cucumber/cucumber-rails/blob/master/features/choose_javascript_database_strategy.feature
+Cucumber::Rails::Database.javascript_strategy = :truncation

data/lib/tasks/cucumber.rake

@@ -34,6 +34,12 @@ begin
 
     desc 'Run all features'
     task :all => [:ok, :wip]
+
+    task :statsetup do
+      require 'rails/code_statistics'
+      ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
+      ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
+    end
   end
   desc 'Alias for cucumber:ok'
   task :cucumber => 'cucumber:ok'
@@ -43,6 +49,12 @@ begin
   task :features => :cucumber do
     STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end
+
+  # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
+  task 'db:test:prepare' do
+  end
+
+  task :stats => 'cucumber:statsetup'
 rescue LoadError
   desc 'cucumber rake task not available (cucumber not installed)'
   task :cucumber do