comfortable_mexican_sofa 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   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 = %q{2011-05-11}
+  s.date = %q{2011-05-13}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/config/initializers/comfortable_mexican_sofa.rb

@@ -7,7 +7,8 @@ ComfortableMexicanSofa.configure do |config|
   config.authentication = 'ComfortableMexicanSofa::HttpAuth'
   
   # Default url to access admin area is http://yourhost/cms-admin/ 
-  # You can change 'cms-admin' to 'admin', for example.
+  # You can change 'cms-admin' to 'admin', for example. To disable admin area
+  # entirely set this to '' or nil
   #   config.admin_route_prefix = 'cms-admin'
   
   # By default Cms content is served directly from the root. Change this setting
@@ -16,8 +17,7 @@ ComfortableMexicanSofa.configure do |config|
   #   config.content_route_prefix = ''
   
   # Path: /cms-admin redirects to /cms-admin/pages but you can change it
-  # You don't need to change it when changing admin_route_prefix
-  #   config.admin_route_redirect = '/cms-admin/pages'
+  #   config.admin_route_redirect = 'pages'
   
   # If you enable this setting you'll be able to serve completely different set
   # of sites with their own layouts and pages.

data/config/routes.rb

@@ -1,7 +1,9 @@
 Rails.application.routes.draw do
   
   namespace :cms_admin, :path => ComfortableMexicanSofa.config.admin_route_prefix, :except => :show do
-    get '/' => redirect(ComfortableMexicanSofa.config.admin_route_redirect)
+    get '/' => redirect(
+      "/#{ComfortableMexicanSofa.config.admin_route_prefix}/#{ComfortableMexicanSofa.config.admin_route_redirect}"
+    )
     resources :pages do
       member do 
         match :form_blocks
@@ -26,7 +28,7 @@ Rails.application.routes.draw do
         put :revert, :on => :member
       end
     end
-  end
+  end unless ComfortableMexicanSofa.config.admin_route_prefix.blank?
   
   scope :controller => :cms_content do
     prefix = ComfortableMexicanSofa.config.content_route_prefix

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -46,8 +46,8 @@ class ComfortableMexicanSofa::Configuration
     @authentication         = 'ComfortableMexicanSofa::HttpAuth'
     @seed_data_path         = nil
     @admin_route_prefix     = 'cms-admin'
+    @admin_route_redirect   = 'pages'
     @content_route_prefix   = ''
-    @admin_route_redirect   = "/#{@admin_route_prefix}/pages"
     @enable_multiple_sites  = false
     @allow_irb              = false
     @enable_caching         = true

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -98,7 +98,7 @@ module ComfortableMexicanSofa::Fixtures
       
       # saving
       page.blocks_attributes = blocks_attributes if blocks_attributes.present?
-      page.save! if page.changed?
+      page.save! if page.changed? || blocks_attributes.present?
       page_ids << page.id
       
       # checking for nested fixtures

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -56,7 +56,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   # -- Tag Field Fields -----------------------------------------------------
   def default_tag_field(tag, options = {})
     label     = options[:label] || tag.label.to_s.titleize
-    css_class = options[:css_class] || tag.class.name.underscore.downcase.idify
+    css_class = options[:css_class] || tag.class.to_s.demodulize.underscore
     
     field_css_class = case tag
     when ComfortableMexicanSofa::Tag::PageRichText

data/public/stylesheets/comfortable_mexican_sofa/form.css

@@ -42,17 +42,17 @@
 .page_form_extras {
   margin-bottom: 10px;
 }
-.form_element.cms_tag_field_datetime .label,
-.form_element.cms_tag_field_integer .label,
-.form_element.cms_tag_field_string .label,
-.form_element.cms_tag_field_text .label {
+.form_element.field_datetime .label,
+.form_element.field_integer .label,
+.form_element.field_string .label,
+.form_element.field_text .label {
   border-color: #48699C;
 }
-.form_element.cms_tag_page_datetime .label,
-.form_element.cms_tag_page_integer .label,
-.form_element.cms_tag_page_string .label,
-.form_element.cms_tag_page_text .label,
-.form_element.cms_tag_page_rich_text .label {
+.form_element.page_datetime .label,
+.form_element.page_integer .label,
+.form_element.page_string .label,
+.form_element.page_text .label,
+.form_element.page_rich_text .label {
   border-color: #3F7300;
 }
 .form_error {

data/test/integration/routing_extensions_test.rb

@@ -31,4 +31,23 @@ class RoutingExtensionsTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
   
+  def test_get_admin_with_admin_route_redirect
+    ComfortableMexicanSofa.config.admin_route_redirect = 'snippets'
+    load(File.expand_path('config/routes.rb', Rails.root))
+    
+    http_auth :get, '/cms-admin'
+    assert_response :redirect
+    assert_redirected_to cms_admin_snippets_path
+  end
+  
+  def test_get_admin_with_admin_route_prefix_disabled
+    ComfortableMexicanSofa.config.admin_route_prefix = ''
+    load(File.expand_path('config/routes.rb', Rails.root))
+    
+    assert !respond_to?(:cms_admin_path)
+    
+    http_auth :get, '/cms-admin'
+    assert_response 404
+  end
+  
 end

data/test/test_helper.rb

@@ -18,7 +18,7 @@ class ActiveSupport::TestCase
       config.authentication         = 'ComfortableMexicanSofa::HttpAuth'
       config.admin_route_prefix     = 'cms-admin'
       config.content_route_prefix   = ''
-      config.admin_route_redirect   = "/cms-admin/pages"
+      config.admin_route_redirect   = 'pages'
       config.enable_multiple_sites  = false
       config.allow_irb              = false
       config.enable_caching         = true

data/test/unit/configuration_test.rb

@@ -8,7 +8,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'ComfortableMexicanSofa::HttpAuth', config.authentication
     assert_equal 'cms-admin', config.admin_route_prefix
     assert_equal '', config.content_route_prefix
-    assert_equal '/cms-admin/pages', config.admin_route_redirect
+    assert_equal 'pages', config.admin_route_redirect
     assert_equal false, config.enable_multiple_sites
     assert_equal false, config.allow_irb
     assert_equal true, config.enable_caching

metadata

@@ -2,7 +2,7 @@
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 Z
+date: 2011-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -321,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2061797632960950114
+      hash: 1368989658120238952
       segments: 
       - 0
       version: "0"