rich_cms 2.1.1 → 2.1.2

data/CHANGELOG

@@ -1,5 +1,10 @@
 = Rich-CMS CHANGELOG
 
+== Version 2.1.2 (November 9, 2010)
+
+* Defining the 'to_key' method in the correct file (which fixes Authlogic in Rails 3)
+* Fixed the Rails generators once and for all
+
 == Version 2.1.1 (November 8, 2010)
 
 * Fixed the Rails 3 generators which conflicted with Rich-I18n

data/README.textile

@@ -20,7 +20,7 @@ Add Rich-CMS in @Gemfile@ as a gem dependency:
 Run the following in your console to install with Bundler:
 
 <pre>
-  bundle install
+  sudo bundle install
 </pre>
 
 h3. Using Rich-CMS as gem in Rails 2

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

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

@@ -16,6 +16,7 @@ module Rich
         filename = "config/initializers/enrichments.rb"
         line     = "\nRich::Cms::Engine.authenticate(:authlogic, {:class_name => \"#{model_class_name}\", :identifier => :email})"
 
+        create_file filename unless File.exists?(filename)
         return if File.open(filename).readlines.collect(&:strip).include? line.strip
 
         File.open(filename, "a+") do |file|

data/lib/generators/rich/authlogic_user/templates/model.rb

@@ -5,8 +5,4 @@ class <%= model_class_name %> < ActiveRecord::Base
     c.crypted_password_field = :crypted_password
   end
 
-  def to_key
-    new_record? ? nil : [self.send self.class.primary_key]
-  end
-
 end

data/lib/generators/rich/authlogic_user/templates/session.rb

@@ -4,4 +4,8 @@ class <%= model_class_name %>Session < Authlogic::Session::Base
   generalize_credentials_error_messages true
   params_key "user_credentials"
 
+  def to_key
+    new_record? ? nil : [self.send self.class.primary_key]
+  end
+
 end

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

@@ -16,6 +16,7 @@ module Rich
         filename = "config/initializers/enrichments.rb"
         line     = "\nRich::Cms::Engine.register(\".#{model_file_name}\", {:class_name => \"#{model_class_name}\"})"
 
+        create_file filename unless File.exists?(filename)
         return if File.open(filename).readlines.collect(&:strip).include? line.strip
 
         File.open(filename, "a+") do |file|

data/rails_generators/rich_authlogic_user/rich_authlogic_user_generator.rb

@@ -15,9 +15,12 @@ class RichAuthlogicUserGenerator < Rails::Generator::Base
   end
 
   def after_generate
-    File.open(destination_path("config/initializers/enrichments.rb"), "a+") do |file|
-      file << "\nRich::Cms::Engine.authenticate(:authlogic, {:class_name => \"#{model_class_name}\", :identifier => :email})"
-    end
+    filename = destination_path("config/initializers/enrichments.rb")
+    line     = "\nRich::Cms::Engine.authenticate(:authlogic, {:class_name => \"#{model_class_name}\", :identifier => :email})"
+
+    File.open(filename, "a+") do |file|
+      file << line
+    end unless File.open(filename).readlines.collect(&:strip).include? line.strip
 
     system "rake db:migrate" if options[:migrate]
   end

data/rails_generators/rich_cms_content/rich_cms_content_generator.rb

@@ -14,9 +14,12 @@ class RichCmsContentGenerator < Rails::Generator::Base
   end
 
   def after_generate
-    File.open(destination_path("config/initializers/enrichments.rb"), "a+") do |file|
-      file << "\nRich::Cms::Engine.register(\".#{model_file_name}\", {:class_name => \"#{model_class_name}\"})"
-    end
+    filename = destination_path("config/initializers/enrichments.rb")
+    line     = "\nRich::Cms::Engine.register(\".#{model_file_name}\", {:class_name => \"#{model_class_name}\"})"
+
+    File.open(filename, "a+") do |file|
+      file << line
+    end unless File.open(filename).readlines.collect(&:strip).include? line.strip
 
     system "rake db:migrate" if options[:migrate]
   end

data/rich_cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_cms}
-  s.version = "2.1.1"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2010-11-08}
+  s.date = %q{2010-11-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: 9
+  hash: 15
   prerelease: false
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +01:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency