comfortable_mexican_sofa 1.2.0 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   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-10}
+  s.date = %q{2011-05-11}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".gemtest",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.md",
     "Rakefile",
@@ -264,45 +263,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.7.2}
   s.summary = %q{ComfortableMexicanSofa is a powerful micro CMS for Ruby on Rails 3 applications}
-  s.test_files = [
-    "test/functional/cms_admin/layouts_controller_test.rb",
-    "test/functional/cms_admin/pages_controller_test.rb",
-    "test/functional/cms_admin/revisions_controller_test.rb",
-    "test/functional/cms_admin/sites_controller_test.rb",
-    "test/functional/cms_admin/snippets_controller_test.rb",
-    "test/functional/cms_admin/uploads_controller_test.rb",
-    "test/functional/cms_content_controller_test.rb",
-    "test/integration/authentication_test.rb",
-    "test/integration/fixtures_test.rb",
-    "test/integration/render_cms_test.rb",
-    "test/integration/routing_extensions_test.rb",
-    "test/integration/sites_test.rb",
-    "test/integration/view_hooks_test.rb",
-    "test/test_helper.rb",
-    "test/unit/configuration_test.rb",
-    "test/unit/fixtures_test.rb",
-    "test/unit/models/block_test.rb",
-    "test/unit/models/layout_test.rb",
-    "test/unit/models/page_test.rb",
-    "test/unit/models/site_test.rb",
-    "test/unit/models/snippet_test.rb",
-    "test/unit/models/upload_test.rb",
-    "test/unit/revisions_test.rb",
-    "test/unit/tag_test.rb",
-    "test/unit/tags/field_datetime_test.rb",
-    "test/unit/tags/field_integer_test.rb",
-    "test/unit/tags/field_string_test.rb",
-    "test/unit/tags/field_text_test.rb",
-    "test/unit/tags/helper_test.rb",
-    "test/unit/tags/page_datetime_test.rb",
-    "test/unit/tags/page_integer_test.rb",
-    "test/unit/tags/page_rich_text.rb",
-    "test/unit/tags/page_string_test.rb",
-    "test/unit/tags/page_text_test.rb",
-    "test/unit/tags/partial_test.rb",
-    "test/unit/tags/snippet_test.rb",
-    "test/unit/view_methods_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -23,9 +23,9 @@ module ComfortableMexicanSofa::ViewMethods
   # Content of a snippet. Example:
   #   cms_snippet_content(:my_snippet)
   def cms_snippet_content(snippet_slug, cms_site = nil)
-    return '' unless cms_site ||= (@cms_site || Cms::Site.find_by_hostname!(request.host.downcase))
+    return '' unless cms_site ||= (@cms_site || Cms::Site.find_by_hostname(request.host.downcase))
     return '' unless snippet = cms_site.snippets.find_by_slug(snippet_slug)
-    ComfortableMexicanSofa::Tag.process_content(Cms::Page.new, snippet.content).html_safe
+    render :inline => ComfortableMexicanSofa::Tag.process_content(Cms::Page.new, snippet.content)
   end
   
   # Content of a page block. This is how you get content from page:field
@@ -35,7 +35,7 @@ module ComfortableMexicanSofa::ViewMethods
   def cms_page_content(block_label, page = nil)
     return '' unless page ||= @cms_page
     return '' unless block = page.blocks.find_by_label(block_label)
-    ComfortableMexicanSofa::Tag.process_content(page, block.content).html_safe
+    render :inline => ComfortableMexicanSofa::Tag.process_content(page, block.content)
   end
 end
 

data/lib/generators/cms_generator.rb

@@ -1,5 +1,6 @@
 class CmsGenerator < Rails::Generators::Base
   
+  require 'rails/generators/active_record'
   include Rails::Generators::Migration
   include Thor::Actions
   
@@ -22,9 +23,14 @@ class CmsGenerator < Rails::Generators::Base
   end
   
   def generate_public_assets
-    directory 'public/stylesheets/comfortable_mexican_sofa', 'public/stylesheets/comfortable_mexican_sofa'
-    directory 'public/javascripts/comfortable_mexican_sofa', 'public/javascripts/comfortable_mexican_sofa'
-    directory 'public/images/comfortable_mexican_sofa', 'public/images/comfortable_mexican_sofa'
+    assets_dir = if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1 && Rails.configuration.assets.enabled
+      'app/assets'
+    else
+      'public'
+    end
+    directory 'public/stylesheets/comfortable_mexican_sofa', "#{assets_dir}/stylesheets/comfortable_mexican_sofa"
+    directory 'public/javascripts/comfortable_mexican_sofa', "#{assets_dir}/javascripts/comfortable_mexican_sofa"
+    directory 'public/images/comfortable_mexican_sofa', "#{assets_dir}/images/comfortable_mexican_sofa"
   end
   
   def generate_cms_seeds
@@ -36,9 +42,7 @@ class CmsGenerator < Rails::Generators::Base
   end
   
   def self.next_migration_number(dirname)
-    orm = Rails.configuration.generators.options[:rails][:orm]
-    require "rails/generators/#{orm}"
-    "#{orm.to_s.camelize}::Generators::Base".constantize.next_migration_number(dirname)
+    ActiveRecord::Generators::Base.next_migration_number(dirname)
   end
   
 end

data/test/unit/fixtures_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
-class ViewMethodsTest < ActiveSupport::TestCase
+class FixturesTest < ActiveSupport::TestCase
   
   def setup
     @site = cms_sites(:default)

data/test/unit/view_methods_test.rb

@@ -2,32 +2,38 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ViewMethodsTest < ActiveSupport::TestCase
   
-  include ComfortableMexicanSofa::ViewMethods
+  class HelpersTestController < ActionController::Base
+    helper { def hello; 'hello' end }
+    def test_cms_snippet_content
+      render :inline => '<%= cms_snippet_content(:default) %>'
+    end
+    def test_cms_page_content
+      @cms_page = Cms::Page.root
+      render :inline => '<%= cms_page_content(:default_field_text) %>'
+    end
+  end
+  
+  # Simulating a call and getting resulting output
+  def action_result(action)
+    HelpersTestController.action(action).call(ActionController::TestRequest.new.env).last.body
+  end
   
   def test_cms_snippet_content
-    assert_equal 'default_snippet_content', cms_snippet_content('default', cms_sites(:default))
-    assert_equal '', cms_snippet_content('not_found', cms_sites(:default))
+    assert_equal 'default_snippet_content', action_result('test_cms_snippet_content')
   end
   
-  def test_cms_snippet_cotnent_with_tags
-    snippet = cms_snippets(:default)
-    snippet.update_attribute(:content, 'content {{cms:helper:test}}')
-    assert_equal 'content <%= test() %>', cms_snippet_content(:default, cms_sites(:default))
+  def test_cms_snippet_content_with_tags
+    cms_snippets(:default).update_attribute(:content, '{{cms:helper:hello}}')
+    assert_equal 'hello', action_result('test_cms_snippet_content')
   end
   
   def test_cms_page_content
-    assert_equal 'default_field_text_content', cms_page_content('default_field_text', cms_pages(:default))
-    assert_equal '', cms_page_content('default_field_text')
-    @cms_page = cms_pages(:default)
-    assert_equal 'default_field_text_content', cms_page_content('default_field_text')
-    assert_equal '', cms_page_content('not_found')
-    @cms_page = nil
+    assert_equal 'default_field_text_content', action_result('test_cms_page_content')
   end
   
   def test_cms_page_content_with_tags
-    block = cms_blocks(:default_field_text)
-    block.update_attribute(:content, 'content {{cms:helper:test}}')
-    assert_equal 'content <%= test() %>', cms_page_content(:default_field_text, cms_pages(:default))
+    cms_blocks(:default_field_text).update_attribute(:content, '{{cms:helper:hello}}')
+    assert_equal 'hello', action_result('test_cms_page_content')
   end
   
 end

metadata

@@ -2,7 +2,7 @@
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -69,7 +69,6 @@ extra_rdoc_files:
 files: 
 - .gemtest
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -322,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3455940093554441845
+      hash: -2061797632960950114
       segments: 
       - 0
       version: "0"
@@ -339,41 +338,5 @@ rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: ComfortableMexicanSofa is a powerful micro CMS for Ruby on Rails 3 applications
-test_files: 
-- test/functional/cms_admin/layouts_controller_test.rb
-- test/functional/cms_admin/pages_controller_test.rb
-- test/functional/cms_admin/revisions_controller_test.rb
-- test/functional/cms_admin/sites_controller_test.rb
-- test/functional/cms_admin/snippets_controller_test.rb
-- test/functional/cms_admin/uploads_controller_test.rb
-- test/functional/cms_content_controller_test.rb
-- test/integration/authentication_test.rb
-- test/integration/fixtures_test.rb
-- test/integration/render_cms_test.rb
-- test/integration/routing_extensions_test.rb
-- test/integration/sites_test.rb
-- test/integration/view_hooks_test.rb
-- test/test_helper.rb
-- test/unit/configuration_test.rb
-- test/unit/fixtures_test.rb
-- test/unit/models/block_test.rb
-- test/unit/models/layout_test.rb
-- test/unit/models/page_test.rb
-- test/unit/models/site_test.rb
-- test/unit/models/snippet_test.rb
-- test/unit/models/upload_test.rb
-- test/unit/revisions_test.rb
-- test/unit/tag_test.rb
-- test/unit/tags/field_datetime_test.rb
-- test/unit/tags/field_integer_test.rb
-- test/unit/tags/field_string_test.rb
-- test/unit/tags/field_text_test.rb
-- test/unit/tags/helper_test.rb
-- test/unit/tags/page_datetime_test.rb
-- test/unit/tags/page_integer_test.rb
-- test/unit/tags/page_rich_text.rb
-- test/unit/tags/page_string_test.rb
-- test/unit/tags/page_text_test.rb
-- test/unit/tags/partial_test.rb
-- test/unit/tags/snippet_test.rb
-- test/unit/view_methods_test.rb
+test_files: []
+

data/Gemfile.lock

@@ -1,85 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    active_link_to (0.0.7)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mail (2.2.12)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    paperclip (2.3.8)
-      activerecord
-      activesupport
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    sqlite3 (1.3.3)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_link_to (>= 0.0.7)
-  jeweler (>= 1.4.0)
-  paperclip (>= 2.3.8)
-  rails (>= 3.0.0)
-  sqlite3