comfortable_mexican_sofa 1.6.9 → 1.6.10

data/README.md

@@ -23,7 +23,7 @@ Add gem definition to your Gemfile:
 Then from the Rails project's root run:
     
     bundle install
-    rails generate cms
+    rails generate comfy:cms
     rake db:migrate
     
 When upgrading from the older version please take a look at [Upgrading ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa/wiki/Upgrading-ComfortableMexicanSofa)

data/VERSION

@@ -1 +1 @@
-1.6.9
+1.6.10

data/app/assets/stylesheets/comfortable_mexican_sofa/content.css

@@ -128,6 +128,9 @@
   height: 28px;
   background: url(/assets/comfortable_mexican_sofa/icon_regular.gif);
 }
+#cms_body ul.list li .item .icon.draft {
+  background: url(/assets/comfortable_mexican_sofa/icon_draft.gif);
+}
 #cms_body ul.list li .item .icon .dragger {
   width: 28px;
   height: 28px;

data/app/assets/stylesheets/comfortable_mexican_sofa/files.css

@@ -35,7 +35,7 @@
   white-space: nowrap;
   overflow: hidden;
   float: left;
-  color: #eee;
+  color: #8a8a8a;
 }
 #cms_body .uploaded_files .file .file_name a.delete {
   float: right;

data/app/assets/stylesheets/comfortable_mexican_sofa/form.css

@@ -10,7 +10,7 @@
   font: 13px/19px 'Lucida Grande', 'Tahoma', sans-serif;
   text-shadow: #fff 1px 1px;
   padding: 0px 10px;
-  background-color: #f1f1f1;
+  background-color: #f6f5f5;
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px ;
   -moz-border-radius-topleft: 3px;
@@ -38,6 +38,9 @@
 #cms_body .form_element .value textarea {
   height: 300px;
 }
+#cms_body .form_element .value textarea.short {
+  height: 100px;
+}
 #cms_body .form_element .value .CodeMirror-wrapping {
   background-color: #fff;
 }
@@ -142,7 +145,7 @@
 }
 #cms_body .form_element.submit_element .value {
   overflow: hidden;
-  background-color: #f1f1f1;
+  background-color: #f6f5f5;
   border-radius: 3px;
   -moz-border-radius: 3px;
   padding: 5px;

data/app/assets/stylesheets/comfortable_mexican_sofa/structure.css

@@ -29,29 +29,37 @@ html, body#cms_body {
   position: fixed;
 }
 #cms_body .left_column_content {
-  padding: 25px 0px 25px 10px;
-  width: 165px;
+  padding: 25px 0px;
+  width: 175px;
   position: fixed;
 }
 #cms_body .left_column_content ul.nav a {
+  position: relative;
   display: block;
-  padding: 3px 10px;
-  margin-bottom: 5px;
+  padding: 5px 15px;
   font: 15px/25px 'Lucida Grande', 'Tahoma', sans-serif;
-  border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  background: #2D2D2D;
-  background: -moz-linear-gradient(left, #2D2D2D 0%, #484848 100%);
-  background: -webkit-gradient(linear, left top, right top, color-stop(0%,#2D2D2D), color-stop(100%,#484848));
-  color: #fff;
-  opacity: 0.3;
+  color: #8a8a8a;
+  text-shadow: 0px 1px 0px #000;
+  border-bottom: 1px solid #1a1a1a;
 }
 #cms_body .left_column_content ul.nav a:hover,
 #cms_body .left_column_content ul.nav a.active {
-  color: #fff;
-  opacity: 1;
+  color: #ddd;
+}
+#cms_body .left_column_content ul.nav a.active {
+  background-color: #1f1f1f;
+  box-shadow: inset 0px 0px 10px #000;
+}
+#cms_body .left_column_content ul.nav a.active:after {
+  position: absolute;
+  top: 10px;
+  right: -8px;
+  z-index: 9999;
+  content: '';
+  display: block;
+  height: 16px;
+  width: 8px;
+  background: transparent url(/assets/comfortable_mexican_sofa/nav_arrow.png);
 }
 #cms_body .right_column_content h2 {
   color: #d8d8d8;

data/app/controllers/cms_admin/base_controller.rb

@@ -7,6 +7,7 @@ class CmsAdmin::BaseController < ApplicationController
 
   before_filter :authenticate,
                 :load_admin_site,
+                :set_locale,
                 :load_fixtures,
                 :except => :jump
   
@@ -27,7 +28,11 @@ protected
       flash[:error] = I18n.t('cms.base.site_not_found')
       return redirect_to(new_cms_admin_site_path)
     end
-    I18n.locale = ComfortableMexicanSofa.config.admin_locale || @site.locale
+  end
+
+  def set_locale
+    I18n.locale = ComfortableMexicanSofa.config.admin_locale || (@site && @site.locale)
+    true
   end
 
   def load_fixtures

data/app/models/cms/page.rb

@@ -144,6 +144,7 @@ protected
   
   def assign_position
     return unless self.parent
+    return if self.position.to_i > 0
     max = self.parent.children.maximum(:position)
     self.position = max ? max + 1 : 0
   end

data/app/views/cms_admin/pages/_index_branch.html.erb

@@ -15,7 +15,7 @@
         end
       %>
     </div>
-    <div class='icon'>
+    <div class='icon <%= page.is_published?? 'published' : 'draft' %>'>
       <% if !category_view && has_siblings %>
         <div class='dragger'><span><%= t('cms.views.pages.drag') %></span></div>
       <% end %>

data/app/views/layouts/cms_admin/_body.html.erb

@@ -13,7 +13,7 @@
     <div class='center_column'>
       <%= render :partial => 'layouts/cms_admin/center' %>
       <div class='sofa'>
-        <a href='https://github.com/comfy/comfortable-mexican-sofa' target='_blank'>ComfortableMexicanSofa</a>
+        <a href='https://github.com/comfy' target='_blank'>ComfortableMexicanSofa</a>
         <span class='version'><%= ComfortableMexicanSofa::VERSION %></span>
       </div>
     </div>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.9"
+  s.version = "1.6.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = "2012-02-02"
+  s.date = "2012-02-07"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
     "app/assets/images/comfortable_mexican_sofa/elrte/smileys/unhappy.png",
     "app/assets/images/comfortable_mexican_sofa/elrte/smileys/waii.png",
     "app/assets/images/comfortable_mexican_sofa/elrte/smileys/wink.png",
+    "app/assets/images/comfortable_mexican_sofa/icon_draft.gif",
     "app/assets/images/comfortable_mexican_sofa/icon_layout.gif",
     "app/assets/images/comfortable_mexican_sofa/icon_move.gif",
     "app/assets/images/comfortable_mexican_sofa/icon_regular.gif",
@@ -68,6 +69,7 @@ Gem::Specification.new do |s|
     "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_454545_256x240.png",
     "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_888888_256x240.png",
     "app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_cd0a0a_256x240.png",
+    "app/assets/images/comfortable_mexican_sofa/nav_arrow.png",
     "app/assets/images/comfortable_mexican_sofa/x.png",
     "app/assets/javascripts/comfortable_mexican_sofa/application.js",
     "app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js",
@@ -237,8 +239,8 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/version.rb",
     "lib/comfortable_mexican_sofa/view_hooks.rb",
     "lib/comfortable_mexican_sofa/view_methods.rb",
-    "lib/generators/README",
-    "lib/generators/cms_generator.rb",
+    "lib/generators/comfy/cms/README",
+    "lib/generators/comfy/cms/cms_generator.rb",
     "lib/tasks/comfortable_mexican_sofa.rake",
     "rvmrc.example",
     "script/rails",

data/db/cms_fixtures/example.com/layouts/default/nested/_nested.yml

@@ -1 +1,2 @@
-label: Default Fixture Nested Layout
+label: Default Fixture Nested Layout
+position: 42

data/db/cms_fixtures/example.com/pages/index/child/_child.yml

@@ -1,2 +1,3 @@
 label: Child Fixture Page
-layout: nested
+layout: nested
+position: 42

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -28,7 +28,8 @@ module ComfortableMexicanSofa::Fixtures
         if layout.new_record? || File.mtime(file_path) > layout.updated_at
           attributes = YAML.load_file(file_path).try(:symbolize_keys!) || { }
           layout.label      = attributes[:label] || identifier.titleize
-          layout.app_layout = attributes[:app_layout] || parent.try(:app_layout) 
+          layout.app_layout = attributes[:app_layout] || parent.try(:app_layout)
+          layout.position   = attributes[:position] if attributes[:position]
         end
       elsif layout.new_record?
         layout.label      = identifier.titleize
