comfortable_mexican_sofa 1.0.44 → 1.0.45

data/README.md

@@ -7,7 +7,7 @@ Installation
 ------------
 Add gem definition to your Gemfile:
     
-    config.gem 'comfortable_mexican_sofa'
+    gem 'comfortable_mexican_sofa'
     
 Then from the Rails project's root run:
     
@@ -15,6 +15,8 @@ Then from the Rails project's root run:
     rails g cms
     rake db:migrate
     
+When upgrading to a newer version just run `rails g cms` and replace files when prompted. You may also need to run `rake db:migrate` again.
+    
 Usage
 -----
 After finishing installation you should be able to navigate to http://yoursite/cms-admin
@@ -122,7 +124,7 @@ If you wish, you can re-use Sofa's admin area for things you need to administer
       # your code goes here
     end
     
-From your views you can user `cms_form_for` method to re-use Sofa's FormBuilder. There are also some existing styles for tables, will\_paginate helpers, etc. Take a look in [/public/stylesheets/comfortable\_mexican\_sofa/content.css](https://github.com/twg/comfortable-mexican-sofa/blob/master/public/stylesheets/comfortable_mexican_sofa/content.css)
+From your views you can use `cms_form_for` method to re-use Sofa's FormBuilder. There are also some existing styles for tables, will\_paginate helpers, etc. Take a look in [/public/stylesheets/comfortable\_mexican\_sofa/content.css](https://github.com/twg/comfortable-mexican-sofa/blob/master/public/stylesheets/comfortable_mexican_sofa/content.css)
 
 You will probably want to add a navigation link on the left side, and for that you will want to use ViewHook functionality. Create a partial that has a link to your admin area and declare in in Sofa's initializer: `ComfortableMexicanSofa::ViewHooks.add(:navigation, '/admin/navigation')`. Similarly you can add extra stylesheets, etc into admin area in the same way.
     
@@ -138,9 +140,9 @@ Do you have other authentication system in place (like Devise, AuthLogic, etc) a
     
 You can put this module in /config/initializers/comfortable\_mexican\_sofa.rb and change authentication method: `config.authentication = 'CmsDeviseAuth'`. Now to access Sofa's admin area users will be authenticated against your existing authentication system.
 
-Working with fixtures
----------------------
-Comfortable Mexican Sofa has fixtures, functionality that helps manage content during development phase. It's very different from Rails seeds as Sofa's fixtures are loaded with each page load. The database is completely bypassed when fixtures are active. This way, you can source-control content before going live, disabling fixtures and dumping everything into the database.
+Working with seeds
+------------------
+Comfortable Mexican Sofa has seeds, functionality that helps manage content during development phase. It's very different from Rails seeds as Sofa's seeds are loaded with each page load. The database is completely bypassed when seeds are active. This way, you can source-control content before going live, disabling seeds and dumping everything into the database.
 
 First, you will need to set a path where fixture files will be found (inside Sofa's initializer):
     
@@ -148,20 +150,19 @@ First, you will need to set a path where fixture files will be found (inside Sof
       ComfortableMexicanSofa.config.seed_data_path = File.expand_path('db/cms_seeds', Rails.root)
     end
     
-If you ran `rails g cms`, you should find an example set of fixtures in /db/cms\_seeds directory. Please note that seeds are nested in the folder that is the hostname of your site. Each file is an YAML representation of a database entry for that layout/page/snippet.
+If you ran `rails g cms`, you should find an example set of seeds in /db/cms\_seeds directory. Please note that seeds are nested in the folder that is the hostname of your site. Each file is an YAML representation of a database entry for that layout/page/snippet.
 
-There's a rake task that makes moving fixtures into database (and vice-versa) easy:
+There's a rake task that makes moving seeds into database (and vice-versa) easy:
     
-    # from fixtures into database
-    rake comfortable_mexican_sofa:import:all FROM=your-site.local TO=your-site.com SEED_PATH=/path/to/fixtures
+    # from seeds into database
+    rake comfortable_mexican_sofa:import:all FROM=your-site.local TO=your-site.com SEED_PATH=/path/to/seeds
     
-    # from database to fixtures    
-    rake comfortable_mexican_sofa:export:all FROM=your-site.com TO=your-site.local SEED_PATH=/path/to/fixtures
+    # from database to seeds    
+    rake comfortable_mexican_sofa:export:all FROM=your-site.com TO=your-site.local SEED_PATH=/path/to/seeds
     
-What else?
-----------
-Versioning control will be eventually implemented. Also I'd love to hear ideas how this CMS can be improved. But feel free to just fork and hack away.
-
+---
 ![Looks pretty comfortable to me. No idea what makes it Mexican.](https://github.com/twg/comfortable-mexican-sofa/raw/master/doc/sofa.png)
 
-ComfortableMexicanSofa is released under the [MIT license](https://github.com/twg/comfortable-mexican-sofa/raw/master/LICENSE) and is copyright 2009-11 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)
+ComfortableMexicanSofa is released under the [MIT license](https://github.com/twg/comfortable-mexican-sofa/raw/master/LICENSE) 
+
+Copyright 2009-2011 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)

data/VERSION

@@ -1 +1 @@
-1.0.44
+1.0.45

data/app/models/cms_page.rb

@@ -86,6 +86,11 @@ class CmsPage < ActiveRecord::Base
   end
   
   # -- Instance Methods -----------------------------------------------------
+  # For previewing purposes sometimes we need to have full_path set
+  def full_path
+    self.read_attribute(:full_path) || self.assign_full_path
+  end
+  
   # Transforms existing cms_block information into a hash that can be used
   # during form processing. That's the only way to modify cms_blocks.
   def cms_blocks_attributes

data/comfortable_mexican_sofa.gemspec

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

data/lib/comfortable_mexican_sofa/controller_methods.rb

@@ -1,7 +1,6 @@
 module ComfortableMexicanSofa::ControllerMethods
   
   def self.included(base)
-    base.alias_method_chain :render, :cms
     
     # If application controller doesn't have template associated with it
     # CMS will attempt to find one. This is so you don't have to explicitly
@@ -13,29 +12,29 @@ module ComfortableMexicanSofa::ControllerMethods
         raise e
       end
     end
-  end
-  
-  # Now you can render cms_page simply by calling:
-  #   render :cms_page => '/path/to/page'
-  # This way application controllers can use CMS content while populating
-  # instance variables that can be used in partials (that are included by
-  # by the cms page and/or layout)
-  def render_with_cms(options = {}, locals = {}, &block)
-    if options.is_a?(Hash) && path = options.delete(:cms_page)
-      site = CmsSite.find_by_hostname(request.host.downcase)
-      page = CmsPage.load_from_file(site, path) if site && ComfortableMexicanSofa.configuration.seed_data_path
-      page ||= site && site.cms_pages.find_by_full_path(path)
-      if page
-        cms_app_layout = page.cms_layout.try(:app_layout)
-        options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
-        options[:inline] = page.content
-        @cms_page = page
-        render_without_cms(options, locals, &block)
+    
+    # Now you can render cms_page simply by calling:
+    #   render :cms_page => '/path/to/page'
+    # This way application controllers can use CMS content while populating
+    # instance variables that can be used in partials (that are included by
+    # by the cms page and/or layout)
+    def render(options = {}, locals = {}, &block)
+      if options.is_a?(Hash) && path = options.delete(:cms_page)
+        site = CmsSite.find_by_hostname(request.host.downcase)
+        page = CmsPage.load_from_file(site, path) if site && ComfortableMexicanSofa.configuration.seed_data_path
+        page ||= site && site.cms_pages.find_by_full_path(path)
+        if page
+          cms_app_layout = page.cms_layout.try(:app_layout)
+          options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
+          options[:inline] = page.content
+          @cms_page = page
+          super(options, locals, &block)
+        else
+          raise ActionView::MissingTemplate.new([path], path, "CMS page not found", nil)
+        end
       else
-        raise ActionView::MissingTemplate.new([path], path, "CMS page not found", nil)
+        super(options, locals, &block)
       end
-    else
-      render_without_cms(options, locals, &block)
     end
   end
 end

data/test/unit/cms_page_test.rb

@@ -62,6 +62,9 @@ class CmsPageTest < ActiveSupport::TestCase
   end
   
   def test_initialization_of_full_path
+    page = CmsPage.new
+    assert_equal '/', page.full_path
+    
     page = CmsPage.new(new_params)
     assert page.invalid?
     assert_has_errors_on page, :cms_site_id

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 44
-  version: 1.0.44
+  - 45
+  version: 1.0.45
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -05:00
+date: 2011-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -384,7 +384,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4033881371897976307
+      hash: -53123372768433435
       segments: 
       - 0
       version: "0"