comfortable_mexican_sofa 1.0.6 → 1.0.7

data/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails',          '>=3.0.1'
 gem 'sqlite3-ruby',   :require => 'sqlite3'
 gem 'active_link_to', '>=0.0.6'
-gem 'paperclip',      '>=2.3.3'
+gem 'paperclip',      '>=2.3.5'
 gem 'mime-types',     :require => 'mime/types'
 
 group :test do

data/Gemfile.lock

@@ -47,7 +47,7 @@ GEM
       mime-types
       treetop (>= 1.4.5)
     mime-types (1.16)
-    paperclip (2.3.4)
+    paperclip (2.3.5)
       activerecord
       activesupport
     polyglot (0.3.1)
@@ -85,6 +85,6 @@ DEPENDENCIES
   active_link_to (>= 0.0.6)
   jeweler (>= 1.4.0)
   mime-types
-  paperclip (>= 2.3.3)
+  paperclip (>= 2.3.5)
   rails (>= 3.0.1)
   sqlite3-ruby

data/Rakefile

@@ -16,9 +16,9 @@ begin
     gem.email       = 'oleg@theworkinggroup.ca'
     gem.homepage    = 'http://github.com/theworkinggroup/comfortable-mexican-sofa'
     gem.authors     = ['Oleg Khabarov', 'The Working Group Inc']
-    gem.add_dependency('rails',           '>=3.0.0')
+    gem.add_dependency('rails',           '>=3.0.1')
     gem.add_dependency('active_link_to',  '>=0.0.6')
-    gem.add_dependency('paperclip',       '>=2.3.3')
+    gem.add_dependency('paperclip',       '>=2.3.5')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/app/controllers/cms_admin/base_controller.rb

@@ -1,4 +1,7 @@
-class CmsAdmin::BaseController < ApplicationController
+class CmsAdmin::BaseController < ActionController::Base
+  
+  protect_from_forgery
+  
   # Authentication module must have #authenticate method
   include ComfortableMexicanSofa.config.authentication.to_s.constantize
   

data/app/views/layouts/cms_admin.html.erb

@@ -16,7 +16,7 @@
           <%= active_link_to 'Layouts', cms_admin_layouts_path %>
           <%= active_link_to 'Pages', cms_admin_pages_path %>
           <%= active_link_to 'Snippets', cms_admin_snippets_path %>
-          <%= hook :navigation %>
+          <%= cms_hook :navigation %>
         </div>
       </div>
       <div class='right_column'>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   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-26}
+  s.date = %q{2010-10-27}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -213,18 +213,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
       s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.6"])
-      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.3"])
+      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.5"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<rails>, [">= 3.0.1"])
       s.add_dependency(%q<active_link_to>, [">= 0.0.6"])
-      s.add_dependency(%q<paperclip>, [">= 2.3.3"])
+      s.add_dependency(%q<paperclip>, [">= 2.3.5"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<rails>, [">= 3.0.1"])
     s.add_dependency(%q<active_link_to>, [">= 0.0.6"])
-    s.add_dependency(%q<paperclip>, [">= 2.3.3"])
+    s.add_dependency(%q<paperclip>, [">= 2.3.5"])
   end
 end
 

data/lib/comfortable_mexican_sofa/cms_tag.rb

@@ -42,11 +42,6 @@ module CmsTag
       "#{self.class.name.underscore}_#{self.label}"
     end
     
-    # Equality check. Content doesn't matter. Tag identifier does.
-    def ==(tag)
-      self.identifier == tag.identifier
-    end
-    
     # Ancestors of this tag constructed during rendering process.
     def ancestors
       node, nodes = self, []
@@ -91,7 +86,7 @@ private
       if tag_signature
         if tag = self.initialize_tag(cms_page, tag_signature)
           tag.parent = parent_tag if parent_tag
-          unless tag.ancestors.member?(tag)
+          if tag.ancestors.select{|a| a.identifier == tag.identifier}.blank?
             cms_page.cms_tags << tag
             self.process_content(cms_page, tag.render, tag)
           end

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -16,7 +16,7 @@ module ComfortableMexicanSofa::ViewMethods
   end
   
   # Injects some content somewhere inside cms admin area
-  def hook(name)
+  def cms_hook(name)
     ComfortableMexicanSofa::ViewHooks.render(name, self)
   end
 end

data/test/unit/cms_tag_test.rb

@@ -138,12 +138,4 @@ class CmsTagTest < ActiveSupport::TestCase
     ), page.content
     assert_equal 6, page.cms_tags.size
   end
-  
-  def test_tag_equality
-    tag_1 = CmsTag::PageText.new(:label => 'new_text', :content => 'content')
-    tag_2 = CmsTag::FieldText.new(:label => 'new_text', :content => 'content')
-    tag_3 = CmsTag::PageText.new(:label => 'new_text', :content => 'other content')
-    assert_not_equal tag_1, tag_2
-    assert_equal tag_1, tag_3
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2010-10-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 1
+        version: 3.0.1
   type: :runtime
   name: rails
   prerelease: false
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 9
         segments: 
         - 2
         - 3
-        - 3
-        version: 2.3.3
+        - 5
+        version: 2.3.5
   type: :runtime
   name: paperclip
   prerelease: false