spree_essential_cms 0.2.1 → 0.3.0.rc1

data/README.md

@@ -1,8 +1,11 @@
 # Spree Essential CMS [![Build Status](https://secure.travis-ci.org/citrus/spree_essential_cms.png)](http://travis-ci.org/citrus/spree_essential_cms)
 
+A robust CMS for Spree Commerce.
 
+
+------------------------------------------------------------------------------
 Installation
-------------
+------------------------------------------------------------------------------
 
 If you don't already have an existing Spree site, [click here](https://gist.github.com/946719) then come back later... You can also read the Spree docs [here](http://spreecommerce.com/documentation/getting_started.html)...
 
@@ -10,37 +13,46 @@ Otherwise, follow these steps to get up and running with SpreeEssentialCms:
 
 Add spree_essential_cms to your Gemfile:
 
-    gem 'spree_essential_cms', '>= 0.2.1'
+```ruby
+gem 'spree_essential_cms', '>= 0.2.1'
+```
 
 Now, bundle up with:
 
-    bundle install
+```bash
+bundle install
+```
 
 Then run the generators to create the migration files:
 
-    rails g spree_essentials:install
-    rails g spree_essentials:cms
+```bash
+bundle exec rails g spree_essentials:install
+bundle exec rails g spree_essentials:cms
+```
 
 Now migrate your database:
 
-    rake db:migrate
-    
-Boot your server and checkout the admin!
+```bash
+bundle exec rake db:migrate
+```
 
-    rails s
-    
+Boot your server and checkout the admin at `localhost:3000/admin`!
 
+```bash
+bundle exec rails s
+```
 
-Usage
------
 
-[todo] add basic usage stuff here
+------------------------------------------------------------------------------
+Usage
+------------------------------------------------------------------------------
 
+Basic usage of this CMS is trivial. Create pages and add content... 
 
-### Here's some tips for making content really customized...
+Pages also have images so you can create galleries or slideshows.  
 
 
-#### Contexts
+### Content Contexts
 
 Contexts allow you to place different forms of content in various places of a page. A slideshow or a sidebar might be good examples...
 
@@ -48,70 +60,79 @@ You can set a content's context (say that ten times fast!) under the 'Optional F
 
 In your view you'll be able to grab those bits of content like so:
 
-    
-    .slideshow
-      - if @slides = @page.for_context('slideshow')
-        = render 'shared/content', :content => @slides
-    
-    - if @sidebar = @page.for_context('sidebar').first
-      - content_for :sidebar do
-        = render 'shared/your_custom_sidebar', :content => @sidebar  
-
+```haml
+.slideshow
+  - if @slides = @page.for_context('slideshow')
+    = render 'shared/content', :content => @slides
 
+- if @sidebar = @page.for_context('sidebar').first
+  - content_for :sidebar do
+    = render 'shared/your_custom_sidebar', :content => @sidebar
+```
 
 
-#### Custom image sizes
+### Custom image sizes
 
 Use a content decorator when you want different contexts to have their own image sizes:
 
 
-    Content.class_eval do 
-    
-      # override default image sizes
-      def default_attachment_sizes
-        { :mini => '48x48>', :medium => '427x287>' }
-      end
-      
-      # or set a custom size for each context
-      def attachment_sizes
-        case context
-          when 'slideshow'
-            sizes = default_attachment_sizes.merge(:slide => '955x476#')
-          when 'main'
-            sizes = default_attachment_sizes.merge(:custom => '580x289#')
-          when 'small-top'
-            sizes = default_attachment_sizes.merge(:custom => '364x177#')
-          when 'small-bottom'
-            sizes = default_attachment_sizes.merge(:custom => '364x109#') 
-          else
-            sizes = default_attachment_sizes
-        end
-        sizes
-      end
-    
-    end
+```ruby
+
+# app/models/content_decorator.rb
+
+Content.class_eval do
 
+  # override default image sizes
+  def default_attachment_sizes
+    { :mini => '48x48>', :medium => '427x287>' }
+  end
 
+  # or set a custom size for each context
+  def attachment_sizes
+    case context
+      when 'slideshow'
+        sizes = default_attachment_sizes.merge(:slide => '955x476#')
+      when 'main'
+        sizes = default_attachment_sizes.merge(:custom => '580x289#')
+      when 'small-top'
+        sizes = default_attachment_sizes.merge(:custom => '364x177#')
+      when 'small-bottom'
+        sizes = default_attachment_sizes.merge(:custom => '364x109#')
+      else
+        sizes = default_attachment_sizes
+    end
+    sizes
+  end
 
+end
+```
 
 
-    
+------------------------------------------------------------------------------
 Demo
-----
+------------------------------------------------------------------------------
 
 You can easily use the test/dummy app as a demo of spree_essential_cms. Just `cd` to where you develop and run:
-    
-    git clone git://github.com/citrus/spree_essential_cms.git
-    cd spree_essential_cms
-    mv lib/dummy_hooks/after_migrate.rb.sample lib/dummy_hooks/after_migrate.rb
-    bundle install
-    bundle exec dummier
-    cd test/dummy
-    rails s
-    
 
+```bash
+git clone git://github.com/citrus/spree_essential_cms.git
+cd spree_essential_cms
+cp test/dummy_hooks/after_migrate.rb.sample test/dummy_hooks/after_migrate.rb
+bundle install
+bundle exec dummier
+cd test/dummy
+bundle exec rails s
+```
+
+
+------------------------------------------------------------------------------
 Change Log
-----------
+------------------------------------------------------------------------------
+
+**2012/1/16**
+
+* Add support for Spree 1.0.x
+
 
 **0.2.1 - 2011/12/15**
 
@@ -141,8 +162,9 @@ Change Log
 * Extracted from the Spree Essentials core.
 
 
+------------------------------------------------------------------------------
 To Do
------
+------------------------------------------------------------------------------
 
 * more tests... many many more.
 * optimizations
@@ -150,19 +172,23 @@ To Do
 * add widgets that you can drop into any page
 * page and menu caching/sweeping
 * nested set for pages
-* 0.30 and 0.40 compatibility
 * create wiki pages
 
 
+------------------------------------------------------------------------------
 Contributors
-------------
+------------------------------------------------------------------------------
+
+* Spencer Steffen ([@citrus](https://github.com/citrus))
+* Kyle West ([@kylewest](https://github.com/kylewest))
+* [@kpitn](https://github.com/kpitn)
 
-So far it's just me; Spencer Steffen. 
 
 If you'd like to help out feel free to fork and send me pull requests!
 
 
+------------------------------------------------------------------------------
 License
--------
+------------------------------------------------------------------------------
 
-Copyright (c) 2011 Spencer Steffen & Citrus, released under the New BSD License All rights reserved.
+Copyright (c) 2011 - 2012 Spencer Steffen & Citrus, released under the New BSD License All rights reserved.

data/app/controllers/{admin → spree/admin}/contents_controller.rb

@@ -1,33 +1,33 @@
-class ::Admin::ContentsController < ::Admin::ResourceController
+class Spree::Admin::ContentsController < Spree::Admin::ResourceController
 
   before_filter :load_resource
   before_filter :parent, :only => :index
-  
+
   before_filter :get_pages, :only => [ :new, :edit, :create, :update ]
 
-  belongs_to :page
-  
+  belongs_to 'spree/page'
+
   def update_positions
     @page = parent
     params[:positions].each do |id, index|
       @page.contents.update_all(['position=?', index], ['id=?', id])
     end
     respond_to do |format|
-      format.html { redirect_to admin_page_contents_url(@oage) }
+      format.html { redirect_to admin_page_contents_url(@page) }
       format.js  { render :text => 'Ok' }
     end
   end
-  
+
   private
-    
+
     def get_pages
-      @pages = Page.order(:position).all
+      @pages = Spree::Page.order(:position).all
     end
-    
+
     def parent
-	    @page ||= Page.find_by_path(params[:page_id])
+	   @page ||= Spree::Page.find_by_path(params[:page_id])
     end
-    
+
     def collection
       params[:search] ||= {}
       params[:search][:meta_sort] ||= "page.asc"

data/app/controllers/{admin → spree/admin}/page_images_controller.rb

@@ -1,4 +1,4 @@
-class Admin::PageImagesController < Admin::ResourceController
+class Spree::Admin::PageImagesController < Spree::Admin::ResourceController
   
   before_filter :load_data
 
@@ -8,7 +8,7 @@ class Admin::PageImagesController < Admin::ResourceController
 
   def update_positions
     params[:positions].each do |id, index|
-      PageImage.update_all(['position=?', index], ['id=?', id])
+      Spree::PageImage.update_all(['position=?', index], ['id=?', id])
     end
     respond_to do |format|
       format.js  { render :text => 'Ok' }
@@ -22,7 +22,7 @@ class Admin::PageImagesController < Admin::ResourceController
   end
 
   def load_data
-    @page = Page.find_by_path(params[:page_id])
+    @page = Spree::Page.find_by_path(params[:page_id])
   end
 
   def set_viewable

data/app/controllers/{admin → spree/admin}/pages_controller.rb

@@ -1,23 +1,23 @@
-class ::Admin::PagesController < ::Admin::ResourceController
+class Spree::Admin::PagesController < Spree::Admin::ResourceController
   
   before_filter :load_resource
-  
+
   def index
     @pages = collection
   end
-  
+
   def location_after_save
     case params[:action]
       when "create"
         edit_admin_page_content_path(@page, @page.contents.first)
       else
         admin_page_path(@page)
-    end        
+    end
   end
 
   def update_positions
     params[:positions].each do |id, index|
-      Page.update_all(['position=?', index], ['id=?', id])
+      Spree::Page.update_all(['position=?', index], ['id=?', id])
     end
     respond_to do |format|
       format.html { redirect_to admin_pages_path }
@@ -26,16 +26,16 @@ class ::Admin::PagesController < ::Admin::ResourceController
   end
 
   private
-  
+
     def find_resource
-      @page ||= Page.find_by_path(params[:id])
+      @page ||= ::Spree::Page.find_by_path(params[:id])
     end
-  
+
     def collection
       params[:search] ||= {}
       params[:search][:meta_sort] ||= "page.asc"
-      @search = Page.metasearch(params[:search])
+      @search = Spree::Page.metasearch(params[:search])
       @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 
-end
+end

data/app/controllers/{page_controller.rb → spree/page_controller.rb}

@@ -1,19 +1,20 @@
-class PageController < Spree::BaseController
+class Spree::PageController < Spree::BaseController
 
   before_filter :get_page, :only => :index
-  
+
+
   def show
   end
-    
+
   private
-  
+
     def get_page
-      @page = Page.active.find_by_path(page_path)
+      @page = Spree::Page.active.find_by_path(page_path)
       return raise ActionController::RoutingError.new(page_path) unless @page
     end
-      
+
     def page_path
       params[:path] || "/"
     end
-        
+
 end

data/app/controllers/spree/pages_controller.rb

@@ -0,0 +1,28 @@
+class Spree::PagesController < Spree::BaseController
+  
+  before_filter :get_page, :only => :show
+
+  def show
+    if @page.root?
+      @posts    = Spree::Post.live.limit(5)    if SpreeEssentials.has?(:blog)
+      @articles = Spree::Article.live.limit(5) if SpreeEssentials.has?(:news)
+      render :template => 'spree/pages/home'
+    end
+  end
+
+  private
+
+    def get_page
+      @page = Spree::Page.includes(:images, :contents).active.find_by_path(page_path) rescue nil
+      raise ActionController::RoutingError.new(page_path) if @page.nil?
+    end
+
+    def page_path
+      params[:page_path].blank? ? "/" : params[:page_path]
+    end
+
+    def accurate_title
+      @page.meta_title
+    end
+
+end

data/app/controllers/{spree_base_controller_decorator.rb → spree/spree_base_controller_decorator.rb}

@@ -1,11 +1,11 @@
 Spree::BaseController.class_eval do
-  
+
   before_filter :get_pages
-  
+
   def get_pages
     admin = request.path =~ /^\/admin/
-    @page = Page.find_by_path(request.path) rescue nil unless admin
-    scope = admin ? Page.scoped : Page.visible
+    @page = Spree::Page.find_by_path(request.path) rescue nil unless admin
+    scope = admin ? Spree::Page.scoped : Spree::Page.visible
     @pages = scope.order(:position).all
   end
 

data/app/models/{content.rb → spree/content.rb}

@@ -1,4 +1,4 @@
-class Content < ActiveRecord::Base
+class Spree::Content < ActiveRecord::Base
   
   belongs_to :page
   validates_associated :page

data/app/models/{page.rb → spree/page.rb}

@@ -1,4 +1,4 @@
-class Page < ActiveRecord::Base
+class Spree::Page < ActiveRecord::Base
   
   alias_attribute :name, :title
   
@@ -11,13 +11,13 @@ class Page < ActiveRecord::Base
   scope :visible, active.where(:visible => true)
   
   has_many :contents, :order => :position, :dependent => :destroy
-  has_many :images, :as => :viewable, :class_name => 'PageImage', :order => :position, :dependent => :destroy
+  has_many :images, :as => :viewable, :class_name => 'Spree::PageImage', :order => :position, :dependent => :destroy
   
   before_validation :set_defaults
   after_create :create_default_content
   
   def self.find_by_path(_path)
-    return super('/') if _path == '_home_' && Page.exists?(:path => '/')
+    return super('/') if _path == '_home_' && self.exists?(:path => '/')
     super _path.to_s.sub(/^\/*/, '/').gsub('--', '/')
   end
   

data/app/models/spree/page_image.rb

@@ -0,0 +1,31 @@
+class Spree::PageImage < Spree::Asset
+
+  validate :no_attachement_errors
+
+  has_attached_file :attachment,
+    :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
+    :default_style => :medium
+ 
+  def image_content?
+    attachment_content_type.match(/\/(jpeg|png|gif|tiff|x-photoshop)/)
+  end
+     
+  def attachment_sizes
+    sizes = {}
+    if image_content?
+      sizes.merge!(:mini => '48x48>', :small => '150x150>', :medium => '420x300>', :large => '900x650>')
+      sizes.merge!(:slide => '950x250#') if viewable.respond_to?(:root?) && viewable.root?
+    end
+    sizes
+  end
+  
+  def no_attachement_errors
+    unless attachment.errors.empty?
+      # uncomment this to get rid of the less-than-useful interrim messages
+      errors.clear
+      errors.add :attachment, "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file."
+      false
+    end
+  end
+  
+end

data/app/views/{admin → spree/admin}/contents/edit.html.erb

@@ -1,9 +1,9 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
-<%= render :partial => 'admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
+<%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
 
 <% if @content.try(:errors).present? %>
-  <%= render 'shared/error_messages', :target => @content %>
+  <%= render 'spree/shared/error_messages', :target => @content %>
 <% end %>
 
 <h2><%= t('.edit_content') %></h2>

data/app/views/{admin → spree/admin}/contents/index.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
 <div class='toolbar'>
   <ul class='actions'>
@@ -9,7 +9,7 @@
   <br class='clear' />
 </div>
 
-<%= render :partial => 'admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
+<%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
 
 <h2><%= t('.listing_contents') %></h2>
 
@@ -42,7 +42,7 @@
 <div class="box">
   <h3><%= t(:search) %></h3>
 
-  <% @content = Content.metasearch %>
+  <% @content = Spree::Content.metasearch %>
   <%= form_for [:admin, @page, @content] do |f| %>
     <p>
       <label><%= t('content.title') %></label><br />

data/app/views/{admin → spree/admin}/contents/new.html.erb

@@ -1,9 +1,9 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
-<%= render :partial => 'admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
+<%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
 
 <% if @content.try(:errors).present? %>
-  <%= render 'shared/error_messages', :target => @content %>
+  <%= render 'spree/shared/error_messages', :target => @content %>
 <% end %>
 
 <h2><%= t('.new_content') %></h2>

data/app/views/spree/admin/contents/show.html.erb

@@ -0,0 +1,11 @@
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
+
+<h2>Content: <%= h @content.title %></h2>
+
+<%= RDiscount.new(@content.body).to_html.html_safe %>
+
+<p>
+  <%= link_to_edit @content %>
+  <%= link_to t('back'), collection_url %>
+</p>

data/app/views/{admin → spree/admin}/page_images/edit.html.erb

@@ -1,9 +1,9 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
-<%= render :partial => 'admin/shared/page_tabs', :locals => {:current => "Images"} %>
+<%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => "Images"} %>
 
 <% if @page_image.try(:errors).present? %>
-  <%= render 'shared/error_messages', :target => @page_image %>
+  <%= render 'spree/shared/error_messages', :target => @page_image %>
 <% end %>
 
 <%= form_for([:admin, @page.id, @page_image], :url => admin_page_image_url(@page, @page_image), :html => { :multipart => true }) do |f| %>

data/app/views/{admin → spree/admin}/page_images/index.html.erb

@@ -1,6 +1,6 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
-<%= render :partial => 'admin/shared/page_tabs', :locals => {:current => "Images"} %>
+<%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => "Images"} %>
 
 <table class="index sortable">
 	<tr>

data/app/views/{admin → spree/admin}/page_images/new.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t("new_image") %></h3>
 
-<%= render 'shared/error_messages', :target => @page_image %>
+<%= render 'spree/shared/error_messages', :target => @page_image %>
 
 <%= form_for(@page_image, :url => admin_page_images_path(@page), :html => { :multipart => true }) do |form| %>
   <table class="basic-table">

data/app/views/{admin → spree/admin}/pages/_form.html.erb

@@ -25,7 +25,7 @@
 <%= form.field_container :accessible do %>
   <%= form.check_box :accessible, :class => "text"  %> &nbsp;
   <%= form.label :accessible, t('page.accessible') %>
-  &ndash; <em><%= t('page.explain_accessible') %></em>
+  <em><%= t('page.explain_accessible') %></em>
   <%= error_message_on :page, :accessible %>
 <% end %>
 

data/app/views/{admin → spree/admin}/pages/edit.html.erb

@@ -1,9 +1,9 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
-<%= render :partial => 'admin/shared/page_tabs', :locals => {:current => 'Page Details'} %>
+<%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => 'Page Details'} %>
 
 <% if @page.try(:errors).present? %>
-  <%= render 'shared/error_messages', :target => @page %>
+  <%= render 'spree/shared/error_messages', :target => @page %>
 <% end %>
 
 <%= form_for([:admin, @page]) do |f| %>

data/app/views/{admin → spree/admin}/pages/index.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
 <div class='toolbar'>
   <ul class='actions'>
@@ -45,7 +45,7 @@
 <div class="box">
   <h3><%= t(:search) %></h3>
 
-  <% @page = Page.metasearch %>
+  <% @page = Spree::Page.metasearch %>
   <%= form_for [:admin, @page] do |f| %>
     <p>
       <label><%= t '.title_contains' %></label><br />

data/app/views/{admin → spree/admin}/pages/new.html.erb

@@ -1,7 +1,7 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
 <% if @page.try(:errors).present? %>
-  <%= render 'shared/error_messages', :target => @page %>
+  <%= render 'spree/shared/error_messages', :target => @page %>
 <% end %>
 
 <h1><%= t('.new_page') %></h1>

data/app/views/{admin → spree/admin}/pages/show.html.erb

@@ -1,6 +1,6 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
-<%= render :partial => 'admin/shared/page_tabs', :locals => {:current => "Page Details"} %>
+<%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => "Page Details"} %>
 
 <h3>Meta Data:</h3>
 <p>

data/app/views/spree/pages/home.html.erb

@@ -0,0 +1,28 @@
+<% unless @page.images.empty? %>
+  <%= render 'spree/shared/slideshow', :images => @page.images, :size => :slide %>
+<% end %>
+
+<% if @page.has_context?('intro') %>
+  <div class="intro">
+    <%= render 'spree/shared/content', :content => @page.for_context('intro').first %>
+  </div>
+<% end %>
+
+<div class="left">
+  <%= render :partial => 'spree/shared/content', :collection => @page.for_context('main') %>
+</div>
+
+<div class="right">
+  <% if defined?(Spree::SpreeEssentialBlog) && !@posts.blank? %>
+    <div class="home-posts">
+      <h1><%= t('blog.home.title') %></h1>
+      <%= render :partial => 'spree/blog/shared/preview', :collection => @posts, :as => :post %>
+    </div>
+  <% end %>
+  <% if defined?(Spree::SpreeEssentialNews) && !@articles.blank? %>
+    <div class="home-articles">
+      <h1><%= t('news.home.title') %></h1>
+      <%= render :partial => 'spree/news/articles/preview', :collection => @articles, :as => :article %>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/pages/show.html.erb

@@ -0,0 +1,3 @@
+<div class="for-<%= @page.to_param %>">
+  <%= render :partial => 'spree/shared/content', :collection => @page.contents %>
+</div>

data/config/locales/en.yml

@@ -27,31 +27,33 @@ en:
   
   pages: Pages
   
-  admin:
-    subnav:
-      pages: Pages
-    shared:
-      contents_tab:
-        content: Content
-      page_tabs:
-        editing_page: Editing Page
-        page_details: Page Details
-        contents: Contents
-        images: Images
-    pages:
-      index:
-        title: Title
-        listing_pages: Listing Pages
-        new_page: New Page        
-        title_contains: Title        
-      new: 
-        new_page: New Page
-        
-    contents:
-      index:
-        new_content: New Content
-        listing_contents: Listing Contents
-      new:
-        new_content: New Content
-      edit:
-        edit_content: Edit Content
+  
+  spree:
+    admin:
+      subnav:
+        pages: Pages
+      shared:
+        contents_tab:
+          content: Content
+        page_tabs:
+          editing_page: Editing Page
+          page_details: Page Details
+          contents: Contents
+          images: Images
+      pages:
+        index:
+          title: Title
+          listing_pages: Listing Pages
+          new_page: New Page        
+          title_contains: Title        
+        new: 
+          new_page: New Page
+          
+      contents:
+        index:
+          new_content: New Content
+          listing_contents: Listing Contents
+        new:
+          new_content: New Content
+        edit:
+          edit_content: Edit Content

data/config/routes.rb

@@ -1,37 +1,37 @@
-class PossiblePage
+class Spree::PossiblePage
   def self.matches?(request)
     path = request.fullpath
     return if path =~ /(^\/(admin|account|cart|checkout|content|login|pg\/|orders|products|s\/|session|signup|shipments|states|t\/|tax_categories|user)+)/
-    count = Page.active.where(:path => path).count
+    count = Spree::Page.active.where(:path => path.gsub("//","/")).count
     0 < count
   end
 end
 
-Rails.application.routes.draw do
-  
+Spree::Core::Engine.routes.draw do
+
   namespace :admin do
-  
+
     resources :pages do
       collection do
         post :update_positions
       end
-      
+
       resources :contents do
         collection do
           post :update_positions
         end
       end
-      
+
       resources :images, :controller => "page_images" do
         collection do
           post :update_positions
         end
       end
     end
-  
+
   end
 
-  constraints(PossiblePage) do
+  constraints(Spree::PossiblePage) do
     get '(:page_path)', :to => 'pages#show', :page_path => /.*/, :as => :page
   end
   

data/lib/generators/spree_essentials/cms_generator.rb

@@ -10,6 +10,7 @@ module SpreeEssentials
       def copy_migrations
         migration_template "create_pages.rb",    "db/migrate/create_pages.rb"
         migration_template "create_contents.rb", "db/migrate/create_contents.rb"
+        migration_template "add_spree_namespace.rb", "db/migrate/add_spree_namespace.rb"
       end
 
     end

data/lib/generators/templates/db/migrate/add_spree_namespace.rb

@@ -0,0 +1,11 @@
+class AddSpreeNamespace < ActiveRecord::Migration
+  def up
+    rename_table :contents, :spree_contents
+    rename_table :pages, :spree_pages
+  end
+
+  def down
+    rename_table :spree_contents, :contents
+    rename_table :spree_pages, :pages
+  end
+end

data/lib/spree_essential_cms.rb

@@ -16,7 +16,7 @@ module SpreeEssentialCms
     
     config.to_prepare do
       #loads application's model / class decorators
-      Dir.glob File.expand_path("../../app/**/*_decorator*.rb") do |c|
+      Dir.glob File.expand_path("../../app/**/*_decorator.rb", __FILE__) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
 

data/lib/spree_essential_cms/version.rb

@@ -1,3 +1,3 @@
 module SpreeEssentialCms
-  VERSION = "0.2.1"
+  VERSION = "0.3.0.rc1"
 end

data/lib/tasks/sample.rake

@@ -19,7 +19,7 @@ namespace :db do
       images = Dir[File.expand_path("../sample", __FILE__) + "/*.jpg"]
       
       home = Page.create(:title => "Home", :path => "/")
-      home.contents.first.update_attributes(:body => Faker::Lorem.paragraphs().join("\n\n"), :context => "main")
+      home.contents.first.update_attributes(:body => FFaker::Lorem.paragraphs().join("\n\n"), :context => "main")
       home.contents.create(:title => Faker::Lorem.words(3 + rand(3)).join(" "), :body => Faker::Lorem.sentence, :context => "intro")
       
       images.each {|image| 

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: spree_essential_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Spencer Steffen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000Z
+date: 2012-01-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_essentials
-  requirement: &70176218104080 !ruby/object:Gem::Requirement
+  requirement: &70176245146400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *70176218104080
+  version_requirements: *70176245146400
 - !ruby/object:Gem::Dependency
   name: dummier
-  requirement: &70176218103340 !ruby/object:Gem::Requirement
+  requirement: &70176245145720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70176218103340
+  version_requirements: *70176245145720
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70176218102680 !ruby/object:Gem::Requirement
+  requirement: &70176245145160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0.beta2
   type: :development
   prerelease: false
-  version_requirements: *70176218102680
+  version_requirements: *70176245145160
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70176218101960 !ruby/object:Gem::Requirement
+  requirement: &70176245144400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *70176218101960
+  version_requirements: *70176245144400
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70176218101220 !ruby/object:Gem::Requirement
+  requirement: &70176245143220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70176218101220
+  version_requirements: *70176245143220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70176218100320 !ruby/object:Gem::Requirement
+  requirement: &70176245142740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70176218100320
+  version_requirements: *70176245142740
 description: SpreeEssentialCms is a full featured content management system for Spree
   Commerce. It's designed to be used with the spree_essentials base.
 email:
@@ -90,6 +90,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/generators/spree_essentials/cms_generator.rb
+- lib/generators/templates/db/migrate/add_spree_namespace.rb
 - lib/generators/templates/db/migrate/create_contents.rb
 - lib/generators/templates/db/migrate/create_pages.rb
 - lib/spree_essential_cms/version.rb
@@ -99,35 +100,35 @@ files:
 - lib/tasks/sample/sailing3.jpg
 - lib/tasks/sample.rake
 - app/assets/stylesheets/essentials/cms.css
-- app/controllers/admin/contents_controller.rb
-- app/controllers/admin/page_images_controller.rb
-- app/controllers/admin/pages_controller.rb
-- app/controllers/page_controller.rb
-- app/controllers/pages_controller.rb
-- app/controllers/spree_base_controller_decorator.rb
-- app/models/content.rb
-- app/models/page.rb
-- app/models/page_image.rb
-- app/views/admin/contents/_form.html.erb
-- app/views/admin/contents/edit.html.erb
-- app/views/admin/contents/index.html.erb
-- app/views/admin/contents/new.html.erb
-- app/views/admin/contents/show.html.erb
-- app/views/admin/page_images/_form.html.erb
-- app/views/admin/page_images/edit.html.erb
-- app/views/admin/page_images/index.html.erb
-- app/views/admin/page_images/new.html.erb
-- app/views/admin/pages/_form.html.erb
-- app/views/admin/pages/edit.html.erb
-- app/views/admin/pages/index.html.erb
-- app/views/admin/pages/new.html.erb
-- app/views/admin/pages/show.html.erb
-- app/views/admin/shared/_page_tabs.html.erb
-- app/views/pages/home.html.erb
-- app/views/pages/show.html.erb
-- app/views/shared/_content.html.erb
-- app/views/shared/_main_menu.html.erb
-- app/views/shared/_slideshow.html.erb
+- app/controllers/spree/admin/contents_controller.rb
+- app/controllers/spree/admin/page_images_controller.rb
+- app/controllers/spree/admin/pages_controller.rb
+- app/controllers/spree/page_controller.rb
+- app/controllers/spree/pages_controller.rb
+- app/controllers/spree/spree_base_controller_decorator.rb
+- app/models/spree/content.rb
+- app/models/spree/page.rb
+- app/models/spree/page_image.rb
+- app/views/spree/admin/contents/_form.html.erb
+- app/views/spree/admin/contents/edit.html.erb
+- app/views/spree/admin/contents/index.html.erb
+- app/views/spree/admin/contents/new.html.erb
+- app/views/spree/admin/contents/show.html.erb
+- app/views/spree/admin/page_images/_form.html.erb
+- app/views/spree/admin/page_images/edit.html.erb
+- app/views/spree/admin/page_images/index.html.erb
+- app/views/spree/admin/page_images/new.html.erb
+- app/views/spree/admin/pages/_form.html.erb
+- app/views/spree/admin/pages/edit.html.erb
+- app/views/spree/admin/pages/index.html.erb
+- app/views/spree/admin/pages/new.html.erb
+- app/views/spree/admin/pages/show.html.erb
+- app/views/spree/admin/shared/_page_tabs.html.erb
+- app/views/spree/pages/home.html.erb
+- app/views/spree/pages/show.html.erb
+- app/views/spree/shared/_content.html.erb
+- app/views/spree/shared/_main_menu.html.erb
+- app/views/spree/shared/_slideshow.html.erb
 - Rakefile
 homepage: http://github.com/citrus/spree_essential_cms
 licenses: []
@@ -143,16 +144,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -927433600182519188
+      hash: 1544382525842900464
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -927433600182519188
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app/controllers/pages_controller.rb

@@ -1,28 +0,0 @@
-class PagesController < Spree::BaseController
-  
-  before_filter :get_page, :only => :show
-  
-  def show
-    if @page.root?
-      @posts    = Post.live.limit(5)    if SpreeEssentials.has?(:blog)
-      @articles = Article.live.limit(5) if SpreeEssentials.has?(:news)
-      render :template => 'pages/home'
-    end
-  end
-  
-  private
-  
-    def get_page
-      @page = Page.includes(:images, :contents).active.find_by_path(page_path) rescue nil
-      raise ActionController::RoutingError.new(page_path) if @page.nil?
-    end
-      
-    def page_path
-      params[:page_path] || "/"
-    end
-  
-    def accurate_title
-      @page.meta_title
-    end
-    
-end

data/app/models/page_image.rb

@@ -1,40 +0,0 @@
-class PageImage < Image
-
-  validate :no_attachement_errors
-
-  if defined?(SpreeHeroku)
-    has_attached_file :attachment,
-      :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
-      :default_style => :medium,
-      :path => "assets/pages/:id/:style/:basename.:extension",
-      :storage => "s3",
-      :s3_credentials => "#{Rails.root}/config/s3.yml"
-  else
-    has_attached_file :attachment,
-      :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
-      :default_style => :medium,
-      :url => "/assets/pages/:id/:style/:basename.:extension",
-      :path => ":rails_root/public/assets/pages/:id/:style/:basename.:extension"
-  end 
- 
-  def image_content?
-    attachment_content_type.match(/\/(jpeg|png|gif|tiff|x-photoshop)/)
-  end
-     
-  def attachment_sizes
-    sizes = {}
-    sizes.merge!(:mini => '48x48>', :small => '150x150>', :medium => '420x300>', :large => '900x650>') if image_content?
-    sizes.merge!(:slide => '950x250#') if viewable.respond_to?(:root?) && viewable.root?
-    sizes
-  end
-  
-  def no_attachement_errors
-    unless attachment.errors.empty?
-      # uncomment this to get rid of the less-than-useful interrim messages
-      errors.clear
-      errors.add :attachment, "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file."
-      false
-    end
-  end
-  
-end

data/app/views/admin/contents/show.html.erb

@@ -1,11 +0,0 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
-<%= render :partial => 'admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
-
-<h2><%= h @content.title %></h2>
-
-<%= RDiscount.new(@content.body).to_html.html_safe %>
-
-<p>
-  <%= link_to_edit @user %> &nbsp;
-  <%= link_to t('back'), collection_url %>
-</p>

data/app/views/pages/home.html.erb

@@ -1,28 +0,0 @@
-<% unless @page.images.empty? %>
-  <%= render 'shared/slideshow', :images => @page.images, :size => :slide %>
-<% end %>
-
-<% if @page.has_context?('intro') %>
-  <div class="intro">
-    <%= render 'shared/content', :content => @page.for_context('intro').first %>
-  </div>
-<% end %>
-
-<div class="left">
-  <%= render :partial => 'shared/content', :collection => @page.for_context('main') %>
-</div>
-
-<div class="right">
-  <% if defined?(SpreeEssentialBlog) && !@posts.blank? %>
-    <div class="home-posts">
-      <h1><%= t('blog.home.title') %></h1>
-      <%= render :partial => 'blog/shared/preview', :collection => @posts, :as => :post %>
-    </div>
-  <% end %>
-  <% if defined?(SpreeEssentialNews) && !@articles.blank? %>
-    <div class="home-articles">
-      <h1><%= t('news.home.title') %></h1>
-      <%= render :partial => 'news/articles/preview', :collection => @articles, :as => :article %>
-    </div>
-  <% end %>
-</div>

data/app/views/pages/show.html.erb

@@ -1,3 +0,0 @@
-<div class="for-<%= @page.to_param %>">
-  <%= render :partial => 'shared/content', :collection => @page.contents %>
-</div>