comfortable_mexican_sofa 1.0.22 → 1.0.23

data/README.md

@@ -30,6 +30,8 @@ At this point you should have database structure created, some assets copied to
     ComfortableMexicanSofa::HttpAuth.username = 'username'
     ComfortableMexicanSofa::HttpAuth.password = 'password'
     
+For a full list of available configuration options and their defaults take a peek in here: [configuration.rb](http://https://github.com/theworkinggroup/comfortable-mexican-sofa/blob/master/lib/comfortable_mexican_sofa/configuration.rb)
+    
 Usage
 -----
 Now you should be able to navigate to http://yoursite/cms-admin
@@ -49,6 +51,8 @@ Before creating pages and populating them with content we need to create a layou
     
 So there's your layout and the `{{cms:page:content}}` defines a place where renderable `content` will go. There's just a handful of tags that you can use.
 
+Layout may also be linked to the `application layout`. As a result cms page content will end up inside `<%= yeild %>` of your application layout.
+
 #### Page Blocks
 pieces of content that will be output on the page:
     
@@ -84,10 +88,79 @@ are exactly that. You don't want to do IRB inside CMS so there's a handy tag:
     {{ cms:partial:path/to/partial:x:y }} # gets translated to <%= render :partial => 'path/to/partial', 
                                           # :locals => { :param_1 => 'x', :param_2 => 'y'} %>
 
-You don't have to define entire html layout, however. You can simply re-use your application one. Page content will be yielded into it like any normal view.
+### Step 3: Create Page
+Now you're ready to create a page. Based on how you defined your layout, you should have form inputs ready to be populated.
+Save a page, and it will be accessible from the public side.
+
+Integrating CMS with your app
+-----------------------------
+Unlike most CMS solutions, Sofa is here only to help. Your application is more important. There are few useful ways you can use CMS functionality from your application.
 
-TODO: more stuff
+* When CMS renders a page, you automatically have access to `@cms_page` variable.
+* CMS can take over the rendering of views for your application. For example, http://your-app.local/books hits books\_controller#index and if you don't have a view setup CMS will try to serve a page with '/books' path. You can even force your controller to render a particular page like this: `render :cms_page => '/books'`
 
-### Step 3: Create Page
+Working with fixtures
+---------------------
+During development it's often more convenient to work with files that can be source controlled, versus putting content in the database and then manage database dump. Thankfully Sofa makes working with fixtures easy.
+
+### Setting up Fixtures
+First of all you need to set a path where fixture files will be found:
+    
+    # in config/initializers/comfortable_mexican_sofa.rb
+    if Rails.env.development? || Rails.env.test?
+      ComfortableMexicanSofa.config.seed_data_path = File.expand_path('db/cms_seeds', Rails.root)
+    end
+    
+This is an example of the file/folder structure for fixtures:
+    
+    your-site.local/
+      - layouts/
+        - default_layout.yml
+      - pages
+        - index.yml
+        - help.yml
+        - help/
+          - more_help.yml
+      - snippets
+        - random_snippet.yml
+    
+Then it's a matter of populating the content. Few rules to remember:
+  
+- root page is always index.yml
+- sections of the page are defined by cms\_block\_attributes
+- parent pages are identified by full_path (slug for layouts)
+- folder structure reflects tree structure of the site
+
+Example fixture files for a [layout](https://github.com/theworkinggroup/comfortable-mexican-sofa/blob/master/test/cms_seeds/test.host/layouts/nested.yml), [page](https://github.com/theworkinggroup/comfortable-mexican-sofa/blob/master/test/cms_seeds/test.host/pages/child/subchild.yml) and [snippet](https://github.com/theworkinggroup/comfortable-mexican-sofa/blob/master/test/cms_seeds/test.host/snippets/default.yml)
 
-TODO: You pres butan page is created. Yay!
+**Note:** If ComfortableMexicanSofa.config.seed\_data\_path is set no content is loaded from database. Only fixture files are used.
+
+### Importing fixtures into database
+Now that you have all those fixture files, how do we get them into database? Easy:
+
+    rake comfortable_mexican_sofa:import:all FROM=your-site.local TO=your-site.com PATH=/path/to/fixtures
+    
+PATH is optional if seed\_data\_path configuration option is set.
+
+### Exporting database data into fixtures
+If you need to pull down database content into fixtures it's done as follows:
+    
+    rake comfortable_mexican_sofa:export:all FROM=your-site.com TO=your-site.local PATH=/path/to/fixtures
+    
+During import/export it will prompt you if there are any files/database entries that are going to be overwritten
+
+Admin Area Integration
+----------------------
+Sofa has a wonderful admin area. Why would you want to make your own layout, styling and so on if you can reuse what CMS has. 
+
+You can easily make your controllers use layouts and CMS authentication like this:
+
+    class Admin::UsersController < CmsAdmin::BaseController
+      # ...
+    end
+    
+To add your own tabs to the admin area you can use hooks:
+    
+    # in config/initializers/comfortable_mexican_sofa.rb
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/path/to/view/partial')
+    ComfortableMexicanSofa::ViewHooks.add(:html_head, '/path/to/view/partial')

data/VERSION

@@ -1 +1 @@
-1.0.22
+1.0.23

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

@@ -5,7 +5,7 @@
     <%= form.text_field :slug, :id => 'slug' %>
   <% end %>
   <% if (options = CmsLayout.options_for_select(@cms_site)).present? %>
-    <%= form.select :cms_layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i, :label => 'Layout' %>
+    <%= form.select :cms_layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i, 'data-path-prefix' => ComfortableMexicanSofa.config.admin_route_prefix, :label => 'Layout' %>
   <% end %>
   <% if (options = CmsPage.options_for_select(@cms_site, @cms_page)).present? %>
     <%= form.select :parent_id, options %>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.22"
+  s.version = "1.0.23"
 
   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{2010-11-12}
+  s.date = %q{2010-11-16}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/lib/tasks/comfortable_mexican_sofa.rake

@@ -46,7 +46,7 @@ namespace :comfortable_mexican_sofa do
             existing_layout = nil
             
             if existing_layout = @site.cms_layouts.find_by_slug(layout.slug)
-              print "Found layout in database with slug: #{layout.slug}. Overwrite? (yN): "
+              print "Found layout in database with slug: #{layout.slug}. Overwrite? (y/N): "
               should_write = ($stdin.gets.to_s.strip.downcase == 'y')
             end
             if should_write
@@ -86,7 +86,7 @@ namespace :comfortable_mexican_sofa do
             existing_page = nil
             
             if existing_page = @site.cms_pages.find_by_full_path(page.full_path)
-              print "Found page in database with full_path: #{page.full_path}. Overwrite? (yN): "
+              print "Found page in database with full_path: #{page.full_path}. Overwrite? (y/N): "
               should_write = ($stdin.gets.to_s.strip.downcase == 'y')
             end
             
@@ -128,7 +128,7 @@ namespace :comfortable_mexican_sofa do
           should_write      = true
           existing_snippet  = nil
           if existing_snippet = @site.cms_snippets.find_by_slug(snippet.slug)
-            print "Found snippet in database with slug: #{snippet.slug}. Overwrite? (yN): "
+            print "Found snippet in database with slug: #{snippet.slug}. Overwrite? (y/N): "
             should_write = ($stdin.gets.to_s.strip.downcase == 'y')
           end
           if should_write
@@ -187,7 +187,7 @@ namespace :comfortable_mexican_sofa do
         should_write = true
         file_path = File.join(@seed_path, 'layouts', "#{layout.slug}.yml")
         if File.exists?(file_path)
-          print "Found layout fixture: #{file_path} Overwrite? (yN): "
+          print "Found layout fixture: #{file_path} Overwrite? (y/N): "
           should_write = ($stdin.gets.to_s.strip.downcase == 'y')
         end
         if should_write
@@ -216,7 +216,7 @@ namespace :comfortable_mexican_sofa do
         file_path = File.join(@seed_path, 'pages', "#{page_path}/#{page_name}.yml")
         
         if File.exists?(file_path)
-          print "Found page fixture: #{file_path} Overwrite? (yN): "
+          print "Found page fixture: #{file_path} Overwrite? (y/N): "
           should_write = ($stdin.gets.to_s.strip.downcase == 'y')
         end
         if should_write
@@ -244,7 +244,7 @@ namespace :comfortable_mexican_sofa do
         should_write = true
         file_path = File.join(@seed_path, 'snippets', "#{snippet.slug}.yml")
         if File.exists?(file_path)
-          print "Found snippet fixture: #{file_path} Overwrite? (yN): "
+          print "Found snippet fixture: #{file_path} Overwrite? (y/N): "
           should_write = ($stdin.gets.to_s.strip.downcase == 'y')
         end
         if should_write

data/public/javascripts/comfortable_mexican_sofa/cms.js

@@ -31,7 +31,7 @@ $.CMS = function(){
     
     // Load Page Blocks on layout change
     $('select#cms_page_cms_layout_id').bind('change.cms', function() {
-      $.ajax({url: ['/cms-admin/pages', $(this).attr('data-page-id'), 'form_blocks'].join('/'), data: ({ layout_id: $(this).val()})})
+      $.ajax({url: [$(this).attr('data-path-prefix'), 'pages', $(this).attr('data-page-id'), 'form_blocks'].join('/'), data: ({ layout_id: $(this).val()})})
     })
 
   }); // End $(document).ready()

data/public/stylesheets/comfortable_mexican_sofa/structure.css

@@ -105,6 +105,7 @@ html, body {
   width: 98%;
 }
 .form_element .value input,
+.form_element .value select,
 .form_element .value textarea {
   border: 1px solid #ccc;
   padding: 2px;
@@ -116,6 +117,9 @@ html, body {
 .form_element.submit_element {
   margin-left: 160px;
 }
+.form_element.check_box_element input {
+  width: auto;
+}
 .page_form_extras {
   margin-bottom: 25px;
 }
@@ -199,6 +203,9 @@ ul.list li .item:hover .action_links,
 table.formatted tr:hover td.action_links a {
   opacity: 1;
 }
+table.formatted {
+  clear: both;
+}
 table.formatted th {
   background: url(/images/comfortable_mexican_sofa/body_bg.jpg);
   color: #ececec;
@@ -237,3 +244,7 @@ table.formatted td.main {
   background-color: #1C1F22;
   color: #fff;
 }
+form.search {
+  float: right;
+  margin: 5px 0px;
+}

data/test/functional/cms_admin/pages_controller_test.rb

@@ -24,6 +24,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     
     assert_template :new
     assert_select 'form[action=/cms-admin/pages]'
+    assert_select 'select[data-path-prefix=cms-admin]'
   end
   
   def test_get_new_with_field_datetime

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 1
   - 0
-  - 22
-  version: 1.0.22
+  - 23
+  version: 1.0.23
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -05:00
+date: 2010-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency