spree_essential_cms 0.3.0.rc1 → 0.4.0

data/.gitignore

@@ -0,0 +1,8 @@
+*.gem
+.bundle
+.DS_Store
+coverage
+Gemfile.lock
+pkg/*
+test/dummy_hooks/after_migrate.rb
+test/dummy

data/.travis.yml

@@ -0,0 +1,15 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+
+branches:
+  only:
+    - master
+
+before_script:
+  - "sh -e /etc/init.d/xvfb start"
+  - "bundle exec dummier"
+
+script: "DISPLAY=:99.0 bundle exec rake"

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Spencer Steffen and Citrus Media Group.
+Copyright (c) 2011 - 2012 Spencer Steffen and Citrus Media Group.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -14,7 +14,17 @@ Otherwise, follow these steps to get up and running with SpreeEssentialCms:
 Add spree_essential_cms to your Gemfile:
 
 ```ruby
-gem 'spree_essential_cms', '>= 0.2.1'
+# Spree 1.1.x
+gem 'spree_essential_cms', '~> 0.4.0'
+
+# Spree 1.0.x
+gem 'spree_essential_cms', '~> 0.3.0.rc1'
+
+# Spree 0.70.x
+gem 'spree_essential_cms', '~> 0.2.1'
+
+# Spree 0.60.x and below
+gem 'spree_essential_cms', '~> 0.1.2'
 ```
 
 Now, bundle up with:
@@ -42,6 +52,19 @@ Boot your server and checkout the admin at `localhost:3000/admin`!
 bundle exec rails s
 ```
 
+### To use the built in main menu create a deface override in your application that looks like this:
+
+```ruby
+# app/overrides/main_menu.rb
+Deface::Override.new(:virtual_path  => "spree/shared/_store_menu",
+                     :name          => "spree_essential_cms_main_menu_items",
+                     :insert_after  => "#home-link[data-hook]",
+                     :partial       => "spree/shared/main_menu_items",
+                     :disabled      => false)
+```
+
+This example override can be found in `test/dummy_hooks/templates/main_menu.rb`
+
 
 ------------------------------------------------------------------------------
 Usage
@@ -80,7 +103,7 @@ Use a content decorator when you want different contexts to have their own image
 
 # app/models/content_decorator.rb
 
-Content.class_eval do
+Spree::Content.class_eval do
 
   # override default image sizes
   def default_attachment_sizes
@@ -107,12 +130,18 @@ Content.class_eval do
 end
 ```
 
+### Custom Home Page
+
+This extension modifies the `Spree::HomeController.index` method and redirects to `/products`
+if no root page is defined in the spree CMS. In order to define a custom home page you'll need to use another view
+off of the `Spree::HomeController` class such as `splash`, add the root route
+(`root :to => 'spree/home#splash'`) to your `config/routes.rb`, and add a blank page with path "/" in the spree CMS.
 
 ------------------------------------------------------------------------------
 Demo
 ------------------------------------------------------------------------------
 
-You can easily use the test/dummy app as a demo of spree_essential_cms. Just `cd` to where you develop and run:
+You can easily use the `test/dummy` app as a demo of spree_essential_cms. Just `cd` to where you develop and run:
 
 ```bash
 git clone git://github.com/citrus/spree_essential_cms.git
@@ -125,11 +154,40 @@ bundle exec rails s
 ```
 
 
+------------------------------------------------------------------------------
+Testing
+------------------------------------------------------------------------------
+
+Testing for spree_essential_cms is done with unit tests and capybara integration tests. To get setup, run the commands below:
+
+```bash
+git clone git://github.com/citrus/spree_essential_cms.git
+cd spree_essential_cms
+bundle install
+bundle exec dummier
+```
+
+
+Now you've got a test app setup in `test/dummy`. Now you can run the tests with:
+
+```bash
+bundle exec rake
+```
+
+
+If for any reason you want to re-create your `test/dummy` app, just re-run `bundle exec dummier`.
+
+
 ------------------------------------------------------------------------------
 Change Log
 ------------------------------------------------------------------------------
 
-**2012/1/16**
+**0.4.0 - 2012/5/1**
+
+* Add support for Spree 1.1.x
+
+
+**0.3.0.rc1 - 2012/1/16**
 
 * Add support for Spree 1.0.x
 
@@ -166,7 +224,6 @@ Change Log
 To Do
 ------------------------------------------------------------------------------
 
-* more tests... many many more.
 * optimizations
 * A 'create translation' button that clones the current page's contents into another language
 * add widgets that you can drop into any page
@@ -180,7 +237,9 @@ Contributors
 ------------------------------------------------------------------------------
 
 * Spencer Steffen ([@citrus](https://github.com/citrus))
+* Stéphane Bounmy ([@sbounmy](https://github.com/sbounmy))
 * Kyle West ([@kylewest](https://github.com/kylewest))
+* Derek Ethier ([@ethier](https://github.com/ethier))
 * [@kpitn](https://github.com/kpitn)
 
 

data/Versionfile

@@ -0,0 +1,8 @@
+"1.1.x"  => { :version => "0.4.0" }
+"1.0.x"  => { :version => "0.3.0.rc1" }
+"0.70.x" => { :version => "0.2.1" }
+"0.60.x" => { :version => "0.1.2" }
+"0.50.x" => { :version => "0.1.2" }
+"0.40.x" => {}
+"0.30.x" => {}
+"0.10.x" => {}

data/app/controllers/spree/admin/contents_controller.rb

@@ -29,10 +29,10 @@ class Spree::Admin::ContentsController < Spree::Admin::ResourceController
     end
 
     def collection
-      params[:search] ||= {}
-      params[:search][:meta_sort] ||= "page.asc"
-      @search = parent.contents.metasearch(params[:search])
-      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
+      params[:q] ||= {}
+      params[:q][:sort] ||= "page.asc"
+      @search = parent.contents.search(params[:q])
+      @collection = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 
 end

data/app/controllers/spree/admin/pages_controller.rb

@@ -1,11 +1,5 @@
 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"
@@ -30,12 +24,12 @@ class Spree::Admin::PagesController < Spree::Admin::ResourceController
     def find_resource
       @page ||= ::Spree::Page.find_by_path(params[:id])
     end
-
+    
     def collection
-      params[:search] ||= {}
-      params[:search][:meta_sort] ||= "page.asc"
-      @search = Spree::Page.metasearch(params[:search])
-      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
+      params[:q] ||= {}
+      params[:q][:sort] ||= "page.asc"
+      @search = Spree::Page.search(params[:q])
+      @collection = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 
-end
+end

data/app/controllers/spree/base_controller_decorator.rb

@@ -0,0 +1,15 @@
+Spree::BaseController.class_eval do
+
+  before_filter :get_pages
+  helper_method :current_page
+  
+  def current_page
+    @page ||= Spree::Page.find_by_path(request.fullpath)
+  end
+  
+  def get_pages
+    return if request.path =~ /^\/+admin/
+    @pages ||= Spree::Page.visible.order(:position).all
+  end
+
+end

data/app/controllers/spree/home_controller_decorator.rb

@@ -0,0 +1,23 @@
+Spree::HomeController.class_eval do
+  
+  before_filter :get_homepage
+  
+  def index
+    @searcher = Spree::Config.searcher_class.new(params)
+    @products = @searcher.retrieve_products
+    render :template => "spree/pages/home"      
+  end
+  
+  private
+  
+    def get_homepage
+      @page = Spree::Page.find_by_path("/")
+      redirect_to products_url if @page.nil?
+      @page
+    end
+    
+    def accurate_title
+      @page.meta_title unless @page.nil?
+    end
+  
+end

data/app/controllers/spree/pages_controller.rb

@@ -1,8 +1,8 @@
 class Spree::PagesController < Spree::BaseController
-  
-  before_filter :get_page, :only => :show
 
   def show
+    @page = current_page
+    raise ActionController::RoutingError.new("No route matches [GET] #{request.fullpath}") if @page.nil? 
     if @page.root?
       @posts    = Spree::Post.live.limit(5)    if SpreeEssentials.has?(:blog)
       @articles = Spree::Article.live.limit(5) if SpreeEssentials.has?(:news)
@@ -12,15 +12,6 @@ class Spree::PagesController < Spree::BaseController
 
   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

data/app/models/spree/content.rb

@@ -1,62 +1,54 @@
 class Spree::Content < ActiveRecord::Base
-  
+
+  attr_accessor :delete_attachment
+  attr_accessible :page_id, :title, :path, :body, :hide_title, :link, :link_text, :context, :attachment, :delete_attachment
+
   belongs_to :page
   validates_associated :page
   validates_presence_of :title, :page
 
   default_scope order(:position)
-  
-  if defined?(SpreeHeroku)
-    has_attached_file :attachment,
-      :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
-      :default_style => :preview,
-      :path => "assets/contents/: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 => :preview,
-      :url => "/assets/contents/:id/:style/:basename.:extension",
-      :path => ":rails_root/public/assets/contents/:id/:style/:basename.:extension"
-  end
-  
+
+  has_attached_file :attachment,
+    :styles        => Proc.new{ |clip| clip.instance.attachment_sizes },
+    :default_style => :preview,
+    :url           => "/spree/contents/:id/:style/:basename.:extension",
+    :path          => ":rails_root/public/spree/contents/:id/:style/:basename.:extension"
   
   cattr_reader :per_page
   @@per_page = 10
-  
-  
+
   scope :for, Proc.new{|context| where(:context => context)}
-  
-    
+
+  before_update :delete_attachment!, :if => :delete_attachment
+  before_update :reprocess_images_if_context_changed
+
   [ :link_text, :link, :body ].each do |property|
     define_method "has_#{property.to_s}?" do
       has_value property
     end
   end
-  
+
   def has_full_link?
     has_link? && has_link_text?
   end
- 	
+
   def has_image?
     has_value(:attachment_file_name) && attachment_file_name.match(/gif|jpg|png/i)
   end
-  
+
   def hide_title?
     self.hide_title == true
   end
-  
-  
+
   def rendered_body
     RDiscount.new(body.to_s).to_html.html_safe
   end
-    
-  
+
   def default_attachment_sizes
     { :mini => '48x48>', :medium => '427x287>' }
   end
- 	
+
   def attachment_sizes
     case self.context
       when 'slideshow'
@@ -66,18 +58,27 @@ class Spree::Content < ActiveRecord::Base
     end
     sizes
   end
-  
-  
-  
+
   def context=(value)
     write_attribute :context, value.to_s.parameterize
   end
 
-  private
-  
-    def has_value(selector)
-      v = self.send selector
-      v && !v.to_s.blank?
-    end
+private
+
+  def delete_attachment!
+    del = delete_attachment.to_s
+    self.attachment = nil if del == "1" || del == "true"
+    true
+  end
+
+  def reprocess_images_if_context_changed
+    return unless context_changed? && attachment_file_name.present?
+    attachment.reprocess!
+  end
+
+  def has_value(selector)
+    v = self.send selector
+    v && !v.to_s.blank?
+  end
 
-end
+end

data/app/models/spree/page.rb

@@ -1,5 +1,15 @@
 class Spree::Page < ActiveRecord::Base
   
+  class << self
+  
+    def find_by_path(_path)
+      return super('/') if _path == "_home_" && self.exists?(:path => "/")
+      super _path.to_s.sub(/^\/*/, "/").gsub("--", "/")
+    end
+
+  end
+  
+  attr_accessible :title, :path, :nav_title, :meta_title, :meta_description, :meta_keywords, :accessible, :visible
   alias_attribute :name, :title
   
   validates_presence_of :title
@@ -11,19 +21,14 @@ class Spree::Page < ActiveRecord::Base
   scope :visible, active.where(:visible => true)
   
   has_many :contents, :order => :position, :dependent => :destroy
-  has_many :images, :as => :viewable, :class_name => 'Spree::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_' && self.exists?(:path => '/')
-    super _path.to_s.sub(/^\/*/, '/').gsub('--', '/')
-  end
-  
+    
   def to_param
-    return '_home_' if path == '/'
-    path.sub(/^\//, '').gsub('/', '--')
+    return "_home_" if path == "/"
+    path.sub(/^\/*/, "")
   end
   
   def meta_title
@@ -47,6 +52,12 @@ class Spree::Page < ActiveRecord::Base
     self.path == "/"
   end
   
+  def path=(value)
+    value = value.to_s.strip
+    value.gsub!(/[\/\-\_]+$/, "") unless value == "/"
+    write_attribute :path, value
+  end
+  
   private
   
     def set_defaults
@@ -54,7 +65,7 @@ class Spree::Page < ActiveRecord::Base
       #return errors.add(:path, "is reserved. Please use another") if path.to_s =~ /home/
       self.nav_title = title if nav_title.blank?
       self.path = nav_title.parameterize if path.blank?
-      self.path = "/" + path.sub(/^\//, '')
+      self.path = "/" + path.sub(/^\//, "")
     end
     
     def create_default_content