rich_cms 2.0.7 → 2.1.0

data/config/routes.rb

@@ -0,0 +1,36 @@
+if Rails::VERSION::MAJOR >= 3
+
+  Rails.application.routes.draw do
+    scope :module => "rich" do
+      %w(login logout update).each do |action|
+        match "/cms/#{action}" => "cms##{action}", :as => "rich_cms_#{action}"
+      end
+      match "/cms/"         => "cms#display", :as => "rich_cms"     , :display => true
+      match "/cms/hide"     => "cms#display", :as => "rich_cms_hide", :display => false
+      match "/cms/position" => "cms#position"
+    end
+  end
+
+else
+
+  # TODO: add routes the right way as this is evil
+  class << ActionController::Routing::Routes;self;end.class_eval do
+    define_method :clear!, lambda {}
+  end
+  # END
+
+  ActionController::Routing::Routes.draw do |map|
+    map.namespace :rich, :path_prefix => "" do |rich|
+
+      %w(login logout update).each do |action|
+        rich.send "cms_#{action}", "cms/#{action}", :controller => "cms", :action => action
+      end
+
+      rich.cms      "cms"         , :controller => "cms", :action => "display", :display => true
+      rich.cms_hide "cms/hide"    , :controller => "cms", :action => "display", :display => false
+      rich.connect  "cms/position", :controller => "cms", :action => "position"
+
+    end
+  end
+
+end

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

@@ -0,0 +1,63 @@
+require "generators/rich"
+
+module Rich
+  module Generators
+
+    class AuthlogicUserGenerator < Base
+
+      include Rails::Generators::Migration
+      include Rich::Generators::Migration
+
+      desc         "Creates Authlogic model and migration and also registers authenticated model to Rich-CMS."
+      argument     :model_name, :type => :string , :default => "user"
+      class_option :migrate   , :type => :boolean, :default => false, :aliases => "-m", :desc => "Run 'rake db:migrate' after generating model and migration"
+
+      def register_authentication
+        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
+
+        File.open(filename, "a+") do |file|
+          file << line
+        end
+      end
+
+      def generate_model
+        template "model.rb", "app/models/#{model_file_name}.rb"
+      end
+
+      def generate_session
+        template "session.rb", "app/models/#{model_file_name}_session.rb"
+      end
+
+      def generate_migration
+        migration_template "migration.rb", "db/migrate/create_#{table_name}"
+      end
+
+      def migrate
+        rake "db:migrate" if options[:migrate]
+      end
+
+    protected
+
+      def model_file_name
+        model_name.underscore
+      end
+
+      def model_class_name
+        model_name.classify
+      end
+
+      def migration_class_name
+        migration_file_name.pluralize.camelize
+      end
+
+      def table_name
+        model_file_name.underscore.gsub("/", "_").pluralize
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,25 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %> do |t|
+      t.string   :name
+      t.string   :email
+      t.string   :crypted_password
+      t.string   :password_salt
+      t.datetime :created_at
+      t.string   :persistence_token  , :default => "", :null => false
+      t.string   :single_access_token, :default => "", :null => false
+      t.string   :perishable_token   , :default => "", :null => false
+      t.integer  :login_count
+      t.datetime :last_request_at
+      t.datetime :current_login_at
+      t.datetime :last_login_at
+      t.timestamps
+    end
+
+    add_index :<%= table_name %>, :email
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end

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

@@ -0,0 +1,12 @@
+class <%= model_class_name %> < ActiveRecord::Base
+
+  acts_as_authentic do |c|
+    c.login_field            = :email
+    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

@@ -0,0 +1,7 @@
+class <%= model_class_name %>Session < Authlogic::Session::Base
+
+  authenticate_with <%= model_class_name %>
+  generalize_credentials_error_messages true
+  params_key "user_credentials"
+
+end

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

@@ -0,0 +1,59 @@
+require "generators/rich"
+
+module Rich
+  module Generators
+
+    class CmsContentGenerator < Base
+
+      include Rails::Generators::Migration
+      include Rich::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"
+      class_option :migrate   , :type => :boolean, :default => false, :aliases => "-m", :desc => "Run 'rake db:migrate' after generating model and migration"
+
+      def register_content
+        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
+
+        File.open(filename, "a+") do |file|
+          file << line
+        end
+      end
+
+      def generate_model
+        invoke "active_record:model", [model_file_name], :migration => false
+      end
+
+      def generate_migration
+        migration_template "migration.rb", "db/migrate/create_#{table_name}"
+      end
+
+      def migrate
+        rake "db:migrate" if options[:migrate]
+      end
+
+    protected
+
+      def model_file_name
+        model_name.underscore
+      end
+
+      def model_class_name
+        model_name.classify
+      end
+
+      def migration_class_name
+        migration_file_name.pluralize.camelize
+      end
+
+      def table_name
+        model_file_name.underscore.gsub("/", "_").pluralize
+      end
+
+    end
+
+  end
+end

