rich_cms 2.0.1 → 2.0.2

data/CHANGELOG

@@ -1,5 +1,9 @@
 = Rich-CMS CHANGELOG
 
+== Version 2.0.2 (September 9, 2010)
+
+* Corrected the Rich::Cms::Engine.to_content_tag implementation when using combined keys
+
 == Version 2.0.1 (September 3, 2010)
 
 * Tweaked determination of whether to show a text input or textarea when editing content
@@ -9,7 +13,16 @@
 
 == Version 2.0.0 (September 3, 2010)
 
-* Updated the look and feel
+* Complete new look and feel (using CSS3, no images and IE6+ compatible, Safari, Chrome and Firefox)
+* Using RaccoonTip (yay!)
+* Including jQuery dependencies the correct way
+* Moved app, assets and config to lib directory
+* Added lib/app/controllers to the load path
+* Added lib/app/views to view paths
+* Using Jzip::Engine instead of Jzip::Plugin
+* Refactored ActionController::Base a bit
+* Deriving the CMS content (to edit) the correct way within Rich.Cms.Editor
+* Improved the Rich::Cms::Engine.to_content_tag implementation
 
 == Version 1.0.0 (August 15, 2010)
 

data/README.textile

@@ -85,11 +85,21 @@ Rich-CMS requires a rendered DOM element provided with meta data of the content
   => "<div class='cms_content' data-key='test_content' data-value='Hello world!'>Hello world!</div>"
 </pre>
 
+When using a combined key for content identification, just call it as follows:
+
+<pre>
+  >> Rich::Cms::Engine.to_content_tag(".cms_content", {:key => key, :locale => I18n.locale})
+  => "<div class='cms_content' data-key='test_content' data-locale='nl' data-value='Hallo wereld!'>Hallo wereld!</div>"
+</pre>
+
+*Note*: In this case, the content was registered with @Rich::Cms::Engine.register(".cms_content", {:class_name => "Cms::StaticContent", :key => [:key, :locale]})@
+
 We have also provided you a helper method to render Rich-CMS content tags:
 
 <pre>
   ...
   <%= rich_cms_tag ".cms_content", "test_content" %>
+  <%= rich_cms_tag ".cms_content", {:key => "test_content", :locale => I18n.locale} %>
   ...
 </pre>
 

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/rich/cms/content/group.rb

@@ -10,8 +10,13 @@ module Rich
         end
         
         def fetch(ref, as_content_item = true)
-          reference = ref.is_a?(Hash) || (identifiers.size != 1) ? ref : {identifiers.first => ref}
-
+          reference = if ref.is_a?(Hash)
+                        ref
+                      elsif identifiers.size == 1
+                        {identifiers.first => ref}
+                      end
+          reference.stringify_keys! if reference.is_a?(Hash)
+          
           unless valid_reference?(reference)
             raise ArgumentError, "Invalid reference #{reference.inspect} (#{reference.values_at(*identifiers).inspect}) passed for #{identifiers.inspect}"
           end
@@ -53,7 +58,7 @@ module Rich
       private
         
         def valid_reference?(reference)
-          reference.is_a?(Hash) && (identifiers - reference.stringify_keys.keys).empty? && reference.values_at(*identifiers).compact!.nil?
+          reference.is_a?(Hash) && (identifiers - reference.keys).empty? && reference.values_at(*identifiers).compact!.nil?
         end
         
       end

data/lib/rich/cms/engine.rb

@@ -44,10 +44,7 @@ module Rich
         end
       end
       
-      def to_content_tag(*args)
-  	    selector    = args.shift
-  	    options     = args.extract_options!
-  	    identifiers = args
+      def to_content_tag(selector, identifiers, options = {})
         editable_content[selector].fetch(identifiers).to_tag options
       end
       

data/rich_cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_cms}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2010-09-03}
+  s.date = %q{2010-09-09}
   s.description = %q{Rich-CMS is a module of E9s (http://github.com/archan937/e9s) which provides a frontend for your CMS content. You can use this gem to manage CMS content or translations (in an internationalized application). The installation and setup process is very easily done. You will have to register content at the Rich-CMS engine and also you will have to specify the authentication mechanism. Both are one-liners.}
   s.email = %q{paul.engel@holder.nl}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rich_cms
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +02:00
+date: 2010-09-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency