rich_cms 2.1.7 → 3.0.0

data/assets/jzip/jquery/extensions/browser_detect.js

@@ -1,8 +1,7 @@
-
 $.extend({
   ie:  jQuery.browser.msie,
   ie6: jQuery.browser.msie    && parseInt(jQuery.browser.version, 10) == 6,
   ie7: jQuery.browser.msie    && parseInt(jQuery.browser.version, 10) == 7,
   ie8: jQuery.browser.msie    && parseInt(jQuery.browser.version, 10) == 8,
   ff2: jQuery.browser.mozilla && parseFloat(jQuery.browser.version) < 1.9
-});
+});

data/assets/jzip/native/extensions.js

@@ -0,0 +1,41 @@
+/* Implement indexOf ourselves as IE does not support it */
+if (!Array.prototype.indexOf)
+{
+  Array.prototype.indexOf = function(searchElement /*, fromIndex */)
+  {
+    "use strict";
+
+    if (this === void 0 || this === null)
+      throw new TypeError();
+
+    var t = Object(this);
+    var len = t.length >>> 0;
+    if (len === 0)
+      return -1;
+
+    var n = 0;
+    if (arguments.length > 0)
+    {
+      n = Number(arguments[1]);
+      if (n !== n)
+        n = 0;
+      else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0))
+        n = (n > 0 || -1) * Math.floor(Math.abs(n));
+    }
+
+    if (n >= len)
+      return -1;
+
+    var k = n >= 0
+          ? n
+          : Math.max(len - Math.abs(n), 0);
+
+    for (; k < len; k++)
+    {
+      if (k in t && t[k] === searchElement)
+        return k;
+    }
+    return -1;
+  };
+}
+

data/assets/jzip/rich/cms/editor.js

