rich_cms 2.0.7 → 2.1.0

data/lib/rich/cms/engine.rb

@@ -1,87 +1,98 @@
 
 module Rich
   module Cms
-    module Engine
-      
+    class Engine < Rails::Engine
+
       class RichCmsError < StandardError
       end
-      
-      extend self
-      
-      attr_reader :authentication, :editable_content
-  
-      def init
-        @authentication   = AuthenticationSpecs.new
-        @editable_content = {}
-        
-        %w(controllers).each do |dir|
-          path = File.join File.dirname(__FILE__), "..", "..", "app", dir
-          $LOAD_PATH << path
-          ActiveSupport::Dependencies.load_paths << path
-          ActiveSupport::Dependencies.load_once_paths.delete path
-        end
-        
-        ::Jzip::Engine.add_template_location({File.join(File.dirname(__FILE__), "..", "..", "assets", "jzip") => File.join(RAILS_ROOT, "public", "javascripts")})
-        ::Sass::Plugin.add_template_location( File.join(File.dirname(__FILE__), "..", "..", "assets", "sass"),   File.join(RAILS_ROOT, "public", "stylesheets") )
-        
-        copy_assets
-      end
-    
-      def copy_assets
-        return if RAILS_ENV == "test"
-        
-        source_dir = File.join File.dirname(__FILE__), "..", "..", "assets", "images", "."
-        target_dir = File.join RAILS_ROOT, "public", "images", "rich", "cms"
-        
-        FileUtils.rm_r    target_dir if File.exists? target_dir
-        FileUtils.mkdir_p target_dir
-        FileUtils.cp_r    source_dir, target_dir
-      end
-      
-      def current_controller=(current_controller)
-        @current_controller  = current_controller
-        @can_render_metadata = nil
-      end
-      
-      def authenticate(logic, specs)
-        @authentication = AuthenticationSpecs.new(logic, specs)
-      end
-      
-      def register(*args)
-        (editables = args.first.is_a?(Hash) ? args.first : Hash[*args]).each do |selector, specs|
-          if @editable_content.keys.include?(selector)
-            raise RichCmsError, "Already registered editable content identified with #{selector.inspect}"
+
+      class << self
+
+        attr_reader :authentication, :editable_content
+
+        def init
+          @authentication   = AuthenticationSpecs.new
+          @editable_content = {}
+
+          %w(controllers).each do |dir|
+            path = File.join File.dirname(__FILE__), "..", "..", "app", dir
+            $LOAD_PATH << path
+            ActiveSupport::Dependencies.autoload_paths << path
+            ActiveSupport::Dependencies.autoload_once_paths.delete path
+          end
+
+          procedure = proc {
+            ::Jzip::Engine.add_template_location({File.expand_path("../../../../assets/jzip", __FILE__) => File.join(Rails.root, "public", "javascripts")})
+            ::Sass::Plugin.add_template_location( File.expand_path("../../../../assets/sass", __FILE__),   File.join(Rails.root, "public", "stylesheets") )
+            copy_assets
+          }
+
+          if Rails::VERSION::MAJOR >= 3
+            config.after_initialize do
+              procedure.call
+            end
           else
-            @editable_content[selector] = Cms::Content::Group.build(selector, specs)
+            procedure.call
           end
         end
-      end
-      
-      def to_content_tag(selector, identifiers, options = {})
-        editable_content[selector].fetch(identifiers).to_tag options
-      end
-      
-      def editable_content_javascript_hash
-        "{#{@editable_content.collect{|k, v| v.to_javascript_hash}.join ", "}}"
-      end
-      
-      def can_render_metadata?
-        if @can_render_metadata.nil?
-          @can_render_metadata = case authentication.logic
-                                 when :authlogic
-                                   @current_controller.try :current_rich_cms_admin
-                                 when nil
-                                   true
-                                 end
-        else
-          @can_render_metadata
+
+        def copy_assets
+          return if Rails.env == "test"
+
+          source_dir = File.join File.dirname(__FILE__), "..", "..", "..", "assets", "images", "."
+          target_dir = File.join Rails.root, "public", "images", "rich", "cms"
+
+          FileUtils.rm_r    target_dir if File.exists? target_dir
+          FileUtils.mkdir_p target_dir
+          FileUtils.cp_r    source_dir, target_dir
         end
+
+        def current_controller=(current_controller)
+          @current_controller  = current_controller
+          @can_render_metadata = nil
+        end
+
+        def authenticate(logic, specs)
+          @authentication = AuthenticationSpecs.new(logic, specs)
+        end
+
+        def register(*args)
+          (editables = args.first.is_a?(Hash) ? args.first : Hash[*args]).each do |selector, specs|
+            if @editable_content.keys.include?(selector)
+              raise RichCmsError, "Already registered editable content identified with #{selector.inspect}"
+            else
+              @editable_content[selector] = Cms::Content::Group.build(selector, specs)
+            end
+          end
+        end
+
+        def to_content_tag(selector, identifiers, options = {})
+          editable_content[selector].fetch(identifiers).to_tag options
+        end
+
+        def editable_content_javascript_hash
+          "{#{@editable_content.collect{|k, v| v.to_javascript_hash}.join ", "}}".html_safe
+        end
+
+        def can_render_metadata?
+          if @can_render_metadata.nil?
+            @can_render_metadata = case authentication.logic
+                                   when :authlogic
+                                     @current_controller.try :current_rich_cms_admin
+                                   when nil
+                                     true
+                                   end
+          else
+            @can_render_metadata
+          end
+        end
+
+      private
+
+        AuthenticationSpecs = Struct.new(:logic, :specs)
+
       end
-      
-    private
-    
-      AuthenticationSpecs = Struct.new(:logic, :specs)
-      
+
     end
   end
 end

data/lib/rich/cms/rails/engine.rb

@@ -0,0 +1,5 @@
+
+unless defined?(Rails::Engine)
+  class Rails::Engine
+  end
+end

data/lib/rich/cms/rails.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), "rails", "engine.rb")

data/lib/rich_cms.rb

@@ -1,12 +1,14 @@
 require "authlogic"
-require "jzip"
-require "sass/plugin"
-
 require "formtastic"
-ActionView::Base.send :include, Formtastic::SemanticFormHelper
+require "jzip"
+require "haml"
 
-require "config/routes"
+require "rich/cms/core"
+require "rich/cms/activesupport"
 require "rich/cms/actionpack"
+require "rich/cms/rails"
 require "rich/cms/engine"
 require "rich/cms/content/group"
-require "rich/cms/content/item"
+require "rich/cms/content/item"
+
+require "config/routes" if Rails::VERSION::MAJOR < 3

data/rails_generators/rich_authlogic_user/rich_authlogic_user_generator.rb

@@ -13,12 +13,12 @@ class RichAuthlogicUserGenerator < Rails::Generator::Base
       m.migration_template "migration.rb", "db/migrate", :migration_file_name => migration_file_name
     end
   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
-    
+
     system "rake db:migrate" if options[:migrate]
   end
 
@@ -29,7 +29,7 @@ class RichAuthlogicUserGenerator < Rails::Generator::Base
   def model_class_name
     @name.classify
   end
-  
+
   def table_name
     model_file_name.gsub("/", "_").pluralize
   end
@@ -49,7 +49,7 @@ protected
     opt.separator "Options:"
     opt.on("-m", "--migrate", "Run 'rake db:migrate' after generating model and migration.") { options[:migrate] = true }
   end
-  
+
   def banner
     <<-EOS
 Creates Authlogic model and migration and also registers authenticated model to Rich-CMS.

data/rails_generators/rich_authlogic_user/templates/migration.rb

@@ -15,7 +15,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.datetime :last_login_at
       t.timestamps
     end
-    
+
     add_index :<%= table_name %>, :email
   end
 

data/rails_generators/rich_authlogic_user/templates/model.rb

@@ -4,5 +4,5 @@ class <%= model_class_name %> < ActiveRecord::Base
     c.login_field            = :email
     c.crypted_password_field = :crypted_password
   end
-  
+
 end

data/rails_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/rails_generators/rich_cms_content/rich_cms_content_generator.rb

@@ -12,12 +12,12 @@ class RichCmsContentGenerator < Rails::Generator::Base
       m.migration_template "migration.rb", "db/migrate", :migration_file_name => migration_file_name
     end
   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
-    
+
     system "rake db:migrate" if options[:migrate]
   end
 
@@ -28,7 +28,7 @@ class RichCmsContentGenerator < Rails::Generator::Base
   def model_class_name
     @name.classify
   end
-  
+
   def table_name
     model_file_name.gsub("/", "_").pluralize
   end

data/rails_generators/rich_cms_content/templates/migration.rb

@@ -5,7 +5,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.text   :value
       t.timestamps
     end
-    
+
     add_index :<%= table_name %>, :key
   end
 

