comfortable_mexican_sofa 1.1.2 → 1.2.0

data/config/initializers/comfortable_mexican_sofa.rb

@@ -47,6 +47,11 @@ ComfortableMexicanSofa.configure do |config|
   # Path where fixtures can be located.
   #   config.fixtures_path = File.expand_path('db/cms_fixtures', Rails.root)
   
+  # Content for Layouts, Pages and Snippets has a revision history. You can revert
+  # a previous version using this system. You can control how many revisions per
+  # object you want to keep. Set it to 0 if you wish to turn this feature off.
+  #   config.revisions_limit = 25
+  
 end
 
 # Default credentials for ComfortableMexicanSofa::HttpAuth

data/config/routes.rb

@@ -10,11 +10,22 @@ Rails.application.routes.draw do
       collection do
         match :reorder
       end
+      resources :revisions, :only => [:index, :show, :revert] do
+        put :revert, :on => :member
+      end
     end
     resources :sites
-    resources :layouts
-    resources :snippets
     resources :uploads, :only => [:create, :destroy]
+    resources :layouts do
+      resources :revisions, :only => [:index, :show, :revert] do
+        put :revert, :on => :member
+      end
+    end
+    resources :snippets do 
+      resources :revisions, :only => [:index, :show, :revert] do
+        put :revert, :on => :member
+      end
+    end
   end
   
   scope :controller => :cms_content do

data/db/migrate/01_create_cms.rb

@@ -70,6 +70,16 @@ class CreateCms < ActiveRecord::Migration
       t.timestamps
     end
     add_index :cms_uploads, [:site_id, :file_file_name]
+    
+    # -- Revisions -----------------------------------------------------------
+    create_table :cms_revisions, :force => true do |t|
+      t.string    :record_type
+      t.integer   :record_id
+      t.text      :data
+      t.datetime  :created_at
+    end
+    add_index :cms_revisions, [:record_type, :record_id, :created_at]
+    
   end
   
   def self.down
@@ -79,5 +89,6 @@ class CreateCms < ActiveRecord::Migration
     drop_table :cms_snippets
     drop_table :cms_blocks
     drop_table :cms_uploads
+    drop_table :cms_revisions
   end
 end

data/db/migrate/upgrades/03_upgrade_to_1_2_0.rb

@@ -0,0 +1,15 @@
+class UpgradeTo120 < ActiveRecord::Migration
+  def self.up
+    create_table :cms_revisions, :force => true do |t|
+      t.string    :record_type
+      t.integer   :record_id
+      t.text      :data
+      t.datetime  :created_at
+    end
+    add_index :cms_revisions, [:record_type, :record_id, :created_at]
+  end
+
+  def self.down
+    drop_table :cms_revisions
+  end
+end

data/lib/comfortable_mexican_sofa.rb

@@ -3,7 +3,8 @@ unless defined? ComfortableMexicanSofa::Application
   require File.expand_path('comfortable_mexican_sofa/engine', File.dirname(__FILE__))
 end
 
-[ 'comfortable_mexican_sofa/configuration',
+[ 'comfortable_mexican_sofa/version',
+  'comfortable_mexican_sofa/configuration',
   'comfortable_mexican_sofa/http_auth',
   'comfortable_mexican_sofa/rails_extensions',
   'comfortable_mexican_sofa/controller_methods',
@@ -11,6 +12,7 @@ end
   'comfortable_mexican_sofa/view_methods',
   'comfortable_mexican_sofa/form_builder',
   'comfortable_mexican_sofa/acts_as_tree',
+  'comfortable_mexican_sofa/has_revisions',
   'comfortable_mexican_sofa/tag',
   'comfortable_mexican_sofa/fixtures'
 ].each do |path|

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -37,6 +37,9 @@ class ComfortableMexicanSofa::Configuration
   # Path where fixtures can be located.
   attr_accessor :fixtures_path
   
+  # Number of revisions kept. Default is 25. If you wish to disable: set this to 0.
+  attr_accessor :revisions_limit
+  
   # Configuration defaults
   def initialize
     @cms_title              = 'ComfortableMexicanSofa MicroCMS'
@@ -51,6 +54,7 @@ class ComfortableMexicanSofa::Configuration
     @upload_file_options    = {}
     @enable_fixtures        = false
     @fixtures_path          = File.expand_path('db/cms_fixtures', Rails.root)
+    @revisions_limit        = 25
   end
   
 end

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -76,7 +76,6 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
         <div class='value'>
           #{field}
           #{@template.hidden_field_tag('cms_page[blocks_attributes][][label]', tag.label, :id => nil)}
-          #{@template.hidden_field_tag('cms_page[blocks_attributes][][id]', tag.record_id, :id => nil) if tag.record_id}
         </div>
       </div>
     ).html_safe

data/lib/comfortable_mexican_sofa/has_revisions.rb

@@ -0,0 +1,64 @@
+module ComfortableMexicanSofa::HasRevisions
+  
+  def self.included(base)
+    base.send :extend, ClassMethods
+  end
+  
+  module ClassMethods
+    
+    def has_revisions_for(*fields)
+      
+      include ComfortableMexicanSofa::HasRevisions::InstanceMethods
+      
+      attr_accessor :revision_data
+      
+      has_many :revisions,
+        :as         => :record,
+        :dependent  => :destroy
+      
+      before_save :prepare_revision
+      after_save  :create_revision
+      
+      define_method(:revision_fields) do
+        fields.collect(&:to_s)
+      end
+    end
+  end
+  
+  module InstanceMethods
+    
+    # Preparing revision data. A bit of a special thing to grab page blocks
+    def prepare_revision
+      return if self.new_record?
+      if (self.respond_to?(:blocks_attributes_changed) && self.blocks_attributes_changed) || 
+        !(self.changed & revision_fields).empty?
+        self.revision_data = revision_fields.inject({}) do |c, field|
+          c[field] = self.send("#{field}_was")
+          c
+        end
+      end
+    end
+    
+    # Revision is created only if relevant data changed
+    def create_revision
+      return unless self.revision_data
+      
+      # creating revision
+      if ComfortableMexicanSofa.config.revisions_limit.to_i != 0
+        self.revisions.create!(:data => self.revision_data)
+      end
+      
+      # blowing away old revisions
+      ids = [0] + self.revisions.limit(ComfortableMexicanSofa.config.revisions_limit.to_i).collect(&:id)
+      self.revisions.where('id NOT IN (?)', ids).destroy_all
+    end
+    
+    # Assigning whatever is found in revision data and attemptint to save the object
+    def restore_from_revision(revision)
+      return unless revision.record == self
+      self.update_attributes!(revision.data)
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, ComfortableMexicanSofa::HasRevisions

data/lib/comfortable_mexican_sofa/http_auth.rb

@@ -14,4 +14,5 @@ module ComfortableMexicanSofa::HttpAuth
       username == self.username && password == self.password
     end
   end
+  
 end

data/lib/comfortable_mexican_sofa/version.rb

@@ -0,0 +1,7 @@
+module ComfortableMexicanSofa
+  VERSION = begin 
+    IO.read(File.join(File.dirname(__FILE__), '/../../VERSION')).chomp
+  rescue
+    'UNKNOWN'
+  end
+end

data/public/stylesheets/comfortable_mexican_sofa/content.css

@@ -182,4 +182,46 @@ form.search {
 }
 .c_cms_admin_snippets.a_index ul.list li .item .icon {
   background-image: url(/images/comfortable_mexican_sofa/icon_snippet.gif);
+}
+
+/* -- Revisions ---------------------------------------------------------- */
+.c_cms_admin_revisions.a_show .form_element.submit_element .value {
+  margin-left: 0px;
+}
+.c_cms_admin_revisions.a_show .current {
+  width: 50%;
+  float: left;
+}
+.c_cms_admin_revisions.a_show .versioned {
+  width: 50%;
+  float: right;
+}
+.c_cms_admin_revisions.a_show .title,
+.c_cms_admin_revisions.a_show .content {
+  padding: 2px 5px;
+  margin: 0px 3px;
+}
+.c_cms_admin_revisions.a_show .title {
+  background: #f1f1f1;
+  border-bottom: 2px solid #bbb;
+}
+.c_cms_admin_revisions.a_show .content {
+  min-height: 16px;
+  border: 1px dashed #f1f1f1;
+}
+.c_cms_admin_revisions.a_show .revisions a {
+  display: block;
+  background-color: #252525;
+  border-radius: 2px;
+  padding: 0px 3px;
+  opacity: 0.5;
+  margin-bottom: 2px;
+  color: #fff;
+}
+.c_cms_admin_revisions.a_show .revisions a:hover,
+.c_cms_admin_revisions.a_show .revisions a.active {
+  opacity: 1;
+}
+.c_cms_admin_revisions.a_show .revisions a:last-child {
+  margin-bottom: 0px;
 }

data/public/stylesheets/comfortable_mexican_sofa/structure.css

@@ -11,14 +11,14 @@ html, body {
   float: left;
 }
 .center_column {
+  position: relative;
   margin: 0px 250px 0px 175px;
   min-height: 100%;
-  overflow: hidden;
   background-color: #D8D8D8;
   border-left: 1px solid #484848;
   border-right: 1px solid #484848;
 }
-.center_column_content {
+.center_column .center_column_content {
   padding: 25px;
 }
 .right_column {
@@ -35,7 +35,7 @@ html, body {
   width: 165px;
   position: fixed;
 }
-.left_column_content a {
+.left_column_content ul.nav a {
   display: block;
   padding: 3px 10px;
   margin-bottom: 5px;
@@ -50,12 +50,16 @@ html, body {
   color: #fff;
   opacity: 0.3;
 }
-.left_column_content a:hover,
-.left_column_content a.active {
+.left_column_content ul.nav a:hover,
+.left_column_content ul.nav a.active {
   color: #fff;
   opacity: 1;
 }
-
+.right_column_content h2 {
+  color: #d8d8d8;
+  text-shadow: #000 1px 1px;
+  margin-bottom: 5px;
+}
 .right_column_content .box {
   background-color: #484848;
   padding: 5px;
@@ -125,4 +129,25 @@ input[type='file'] {
 }
 a.button.big {
   float: right;
+}
+
+.center_column .sofa {
+  position: absolute;
+  background: #000;
+  bottom: 0px;
+  left: -175px;
+  width: 155px;
+  padding: 5px 10px;
+  font-size: 10px;
+}
+.center_column .sofa a {
+  color: #484848;
+}
+.center_column .sofa a:hover {
+  color: #f1f1f1;
+}
+.center_column .sofa span.version {
+  color: #f1f1f1;
+  font-size: 9px;
+  margin-left: 2px;
 }

data/public/stylesheets/comfortable_mexican_sofa/typography.css

@@ -10,6 +10,14 @@ h1 {
   text-shadow: #fff 1px 1px;
   border-bottom: 2px solid #9f9f9f;
 }
+h2 {
+  font: bold 16px/16px 'Lucida Grande', 'Tahoma', serif;
+  text-shadow: #fff 1px 1px;
+  margin-bottom: 15px;
+}
+h1 + h2 {
+  margin-top: -15px;
+}
 a {
   text-decoration: none;
   color: #384E66;

data/test/fixtures/cms/revisions.yml

@@ -0,0 +1,21 @@
+layout:
+  record: default (Cms::Layout)
+  data: <%= {
+    'content' => 'revision {{cms:page:default_page_text}}',
+    'css'     => 'revision css',
+    'js'      => 'revision js' }.to_yaml.inspect %>
+    
+page:
+  record: default (Cms::Page)
+  data: <%= {
+    'blocks_attributes' => [
+      { 'label'   => 'default_page_text',
+        'content' => 'revision page content' },
+      { 'label'   => 'default_field_text',
+        'content' => 'revision field content'}
+    ]}.to_yaml.inspect %>
+      
+snippet:
+  record: default (Cms::Snippet)
+  data: <%= {
+    'content' => 'revision content' }.to_yaml.inspect %>

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -41,7 +41,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     assert_equal 'Layout not found', flash[:error]
   end
   
-  def test_creation_with_commit
+  def test_creation
     assert_difference 'Cms::Layout.count' do
       post :create, :cms_layout => {
         :label    => 'Test Layout',
@@ -51,21 +51,6 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
       assert_response :redirect
       layout = Cms::Layout.last
       assert_equal cms_sites(:default), layout.site
-      assert_redirected_to :action => :index
-      assert_equal 'Layout created', flash[:notice]
-    end
-  end
-  
-  def test_creation_without_commit
-    assert_difference 'Cms::Layout.count' do
-      post :create, :cms_layout => {
-        :label    => 'Test Layout',
-        :slug     => 'test',
-        :content  => 'Test {{cms:page:content}}'
-      }
-      assert_response :redirect
-      layout = Cms::Layout.last
-      assert_equal cms_sites(:default), layout.site
       assert_redirected_to :action => :edit, :id => layout
       assert_equal 'Layout created', flash[:notice]
     end
@@ -80,21 +65,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     end
   end
   
-  def test_update_with_commit
-    layout = cms_layouts(:default)
-    put :update, :id => layout, :cms_layout => {
-      :label    => 'New Label',
-      :content  => 'New {{cms:page:content}}'
-    }, :commit  => 'Update Layout'
-    assert_response :redirect
-    assert_redirected_to :action => :index
-    assert_equal 'Layout updated', flash[:notice]
-    layout.reload
-    assert_equal 'New Label', layout.label
-    assert_equal 'New {{cms:page:content}}', layout.content
-  end
-  
-  def test_update_without_commit
+  def test_update
     layout = cms_layouts(:default)
     put :update, :id => layout, :cms_layout => {
       :label    => 'New Label',

data/test/functional/cms_admin/pages_controller_test.rb

@@ -103,8 +103,6 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert assigns(:cms_page)
     assert_template :edit
     assert_select "form[action=/cms-admin/pages/#{page.id}]"
-    assert_select "input[name='cms_page[blocks_attributes][][id]'][value='#{cms_blocks(:default_field_text).id}']"
-    assert_select "input[name='cms_page[blocks_attributes][][id]'][value='#{cms_blocks(:default_field_text).id}']"
   end
 
   def test_get_edit_failure
@@ -123,7 +121,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert assigns(:cms_page).layout
   end
   
-  def test_creation_with_commit
+  def test_creation
     assert_difference 'Cms::Page.count' do
       assert_difference 'Cms::Block.count', 2 do
         post :create, :cms_page => {
@@ -141,36 +139,12 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
         assert_response :redirect
         page = Cms::Page.last
         assert_equal cms_sites(:default), page.site
-        assert_redirected_to :action => :index
-        assert_equal 'Page saved', flash[:notice]
-      end
-    end
-  end
-
-  def test_creation_without_commit
-    assert_difference 'Cms::Page.count' do
-      assert_difference 'Cms::Block.count', 2 do
-        post :create, :cms_page => {
-          :label      => 'Test Page',
-          :slug       => 'test-page',
-          :parent_id  => cms_pages(:default).id,
-          :layout_id  => cms_layouts(:default).id,
-          :blocks_attributes => [
-            { :label    => 'default_page_text',
-              :content  => 'content content' },
-            { :label    => 'default_field_text',
-              :content  => 'title content' }
-          ]
-        }
-        assert_response :redirect
-        page = Cms::Page.last
-        assert_equal cms_sites(:default), page.site
         assert_redirected_to :action => :edit, :id => page
         assert_equal 'Page saved', flash[:notice]
       end
     end
   end
-
+  
   def test_creation_failure
     assert_no_difference ['Cms::Page.count', 'Cms::Block.count'] do
       post :create, :cms_page => {
@@ -191,21 +165,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     end
   end
 
-  def test_update_with_commit
-    page = cms_pages(:default)
-    assert_no_difference 'Cms::Block.count' do
-      put :update, :id => page, :cms_page => {
-        :label => 'Updated Label'
-      }, :commit => 'Update Page'
-      page.reload
-      assert_response :redirect
-      assert_redirected_to :action => :index
-      assert_equal 'Page updated', flash[:notice]
-      assert_equal 'Updated Label', page.label
-    end
-  end
-
-  def test_update_without_commit
+  def test_update
     page = cms_pages(:default)
     assert_no_difference 'Cms::Block.count' do
       put :update, :id => page, :cms_page => {
@@ -218,17 +178,16 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       assert_equal 'Updated Label', page.label
     end
   end
-
+  
   def test_update_with_layout_change
     page = cms_pages(:default)
-    assert_difference 'Cms::Block.count', 1 do
+    assert_difference 'Cms::Block.count', 2 do
       put :update, :id => page, :cms_page => {
         :label      => 'Updated Label',
         :layout_id  => cms_layouts(:nested).id,
         :blocks_attributes => [
           { :label    => 'content',
-            :content  => 'new_page_text_content',
-            :id       => cms_blocks(:default_page_text).id },
+            :content  => 'new_page_text_content' },
           { :label    => 'header',
             :content  => 'new_page_string_content' }
         ]
@@ -238,7 +197,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       assert_redirected_to :action => :edit, :id => page
       assert_equal 'Page updated', flash[:notice]
       assert_equal 'Updated Label', page.label
-      assert_equal ['new_page_text_content', 'default_field_text_content', 'new_page_string_content'], page.blocks.collect{|b| b.content}
+      assert_equal ['content', 'default_field_text', 'default_page_text', 'header'], page.blocks.collect{|b| b.label}
     end
   end