data/lib/generators/rich/cms_content/templates/migration.rb

@@ -0,0 +1,15 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %> do |t|
+      t.string :key
+      t.text   :value
+      t.timestamps
+    end
+
+    add_index :<%= table_name %>, :key
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end

data/lib/generators/rich.rb

@@ -0,0 +1,25 @@
+require "rails/generators/named_base"
+
+module Rich
+  module Generators
+
+    class Base < Rails::Generators::Base
+      def self.source_root
+        File.expand_path File.join(File.dirname(__FILE__), "rich", generator_name, "templates")
+      end
+    end
+
+    module Migration
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def next_migration_number(dirname)
+          Time.now.strftime "%Y%m%d%H%M%S"
+        end
+      end
+    end
+
+  end
+end

data/lib/rich/cms/actionpack/action_controller/base.rb

@@ -3,21 +3,21 @@ module ActionController
   class Base
 
     around_filter :prepare_rich_cms
-    
+
     def prepare_rich_cms
       ::Rich::Cms::Engine.current_controller = self
       yield
     ensure
       ::Rich::Cms::Engine.current_controller = nil
     end
-    
-    view_path = File.join File.dirname(__FILE__), "..", "..", "..", "..", "app", "views"
+
+    view_path = File.expand_path "../../../../../../app/views", __FILE__
     if respond_to? :append_view_path
       self.append_view_path view_path
     elsif respond_to? :view_paths
       self.view_paths << view_path
     end
-    
+
     helper_method :current_rich_cms_admin, :current_rich_cms_admin_name, :rich_cms_authenticated_class, :rich_cms_authentication_inputs
 
     def require_current_rich_cms_admin
@@ -39,24 +39,24 @@ module ActionController
     def current_rich_cms_admin_name
       current_rich_cms_admin[rich_cms_auth.specs[:identifier]] if current_rich_cms_admin
     end
-    
+
     def rich_cms_auth
       ::Rich::Cms::Engine.authentication
     end
-    
+
     def rich_cms_authenticated_class
       case rich_cms_auth.logic
       when :authlogic
         "#{rich_cms_auth.specs[:class_name]}Session".constantize
       end
     end
-    
+
     def rich_cms_authentication_inputs
       case rich_cms_auth.logic
       when :authlogic
         rich_cms_auth.specs[:inputs] || [:email, :password]
       end
     end
-    
+
   end
 end

data/lib/rich/cms/actionpack/action_view/base.rb

@@ -1,23 +1,23 @@
 
 module ActionView
   class Base
-    
-  	def rich_cms
-  	  render :file => File.join(File.dirname(__FILE__), "..", "..", "..", "..", "app", "views", "rich_cms.html.erb") if display_rich_cms?
-  	end
-  	
+
+    def rich_cms
+      render :file => File.expand_path("../../../../../../app/views/rich_cms.html.erb", __FILE__) if display_rich_cms?
+    end
+
     def display_rich_cms?
       !!session[:rich_cms].try(:fetch, :display, nil)
     end
-  	
-  	def link(name, options = nil)
-  	  options = {:class => options || name.underscore} unless options.is_a?(Hash)
-  	  link_to name, "#", options
-  	end
-  	
-  	def rich_cms_tag(*args)
-  	  Rich::Cms::Engine.to_content_tag *args
-  	end
+
+    def link(name, options = nil)
+      options = {:class => options || name.underscore} unless options.is_a?(Hash)
+      link_to name, "#", options
+    end
+
+    def rich_cms_tag(*args)
+      Rich::Cms::Engine.to_content_tag *args
+    end
 
   end
 end

data/lib/rich/cms/activesupport/active_support/dependencies.rb

@@ -0,0 +1,12 @@
+module ActiveSupport
+  module Dependencies
+
+    extend self
+
+    unless respond_to? :autoload_paths
+      alias_method :autoload_paths     , :load_paths
+      alias_method :autoload_once_paths, :load_once_paths
+    end
+
+  end
+end

data/lib/rich/cms/activesupport.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), "activesupport", "active_support", "dependencies.rb")

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

@@ -2,13 +2,13 @@
 module Rich
   module Cms
     module Content
-      
+
       class Group < Struct.new(:selector, :tag, :class_name, :key, :value, :add, :before_edit, :after_update)
-        
+
         def self.build(selector, specs)
           self.new *{:selector => selector, :key => :key, :value => :value}.merge(specs).stringify_keys.values_at(*self.members)
         end
-        
+
         def fetch(ref, as_content_item = true)
           reference = if ref.is_a?(Hash)
                         ref
@@ -16,24 +16,24 @@ module Rich
                         {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
-          
+
           object = self.class_name.constantize.send :"find_or_initialize_by_#{identifiers.join "_and_"}", *reference.values_at(*identifiers)
-          
+
           as_content_item ? Cms::Content::Item.new(self, object) : object
         end
-        
+
         def keys
           (identifiers + [self.add || []].flatten.collect(&:to_s)).sort
         end
-      
+
         def identifiers
           @identifiers ||= [self.key].flatten.collect(&:to_s).sort
         end
-        
+
         def to_javascript_hash
           "#{self.selector.inspect}: {#{
             members.collect do |k|
@@ -54,15 +54,15 @@ module Rich
             end.compact.join(", ")
           }}"
         end
-        
+
       private
-        
+
         def valid_reference?(reference)
           reference.is_a?(Hash) && (identifiers - reference.keys).empty? && reference.values_at(*identifiers).compact!.nil?
         end
-        
+
       end
-      
+
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Rich
     module Content
 
       class Item
-      
+
         def initialize(*args)
           if args.size == 1 && args.first.is_a?(Hash)
             hash  = args.first
@@ -13,13 +13,13 @@ module Rich
           else
             raise ArgumentError, "Invalid arguments #{args.inspect} passed for #{self.class.name}"
           end
-          
+
           if hash && (selector = hash.stringify_keys["__selector__"])
             @group  = Engine.editable_content[selector]
             @object = @group.fetch hash, false
-            
+
             attributes, params = hash.partition{|k, v| @object.attribute_names.include? k.to_s}
-            
+
             @object.attributes = Hash[*attributes.flatten]
             @params            = HashWithIndifferentAccess[*params.flatten]
 
@@ -27,7 +27,7 @@ module Rich
             @group, @object = *array
           end
         end
-      
+
         def save
           @object.save
 
@@ -37,38 +37,38 @@ module Rich
             keys = @group.keys << @group.value.to_s
             hash = @object.attributes.reject{|k, v| !keys.include?(k.to_s)}
           end
-          
+
           selector   = @group.selector
           identifier = @group.identifiers.inject({}){|h, k| h[k] = @object.send(k); h}
-          
+
           hash.merge({:__selector__ => selector, :__identifier__ => identifier})
         end
-      
+
         def to_tag(options = {})
-          tag   = options[:tag] || @group.tag || :div
-          attrs = []
-          
+          attrs   = []
           default = @group.identifiers.size == 1 ? @object.send(@group.identifiers.first) : @object.attributes.values_at(*@group.identifiers).inspect
           value   = @object.send(@group.value)
-          
+
           if Engine.can_render_metadata?
             default = "< #{default} >"
             keys    = @group.keys << @group.value.to_s
             data    = @object.attributes.reject{|k, v| !keys.include?(k.to_s)}
 
             data[:editable_input_type] = options[:as] if %w(string text html).include? options[:as].to_s.downcase
-          
+
             if class_name = @group.selector.match(/^\.\w+$/)
               (options[:html] ||= {}).store :class, [class_name.to_s.gsub(/^\./, ""), options[:html].try(:fetch, :class, nil)].compact.join(" ")
             end
-            
+
             attrs << options[:html].collect{|k, v|      "#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ") if options[:html]
             attrs << data          .collect{|k, v| "data-#{k}=\"#{::ERB::Util.html_escape v}\""}.join(" ")
           end
-          
-          "<#{tag} #{attrs.join(" ")}>#{value.blank? ? default : value}</#{tag}>"
+
+          tag = options[:tag] || @group.tag || (%w(text html).include?(data.try :fetch, :editable_input_type, nil) ? :div : :span)
+
+          "<#{tag} #{attrs.join(" ")}>#{value.blank? ? default : value}</#{tag}>".html_safe
         end
-      
+
       end
 
     end

data/lib/rich/cms/core/string/html_safe.rb

@@ -0,0 +1,18 @@
+
+module Rich
+  module Cms
+    module Core
+      module String
+        module HtmlSafe
+
+          unless ::String.new.respond_to? :html_safe
+            def html_safe
+              self
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/rich/cms/core/string.rb

@@ -0,0 +1,6 @@
+
+require "rich/cms/core/string/html_safe"
+
+class String
+  include Rich::Cms::Core::String::HtmlSafe
+end

data/lib/rich/cms/core.rb

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