data/rich_cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rich_cms}
-  s.version = "2.0.7"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2010-10-20}
+  s.date = %q{2010-11-08}
   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 = [
@@ -22,60 +22,71 @@ Gem::Specification.new do |s|
      "README.textile",
      "Rakefile",
      "VERSION",
+     "app/controllers/rich/cms_controller.rb",
+     "app/views/rich/cms/_dock.html.erb",
+     "app/views/rich/cms/dock/_menu.html.erb",
+     "app/views/rich/cms/dock/_panel.html.erb",
+     "app/views/rich/cms/dock/panel/_edit.html.erb",
+     "app/views/rich/cms/dock/panel/_login.html.erb",
+     "app/views/rich/cms/dock/panel/edit/_rails2.html.erb",
+     "app/views/rich/cms/dock/panel/edit/_rails3.html.erb",
+     "app/views/rich/cms/dock/panel/login/_rails2.html.erb",
+     "app/views/rich/cms/dock/panel/login/_rails3.html.erb",
+     "app/views/rich_cms.html.erb",
+     "assets/images/cleditor/buttons.gif",
+     "assets/images/cleditor/toolbar.gif",
+     "assets/jzip/jquery/cleditor.js",
+     "assets/jzip/jquery/core.jz",
+     "assets/jzip/jquery/extensions/ajaxify.js",
+     "assets/jzip/jquery/extensions/browser_detect.js",
+     "assets/jzip/jquery/extensions/modules.js",
+     "assets/jzip/jquery/extensions/object.js",
+     "assets/jzip/jquery/raccoon_tip.js",
+     "assets/jzip/jquery/ui/components/core.js",
+     "assets/jzip/jquery/ui/components/draggable.js",
+     "assets/jzip/jquery/ui/components/mouse.js",
+     "assets/jzip/jquery/ui/components/widget.js",
+     "assets/jzip/jquery/ui/rich_cms/core.jz",
+     "assets/jzip/jquery/ui/rich_cms/draggable.jz",
+     "assets/jzip/jquery/ui/rich_cms/mouse.jz",
+     "assets/jzip/jquery/ui/rich_cms/widget.jz",
+     "assets/jzip/rich.js",
+     "assets/jzip/rich/cms.js",
+     "assets/jzip/rich/cms/dock.js",
+     "assets/jzip/rich/cms/editor.js",
+     "assets/jzip/rich/cms/menu.js",
+     "assets/jzip/rich_cms.jz",
+     "assets/sass/rich_cms.sass",
+     "assets/sass/rich_cms/_content.sass",
+     "assets/sass/rich_cms/_dock.sass",
+     "assets/sass/rich_cms/_menu.sass",
+     "assets/sass/rich_cms/_panel.sass",
+     "assets/sass/rich_cms/_reset.sass",
+     "assets/sass/tools/_css3.sass",
+     "assets/sass/tools/_mixins.sass",
+     "config/routes.rb",
      "init.rb",
      "install.rb",
-     "lib/app/controllers/rich/._cms_controller.rb",
-     "lib/app/controllers/rich/cms_controller.rb",
-     "lib/app/views/._rich_cms.html.erb",
-     "lib/app/views/rich/cms/_dock.html.erb",
-     "lib/app/views/rich/cms/dock/.__menu.html.erb",
-     "lib/app/views/rich/cms/dock/.__panel.html.erb",
-     "lib/app/views/rich/cms/dock/_menu.html.erb",
-     "lib/app/views/rich/cms/dock/_panel.html.erb",
-     "lib/app/views/rich/cms/dock/panel/.__login.html.erb",
-     "lib/app/views/rich/cms/dock/panel/_edit.html.erb",
-     "lib/app/views/rich/cms/dock/panel/_login.html.erb",
-     "lib/app/views/rich_cms.html.erb",
-     "lib/assets/images/cleditor/buttons.gif",
-     "lib/assets/images/cleditor/toolbar.gif",
-     "lib/assets/jzip/jquery/cleditor.js",
-     "lib/assets/jzip/jquery/core.jz",
-     "lib/assets/jzip/jquery/extensions/ajaxify.js",
-     "lib/assets/jzip/jquery/extensions/browser_detect.js",
-     "lib/assets/jzip/jquery/extensions/modules.js",
-     "lib/assets/jzip/jquery/extensions/object.js",
-     "lib/assets/jzip/jquery/raccoon_tip.js",
-     "lib/assets/jzip/jquery/ui/components/core.js",
-     "lib/assets/jzip/jquery/ui/components/draggable.js",
-     "lib/assets/jzip/jquery/ui/components/mouse.js",
-     "lib/assets/jzip/jquery/ui/components/widget.js",
-     "lib/assets/jzip/jquery/ui/rich_cms/core.jz",
-     "lib/assets/jzip/jquery/ui/rich_cms/draggable.jz",
-     "lib/assets/jzip/jquery/ui/rich_cms/mouse.jz",
-     "lib/assets/jzip/jquery/ui/rich_cms/widget.jz",
-     "lib/assets/jzip/rich.js",
-     "lib/assets/jzip/rich/cms.js",
-     "lib/assets/jzip/rich/cms/dock.js",
-     "lib/assets/jzip/rich/cms/editor.js",
-     "lib/assets/jzip/rich/cms/menu.js",
-     "lib/assets/jzip/rich_cms.jz",
-     "lib/assets/sass/rich_cms.sass",
-     "lib/assets/sass/rich_cms/_content.sass",
-     "lib/assets/sass/rich_cms/_dock.sass",
-     "lib/assets/sass/rich_cms/_menu.sass",
-     "lib/assets/sass/rich_cms/_panel.sass",
-     "lib/assets/sass/rich_cms/_reset.sass",
-     "lib/assets/sass/tools/_css3.sass",
-     "lib/assets/sass/tools/_mixins.sass",
-     "lib/config/routes.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/rich/cms/actionpack.rb",
-     "lib/rich/cms/actionpack/action_controller/._base.rb",
      "lib/rich/cms/actionpack/action_controller/base.rb",
-     "lib/rich/cms/actionpack/action_view/._base.rb",
      "lib/rich/cms/actionpack/action_view/base.rb",
+     "lib/rich/cms/activesupport.rb",
+     "lib/rich/cms/activesupport/active_support/dependencies.rb",
      "lib/rich/cms/content/group.rb",
      "lib/rich/cms/content/item.rb",
+     "lib/rich/cms/core.rb",
+     "lib/rich/cms/core/string.rb",
+     "lib/rich/cms/core/string/html_safe.rb",
      "lib/rich/cms/engine.rb",
+     "lib/rich/cms/rails.rb",
+     "lib/rich/cms/rails/engine.rb",
      "lib/rich_cms.rb",
      "rails/init.rb",
      "rails_generators/rich_authlogic_user/rich_authlogic_user_generator.rb",
@@ -89,7 +100,6 @@ Gem::Specification.new do |s|
      "rails_generators/rich_cms_content/templates/model.rb",
      "rich_cms.gemspec",
      "tasks/rich_cms_tasks.rake",
-     "test/engine_test.rb",
      "test/test_helper.rb",
      "uninstall.rb"
   ]
@@ -99,8 +109,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Enrichments (e9s) module for a pluggable CMS frontend}
   s.test_files = [
-    "test/engine_test.rb",
-     "test/test_helper.rb"
+    "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -108,21 +117,21 @@ 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<authlogic>, [">= 0"])
-      s.add_runtime_dependency(%q<formtastic>, ["= 1.0.1"])
+      s.add_runtime_dependency(%q<authlogic>, [">= 2.1.2"])
+      s.add_runtime_dependency(%q<formtastic>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<haml>, [">= 3"])
-      s.add_runtime_dependency(%q<jzip>, [">= 1.0.10"])
+      s.add_runtime_dependency(%q<jzip>, [">= 1.0.11"])
     else
-      s.add_dependency(%q<authlogic>, [">= 0"])
-      s.add_dependency(%q<formtastic>, ["= 1.0.1"])
+      s.add_dependency(%q<authlogic>, [">= 2.1.2"])
+      s.add_dependency(%q<formtastic>, [">= 1.1.0"])
       s.add_dependency(%q<haml>, [">= 3"])
-      s.add_dependency(%q<jzip>, [">= 1.0.10"])
+      s.add_dependency(%q<jzip>, [">= 1.0.11"])
     end
   else
-    s.add_dependency(%q<authlogic>, [">= 0"])
-    s.add_dependency(%q<formtastic>, ["= 1.0.1"])
+    s.add_dependency(%q<authlogic>, [">= 2.1.2"])
+    s.add_dependency(%q<formtastic>, [">= 1.1.0"])
     s.add_dependency(%q<haml>, [">= 3"])
-    s.add_dependency(%q<jzip>, [">= 1.0.10"])
+    s.add_dependency(%q<jzip>, [">= 1.0.11"])
   end
 end
 

data/test/test_helper.rb

@@ -1,3 +1,6 @@
 require "rubygems"
+require "test/unit"
 require "active_support"
-require "active_support/test_case"
+
+require File.join(File.dirname(__FILE__), "..", "lib", "rich_cms")
+include Rich::Cms