rich_cms 2.1.0 → 2.1.1

data/CHANGELOG

@@ -1,5 +1,9 @@
 = Rich-CMS CHANGELOG
 
+== Version 2.1.1 (November 8, 2010)
+
+* Fixed the Rails 3 generators which conflicted with Rich-I18n
+
 == Version 2.1.0 (November 8, 2010)
 
 * Made Rich-CMS Rails 2 and 3 compatible (woot!) Thanks Mark Mulder (@bitterzoet) for contributing

data/README.textile

@@ -265,7 +265,6 @@ h2. ToDo's
 * Provide tools to use Textile, MarkDown, image files upload and models (e.g. products)
 * Provide compatibility with other authentication mechanisms other than AuthLogic
 * Add cache feature which uses the standard Rails cache (rich_cms_tag ".cms_content", "test_content", :cache => true)
-* Make Rich-CMS compatible with Rails 3
 
 h2. Enrichments
 

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/lib/generators/rich/authlogic_user/authlogic_user_generator.rb

@@ -1,12 +1,12 @@
-require "generators/rich"
+require "generators/rich_cms"
 
 module Rich
   module Generators
 
-    class AuthlogicUserGenerator < Base
+    class AuthlogicUserGenerator < ::RichCms::Generators::Base
 
       include Rails::Generators::Migration
-      include Rich::Generators::Migration
+      include RichCms::Generators::Migration
 
       desc         "Creates Authlogic model and migration and also registers authenticated model to Rich-CMS."
       argument     :model_name, :type => :string , :default => "user"
@@ -16,7 +16,7 @@ module Rich
         filename = "config/initializers/enrichments.rb"
         line     = "\nRich::Cms::Engine.authenticate(:authlogic, {:class_name => \"#{model_class_name}\", :identifier => :email})"
 
-        return if File.open(filename, "a+").readlines.include? line.strip
+        return if File.open(filename).readlines.collect(&:strip).include? line.strip
 
         File.open(filename, "a+") do |file|
           file << line

data/lib/generators/rich/cms_content/cms_content_generator.rb

@@ -1,12 +1,12 @@
-require "generators/rich"
+require "generators/rich_cms"
 
 module Rich
   module Generators
 
-    class CmsContentGenerator < Base
+    class CmsContentGenerator < ::RichCms::Generators::Base
 
       include Rails::Generators::Migration
-      include Rich::Generators::Migration
+      include RichCms::Generators::Migration
 
       desc         "Creates Rich-CMS content model and migration and also registers content to Rich-CMS."
       argument     :model_name, :type => :string , :default => "cms_content"
@@ -16,7 +16,7 @@ module Rich
         filename = "config/initializers/enrichments.rb"
         line     = "\nRich::Cms::Engine.register(\".#{model_file_name}\", {:class_name => \"#{model_class_name}\"})"
 
-        return if File.open(filename, "a+").readlines.include? line.strip
+        return if File.open(filename).readlines.collect(&:strip).include? line.strip
 
         File.open(filename, "a+") do |file|
           file << line

data/lib/generators/{rich.rb → rich_cms.rb}

@@ -1,6 +1,6 @@
 require "rails/generators/named_base"
 
-module Rich
+module RichCms
   module Generators
 
     class Base < Rails::Generators::Base

data/rich_cms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_cms}
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
@@ -67,13 +67,13 @@ Gem::Specification.new do |s|
      "config/routes.rb",
      "init.rb",
      "install.rb",
-     "lib/generators/rich.rb",
      "lib/generators/rich/authlogic_user/authlogic_user_generator.rb",
      "lib/generators/rich/authlogic_user/templates/migration.rb",
      "lib/generators/rich/authlogic_user/templates/model.rb",
      "lib/generators/rich/authlogic_user/templates/session.rb",
      "lib/generators/rich/cms_content/cms_content_generator.rb",
      "lib/generators/rich/cms_content/templates/migration.rb",
+     "lib/generators/rich_cms.rb",
      "lib/rich/cms/actionpack.rb",
      "lib/rich/cms/actionpack/action_controller/base.rb",
      "lib/rich/cms/actionpack/action_view/base.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rich_cms
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Paul Engel
@@ -140,13 +140,13 @@ files:
 - config/routes.rb
 - init.rb
 - install.rb
-- lib/generators/rich.rb
 - lib/generators/rich/authlogic_user/authlogic_user_generator.rb
 - lib/generators/rich/authlogic_user/templates/migration.rb
 - lib/generators/rich/authlogic_user/templates/model.rb
 - lib/generators/rich/authlogic_user/templates/session.rb
 - lib/generators/rich/cms_content/cms_content_generator.rb
 - lib/generators/rich/cms_content/templates/migration.rb
+- lib/generators/rich_cms.rb
 - lib/rich/cms/actionpack.rb
 - lib/rich/cms/actionpack/action_controller/base.rb
 - lib/rich/cms/actionpack/action_view/base.rb