refinerycms-core 2.0.10 → 2.1.0

data/lib/refinery/admin/base_controller.rb

@@ -4,15 +4,15 @@ module Refinery
   module Admin
     module BaseController
 
-      extend ActiveSupport::Concern
+      def self.included(base)
+        base.layout :layout?
 
-      included do
-        layout :layout?
+        base.before_filter :require_refinery_users!, :force_ssl!,
+                           :authenticate_refinery_user!, :restrict_plugins,
+                           :restrict_controller
+        base.after_filter :store_location?, :only => [:index] # for redirect_back_or_default
 
-        before_filter :authenticate_refinery_user!, :restrict_plugins, :restrict_controller
-        after_filter :store_location?, :except => [:new, :create, :edit, :update, :destroy, :update_positions] # for redirect_back_or_default
-
-        helper_method :searching?, :group_by_date
+        base.helper_method :searching?, :group_by_date
       end
 
       def admin?
@@ -23,7 +23,11 @@ module Refinery
         params[:search].present?
       end
 
-    protected
+      protected
+
+      def force_ssl!
+        redirect_to :protocol => 'https' if Refinery::Core.force_ssl && !request.ssl?
+      end
 
       def group_by_date(records)
         new_records = []
@@ -37,6 +41,10 @@ module Refinery
         new_records
       end
 
+      def require_refinery_users!
+        redirect_to refinery.signup_path if just_installed? && controller_name != 'users'
+      end
+
       def restrict_plugins
         current_length = (plugins = current_refinery_user.authorized_plugins).length
 
@@ -51,26 +59,29 @@ module Refinery
       end
 
       def restrict_controller
-        # We need to remove the admin/ section since the path is silent for the
-        # namespace.
-        path = params[:controller].gsub('admin/', '')
-        unless ::Refinery::Plugins.active.any? {|plugin| path =~ Regexp.new(plugin.menu_match) }
-          logger.warn "'#{current_refinery_user.username}' tried to access '#{path}' but was rejected."
+        unless allow_controller? params[:controller].gsub 'admin/', ''
+          logger.warn "'#{current_refinery_user.username}' tried to access '#{params[:controller]}' but was rejected."
           error_404
         end
       end
 
-    private
+      private
+
+      def allow_controller?(controller_path)
+        ::Refinery::Plugins.active.any? {|plugin|
+          Regexp.new(plugin.menu_match) === controller_path
+        }
+      end
 
       def layout?
-        "refinery/admin#{"_dialog" if from_dialog?}"
+        "refinery/admin#{'_dialog' if from_dialog?}"
       end
 
       # Check whether it makes sense to return the user to the last page they
       # were at instead of the default e.g. refinery_admin_pages_path
       # right now we just want to snap back to index actions and definitely not to dialogues.
       def store_location?
-        store_location unless action_name !~ /index/ or request.xhr? or from_dialog?
+        store_location unless request.xhr? || from_dialog?
       end
 
       # Override authorized? so that only users with the Refinery role can admin the website.

data/lib/refinery/application_controller.rb

@@ -1,42 +1,29 @@
 module Refinery
   module ApplicationController
 
-    extend ActiveSupport::Concern
+    def self.included(base) # Extend controller
+      base.helper_method :home_page?, :local_request?, :just_installed?,
+                         :from_dialog?, :admin?, :login?
 
-    included do # Extend controller
-      helper_method :home_page?,
-                    :local_request?,
-                    :just_installed?,
-                    :from_dialog?,
-                    :admin?,
-                    :login?
+      base.protect_from_forgery # See ActionController::RequestForgeryProtection
 
-      protect_from_forgery # See ActionController::RequestForgeryProtection
-
-      send :include, Refinery::Crud # basic create, read, update and delete methods
-
-      send :before_filter, :refinery_user_required?
-
-      send :before_filter, :force_ssl?, :if => :admin?
-
-      send :after_filter, :store_current_location!,
-                            :if => Proc.new {|c| send(:refinery_user?) }
+      base.send :include, Refinery::Crud # basic create, read, update and delete methods
 
       if Refinery::Core.rescue_not_found
-        send :rescue_from, ActiveRecord::RecordNotFound,
-                           ::AbstractController::ActionNotFound,
-                           ActionView::MissingTemplate,
-                           :with => :error_404
+        base.rescue_from ActiveRecord::RecordNotFound,
+                         ::AbstractController::ActionNotFound,
+                         ActionView::MissingTemplate,
+                         :with => :error_404
       end
     end
 
     def admin?
-      controller_name =~ %r{^admin/}
+      %r{^admin/} === controller_name
     end
 
     def error_404(exception=nil)
       # fallback to the default 404.html page.
-      file = Rails.root.join('public', '404.html')
+      file = Rails.root.join 'public', '404.html'
       file = Refinery.roots(:'refinery/core').join('public', '404.html') unless file.exist?
       render :file => file.cleanpath.to_s.gsub(%r{#{file.extname}$}, ''),
              :layout => false, :status => 404, :formats => [:html]
@@ -48,7 +35,7 @@ module Refinery
     end
 
     def home_page?
-      refinery.root_path =~ /^#{Regexp.escape(request.path.sub("//", "/"))}\/?/
+      %r{^#{Regexp.escape(request.path)}} === refinery.root_path
     end
 
     def just_installed?
@@ -56,45 +43,26 @@ module Refinery
     end
 
     def local_request?
-      Rails.env.development? or request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/
+      Rails.env.development? || /(::1)|(127.0.0.1)|((192.168).*)/ === request.remote_ip
     end
 
     def login?
-      (controller_name =~ /^(user|session)(|s)/ and not admin?) or just_installed?
+      (/^(user|session)(|s)/ === controller_name && !admin?) || just_installed?
     end
 
   protected
 
-    def force_ssl?
-      redirect_to :protocol => 'https' if !request.ssl? && Refinery::Core.force_ssl
-    end
-
     # use a different model for the meta information.
     def present(model)
       @meta = presenter_for(model).new(model)
     end
 
-    def presenter_for(model, default = BasePresenter)
+    def presenter_for(model, default=BasePresenter)
       return default if model.nil?
 
       "#{model.class.name}Presenter".constantize
     rescue NameError
       default
     end
-
-    def refinery_user_required?
-      if just_installed? and controller_name != 'users'
-        redirect_to refinery.new_refinery_user_registration_path
-      end
-    end
-
-  private
-
-    def store_current_location!
-      if admin? and request.get? and !request.xhr? and !from_dialog?
-        # ensure that we don't redirect to AJAX or POST/PUT/DELETE urls
-        session[:refinery_return_to] = request.path.sub('//', '/')
-      end
-    end
   end
 end

data/lib/refinery/cli.rb

@@ -4,6 +4,14 @@ module Refinery
   class CLI < Thor
     include Thor::Actions
 
+    no_tasks do
+      def source_paths
+        Refinery::Plugins.registered.pathnames.map{|p|
+          %w(app vendor).map{|dir| p.join(dir, @override_kind[:dir])}
+        }.flatten.uniq
+      end
+    end
+
     OVERRIDES = {
       :view => {
         :glob => '*.{erb,builder}',
@@ -20,6 +28,11 @@ module Refinery
         :dir => 'models',
         :desc => 'model',
       },
+      :helper => {
+        :glob => '*.rb',
+        :dir => 'helpers',
+        :desc => 'helper',
+      },
       :presenter => {
         :glob => '*.rb',
         :dir => 'presenters',
@@ -31,7 +44,7 @@ module Refinery
         :desc => 'javascript',
       },
       :stylesheet => {
-        :glob => '*.css.scss',
+        :glob => '*.css{,.scss}',
         :dir => 'assets/stylesheets',
         :desc => 'stylesheet',
       },
@@ -52,6 +65,7 @@ module Refinery
         :stylesheet => %w(home refinery/site_bar),
         :controller => %w(pages),
         :model => %w(page refinery/page),
+        :helper => %w(site_bar refinery/site_bar_helper),
         :presenter => %w(refinery/page_presenter)
       }.each do |type, examples|
         examples.each do |example|
@@ -62,7 +76,7 @@ module Refinery
 
     desc "uncrudify", "shows you the code that your controller using crudify is running for a given action"
     def uncrudify(controller, action)
-      unless (controller_name = controller).present? and (action = action).present?
+      unless (controller_name = controller).present? && (action = action).present?
         abort <<-HELPDOC.strip_heredoc
           You didn't specify anything to uncrudify. Here's some examples:
           rake refinery:uncrudify controller=refinery/admin/pages action=create
@@ -78,19 +92,19 @@ module Refinery
       end
 
       crud_lines = Refinery.roots(:'refinery/core').join('lib', 'refinery', 'crud.rb').read
-      if (matches = crud_lines.scan(/(\ +)(def #{action}.+?protected)/m).first).present? and
+      if (matches = crud_lines.scan(/(\ +)(def #{action}.+?protected)/m).first).present? &&
          (method_lines = "#{matches.last.split(%r{^#{matches.first}end}).first.strip}\nend".split("\n")).many?
-        indent = method_lines.second.index(%r{[^ ]})
-        crud_method = method_lines.join("\n").gsub(/^#{" " * indent}/, "  ")
+        indent = method_lines.second.index %r{[^ ]}
+        crud_method = method_lines.join("\n").gsub /^#{" " * indent}/, "  "
 
         crud_options = controller_class.try(:crudify_options) || {}
-        crud_method.gsub!('#{options[:redirect_to_url]}', crud_options[:redirect_to_url].to_s)
-        crud_method.gsub!('#{options[:conditions].inspect}', crud_options[:conditions].inspect)
-        crud_method.gsub!('#{options[:title_attribute]}', crud_options[:title_attribute])
-        crud_method.gsub!('#{singular_name}', crud_options[:singular_name])
-        crud_method.gsub!('#{class_name}', crud_options[:class_name])
-        crud_method.gsub!('#{plural_name}', crud_options[:plural_name])
-        crud_method.gsub!('\\#{', '#{')
+        crud_method.gsub! '#{options[:redirect_to_url]}', crud_options[:redirect_to_url].to_s
+        crud_method.gsub! '#{options[:conditions].inspect}', crud_options[:conditions].inspect
+        crud_method.gsub! '#{options[:title_attribute]}', crud_options[:title_attribute]
+        crud_method.gsub! '#{singular_name}', crud_options[:singular_name]
+        crud_method.gsub! '#{class_name}', crud_options[:class_name]
+        crud_method.gsub! '#{plural_name}', crud_options[:plural_name]
+        crud_method.gsub! '\\#{', '#{'
 
         puts crud_method
       end
@@ -99,26 +113,33 @@ module Refinery
     private
 
     def _override(kind, which)
-      override_kind = OVERRIDES[kind]
-      pattern = "{refinery#{File::SEPARATOR},}#{which.split("/").join(File::SEPARATOR)}#{override_kind[:glob]}"
-      looking_for = ::Refinery::Plugins.registered.pathnames.map{|p| p.join("app", override_kind[:dir], pattern).to_s}
-
-      # copy in the matches
-      if (matches = looking_for.map{|d| Dir[d]}.flatten.compact.uniq).any?
-        matches.each do |match|
-          dir = match.split("/app/#{override_kind[:dir]}/").last.split('/')
-          file = dir.pop # get rid of the file.
-          dir = dir.join(File::SEPARATOR) # join directory back together
+      @override_kind = OVERRIDES[kind]
 
-          destination_dir = Rails.root.join('app', override_kind[:dir], dir)
-          FileUtils.mkdir_p(destination_dir)
-          FileUtils.cp match, (destination = File.join(destination_dir, file))
+      matcher = [
+        "{refinery#{File::SEPARATOR},}",
+        which.split('/').join(File::SEPARATOR),
+        @override_kind[:glob]
+      ].flatten.join
 
-          puts "Copied #{override_kind[:desc]} file to #{destination.gsub("#{Rails.root.to_s}#{File::SEPARATOR}", '')}"
+      if (matches = find_relative_matches(matcher)).present?
+        matches.each do |match|
+          copy_file match, Rails.root.join('app', @override_kind[:dir], match)
         end
       else
-        puts "Couldn't match any #{override_kind[:desc]} files in any extensions like #{which}"
+        puts "Couldn't match any #{@override_kind[:desc]} files in any extensions like #{which}"
       end
     end
+
+    def find_matches(pattern)
+      Set.new source_paths.map {|path| Dir[path.join(pattern)] }.flatten
+    end
+
+    def find_relative_matches(pattern)
+      find_matches(pattern).map {|match| strip_source_paths(match) }
+    end
+
+    def strip_source_paths(match)
+      match.gsub Regexp.new(source_paths.join('\/?|')), ''
+    end
   end
 end

data/lib/refinery/core.rb

@@ -1,190 +1,9 @@
-require 'rails/all'
-require 'rbconfig'
+require File.expand_path('../../refinery', __FILE__)
 require 'truncate_html'
 require 'will_paginate'
+require 'refinery/i18n'
 
 module Refinery
-  WINDOWS = !!(RbConfig::CONFIG['host_os'] =~ %r!(msdos|mswin|djgpp|mingw)!) unless defined? WINDOWS
-
-  require 'refinery/errors'
-
-  autoload :Activity, 'refinery/activity'
-  autoload :ApplicationController, 'refinery/application_controller'
-  autoload :Engine, 'refinery/engine'
-  autoload :Menu, 'refinery/menu'
-  autoload :MenuItem, 'refinery/menu_item'
-  autoload :Plugin,  'refinery/plugin'
-  autoload :Plugins, 'refinery/plugins'
-  autoload :Version, 'refinery/version'
-  autoload :Crud, 'refinery/crud'
-  autoload :BasePresenter, 'refinery/base_presenter'
-
-  require 'refinery/ext/action_view/helpers/form_builder'
-  require 'refinery/ext/action_view/helpers/form_helper'
-  require 'refinery/ext/action_view/helpers/form_tag_helper'
-
-  module Admin
-    autoload :BaseController, 'refinery/admin/base_controller'
-  end
-
-  autoload :CmsGenerator, 'generators/refinery/cms/cms_generator'
-  autoload :DummyGenerator, 'generators/refinery/dummy/dummy_generator'
-  autoload :CoreGenerator, 'generators/refinery/core/core_generator'
-  autoload :EngineGenerator, 'generators/refinery/engine/engine_generator'
-
-  class << self
-    @@extensions = []
-
-    # Returns an array of modules representing currently registered Refinery Engines
-    #
-    # Example:
-    #   Refinery.extensions  =>  [Refinery::Core, Refinery::Pages]
-    def extensions
-      @@extensions
-    end
-
-    # Register an extension with Refinery
-    #
-    # Example:
-    #   Refinery.register_extension(Refinery::Core)
-    def register_extension(const)
-      return if extension_registered?(const)
-
-      validate_extension!(const)
-
-      @@extensions << const
-    end
-    alias_method :register_engine, :register_extension
-
-    # Unregister an extension from Refinery
-    #
-    # Example:
-    #   Refinery.unregister_extension(Refinery::Core)
-    def unregister_extension(const)
-      @@extensions.delete(const)
-    end
-
-    # Returns true if an extension is currently registered with Refinery
-    #
-    # Example:
-    #   Refinery.extension_registered?(Refinery::Core)
-    def extension_registered?(const)
-      @@extensions.include?(const)
-    end
-
-    # Constructs a deprecation warning message and warns with Kernel#warn
-    #
-    # Example:
-    #   Refinery.deprecate('foo') => "The use of 'foo' is deprecated"
-    #
-    # An options parameter can be specified to construct a more detailed deprecation message
-    #
-    # Options:
-    #   when - version that this deprecated feature will be removed
-    #   replacement - a replacement for what is being deprecated
-    #   caller - who called the deprecated feature
-    #
-    # Example:
-    #   Refinery.deprecate('foo', :when => 'tomorrow', :replacement => 'bar') =>
-    #       "The use of 'foo' is deprecated and will be removed at version 2.0. Please use 'bar' instead."
-    def deprecate(what, options = {})
-      # Build a warning.
-      warning = "\n-- DEPRECATION WARNING --\n"
-      warning << "The use of '#{what}' is deprecated"
-      warning << " and will be removed at version #{options[:when]}" if options[:when]
-      warning << "."
-      warning << "\nPlease use #{options[:replacement]} instead." if options[:replacement]
-
-      # See if we can trace where this happened
-      if options[:caller]
-        whos_calling = options[:caller].detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first
-        warning << "\nCalled from: #{whos_calling}\n"
-      end
-
-      # Give stern talking to.
-      warn warning
-    end
-
-    def i18n_enabled?
-      !!(defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?)
-    end
-
-    # Returns a Pathname to the root of the Refinery CMS project
-    def root
-      @root ||= Pathname.new(File.expand_path('../../../../', __FILE__))
-    end
-
-    # Returns an array of Pathnames pointing to the root directory of each extension that
-    # has been registered with Refinery.
-    #
-    # Example:
-    #   Refinery.roots => [#<Pathname:/Users/Reset/Code/refinerycms/core>, #<Pathname:/Users/Reset/Code/refinerycms/pages>]
-    #
-    # An optional extension_name parameter can be specified to return just the Pathname for
-    # the specified extension. This can be represented in Constant, Symbol, or String form.
-    #
-    # Example:
-    #   Refinery.roots(Refinery::Core)    =>  #<Pathname:/Users/Reset/Code/refinerycms/core>
-    #   Refinery.roots(:'refinery/core')  =>  #<Pathname:/Users/Reset/Code/refinerycms/core>
-    #   Refinery.roots("refinery/core")   =>  #<Pathname:/Users/Reset/Code/refinerycms/core>
-    def roots(extension_name = nil)
-      return @roots ||= self.extensions.map(&:root) if extension_name.nil?
-
-      extension_name.to_s.camelize.constantize.root
-    end
-
-    def version
-      Refinery::Version.to_s
-    end
-
-    # Returns string version of url helper path. We need this to temporarily support namespaces
-    # like Refinery::Image and Refinery::Blog::Post
-    #
-    # Example:
-    #   Refinery.route_for_model(Refinery::Image) => "admin_image_path"
-    #   Refinery.route_for_model(Refinery::Image, {:plural => true}) => "admin_images_path"
-    #   Refinery.route_for_model(Refinery::Blog::Post) => "blog_admin_post_path"
-    #   Refinery.route_for_model(Refinery::Blog::Post, {:plural => true}) => "blog_admin_posts_path"
-    #   Refinery.route_for_model(Refinery::Blog::Post, {:admin => false}) => "blog_post_path"
-    def route_for_model(klass, options = {})
-      if [TrueClass, FalseClass].include? options.class
-        options = {:plural => options}
-        Refinery.deprecate "[Refinery.route_for_model] 'plural' argument",
-                           :when => '2.1',
-                           :replacement => '{:plural => false}'
-      end
-
-      options = {:plural => false, :admin => true}.merge options
-
-      klass = klass.constantize if klass.respond_to?(:constantize)
-      active_name = ActiveModel::Name.new klass, (Refinery if klass.parents.include?(Refinery))
-
-      if options[:admin]
-        # Most of the time this gets rid of 'refinery'
-        parts = active_name.underscore.split('/').reject{|name|
-          active_name.singular_route_key.exclude?(name)
-        }
-
-        # Get the singular resource_name from the url parts
-        resource_name = parts.pop
-        resource_name = resource_name.pluralize if options[:plural]
-
-        [parts.join("_"), "admin", resource_name, "path"].reject(&:blank?).join "_"
-      else
-        path = options[:plural] ? active_name.route_key : active_name.singular_route_key
-
-        [path, 'path'].join '_'
-      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
-    end
-  end
-
   module Core
     require 'refinery/core/engine'
     require 'refinery/core/configuration'
@@ -196,3 +15,8 @@ module Refinery
     end
   end
 end
+
+# this require has to be down here
+# see https://github.com/refinery/refinerycms/issues/2273
+require 'decorators'
+require 'jquery-rails'