site_logic 1.9.0 → 1.9.1

data/Gemfile

@@ -6,7 +6,7 @@ gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
 gem 'ckeditor', :git => 'git://github.com/Bantik/rails-ckeditor.git', :branch => 'rails3_mongoid'
 gem 'mongoid', '>= 2.0.0.beta.17'
 gem 'mongoid-tree', :require => 'mongoid/tree'
-gem 'rails', '>= 3.0.1'
+gem 'rails', '3.0.10'
 gem 'rmagick', '2.12.2' # version compatible with heroku
 gem 'scaffold_logic', '>= 1.0.3'
 gem 'SystemTimer'

data/VERSION

@@ -1 +1 @@
-1.9.0
+1.9.1

data/app/controllers/admin/pages_controller.rb

@@ -26,14 +26,14 @@ class Admin::PagesController < ApplicationController
 
   def create
     if params[:commit] == 'Preview'
-      @page = @site.pages.new(params[:page])
+      @page = @site.pages.new params[:page]
       render :action => 'preview', :layout => @site.layout
     else
-      @page = @site.pages.create(params[:page])
+      @page = @site.pages.create params[:page]
       if @page.valid?
         @page.publish! if params[:page][:state] == 'Published'
-        flash[:notice] = "Successfully created the page."
-        if params[:page][:create_navigation_item] == "true"
+        flash[:notice] = 'Successfully created the page.'
+        if params[:page][:create_navigation_item] == 'true'
           redirect_to new_admin_site_nav_item_path(
             @site,
             :nav_item => {
@@ -44,7 +44,7 @@ class Admin::PagesController < ApplicationController
             :creating_page => true
           )
         else
-          redirect_to admin_site_pages_path(@site)
+          redirect_after_write
         end
       else
         render :action => 'new'
@@ -57,14 +57,14 @@ class Admin::PagesController < ApplicationController
 
   def update
     if params[:commit] == 'Preview'
-      @page = @site.pages.new(params[:page])
+      @page = @site.pages.new params[:page]
       render :action => 'preview', :layout => @page.site.layout
     else
-      if @page.update_attributes(params[:page])
+      if @page.update_attributes params[:page]
         @page.publish! if params[:page][:state] == 'Published'
         @page.unpublish! if params[:page][:state] == 'Draft'
-        flash[:notice] = "Successfully updated the page."
-        redirect_to admin_site_pages_path(@site)
+        flash[:notice] = 'Successfully updated the page.'
+        redirect_after_write
       else
         render :action => 'edit'
       end
@@ -73,23 +73,26 @@ class Admin::PagesController < ApplicationController
 
   def destroy
     @page.destroy
-    flash[:notice] = "Successfully destroyed the page."
-    redirect_to admin_site_pages_path(@site)
+    flash[:notice] = 'Successfully destroyed the page.'
+    redirect_after_write
   end
 
   def preview
-    @page = @site.pages.new(params[:page])
+    @page = @site.pages.new params[:page]
     render :layout => @page.site.layout
   end
 
   private
 
+  def redirect_after_write
+    redirect_to Site.count > 1 ? admin_site_path(@site) : admin_site_pages_path(@site)
+  end
+
   def scope_site
-    @site = Site.find(params[:site_id])
+    @site = Site.find params[:site_id]
   end
 
   def scope_page
-    @page = @site.pages.find(params[:id])
+    @page = @site.pages.find params[:id]
   end
-
-end
+end

data/app/models/page.rb

@@ -71,7 +71,7 @@ class Page
   end
 
   def path
-    self.slug == '' ? '/' : "/#{self.slug}/".gsub(/\/\//,'/').gsub(/\/\//,'/')
+    self.slug == '' ? '/' : "/#{self.slug}".gsub(/\/\//,'/').gsub(/\/\//,'/')
   end
 
   def publish!

data/site_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "site_logic"
-  s.version = "1.9.0"
+  s.version = "1.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bantik"]
-  s.date = "2011-09-26"
+  s.date = "2011-09-27"
   s.description = "An engine for search-engine-optimized content management."
   s.email = "corey@seologic.com"
   s.extra_rdoc_files = [
@@ -832,7 +832,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ckeditor>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.17"])
       s.add_runtime_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
+      s.add_runtime_dependency(%q<rails>, ["= 3.0.10"])
       s.add_runtime_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_runtime_dependency(%q<scaffold_logic>, [">= 1.0.3"])
       s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
@@ -845,7 +845,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ckeditor>, [">= 0"])
       s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.17"])
       s.add_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 3.0.1"])
+      s.add_dependency(%q<rails>, ["= 3.0.10"])
       s.add_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_dependency(%q<scaffold_logic>, [">= 1.0.3"])
       s.add_dependency(%q<SystemTimer>, [">= 0"])
@@ -859,7 +859,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ckeditor>, [">= 0"])
     s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.17"])
     s.add_dependency(%q<mongoid-tree>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 3.0.1"])
+    s.add_dependency(%q<rails>, ["= 3.0.10"])
     s.add_dependency(%q<rmagick>, ["= 2.12.2"])
     s.add_dependency(%q<scaffold_logic>, [">= 1.0.3"])
     s.add_dependency(%q<SystemTimer>, [">= 0"])

data/spec/models/page_spec.rb

@@ -1,19 +1,17 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Page do
-
   before :all do
     Site.destroy_all
     @site = Site.make
   end
 
-  describe "initialization" do
-
-    it "should be invalid without required values" do
+  describe 'initialization' do
+    it 'should be invalid without required values' do
       @site.pages.new.valid?.should be_false
     end
 
-    it "should be valid with required values" do
+    it 'should be valid with required values' do
       @site.pages.new(
         :page_title   => 'Home',
         :desired_slug => 'home',
@@ -21,7 +19,7 @@ describe Page do
       ).should be_valid
     end
 
-    it "should not allow duplicate slugs" do
+    it 'should not allow duplicate slugs' do
       @site.pages.create(
         :page_title   => 'Foo',
         :slug         => 'foo',
@@ -41,11 +39,9 @@ describe Page do
     it 'defaults its state to Draft' do
       @site.pages.new.status.should == 'Draft'
     end
-
   end
 
   describe 'publishing lifecycle' do
-
     it 'defaults a new page to draft status' do
       page = @site.pages.new
       page.draft?.should be_true
@@ -75,11 +71,9 @@ describe Page do
       page.draft?.should be_true
       page.publication_date.should be_nil
     end
-
   end
 
   describe 'slug' do
-
     it 'is generated based on the desired_slug' do
       page = @site.pages.create(
         :page_title   => 'Snakes',
@@ -106,31 +100,27 @@ describe Page do
       )
       page.slug.should == 'sinews-really'
     end
-
   end
 
-  describe 'humanizes its path' do
-
+  describe 'normalizes its path' do
     it 'defaulting to root' do
-      Page.new(:slug => nil).humanize_path.should == '/'
+      Page.new(:slug => nil).path.should == '/'
     end
 
     it 'handling no slashes' do
-      Page.new(:slug => 'foo').humanize_path.should == '/foo/'
+      Page.new(:slug => 'foo').path.should == '/foo'
     end
 
     it 'handling leading slash' do
-      Page.new(:slug => '/foo').humanize_path.should == '/foo/'
+      Page.new(:slug => '/foo').path.should == '/foo'
     end
 
     it 'handling trailing slash' do
-      Page.new(:slug => 'foo/').humanize_path.should == '/foo/'
+      Page.new(:slug => 'foo/').path.should == '/foo/'
     end
 
     it 'handling all kindsa slash action' do
-      Page.new(:slug => '/foo/').humanize_path.should == '/foo/'
+      Page.new(:slug => '/foo/').path.should == '/foo/'
     end
-
   end
-
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: site_logic
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 9
-  - 0
-  version: 1.9.0
+  - 1
+  version: 1.9.1
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-26 00:00:00 Z
+date: 2011-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -97,14 +97,14 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 19
         segments: 
         - 3
         - 0
-        - 1
-        version: 3.0.1
+        - 10
+        version: 3.0.10
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency