comfortable_mexican_sofa 1.0.7 → 1.0.9

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.9

data/comfortable_mexican_sofa.gemspec

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

data/lib/comfortable_mexican_sofa/cms_tag.rb

@@ -6,6 +6,8 @@
 #   end
 module CmsTag
   
+  TOKENIZER_REGEX = /(<\s*cms:.*?\/?>)|((?:[^<]|\<(?!\s*cms:.*?\/?>))+)/
+  
   attr_accessor :params,
                 :parent
   
@@ -81,7 +83,7 @@ private
   # Tags are processed further and their content is expanded in the same way.
   # Tags are defined in the parent tags are ignored and not rendered.
   def self.process_content(cms_page, content = '', parent_tag = nil)
-    tokens = content.to_s.scan(/(<\s*cms:\w+:\w+(?::.+)?\s*\/?>)|((?:[^<]|\<(?!\s*cms:\w+:\w+(?::.+)?\s*\/?>))+)/)
+    tokens = content.to_s.scan(TOKENIZER_REGEX)
     tokens.collect do |tag_signature, text|
       if tag_signature
         if tag = self.initialize_tag(cms_page, tag_signature)

data/lib/comfortable_mexican_sofa/controller_methods.rb

@@ -23,11 +23,13 @@ module ComfortableMexicanSofa::ControllerMethods
   def render_with_cms(options = {}, locals = {}, &block)
     if path = options.delete(:cms_page)
       site = CmsSite.find_by_hostname(request.host.downcase)
-      page = site && site.cms_pages.find_by_full_path(path)
+      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)
       else
         raise ActionView::MissingTemplate.new([path], path, "CMS page not found", nil)

data/test/integration/render_cms_test.rb

@@ -4,8 +4,9 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   
   def setup
     Rails.application.routes.draw do
-      get '/render-implicit' => 'render_test#implicit'
-      get '/render-explicit' => 'render_test#explicit'
+      get '/render-implicit'  => 'render_test#implicit'
+      get '/render-explicit'  => 'render_test#explicit'
+      get '/seed_data_page'   => 'render_test#seed_data_page'
     end
     super
   end
@@ -21,6 +22,9 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     def explicit
       render :cms_page => '/render-explicit-page'
     end
+    def seed_data_page
+      render :cms_page => '/'
+    end
   end
   
   def test_get_with_no_template
@@ -54,4 +58,13 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     end
   end
   
+  def test_get_seed_data_page
+    ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    
+    get '/seed_data_page'
+    assert_response :success
+    assert assigns(:cms_page)
+    assert assigns(:cms_page).new_record?
+  end
+  
 end

data/test/unit/cms_tag_test.rb

@@ -2,6 +2,50 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class CmsTagTest < ActiveSupport::TestCase
   
+  def test_tokenizer_regex
+    regex = CmsTag::TOKENIZER_REGEX
+    
+    tokens = 'content<<cms:some_tag content'.scan(regex)
+    assert_equal nil, tokens[0][0]
+    assert_equal 'content<<cms:some_tag content', tokens[0][1]
+    
+    tokens = 'content<<cms some_tag>>content'.scan(regex)
+    assert_equal nil, tokens[0][0]
+    assert_equal 'content<<cms some_tag>>content', tokens[0][1]
+    
+    tokens = 'content<<cms:some_tag>>content'.scan(regex)
+    assert_equal nil,                     tokens[0][0]
+    assert_equal 'content<',              tokens[0][1]
+    assert_equal '<cms:some_tag>',        tokens[1][0]
+    assert_equal nil,                     tokens[1][1]
+    assert_equal nil,                     tokens[2][0]
+    assert_equal '>content',              tokens[2][1]
+    
+    tokens = 'content<<cms:type:label>>content'.scan(regex)
+    assert_equal nil,                     tokens[0][0]
+    assert_equal 'content<',              tokens[0][1]
+    assert_equal '<cms:type:label>',      tokens[1][0]
+    assert_equal nil,                     tokens[1][1]
+    assert_equal nil,                     tokens[2][0]
+    assert_equal '>content',              tokens[2][1]
+    
+    tokens = 'content<<cms:type:label />>content'.scan(regex)
+    assert_equal nil,                     tokens[0][0]
+    assert_equal 'content<',              tokens[0][1]
+    assert_equal '<cms:type:label />',    tokens[1][0]
+    assert_equal nil,                     tokens[1][1]
+    assert_equal nil,                     tokens[2][0]
+    assert_equal '>content',              tokens[2][1]
+    
+    tokens = 'content<< cms:type:la/b el />>content'.scan(regex)
+    assert_equal nil,                     tokens[0][0]
+    assert_equal 'content<',              tokens[0][1]
+    assert_equal '< cms:type:la/b el />', tokens[1][0]
+    assert_equal nil,                     tokens[1][1]
+    assert_equal nil,                     tokens[2][0]
+    assert_equal '>content',              tokens[2][1]
+  end
+  
   def test_content_for_existing_page
     page = cms_pages(:default)
     assert page.cms_tags.blank?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -04:00
+date: 2010-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency