spree_essential_cms 0.1.2 → 0.2.0

data/README.md

@@ -1,7 +1,4 @@
-SpreeEssentialCms
-=================
-
-SpreeEssentialCms is a full featured CMS for managing pages and content on your [Spree](http://spreecommerce.com) site.
+# Spree Essential CMS [![Build Status](https://secure.travis-ci.org/citrus/spree_essential_cms.png)](http://travis-ci.org/citrus/spree_essential_cms)
 
 
 Installation
@@ -11,17 +8,20 @@ If you don't already have an existing Spree site, [click here](https://gist.gith
 
 Otherwise, follow these steps to get up and running with SpreeEssentialCms:
 
-Add the necessary gems to your Gemfile:
+Add spree_essential_cms to your Gemfile:
+
+    gem 'spree_essential_cms', '>= 0.2.0'
 
-    gem 'spree_essentials',    '~> 0.2.3'
-    gem 'spree_essential_cms', '~> 0.1.2'
+Now, bundle up with:
+
+    bundle install
 
-Run the generators to create the migration files.
+Then run the generators to create the migration files:
 
     rails g spree_essentials:install
     rails g spree_essentials:cms
 
-Now migrate your database...
+Now migrate your database:
 
     rake db:migrate
     
@@ -34,6 +34,11 @@ Boot your server and checkout the admin!
 Usage
 -----
 
+[todo] add basic usage stuff here
+
+
+### Here's some tips for making content really customized...
+
 
 #### Contexts
 
@@ -108,9 +113,10 @@ You can easily use the test/dummy app as a demo of spree_essential_cms. Just `cd
 Change Log
 ----------
 
-**0.1.2 - 2012/1/6**
+**0.2.0 - 2011/12/15**
 
-* Removed automatic attachment config with SpreeHeroku 
+* Add 0.70.x compatibility
+* Removed spork dev dependency
 
 
 **0.1.1 - 2011/6/2**
@@ -154,4 +160,4 @@ If you'd like to help out feel free to fork and send me pull requests!
 License
 -------
 
-Copyright (c) 2011 Spencer Steffen, released under the New BSD License All rights reserved.
+Copyright (c) 2011 Spencer Steffen & Citrus, released under the New BSD License All rights reserved.

data/{public → app/assets}/stylesheets/essentials/cms.css

@@ -36,4 +36,4 @@ body.one-col #content {
 .slideshow.slide {
   width: 950px;
   height: 250px;
-}
+}

data/app/controllers/admin/contents_controller.rb

@@ -26,7 +26,7 @@ class ::Admin::ContentsController < ::Admin::ResourceController
       params[:search] ||= {}
       params[:search][:meta_sort] ||= "page.asc"
       @search = parent.contents.metasearch(params[:search])
-      @collection = @search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
+      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 
 end

data/app/controllers/admin/pages_controller.rb

@@ -35,7 +35,7 @@ class ::Admin::PagesController < ::Admin::ResourceController
       params[:search] ||= {}
       params[:search][:meta_sort] ||= "page.asc"
       @search = Page.metasearch(params[:search])
-      @collection = @search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
+      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 
 end

data/app/models/content.rb

@@ -2,13 +2,24 @@ class Content < ActiveRecord::Base
   
   belongs_to :page
   validates_associated :page
-  validates_presence_of :title
+  validates_presence_of :title, :page
 
   default_scope order(:position)
   
-  has_attached_file :attachment,
-    :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
-    :default_style => :preview
+  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
   
   
   cattr_reader :per_page

data/app/models/page_image.rb

@@ -1,15 +1,26 @@
-class PageImage < Asset
+class PageImage < Image
 
   validate :no_attachement_errors
 
-  has_attached_file :attachment,
-    :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
-    :default_style => :medium
-  
+  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?

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

@@ -35,7 +35,7 @@
   </tbody>
 </table>
 
-<%= will_paginate(@contents, :prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") %>
+<%= paginate @collection %>
 
 <% content_for :sidebar do %>
 
@@ -44,16 +44,11 @@
 
   <% @content = Content.metasearch %>
   <%= form_for [:admin, @page, @content] do |f| %>
-    <%- locals = {:f => f} %>
-    <%= hook :admin_contents_index_search, locals do %>
-      <p>
-        <label><%= t('content.title') %></label><br />
-        <%= f.text_field :title_like, :size => 25 %>
-      </p>      
-    <% end %>
-    <%= hook :admin_contents_index_search_buttons, locals do %>
-      <p><%= button t("search") %></p>
-    <% end %>
+    <p>
+      <label><%= t('content.title') %></label><br />
+      <%= f.text_field :title_like, :size => 25 %>
+    </p>      
+    <p><%= button t("search") %></p>
   <% end %>
 </div>
 <% end %>

data/app/views/admin/pages/index.html.erb

@@ -39,7 +39,7 @@
   </tbody>
 </table>
 
-<%= will_paginate(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") %>
+<%= paginate @collection %>
 
 <% content_for :sidebar do %>
 <div class="box">
@@ -47,16 +47,11 @@
 
   <% @page = Page.metasearch %>
   <%= form_for [:admin, @page] do |f| %>
-    <%- locals = {:f => f} %>
-    <%= hook :admin_pages_index_search, locals do %>
-      <p>
-        <label><%= t '.title_contains' %></label><br />
-        <%= f.text_field :title_contains, :size => 25 %>
-      </p>      
-    <% end %>
-    <%= hook :admin_pages_index_search_buttons, locals do %>
-      <p><%= button t("search") %></p>
-    <% end %>
+    <p>
+      <label><%= t '.title_contains' %></label><br />
+      <%= f.text_field :title_contains, :size => 25 %>
+    </p>      
+    <p><%= button t("search") %></p>
   <% end %>
 </div>
 <% end %>

data/app/views/admin/shared/_page_tabs.html.erb

@@ -6,17 +6,15 @@
   <br clear="clear" />
 
   <ul class="sidebar post-menu">
-    <%= hook :admin_page_tabs, {:current => current} do %>
-      <li<%== ' class="active"' if current == t('.page_details') %>>
-        <%= link_to t('.page_details'), edit_admin_page_url(@page) %>
-      </li>      
-      <li<%== ' class="active"' if current == "Contents" %>>
-        <%= link_to t('.contents'), admin_page_contents_url(@page) %>
-      </li>    
-      <li<%== ' class="active"' if current == "Images" %>>
-        <%= link_to t('.images'), admin_page_images_url(@page) %>
-      </li>    
-    <% end %>
+    <li<%== ' class="active"' if current == t('.page_details') %>>
+      <%= link_to t('.page_details'), edit_admin_page_url(@page) %>
+    </li>      
+    <li<%== ' class="active"' if current == "Contents" %>>
+      <%= link_to t('.contents'), admin_page_contents_url(@page) %>
+    </li>    
+    <li<%== ' class="active"' if current == "Images" %>>
+      <%= link_to t('.images'), admin_page_images_url(@page) %>
+    </li>    
   </ul>
   <br clear="clear" />
 

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

@@ -25,4 +25,4 @@
       <%= render :partial => 'news/articles/preview', :collection => @articles, :as => :article %>
     </div>
   <% end %>
-</div>
+</div>

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

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

data/app/views/shared/_main_menu.html.erb

@@ -4,4 +4,4 @@
       <li<%= ' class="active"'.html_safe if page.matches?(request.path) %>><%= link_to page.nav_title, page.path %></li>
     <% end %>
   </ul>
-<% end %>
+<% end %>

data/app/views/shared/_slideshow.html.erb

@@ -5,4 +5,4 @@
       <%= image_tag image.attachment.url(size), :alt => image.alt %>
     <% end %>
   </div>
-<% end %>
+<% end %>

data/lib/generators/spree_essentials/cms_generator.rb

@@ -14,4 +14,4 @@ module SpreeEssentials
 
     end
   end
-end
+end

data/lib/spree_essential_cms.rb

@@ -3,41 +3,31 @@ require 'spree_essentials'
 module SpreeEssentialCms
 
   def self.tab
-    [ :pages ]
+    { :label => "Pages", :route => :admin_pages }
   end
   
   def self.sub_tab
     [ :pages, { :match_path => '/pages' }]
   end
   
-  def self.independent?
-    return true unless defined?(SpreeEssentials)
-    !SpreeEssentials.respond_to?(:register)
-  end
-  
   class Engine < Rails::Engine
-    config.autoload_paths += %W(#{config.root}/lib)    
     
-    initializer "static assets" do |app|
-      app.middleware.insert_before ::Rack::Lock, ::ActionDispatch::Static, "#{config.root}/public"
-    end
+    config.autoload_paths += %W(#{config.root}/lib)    
     
-    def self.activate
-      
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator.rb")) do |c|
-        Rails.env.production? ? require(c) : load(c)
+    config.to_prepare do
+      #loads application's model / class decorators
+      Dir.glob File.expand_path("../../app/**/*_decorator*.rb") do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
       end
-      
-    end
 
-    config.to_prepare &method(:activate).to_proc
+      #loads application's deface view overrides
+      Dir.glob File.expand_path("../../app/overrides/*.rb", __FILE__) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+    end
     
   end
   
 end
 
-if SpreeEssentialCms.independent?
-  require 'spree_essential_press/custom_hooks'
-else 
-  SpreeEssentials.register :cms, SpreeEssentialCms
-end
+SpreeEssentials.register :cms, SpreeEssentialCms

data/lib/spree_essential_cms/version.rb

@@ -1,3 +1,3 @@
 module SpreeEssentialCms
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/tasks/sample.rake

@@ -22,7 +22,9 @@ namespace :db do
       home.contents.first.update_attributes(:body => Faker::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| home.images.create(:attachment => File.open(image), :alt => "Sailing") }
+      images.each {|image| 
+        PageImage.create(:viewable => home, :attachment => File.open(image), :alt => "Sailing") 
+      }
       
       %w(About Contact).each do |title|
         page = Page.create(:title => title, :path => title.downcase)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_essential_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000Z
+date: 2011-12-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_essentials
-  requirement: &70280302826960 !ruby/object:Gem::Requirement
+  requirement: &70103086805240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70280302826960
-- !ruby/object:Gem::Dependency
-  name: spree_sample
-  requirement: &70280302826460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.60.0
-  type: :development
-  prerelease: false
-  version_requirements: *70280302826460
+  version_requirements: *70103086805240
 - !ruby/object:Gem::Dependency
   name: dummier
-  requirement: &70280302825700 !ruby/object:Gem::Requirement
+  requirement: &70103086804360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,73 +32,51 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70280302825700
+  version_requirements: *70103086804360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70280302825240 !ruby/object:Gem::Requirement
+  requirement: &70103086803620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
-  version_requirements: *70280302825240
+  version_requirements: *70103086803620
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70280302824780 !ruby/object:Gem::Requirement
+  requirement: &70103086803140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta4
+        version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *70280302824780
+  version_requirements: *70103086803140
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70280302824320 !ruby/object:Gem::Requirement
+  requirement: &70103086802500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70280302824320
+  version_requirements: *70103086802500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70280302823860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :development
-  prerelease: false
-  version_requirements: *70280302823860
-- !ruby/object:Gem::Dependency
-  name: spork
-  requirement: &70280302823400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0.rc9
-  type: :development
-  prerelease: false
-  version_requirements: *70280302823400
-- !ruby/object:Gem::Dependency
-  name: spork-testunit
-  requirement: &70280302822940 !ruby/object:Gem::Requirement
+  requirement: &70103086801820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70280302822940
+  version_requirements: *70103086801820
 description: SpreeEssentialCms is a full featured content management system for Spree
   Commerce. It's designed to be used with the spree_essentials base.
 email:
@@ -122,7 +89,6 @@ files:
 - LICENSE
 - config/locales/en.yml
 - config/routes.rb
-- lib/generators/essentials_base.rb
 - lib/generators/spree_essentials/cms_generator.rb
 - lib/generators/templates/db/migrate/create_contents.rb
 - lib/generators/templates/db/migrate/create_pages.rb
@@ -132,6 +98,7 @@ files:
 - lib/tasks/sample/sailing2.jpg
 - 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
@@ -161,7 +128,6 @@ files:
 - app/views/shared/_content.html.erb
 - app/views/shared/_main_menu.html.erb
 - app/views/shared/_slideshow.html.erb
-- public/stylesheets/essentials/cms.css
 - Rakefile
 homepage: http://github.com/citrus/spree_essential_cms
 licenses: []
@@ -177,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 239260853434187353
+      hash: -660690764498914347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 239260853434187353
+      hash: -660690764498914347
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/lib/generators/essentials_base.rb

@@ -1,23 +0,0 @@
-module SpreeEssentials
-  module Generators
-    class EssentialsBase < Rails::Generators::Base
-    
-      include Rails::Generators::Migration      
-
-      def self.count!
-        @count ||= 0
-        (@count += 1) * 3
-      end
-
-      def self.next_migration_number(path)
-        @time ||= Time.new.utc
-        if ActiveRecord::Base.timestamped_migrations
-          (@time + self.count!).strftime("%Y%m%d%H%M%S")
-        else
-          "%.3d" % (current_migration_number(dirname) + 1)
-        end
-      end
-      
-    end
-  end
-end