@@ -101,6 +102,7 @@ module ComfortableMexicanSofa::Fixtures
           page.layout = site.layouts.find_by_identifier(attributes[:layout]) || parent.try(:layout)
           page.target_page = site.pages.find_by_full_path(attributes[:target_page])
           page.is_published = attributes[:is_published].present?? attributes[:is_published] : true
+          page.position = attributes[:position] if attributes[:position]
         end
       elsif page.new_record?
         page.label = slug.titleize
@@ -205,7 +207,8 @@ module ComfortableMexicanSofa::Fixtures
         f.write({
           'label'       => layout.label,
           'app_layout'  => layout.app_layout,
-          'parent'      => layout.parent.try(:identifier)
+          'parent'      => layout.parent.try(:identifier),
+          'position'    => layout.position
         }.to_yaml)
       end
       open(File.join(layout_path, 'content.html'), 'w') do |f|
@@ -237,7 +240,8 @@ module ComfortableMexicanSofa::Fixtures
           'layout'        => page.layout.try(:identifier),
           'parent'        => page.parent && (page.parent.slug.present?? page.parent.slug : 'index'),
           'target_page'   => page.target_page.try(:slug),
-          'is_published'  => page.is_published
+          'is_published'  => page.is_published,
+          'position'      => page.position
         }.to_yaml)
       end
       page.blocks_attributes.each do |block|

data/lib/generators/comfy/cms/cms_generator.rb

@@ -0,0 +1,64 @@
+module Comfy
+  module Generators
+    class CmsGenerator < Rails::Generators::Base
+      
+      require 'rails/generators/active_record'
+      include Rails::Generators::Migration
+      include Thor::Actions
+      
+      source_root File.expand_path('../../../../..', __FILE__)
+      
+      def generate_migration
+        destination   = File.expand_path('db/migrate/01_create_cms.rb', self.destination_root)
+        migration_dir = File.dirname(destination)
+        destination   = self.class.migration_exists?(migration_dir, 'create_cms')
+        
+        if destination
+          puts "\e[0m\e[31mFound existing cms_create.rb migration. Remove it if you want to regenerate.\e[0m"
+        else
+          migration_template 'db/migrate/01_create_cms.rb', 'db/migrate/create_cms.rb'
+        end
+      end
+      
+      def generate_initialization
+        copy_file 'config/initializers/comfortable_mexican_sofa.rb',
+          'config/initializers/comfortable_mexican_sofa.rb'
+      end
+      
+      def generate_public_assets
+        return if ComfortableMexicanSofa.asset_pipeline_enabled?
+        directory 'app/assets/stylesheets/comfortable_mexican_sofa',
+          'public/stylesheets/comfortable_mexican_sofa'
+        directory 'app/assets/javascripts/comfortable_mexican_sofa',
+          'public/javascripts/comfortable_mexican_sofa'
+        directory 'app/assets/images/comfortable_mexican_sofa',
+          'public/images/comfortable_mexican_sofa'
+        
+        files_to_be_changed = [
+          'public/stylesheets/comfortable_mexican_sofa/content.css', 
+          'public/stylesheets/comfortable_mexican_sofa/widgets.css',
+          'public/stylesheets/comfortable_mexican_sofa/jquery_ui.css',
+          'public/stylesheets/comfortable_mexican_sofa/elrte.css',
+          'public/stylesheets/comfortable_mexican_sofa/files.css'
+        ]
+        
+        files_to_be_changed.each do |file_path|
+          gsub_file file_path, '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
+        end
+      end
+      
+      def generate_cms_seeds
+        directory 'db/cms_fixtures', 'db/cms_fixtures'
+      end
+      
+      def show_readme
+        readme 'lib/generators/comfy/cms/README'
+      end
+      
+      def self.next_migration_number(dirname)
+        ActiveRecord::Generators::Base.next_migration_number(dirname)
+      end
+      
+    end
+  end
+end

data/test/fixtures/cms/files.yml

@@ -1,5 +1,6 @@
 default:
   site: default
+  block:
   label: Sample
   file_file_name: sample.jpg
   file_content_type: image/jpeg

data/test/integration/sites_test.rb