@@ -11,6 +11,12 @@ Rich.Cms.Editor = (function() {
   };
 
   var bind = function() {
+    $("#rich_cms_panel .edit form fieldset.inputs div.keys a.toggler").live("click", function(event) {
+      event.preventDefault();
+      var toggler = $(event.target);
+      toggler.hide().closest(".keys").find("select[name=" + toggler.attr("data-name") + "]").show();
+    });
+    
     $("#rich_cms_panel .edit a.close").bind("click", function(event) {
       event.preventDefault();
       RaccoonTip.close();
@@ -18,7 +24,7 @@ Rich.Cms.Editor = (function() {
 
     RaccoonTip.register("." + content_class + "." + mark_class, "#rich_cms_panel", {
                           beforeShow: edit,
-                          canHide: function() { return !$("#cleditor_input").length },
+                          canHide: function() { return !$("#cleditor_input").length; },
                           afterHide: function(content) { content.hide(); }
                         });
 
@@ -67,7 +73,7 @@ Rich.Cms.Editor = (function() {
 
   var edit = function() {
     var content_item = $(this).closest(".rich_cms_content");
-    var label        = $("#rich_cms_panel .edit form fieldset.inputs label");
+    var keys         = $("#rich_cms_panel .edit form fieldset.inputs div.keys");
     var inputs       = $("#rich_cms_panel .edit form fieldset.inputs");
 
     var attrs        = content_item.get(0).attributes;
@@ -76,8 +82,7 @@ Rich.Cms.Editor = (function() {
                        })[0];
     var specs        = editable_content[selector];
 
-    label.html("Editing:&nbsp; " + $.map(specs.keys, function(key) { return "<strong>" + content_item.attr(key) + "</strong>"; }).join(", "));
-
+    keys.find("select,a,span").remove();
     inputs.find(":input,div.cleditorMain").remove();
     inputs.append("<input name='content_item[__selector__]' type='hidden' value='" + selector + "'/>");
 
@@ -99,11 +104,40 @@ Rich.Cms.Editor = (function() {
             case "html":
               inputs.append("<textarea id='cleditor_input' name='" + name + "' style='width: 500px; height: 300px'>" + value + "</textarea>"); break;
           }
+        } else if (specs.keys.indexOf(attr) != -1) {
+          var available_keys = $.map(value.split(","), function(key) { return $.trim(key); });
+          var default_key    = available_keys[0];
+          
+          if (specs.keys.length > 1 && keys.find("select").length > 0) {
+            keys.append("<span>, <span>");
+          }
+          
+          keys.append(available_keys.length == 1 ?
+                        "<span>" + default_key + "<span>" :
+                        "<a href='#' class='toggler' data-attr='" + attr + "' data-name='" + name + "'>" + default_key + "</a>");
+          keys.append("<select name='" + name + "' style='display: none'>" + 
+                         $.map(available_keys, function(key) { return "<option value='" + key + "'>" + key + "</option>"; }).join("") +
+                      "</select>");
         } else {
           inputs.append("<input name='" + name + "' type='hidden' value='" + value + "'/>");
         }
       }
     });
+    
+    $("#rich_cms_panel .edit form fieldset.inputs div.keys select").bind("blur", function(event) {
+      var select  = $(event.target);
+      var toggler = select.hide().closest(".keys").find(".toggler[data-name=" + select.attr("name") + "]").html(select.val()).show();
+      var values  = [select.val()];
+
+      $.map(select.find("option"), function(option) {
+        var value = $(option).val();
+        if (value != values[0]) {
+          values.push(value);
+        }
+      });
+      
+      content_item.attr(toggler.attr("data-attr"), values.join(", "));
+    });
 
     if (specs.beforeEdit) {
       var identifier = $.map(specs.keys, function(key) { return "[" + key + "=" + content_item.attr(key) + "]"; }).join("");
@@ -114,10 +148,10 @@ Rich.Cms.Editor = (function() {
 
     setTimeout(function() {
       if ($("#cleditor_input").length) {
-        $("#cleditor_input").cleditor({
+        $("#cleditor_input").data("cleditor", $("#cleditor_input").cleditor({
           width : 500,
           height: 300
-        })[0].focus();
+        })[0].focus());
       }
     }, 250);
   };
@@ -125,7 +159,7 @@ Rich.Cms.Editor = (function() {
   var afterUpdate = function(form, response) {
     var selector   = response["__selector__"];
     var specs      = editable_content[selector];
-    var identifier = $.map(specs.keys, function(key) { return "[" + key + "=" + response["__identifier__"][key.replace(/^data-/, "")] + "]"; }).join("");
+    var identifier = $.map(specs.keys, function(key) { return "[" + key + "^=" + response["__identifier__"][key.replace(/^data-/, "")] + "]"; }).join("");
 
     var defaultFunction = function(form, response, selector, specs, identifier) {
       $(identifier).html(response[specs.value.replace(/^data-/, "")]);

data/assets/jzip/rich_cms.jz

@@ -1,5 +1,6 @@
-
 var onRaccoonTipReady = function() {
+//= require native/extensions
+
 //= require jquery/extensions/ajaxify
 //= require jquery/extensions/modules
 //= require jquery/extensions/object

data/assets/sass/rich_cms/_panel.sass

@@ -20,9 +20,19 @@
       list-style: none
 
     .inputs
+
+      div.keys
+        min-height: 21px
+        label
+          +inline
+        a, span
+          font-size: 12px
+          font-weight: bold
+        select
+          margin-right: 4px
+
       label
         font-size: 12px
-        +block
         abbr
           padding-left: 2px
           border: 0

data/config/routes.rb

@@ -2,12 +2,14 @@ if Rails::VERSION::MAJOR >= 3
 
   Rails.application.routes.draw do
     scope :module => "rich" do
-      %w(login logout update).each do |action|
+      match "/cms/"     => "cms#display" , :as => "rich_cms"     , :display => true
+      match "/cms/hide" => "cms#display" , :as => "rich_cms_hide", :display => false
+      %w(login logout).each do |action|
+        match "/cms/#{action}" => "cms_sessions##{action}", :as => "rich_cms_#{action}"
+      end
+      %w(position 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
 
@@ -21,15 +23,14 @@ else
 
   ActionController::Routing::Routes.draw do |map|
     map.namespace :rich, :path_prefix => "" do |rich|
-
-      %w(login logout update).each do |action|
+      rich.cms      "cms"     , :controller => "cms", :action => "display", :display => true
+      rich.cms_hide "cms/hide", :controller => "cms", :action => "display", :display => false
+      %w(login logout).each do |action|
+        rich.send "cms_#{action}", "cms/#{action}", :controller => "cms_sessions", :action => action
+      end
+      %w(position 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
 

data/lib/generators/rich/cms_admin/cms_admin_generator.rb

@@ -0,0 +1,82 @@
+require "generators/rich_cms"
+
+module Rich
+  module Generators
+
+    class CmsAdminGenerator < ::RichCms::Generators::Base
+
+      include Rails::Generators::Migration
+      include RichCms::Generators::Migration
+
+      desc         "Creates Devise / Authlogic model and configures your Rails application for Rich-CMS authentication."
+      argument     :model_name, :type => :string , :default => "user"
+      class_option :bundle    , :type => :string , :default => false, :aliases => "-b", :desc => "Add Devise or Authlogic to Gemfile and run 'bundle install'."
+      class_option :devise    , :type => :boolean, :default => true , :aliases => "-d", :desc => "Use Devise as authentication logic (this is default)."
+      class_option :authlogic , :type => :boolean, :default => false, :aliases => "-a", :desc => "Use Authlogic as authentication logic."
+      class_option :migrate   , :type => :boolean, :default => false, :aliases => "-m", :desc => "Run 'rake db:migrate' after generating model and migration."
+
+      def derive_authentication_logic
+        @logic = "Devise"
+        @logic = "Authlogic" if options[:authlogic]
+      end
+
+      def register_authentication
+        filename = "config/initializers/enrichments.rb"
+        line     = "Rich::Cms::Auth.setup do |config|"
+
+        create_file filename unless File.exists?(filename)
+        return if File.open(filename).readlines.collect(&:strip).include? line.strip
+
+        File.open(filename, "a+") do |file|
+          file << "#{line}\n"
+          file << "  config.logic = :#{@logic.underscore}\n"
+          file << "  config.klass = \"#{model_class_name}\"\n"
+          file << "end"
+        end
+      end
+
+      def generate_authenticated_model
+        if options[:bundle]
+          gem @logic.underscore, {"devise" => "~> 1.1.5", "authlogic" => "~> 2.1.6"}[@logic.underscore]
+          run "bundle install"
+        end
+        send :"generate_#{@logic.underscore}_assets"
+      end
+
+      def migrate
+        rake "db:migrate" if options[:migrate]
+      end
+
+    protected
+
+      def generate_devise_assets
+        generate "devise:install"
+        generate "devise", model_class_name
+      end
+
+      def generate_authlogic_assets
+        template           "authlogic/model.rb"    , "app/models/#{model_file_name}.rb"
+        template           "authlogic/session.rb"  , "app/models/#{model_file_name}_session.rb"
+        migration_template "authlogic/migration.rb", "db/migrate/create_#{table_name}"
+      end
+
+      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/rich/cms/actionpack/action_controller/base.rb

@@ -1,14 +1,13 @@
-
 module ActionController
   class Base
 
     around_filter :prepare_rich_cms
 
     def prepare_rich_cms
-      ::Rich::Cms::Engine.current_controller = self
+      ::Rich::Cms::Auth.current_controller = self
       yield
     ensure
-      ::Rich::Cms::Engine.current_controller = nil
+      ::Rich::Cms::Auth.current_controller = nil
     end
 
     view_path = File.expand_path "../../../../../../app/views", __FILE__
@@ -18,45 +17,5 @@ module ActionController
       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
-      unless current_rich_cms_admin
-        redirect_to root_url
-        return false
-      end
-    end
-
-    def current_rich_cms_admin
-      case rich_cms_auth.logic
-      when :authlogic
-        return @current_rich_cms_admin if defined?(@current_rich_cms_admin)
-        @current_rich_cms_admin_session ||= rich_cms_authenticated_class.find
-        @current_rich_cms_admin = @current_rich_cms_admin_session.try rich_cms_auth.specs[:class_name].demodulize.underscore
-      end
-    end
-
-    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
+end

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

@@ -1,23 +1,45 @@
-
 module ActionView
   class Base
 
     def rich_cms
-      render :file => File.expand_path("../../../../../../app/views/rich_cms.html.erb", __FILE__) if display_rich_cms?
+      render :file => File.expand_path("../../../../../../app/views/rich_cms.html.erb", __FILE__) if !!session[:rich_cms].try(:fetch, :display, nil)
+    end
+
+    # //////////////////////////////////
+    # // Rich::Cms::Auth related
+    # //////////////////////////////////
+
+    def rich_cms_login_required?
+      Rich::Cms::Auth.login_required?
+    end
+
+    def rich_cms_admin_class
+      Rich::Cms::Auth.klass
     end
 
-    def display_rich_cms?
-      !!session[:rich_cms].try(:fetch, :display, nil)
+    def rich_cms_admin_inputs
+      Rich::Cms::Auth.inputs
     end
 
-    def link(name, options = nil)
-      options = {:class => options || name.underscore} unless options.is_a?(Hash)
-      link_to name, "#", options
+    def current_rich_cms_admin
+      Rich::Cms::Auth.admin
+    end
+
+    def current_rich_cms_admin_label
+      Rich::Cms::Auth.admin_label
+    end
+
+    # //////////////////////////////////
+    # // Rich::Cms::Engine related
+    # //////////////////////////////////
+
+    def rich_cms_editable_content_javascript_hash
+      "{#{Rich::Cms::Engine.editable_content.collect{|k, v| v.to_javascript_hash}.join ", "}}".html_safe
     end
 
-    def rich_cms_tag(*args)
-      Rich::Cms::Engine.to_content_tag *args
+    def rich_cms_tag(selector, identifiers, options = {})
+      Rich::Cms::Engine.editable_content[selector].fetch(identifiers).to_tag options
     end
 
   end
-end
+end

data/lib/rich/cms/actionpack.rb

@@ -1,3 +1,2 @@
-
 require File.join(File.dirname(__FILE__), "actionpack", "action_controller", "base.rb")
-require File.join(File.dirname(__FILE__), "actionpack", "action_view"      , "base.rb")
+require File.join(File.dirname(__FILE__), "actionpack", "action_view"      , "base.rb")

data/lib/rich/cms/auth.rb

@@ -0,0 +1,110 @@
+module Rich
+  module Cms
+    module Auth
+      mattr_accessor :current_controller
+
+      extend self
+
+      delegate :logic, :klass, :klass_symbol, :inputs, :to => :specs
+
+      def setup
+        @specs = Specs.new
+        yield specs
+      end
+
+      def enabled?
+        !!specs.logic
+      end
+
+      def login_required?
+        enabled? && admin.nil?
+      end
+
+      def login
+        case specs.logic
+        when :authlogic
+          user_session = "#{klass.name}Session".constantize.new params[klass_symbol]
+          user_session.save
+        when :devise
+          case Devise::VERSION
+          when "1.0.8", "1.0.9"
+            warden.authenticate(:scope => klass_symbol)
+          when "1.1.5"
+            begin
+              sessions = Devise.mappings[klass_symbol].controllers[:sessions]
+              Devise.mappings[klass_symbol].controllers[:sessions] = "rich/cms_sessions"
+              warden.authenticate(:scope => klass_symbol)
+            ensure
+              Devise.mappings[klass_symbol].controllers[:sessions] = sessions
+            end
+          end
+        end if enabled?
+        !!admin
+      end
+
+      def logout
+        case specs.logic
+        when :authlogic
+          user_session = "#{klass.name}Session".constantize.find
+          user_session.try :destroy
+        when :devise
+          sign_out klass_symbol
+        end if enabled?
+        session[:rich_cms] = nil
+      end
+
+      def admin
+        case specs.logic
+        when :authlogic
+          user_session = "#{klass.name}Session".constantize.find
+          user_session.try klass_symbol
+        when :devise
+          current_controller.try :send, specs.current_admin_method if enabled? && specs.current_admin_method
+        end if enabled?
+      end
+
+      def admin_label
+        (admin.try(:send, specs.identifier) if enabled?) || "Rich-CMS"
+      end
+
+    private
+
+      delegate :sign_out, :warden, :params, :session, :to => :current_controller
+
+      def specs
+        @specs ||= Specs.new
+      end
+
+      class Specs
+        attr_accessor :logic, :klass, :inputs, :identifier, :current_admin_method
+
+        def klass
+          return unless [:devise, :authlogic].include? logic
+          case @klass.class.name
+          when "String"
+            @klass.constantize
+          when "Class"
+            @klass
+          end
+        end
+
+        def klass_symbol
+          klass.name.underscore.gsub("/", "_").to_sym if klass
+        end
+
+        def inputs
+          @inputs || [:email, :password] if klass
+        end
+
+        def identifier
+          @identifier || inputs.first if klass
+        end
+
+        def current_admin_method
+          @current_admin_method || :"current_#{klass_symbol}" if klass
+        end
+      end
+
+    end
+  end
+end

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

@@ -1,4 +1,3 @@
-
 module Rich
   module Cms
     module Content
@@ -65,4 +64,4 @@ module Rich
 
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-
 module Rich
   module Cms
     module Content
@@ -49,7 +48,7 @@ module Rich
           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?
+          unless Auth.login_required?
             default = "< #{default} >"
             keys    = @group.keys << @group.value.to_s
             data    = @object.attributes.reject{|k, v| !keys.include?(k.to_s)}
@@ -73,4 +72,4 @@ module Rich
 
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-
 module Rich
   module Cms
     module Core
@@ -15,4 +14,4 @@ module Rich
       end
     end
   end
-end
+end

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

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