refinerycms-core 2.0.2 → 2.0.3

data/app/assets/javascripts/refinery/admin.js.erb

@@ -173,29 +173,33 @@ submit_and_continue = function(e, redirect_to) {
   $('.fieldWithErrors').removeClass('fieldWithErrors').addClass('field');
   $('#flash_container .errorExplanation').remove();
 
-  $.post($('#continue_editing').get(0).form.action, $($('#continue_editing').get(0).form).serialize(), function(data) {
-    if (($flash_container = $('#flash_container')).length > 0) {
-      $flash_container.html(data);
+  $.post(
+    $('#continue_editing').get(0).form.action
+    , $($('#continue_editing').get(0).form).serialize()
+    , function(data) {
+      if (($flash_container = $('#flash_container')).length > 0) {
+        $flash_container.html(data);
 
-      $('#flash').css({'width': 'auto', 'visibility': null}).fadeIn(550);
+        $('#flash').css({'width': 'auto', 'visibility': null}).fadeIn(550);
 
-      $('.errorExplanation').not($('#flash_container .errorExplanation')).remove();
+        $('.errorExplanation').not($('#flash_container .errorExplanation')).remove();
 
-      if ((error_fields = $('#fieldsWithErrors').val()) != null) {
-        $.each(error_fields.split(','), function() {
-          $("#" + this).wrap("<div class='fieldWithErrors' />");
-        });
-      } else if (redirect_to) {
-        window.location = redirect_to;
-      }
+        if ((error_fields = $('#fieldsWithErrors').val()) != null) {
+          $.each(error_fields.split(','), function() {
+            $("#" + this).wrap("<div class='fieldWithErrors' />");
+          });
+        } else if (redirect_to) {
+          window.location = redirect_to;
+        }
 
-      $('.fieldWithErrors:first :input:first').focus();
+        $('.fieldWithErrors:first :input:first').focus();
 
-      $('#continue_editing').val(false);
+        $('#continue_editing').val(false);
 
-      init_flash_messages();
-    }
-  });
+        init_flash_messages();
+      }
+    }, 'html'
+  );
 
   e.preventDefault();
 };
@@ -398,13 +402,14 @@ var link_dialog = {
   },
 
   init_resources_submit: function(){
+    <% absolute_page_links = defined?(Refinery::Pages) && Refinery::Pages.absolute_page_links %>
     $('#existing_resource_area .form-actions-dialog #submit_button').click(function(e){
       e.preventDefault();
       if((resource_selected = $('#existing_resource_area_content ul li.linked a')).length > 0) {
         resourceUrl = parseURL(resource_selected.attr('href'));
-        relevant_href = <%= Refinery::Pages.absolute_page_links ? "resource_selected.attr('href')" : "resourceUrl.pathname" %>;
+        relevant_href = <%= absolute_page_links ? "resource_selected.attr('href')" : "resourceUrl.pathname" %>;
 
-        <% unless Refinery::Pages.absolute_page_links %>
+        <% unless absolute_page_links %>
         // Add any alternate resource stores that need a absolute URL in the regex below
         if(resourceUrl.hostname.match(/s3.amazonaws.com/)) {
           relevant_href = resourceUrl.protocol + '//' + resourceUrl.host + relevant_href;
@@ -455,7 +460,7 @@ var link_dialog = {
 
       var link = $(this).children('a.page_link').get(0);
       var port = (window.location.port.length > 0 ? (":" + window.location.port) : "");
-      var url = link.href<%= %q{.replace(window.location.protocol + "//" + window.location.hostname + port, "")} unless Refinery::Pages.absolute_page_links %>;
+      var url = link.href<%= %q{.replace(window.location.protocol + "//" + window.location.hostname + port, "")} unless defined?(Refinery::Pages) && Refinery::Pages.absolute_page_links %>;
 
       link_dialog.update_parent(url, link.rel.replace(/\ ?<em>.+?<\/em>/, ''));
     });

data/app/assets/javascripts/refinery/site_bar.js

@@ -1,16 +1,14 @@
-if (typeof($) == 'function') {
-  $(document).ready(function() {
-    $logo = $('#site_bar_content #site_bar_refinery_cms_logo');
-    $logo.css('left', ($('#site_bar_content').width() / 2) - ($logo.width() / 2));
+(function($) {
+  $logo = $('#site_bar_content #site_bar_refinery_cms_logo');
+  $logo.css('left', ($('#site_bar_content').width() / 2) - ($logo.width() / 2));
 
-    $switch_anchor = $('#editor_switch a').not('.ie7 #editor_switch a, .ie6 #editor_switch a');
-    if ($.isFunction($switch_anchor.corner)) {
-      $switch_anchor.corner('6px');
-    }
+  $switch_anchor = $('#editor_switch a').not('.ie7 #editor_switch a, .ie6 #editor_switch a');
+  if ($.isFunction($switch_anchor.corner)) {
+    $switch_anchor.corner('6px');
+  }
 
-    $('#editor_switch a').appendTo((span = $('<span></span>').prependTo('#editor_switch')));
-    if ($.isFunction(span.corner)) {
-      span.corner('6px');
-    }
-  });
-}
+  $('#editor_switch a').appendTo((span = $('<span></span>').prependTo('#editor_switch')));
+  if ($.isFunction(span.corner)) {
+    span.corner('6px');
+  }
+})(jQuery);

data/app/assets/javascripts/refinery/submit_continue.js.coffee.erb

@@ -5,4 +5,5 @@
 
   if (continue_editing_button = $("#continue_editing")).length > 0 and continue_editing_button.attr("rel") != "no-prompt"
     $("#editor_switch a").click (e) ->
-      e.preventDefault()  unless confirm("<%= ::I18n.t("js.admin.confirm_changes") %>")  if $("form[data-changes-made]").length > 0
+      if $("form[data-changes-made]").length > 0
+        e.preventDefault() unless confirm("<%= ::I18n.t('confirm_changes', :scope => 'refinery.js.admin') %>")

data/app/assets/stylesheets/refinery/{refinery.css.scss → layout.css.scss}

@@ -1565,10 +1565,4 @@ a.information:hover {
 }
 .ie8 .pagination a, .ie8 #content .pagination a, .ie8 .pagination .current, .ie8 .disabled, .ie8 .pagination em {
   padding-bottom: 6px;
-}
-
-@import 'site_bar';
-@import 'ui';
-@import 'submenu';
-@import 'tooltips';
-@import 'wymeditor/skins/refinery/skin';
+}

data/app/assets/stylesheets/refinery/refinery.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into refinery.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ *= require_self
+ *= require refinery/layout
+ *= require refinery/site_bar
+ *= require refinery/ui
+ *= require refinery/submenu
+ *= require refinery/tooltips
+ *= require wymeditor/skins/refinery/skin
+*/

data/app/controllers/refinery/admin/{refinery_core_controller.rb → core_controller.rb}

@@ -1,6 +1,6 @@
-module ::Refinery
+module Refinery
   module Admin
-    class RefineryCoreController < ::Refinery::AdminController
+    class CoreController < ::Refinery::AdminController
       def update_plugin_positions
         params[:menu].each_with_index do |plugin_name, index|
           if (plugin = current_refinery_user.plugins.find_by_name(plugin_name))

data/app/controllers/refinery/admin_controller.rb

@@ -1,7 +1,10 @@
 # Filters added to this controller apply to all controllers in the refinery backend.
 # Likewise, all the methods added will be available for all controllers in the refinery backend.
-module ::Refinery
+module Refinery
   class AdminController < ::ActionController::Base
+    include ::Refinery::ApplicationController
+    helper Refinery::Core::Engine.helpers
+    include Refinery::Admin::BaseController
 
   end
 end

data/app/helpers/refinery/admin/core_helper.rb

@@ -0,0 +1,6 @@
+module Refinery
+  module Admin
+    module CoreHelper
+    end
+  end
+end

data/app/helpers/refinery/admin/dialogs_helper.rb

@@ -0,0 +1,6 @@
+module Refinery
+  module Admin
+    module DialogsHelper
+    end
+  end
+end

data/app/helpers/refinery/admin_helper.rb

@@ -0,0 +1,4 @@
+module Refinery
+  module AdminHelper
+  end
+end

data/app/helpers/refinery/fast_helper.rb

@@ -0,0 +1,4 @@
+module Refinery
+  module FastHelper
+  end
+end

data/app/helpers/refinery/sitemap_helper.rb

@@ -0,0 +1,4 @@
+module Refinery
+  module SitemapHelper
+  end
+end

data/app/models/refinery/core/base_model.rb

@@ -1,5 +1,3 @@
-# If any changes are made to this class then the application will require a restart
-# This is because this class is added to autoload_once_paths in lib/refinery/core/engine.rb.
 module Refinery
   module Core
     class BaseModel < ActiveRecord::Base

data/config/routes.rb

@@ -8,7 +8,7 @@ Refinery::Core::Engine.routes.draw do
     resources :dialogs, :only => :show
   end
 
-  match '/refinery/update_menu_positions', :to => 'admin/refinery_core#update_plugin_positions'
+  match '/refinery/update_menu_positions', :to => 'admin/core#update_plugin_positions'
 
   get '/sitemap.xml' => 'sitemap#index', :defaults => { :format => 'xml' }
 end

data/lib/generators/refinery/cms/cms_generator.rb

@@ -24,6 +24,8 @@ module Refinery
 
       stop_pretending?
 
+      append_gemfile!
+
       append_gitignore!
 
       forced_overwriting?
@@ -45,6 +47,14 @@ module Refinery
 
   protected
 
+    def append_gemfile!
+      if destination_path.join('Gemfile').file? &&
+         destination_path.join('Gemfile').read !~ %r{group :development, :test do\n.+?gem 'sqlite3'\nend}m
+        gsub_file 'Gemfile', %q{gem 'sqlite3'}, %q{group :development, :test do
+  gem 'sqlite3'
+end}  end
+    end
+
     def append_gitignore!
       # Ensure .gitignore exists and append our rules to it.
       create_file ".gitignore" unless destination_path.join('.gitignore').file?
@@ -62,7 +72,7 @@ gem 'heroku'
 gem 'fog'
 }
       # If postgres is not the database in use, Heroku still needs it.
-      if destination_path.join('Gemfile').read !~ %r{gem ['"]pg['"]}
+      if destination_path.join('Gemfile').file? && destination_path.join('Gemfile').read !~ %r{gem ['"]pg['"]}
         append_file 'Gemfile', %q{
 # Postgres support (added for Heroku)
 gem 'pg'
@@ -92,7 +102,7 @@ gem 'pg'
     end
 
     def deploy_to_hosting?
-      if options[:heroku]
+      if heroku?
         append_heroku_gems!
 
         bundle!
@@ -112,7 +122,10 @@ gem 'pg'
       say_status message, nil, :yellow if message
 
       say_status "Creating Heroku app..", nil
-      run "heroku create #{options[:heroku]}#{" --stack #{options[:stack]}" if options[:stack]}"
+      run ["heroku create",
+           (options[:heroku] if heroku?),
+           "#{"--stack #{options[:stack]}" if options[:stack]}"
+          ].compact.join(' ')
 
       say_status "Pushing to Heroku (this takes time, be patient)..", nil
       run "git push heroku master"
@@ -135,12 +148,6 @@ gem 'pg'
         next unless destination_path.join(env).file?
 
         gsub_file env, "config.assets.compile = false", "config.assets.compile = true", :verbose => false
-
-        insert_into_file env, %Q{
-  # Refinery has set config.assets.initialize_on_precompile = false by default.
-  config.assets.initialize_on_precompile = false
-
-},                       :after => "Application.configure do\n" if env =~ /production/
       end
     end
 
@@ -150,6 +157,10 @@ gem 'pg'
       self.options = force_options
     end
 
+    def heroku?
+      options[:heroku].present?
+    end
+
     def manage_roadblocks!
       %w(public/index.html app/views/layouts/application.html.erb).each do |roadblock|
         if (roadblock_path = destination_path.join(roadblock)).file?
@@ -190,6 +201,7 @@ gem 'pg'
       generator_args = []
       generator_args << '--quiet' if self.options[:quiet]
       Refinery::CoreGenerator.start generator_args
+      Refinery::AuthenticationGenerator.start generator_args
       Refinery::ResourcesGenerator.start generator_args
       Refinery::PagesGenerator.start generator_args
       Refinery::ImagesGenerator.start generator_args
@@ -197,7 +209,7 @@ gem 'pg'
     end
 
     def sanity_check_heroku_application_name!
-      if options[:heroku].to_s.include?('_') || options[:heroku].to_s.length > 30
+      if heroku? && options[:heroku].to_s.include?('_') || options[:heroku].to_s.length > 30
         message = ["\nThe application name '#{options[:heroku]}' that you specified is invalid for Heroku."]
         suggested_name = options[:heroku].dup.to_s
         if suggested_name.include?('_')
@@ -214,6 +226,8 @@ gem 'pg'
         message << "We have changed the name to '#{suggested_name}' for you, hope it suits you.\n"
         message.join("\n")
       end
+
+      options[:heroku] = '' if options[:heroku] == 'heroku'
     end
 
     def seed_database!

data/lib/generators/refinery/cms/templates/.gitignore

@@ -74,6 +74,9 @@ capybara-*html
 .rvmrc
 .rvmrc.*
 
+# vendor/extensions dummy applications.
+vendor/extensions/**/spec/dummy
+
 # REFINERY CMS DEVELOPMENT ====================================================
 # Always keep this section at the bottom.
 

data/lib/generators/refinery/dummy/dummy_generator.rb

@@ -54,33 +54,33 @@ module Refinery
 
     attr :database
 
-    protected
+  protected
 
-      def dummy_path
-        'spec/dummy'
-      end
+    def dummy_path
+      'spec/dummy'
+    end
 
-      def module_name
-        'Dummy'
-      end
+    def module_name
+      'Dummy'
+    end
 
-      def application_definition
-        @application_definition ||= begin
-          dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
-          unless options[:pretend] || !File.exists?(dummy_application_path)
-            contents = File.read(dummy_application_path)
-            contents[(contents.index("module #{module_name}"))..-1]
-          end
+    def application_definition
+      @application_definition ||= begin
+        dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
+        unless options[:pretend] || !File.exists?(dummy_application_path)
+          contents = File.read(dummy_application_path)
+          contents[(contents.index("module #{module_name}"))..-1]
         end
       end
-      alias :store_application_definition! :application_definition
+    end
+    alias :store_application_definition! :application_definition
 
-      def camelized
-        @camelized ||= name.gsub(/\W/, '_').squeeze('_').camelize
-      end
+    def camelized
+      @camelized ||= name.gsub(/\W/, '_').squeeze('_').camelize
+    end
 
-      def gemfile_path
-        '../../../../Gemfile'
-      end
+    def gemfile_path
+      '../../../../Gemfile'
+    end
   end
 end

data/lib/generators/refinery/engine/templates/.gitignore

@@ -0,0 +1,2 @@
+# Ignore dummy applications.
+spec/dummy

data/lib/generators/refinery/engine/templates/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.0', :git => 'git://github.com/resolve/refinerycms.git'
+gem 'refinerycms', '~> 2.0.0'
 
 # Refinery/rails should pull in the proper versions of these
 group :assets do

data/lib/generators/refinery/engine/templates/lib/generators/refinery/extension_plural_name_generator.rb

@@ -10,6 +10,7 @@ module Refinery
       append_file 'db/seeds.rb', :verbose => true do
         <<-EOH
 
+# Added by Refinery CMS <%= plural_name.titleize %> extension
 Refinery::<%= namespacing %>::Engine.load_seed
         EOH
       end

data/lib/generators/refinery/engine/templates/script/rails

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+dummy_rails_path = File.expand_path('../../spec/dummy/script/rails',  __FILE__)
+if File.exist?(dummy_rails_path)
+  load dummy_rails_path
+else
+  puts "Please first run 'rake refinery:testing:dummy_app' to create a dummy Refinery CMS application."
+end

data/lib/generators/refinery/form/templates/.gitignore

@@ -0,0 +1,2 @@
+# Ignore dummy applications.
+spec/dummy

data/lib/generators/refinery/form/templates/lib/refinery/plural_name.rb

@@ -1,3 +1,4 @@
+require 'refinerycms-settings'
 require 'refinerycms-core'
 
 module Refinery

data/lib/generators/refinery/form/templates/script/rails

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+dummy_rails_path = File.expand_path('../../spec/dummy/script/rails',  __FILE__)
+if File.exist?(dummy_rails_path)
+  load dummy_rails_path
+else
+  puts "Please first run 'rake refinery:testing:dummy_app' to create a dummy Refinery CMS application."
+end

data/lib/refinery/application_controller.rb

@@ -65,8 +65,15 @@ module Refinery
 
     # use a different model for the meta information.
     def present(model)
-      presenter = (Object.const_get("#{model.class}Presenter") rescue ::Refinery::BasePresenter)
-      @meta = presenter.new(model)
+      @meta = presenter_for(model).new(model)
+    end
+
+    def presenter_for(model, default=BasePresenter)
+      return default if model.nil?
+
+      "#{model.class.name}Presenter".constantize
+    rescue NameError
+      default
     end
 
     def refinery_user_required?

data/lib/refinery/core/engine.rb

@@ -24,16 +24,8 @@ module Refinery
         def refinery_inclusion!
           before_inclusion_procs.each(&:call)
 
-          [::ApplicationController, Refinery::AdminController].each do |c|
-            c.send :include, Refinery::ApplicationController
-            c.send :helper, Refinery::Core::Engine.helpers
-          end
-
-          [Refinery::UsersController, Refinery::SessionsController, Refinery::PasswordsController].each do |c|
-            c.send :helper, Refinery::Core::Engine.helpers
-          end
-
-          Refinery::AdminController.send :include, Refinery::Admin::BaseController
+          ::ApplicationController.send :include, Refinery::ApplicationController
+          ::ApplicationController.send :helper, Refinery::Core::Engine.helpers
 
           after_inclusion_procs.each(&:call)
         end
@@ -41,10 +33,6 @@ module Refinery
 
       config.autoload_paths += %W( #{config.root}/lib )
 
-      # We can't reload the base class because otherwise in development mode
-      # we lose any configuration that is applied to it like macros for Dragonfly.
-      config.autoload_once_paths += %W( #{config.root}/app/models/refinery/core )
-
       # Include the refinery controllers and helpers dynamically
       config.to_prepare &method(:refinery_inclusion!).to_proc
 
@@ -97,10 +85,13 @@ module Refinery
       end
 
       initializer "refinery.acts_as_indexed" do
-        ActsAsIndexed.configure do |config|
-          config.index_file = Rails.root.join('tmp', 'index')
-          config.index_file_depth = 3
-          config.min_word_size = 3
+        ActiveSupport.on_load(:active_record) do
+          require 'acts_as_indexed'
+          ActsAsIndexed.configure do |config|
+            config.index_file = Rails.root.join('tmp', 'index')
+            config.index_file_depth = 3
+            config.min_word_size = 3
+          end
         end
       end
 

data/lib/refinery/core.rb

@@ -1,6 +1,5 @@
 require 'rails/all'
 require 'rbconfig'
-require 'acts_as_indexed'
 require 'truncate_html'
 require 'will_paginate'
 
@@ -158,12 +157,12 @@ module Refinery
       end
     end
 
-    private
-      def validate_extension!(const)
-        unless const.respond_to?(:root) && const.root.is_a?(Pathname)
-          raise InvalidEngineError, "Engine must define a root accessor that returns a pathname to its root"
-        end
+  private
+    def validate_extension!(const)
+      unless const.respond_to?(:root) && const.root.is_a?(Pathname)
+        raise InvalidEngineError, "Engine must define a root accessor that returns a pathname to its root"
       end
+    end
   end
 
   module Core

data/lib/refinery/menu.rb

@@ -1,30 +1,14 @@
 module Refinery
-
-  # Create a little something to store the instances of the menu.
-  class << self
-    attr_accessor :menus
-    def menus
-      @@menus ||= HashWithIndifferentAccess.new
-    end
-  end
-
   class Menu
 
     def initialize(objects = nil)
       objects.each do |item|
         item = item.to_refinery_menu_item if item.respond_to?(:to_refinery_menu_item)
-        items << MenuItem.new(item.merge(:menu_id => id))
+        items << MenuItem.new(item.merge(:menu => self))
       end if objects
-
-      ::Refinery.menus[self.id] = self
     end
 
-    attr_accessor :items, :id
-
-    def id
-      require 'securerandom' unless defined?(::SecureRandom)
-      @id ||= ::SecureRandom.hex(8)
-    end
+    attr_accessor :items
 
     def items
       @items ||= []

data/lib/refinery/menu_item.rb

@@ -3,7 +3,7 @@ module Refinery
 
     class << self
       def attributes
-        [:title, :parent_id, :lft, :rgt, :depth, :url, :menu_id, :menu_match]
+        [:title, :parent_id, :lft, :rgt, :depth, :url, :menu, :menu_match]
       end
 
       def apply_attributes!
@@ -77,10 +77,6 @@ module Refinery
       hash.inspect
     end
 
-    def menu
-      ::Refinery.menus[menu_id]
-    end
-
     def parent
       @parent ||= (menu.detect{|item| item.original_type == original_type && item.original_id == parent_id} if has_parent?)
     end

data/lib/refinery/version.rb

@@ -2,7 +2,7 @@ module Refinery
   class Version
     @major = 2
     @minor = 0
-    @tiny  = 2
+    @tiny  = 3
     @build = nil
 
     class << self

data/spec/controllers/refinery/admin/refinery_core_controller_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 module Refinery
   module Admin
-    describe RefineryCoreController do
+    describe CoreController do
       login_refinery_user
 
       it "should update the plugin positions" do
-        plugins = @refinery_user.plugins.reverse.collect {|p| p.name}
+        plugins = refinery_user.plugins.reverse.collect(&:name)
 
         post 'update_plugin_positions', :menu => plugins
 
-        @refinery_user.plugins.reload
-        @refinery_user.plugins.each_with_index do |plugin, idx|
+        refinery_user.plugins.reload
+        refinery_user.plugins.each_with_index do |plugin, idx|
           plugin.name.should eql(plugins[idx])
         end
       end

data/spec/controllers/refinery/fast_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module ::Refinery
+module Refinery
   describe FastController do
     it "should render the wymiframe template" do
       get :wymiframe

data/spec/lib/generators/refinery/cms/cms_generator_spec.rb

@@ -37,9 +37,6 @@ module Refinery
           file "database.yml.mysql"
           file "database.yml.postgresql"
           file "database.yml.sqlite3"
-          directory "initializers" do
-            file "devise.rb"
-          end
         end
       }
     end