@@ -83,10 +83,20 @@ class SitesTest < ActionDispatch::IntegrationTest
   
   def test_get_admin_with_forced_locale
     ComfortableMexicanSofa.config.admin_locale = :en
+    
     cms_sites(:default).update_attribute(:locale, 'fr')
     http_auth :get, cms_admin_site_pages_path(cms_sites(:default))
     assert_response :success
     assert_equal :en, I18n.locale
+
+    I18n.default_locale = :fr
+    I18n.locale = :fr
+    http_auth :get, cms_admin_sites_path()
+    assert_response :success
+    assert_equal :en, I18n.locale
+
+    I18n.default_locale = :en
+
   end
   
 end

data/test/unit/fixtures_test.rb

@@ -41,6 +41,7 @@ class FixturesTest < ActiveSupport::TestCase
       assert_equal "<html>\n  <body>\n    {{ cms:page:content }}\n  </body>\n</html>", layout.content
       assert_equal 'body{color: red}', layout.css
       assert_equal '// default js', layout.js
+      assert_equal 0, layout.position
       
       nested_layout.reload
       assert_equal layout, nested_layout.parent
@@ -48,6 +49,7 @@ class FixturesTest < ActiveSupport::TestCase
       assert_equal "<div class='left'> {{ cms:page:left }} </div>\n<div class='right'> {{ cms:page:right }} </div>", nested_layout.content
       assert_equal 'div{float:left}', nested_layout.css
       assert_equal '// nested js', nested_layout.js
+      assert_equal 42, nested_layout.position
       
       assert_nil Cms::Layout.find_by_identifier('child')
     end
@@ -91,6 +93,7 @@ class FixturesTest < ActiveSupport::TestCase
       assert_equal layout, page.layout
       assert_equal 'index', page.slug
       assert_equal "<html>Home Page Fixture Contént\ndefault_snippet_content</html>", page.content
+      assert_equal 0, page.position
       assert page.is_published?
       
       assert child_page = Cms::Page.find_by_full_path('/child')
@@ -98,6 +101,7 @@ class FixturesTest < ActiveSupport::TestCase
       assert_equal nested, child_page.layout
       assert_equal 'child', child_page.slug
       assert_equal '<html>Child Page Left Fixture Content<br/>Child Page Right Fixture Content</html>', child_page.content
+      assert_equal 42, child_page.position
     end
   end
   
@@ -248,7 +252,8 @@ class FixturesTest < ActiveSupport::TestCase
     assert_equal ({
       'label'       => 'Nested Layout',
       'app_layout'  => nil,
-      'parent'      => nil
+      'parent'      => nil,
+      'position'    => 0
     }), YAML.load_file(layout_1_attr_path)
     assert_equal cms_layouts(:nested).content, IO.read(layout_1_content_path)
     assert_equal cms_layouts(:nested).css, IO.read(layout_1_css_path)
@@ -257,7 +262,8 @@ class FixturesTest < ActiveSupport::TestCase
     assert_equal ({
       'label'       => 'Child Layout',
       'app_layout'  => nil,
-      'parent'      => 'nested'
+      'parent'      => 'nested',
+      'position'    => 0
     }), YAML.load_file(layout_2_attr_path)
     assert_equal cms_layouts(:child).content, IO.read(layout_2_content_path)
     assert_equal cms_layouts(:child).css, IO.read(layout_2_css_path)
@@ -280,7 +286,8 @@ class FixturesTest < ActiveSupport::TestCase
       'layout'        => 'default',
       'parent'        => nil,
       'target_page'   => nil,
-      'is_published'  => true
+      'is_published'  => true,
+      'position'      => 0
     }), YAML.load_file(page_1_attr_path)
     assert_equal cms_blocks(:default_field_text).content, IO.read(page_1_block_a_path)
     assert_equal cms_blocks(:default_page_text).content, IO.read(page_1_block_b_path)
@@ -290,7 +297,8 @@ class FixturesTest < ActiveSupport::TestCase
       'layout'        => 'default',
       'parent'        => 'index',
       'target_page'   => nil,
-      'is_published'  => true
+      'is_published'  => true,
+      'position'      => 0
     }), YAML.load_file(page_2_attr_path)
     
     FileUtils.rm_rf(host_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70228805602580 !ruby/object:Gem::Requirement
+  requirement: &70230617724740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70228805602580
+  version_requirements: *70230617724740
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70228805602000 !ruby/object:Gem::Requirement
+  requirement: &70230617724260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70228805602000
+  version_requirements: *70230617724260
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70228805601460 !ruby/object:Gem::Requirement
+  requirement: &70230617723780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70228805601460
+  version_requirements: *70230617723780
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -86,6 +86,7 @@ files:
 - app/assets/images/comfortable_mexican_sofa/elrte/smileys/unhappy.png
 - app/assets/images/comfortable_mexican_sofa/elrte/smileys/waii.png
 - app/assets/images/comfortable_mexican_sofa/elrte/smileys/wink.png
+- app/assets/images/comfortable_mexican_sofa/icon_draft.gif
 - app/assets/images/comfortable_mexican_sofa/icon_layout.gif
 - app/assets/images/comfortable_mexican_sofa/icon_move.gif
 - app/assets/images/comfortable_mexican_sofa/icon_regular.gif
@@ -104,6 +105,7 @@ files:
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_454545_256x240.png
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_888888_256x240.png
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_cd0a0a_256x240.png
+- app/assets/images/comfortable_mexican_sofa/nav_arrow.png
 - app/assets/images/comfortable_mexican_sofa/x.png
 - app/assets/javascripts/comfortable_mexican_sofa/application.js
 - app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js
@@ -273,8 +275,8 @@ files:
 - lib/comfortable_mexican_sofa/version.rb
 - lib/comfortable_mexican_sofa/view_hooks.rb
 - lib/comfortable_mexican_sofa/view_methods.rb
-- lib/generators/README
-- lib/generators/cms_generator.rb
+- lib/generators/comfy/cms/README
+- lib/generators/comfy/cms/cms_generator.rb
 - lib/tasks/comfortable_mexican_sofa.rake
 - rvmrc.example
 - script/rails
@@ -362,7 +364,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1140535759846498867
+      hash: 1450113347744328574
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/generators/cms_generator.rb

@@ -1,56 +0,0 @@
-class CmsGenerator < Rails::Generators::Base
-  
-  require 'rails/generators/active_record'
-  include Rails::Generators::Migration
-  include Thor::Actions
-  
-  source_root File.expand_path('../../..', __FILE__)
-  
-  def generate_migration
-    destination   = File.expand_path('db/migrate/01_create_cms.rb', self.destination_root)
-    migration_dir = File.dirname(destination)
-    destination   = self.class.migration_exists?(migration_dir, 'create_cms')
-    
-    if destination
-      puts "\e[0m\e[31mFound existing cms_create.rb migration. Remove it if you want to regenerate.\e[0m"
-    else
-      migration_template 'db/migrate/01_create_cms.rb', 'db/migrate/create_cms.rb'
-    end
-  end
-  
-  def generate_initialization
-    copy_file 'config/initializers/comfortable_mexican_sofa.rb', 'config/initializers/comfortable_mexican_sofa.rb'
-  end
-  
-  def generate_public_assets
-    return if ComfortableMexicanSofa.asset_pipeline_enabled?
-    directory 'app/assets/stylesheets/comfortable_mexican_sofa',  'public/stylesheets/comfortable_mexican_sofa'
-    directory 'app/assets/javascripts/comfortable_mexican_sofa',  'public/javascripts/comfortable_mexican_sofa'
-    directory 'app/assets/images/comfortable_mexican_sofa',       'public/images/comfortable_mexican_sofa'
-    
-    files_to_be_changed = [
-      'public/stylesheets/comfortable_mexican_sofa/content.css', 
-      'public/stylesheets/comfortable_mexican_sofa/widgets.css',
-      'public/stylesheets/comfortable_mexican_sofa/jquery_ui.css',
-      'public/stylesheets/comfortable_mexican_sofa/elrte.css',
-      'public/stylesheets/comfortable_mexican_sofa/files.css'
-    ]
-    
-    files_to_be_changed.each do |file_path|
-      gsub_file file_path, '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
-    end
-  end
-  
-  def generate_cms_seeds
-    directory 'db/cms_fixtures', 'db/cms_fixtures'
-  end
-  
-  def show_readme
-    readme 'lib/generators/README'
-  end
-  
-  def self.next_migration_number(dirname)
-    ActiveRecord::Generators::Base.next_migration_number(dirname)
-  end
-  
-end