refinerycms-core 1.0.11 → 2.0.0

data/lib/generators/refinerycms_generator.rb

@@ -1,124 +0,0 @@
-require 'refinery/generators'
-
-class RefinerycmsGenerator < ::Refinery::Generators::EngineInstaller
-
-  engine_name :refinerycms
-  source_root Pathname.new(File.expand_path('../templates', __FILE__))
-
-  class_option :update, :type => :boolean, :aliases => nil, :group => :runtime,
-                        :desc => "Update an existing Refinery CMS based application"
-
-  def generate
-    # Ensure the generator doesn't output anything using 'puts'
-    self.silence_puts = true
-
-    # Only pretend to do the next actions if this is Refinery to stay DRY
-    if Rails.root == Refinery.root
-      say_status :'-- pretending to make changes that happen in an actual installation --', nil, :yellow
-      old_pretend = self.options[:pretend]
-      new_options = self.options.dup
-      new_options[:pretend] = true
-      self.options = new_options
-    end
-
-    unless self.options[:update]
-      # First, effectively move / rename files that get in the way of Refinery CMS
-      %w(public/index.html app/views/layouts/application.html.erb public/javascripts/rails.js).each do |roadblock|
-        if (roadblock_path = Rails.root.join(roadblock)).file?
-          create_file "#{roadblock}.backup",
-                      :verbose => true do roadblock_path.read end
-          remove_file roadblock_path, :verbose => true
-        end
-      end
-
-      # Copy asset files (JS, CSS) so they're ready to use.
-      %w(application.css formatting.css home.css theme.css).map{ |ss|
-        Refinery.roots('core').join('public', 'stylesheets', ss)
-      }.reject{|ss| !ss.file?}.each do |stylesheet|
-        copy_file stylesheet,
-                  Rails.root.join('public', 'stylesheets', stylesheet.basename),
-                  :verbose => true
-      end
-      copy_file Refinery.roots('core').join('public', 'javascripts', 'admin.js'),
-                Rails.root.join('public', 'javascripts', 'admin.js'),
-                :verbose => true
-    end
-
-    # Ensure the config.serve_static_assets setting is present and enabled
-    %w(development test production).map{|e| "config/environments/#{e}.rb"}.each do |env|
-      gsub_file env, %r{#.*config.serve_static_assets}, 'config.serve_static_assets', :verbose => false
-
-      gsub_file env, "serve_static_assets = false", "serve_static_assets = true # Refinery CMS requires this to be true", :verbose => false
-
-      unless (env_file_contents = Rails.root.join(env).read) =~ %r{Refinery.rescue_not_found}
-        append_file env, "Refinery.rescue_not_found = #{env.split('/').last.split('.rb').first == 'production'}\n"
-      end
-
-      unless env_file_contents =~ %r{Refinery.s3_backend}
-        s3_backend_string = ["# When true will use Amazon's Simple Storage Service on your production machine"]
-        s3_backend_string << "# instead of the default file system for resources and images"
-        s3_backend_string << "Refinery.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)\n"
-        append_file env, s3_backend_string.join("\n")
-      end
-    end
-
-    # Stop pretending
-    if Rails.root == Refinery.root
-      say_status :'-- finished pretending --', nil, :yellow
-      new_options = self.options.dup
-      new_options[:pretend] = old_pretend
-      self.options = new_options
-    end
-
-    # Ensure .gitignore exists and append our rules to it.
-    create_file ".gitignore" unless Rails.root.join('.gitignore').file?
-    our_ignore_rules = self.class.source_root.join('.gitignore').read
-    our_ignore_rules = our_ignore_rules.split('# REFINERY CMS DEVELOPMENT').first if Rails.root != Refinery.root
-    append_file ".gitignore", our_ignore_rules
-
-    # If the admin/base_controller.rb file exists, ensure it does not do the old inheritance
-    if (admin_base = Rails.root.join('app', 'controllers', 'admin', 'base_controller.rb')).file?
-      gsub_file admin_base,
-                "# You can extend refinery backend with your own functions here and they will likely not get overriden in an update.",
-                "",
-                :verbose => self.options[:update]
-
-      gsub_file admin_base, "< Refinery::AdminBaseController", "< ActionController::Base",
-                :verbose => self.options[:update]
-    end
-
-
-    # Append seeds.
-    create_file "db/seeds.rb" unless Rails.root.join('db', 'seeds.rb').file?
-    append_file 'db/seeds.rb', :verbose => true do
-      self.class.source_root.join('db', 'seeds.rb').read
-    end
-
-    force_options = self.options.dup
-    force_options[:force] = self.options[:force] || self.options[:update]
-    self.options = force_options
-    # Seeds and migrations now need to be copied from their various engines.
-    existing_source_root = self.class.source_root
-    ::Refinery::Plugins.registered.pathnames.reject{|p| !p.join('db').directory?}.each do |pathname|
-      self.class.source_root pathname
-      super
-    end
-    self.class.source_root existing_source_root
-
-    super
-
-    # The engine installer only installs database templates.
-    Pathname.glob(self.class.source_root.join('**', '*')).reject{|f|
-      f.directory? or f.to_s =~ /\/db\//
-    }.sort.each do |path|
-      copy_file path, path.to_s.gsub(self.class.source_root.to_s, Rails.root.to_s)
-    end
-
-    # Ensure i18n exists and is up to date.
-    if ::Refinery.i18n_enabled?
-      require 'generators/refinerycms_i18n_generator'
-      ::RefinerycmsI18n.new.generate
-    end
-  end
-
-end

data/lib/generators/templates/autotest/autotest.rb

@@ -1,17 +0,0 @@
-###  uncomment any of the following requires applicable for your system
-###  and then copy this to .autotest if you are using the ZenTest autotest.
-# require "autotest/restart"
-# require "test_notifier/runner/autotest"
-# require "redgreen/autotest"
-# require "autotest/timestamp"
-
-# adds exceptions from .gitignore file, please modify exceptions there!
-imported_exceptions =  IO.readlines('.gitignore').inject([]) do |acc, line|
-  acc << line.strip if line.to_s[0] != '#' && line.strip != ''; acc
-end
-
-Autotest.add_hook :initialize do |autotest|
-  imported_exceptions.each do |exception|
-    autotest.add_exception(exception)
-  end
-end

data/lib/generators/templates/autotest/discover.rb

@@ -1,2 +0,0 @@
-Autotest.add_discovery { "rails" }
-Autotest.add_discovery { "rspec2" }

data/lib/generators/templates/config/initializers/devise.rb

@@ -1,144 +0,0 @@
-require 'devise'
-
-# Use this hook to configure devise mailer, warden hooks and so forth. The first
-# four configuration values can also be set straight in your models.
-::Devise.setup do |config|
-  # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in DeviseMailer.
-  config.mailer_sender = "please-change-me@config-initializers-devise.com"
-
-  # Configure the class responsible to send e-mails.
-  # config.mailer = "::Devise::Mailer"
-
-  # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default) and
-  # :mongoid (bson_ext recommended) by default. Other ORMs may be
-  # available as additional gems.
-  require 'devise/orm/active_record'
-
-  # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating an user. By default is
-  # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating an user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
-  # config.authentication_keys = [ :email ]
-
-  # Tell if authentication through request.params is enabled. True by default.
-  # config.params_authenticatable = true
-
-  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
-  # config.http_authenticatable = false
-
-  # Set this to true to use Basic Auth for AJAX requests.  True by default.
-  # config.http_authenticatable_on_xhr = true
-
-  # The realm used in Http Basic Authentication
-  # config.http_authentication_realm = "Application"
-
-  # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
-  # using other encryptors, it sets how many times you want the password re-encrypted.
-  # config.stretches = 20
-
-  # Define which will be the encryption algorithm. Devise also supports encryptors
-  # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
-  # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
-  # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :bcrypt
-
-  # Setup a pepper to generate the encrypted password.
-  # config.pepper = "2e20a8abdd34d729ba6d05f679e513cfea9fbb1e83c81f84b29e9e4fdbd4ee59b56a32200064082a15a72b05a4d4a6a2c3784a09c0554b3a47a67cc8333ccbc7"
-
-  # ==> Configuration for :confirmable
-  # The time you want to give your user to confirm his account. During this time
-  # he will be able to access your application without confirming. Default is nil.
-  # When confirm_within is zero, the user won't be able to sign in without confirming.
-  # You can use this to let your user access some features of your application
-  # without confirming the account, but blocking it after a certain period
-  # (ie 2 days).
-  # config.confirm_within = 2.days
-
-  # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
-
-  # If true, a valid remember token can be re-used between multiple browsers.
-  # config.remember_across_browsers = true
-
-  # If true, extends the user's remember period when remembered via cookie.
-  # config.extend_remember_period = false
-
-  # ==> Configuration for :validatable
-  # Range for password length
-  config.password_length = 4..20
-
-  # Regex to use to validate the email address
-  # config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
-
-  # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again.
-  # config.timeout_in = 10.minutes
-
-  # ==> Configuration for :lockable
-  # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
-
-  # Defines which strategy will be used to unlock an account.
-  # :email = Sends an unlock link to the user email
-  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
-
-  # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
-  # config.maximum_attempts = 20
-
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
-
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
-
-  # ==> Scopes configuration
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "users/sessions/new". It's turned off by default because it's slower if you
-  # are using only default views.
-  # config.scoped_views = true
-
-  # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes.
-  # config.default_scope = :user
-
-  # Configure sign_out behavior.
-  # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
-  # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
-  # config.sign_out_all_scopes = false
-
-  # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
-  # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists. Default is [:html]
-  # config.navigational_formats = [:html, :iphone]
-
-  # ==> Warden configuration
-  # If you want to use other strategies, that are not (yet) supported by Devise,
-  # you can configure them inside the config.warden block. The example below
-  # allows you to setup OAuth, using http://github.com/roman/warden_oauth
-  #
-  # config.warden do |manager|
-  #   manager.oauth(:twitter) do |twitter|
-  #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
-  #     twitter.consumer_key  = <YOUR CONSUMER KEY>
-  #     twitter.options :site => 'http://twitter.com'
-  #   end
-  #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
-  # end
-end

data/lib/generators/templates/db/seeds.rb

@@ -1,5 +0,0 @@
-# Refinery seeds
-Dir[Rails.root.join('db', 'seeds', '*.rb').to_s].each do |file|
-  puts "Loading db/seeds/#{file.split(File::SEPARATOR).last}"
-  load(file)
-end

data/lib/refinery/admin_base_controller.rb

@@ -1,5 +0,0 @@
-# This is a dummy to enable updates from 0.9.8.x onward.
-module Refinery
-  class AdminBaseController < ActionController::Base
-  end
-end

data/lib/refinery/application.rb

@@ -1,47 +0,0 @@
-module Refinery
-  module Application
-
-    class << self
-
-      def refinery!
-        ::Refinery.config.before_inclusion_procs.each(&:call)
-
-        ::ApplicationHelper.send :include, ::Refinery::ApplicationHelper
-
-        [::ApplicationController, ::Admin::BaseController].each do |c|
-          c.send :include, ::Refinery::ApplicationController
-          c.send :helper, :application
-        end
-
-        ::Admin::BaseController.send :include, ::Refinery::Admin::BaseController
-
-        ::Refinery.config.after_inclusion_procs.each(&:call)
-      end
-
-      def included(base)
-        self.instance_eval %(
-          def self.method_missing(method_sym, *arguments, &block)
-            #{base}.send(method_sym)
-          end
-        )
-
-        # JavaScript files you want as :defaults (application.js is always included).
-        base.config.action_view.javascript_expansions[:defaults] = %w()
-
-        # Configure the default encoding used in templates for Ruby 1.9.
-        base.config.encoding = 'utf-8'
-
-        # Configure sensitive parameters which will be filtered from the log file.
-        base.config.filter_parameters += [:password, :password_confirmation]
-
-        # Specify a cache store to use
-        base.config.cache_store = :memory_store
-
-        # Include the refinery controllers and helpers dynamically
-        base.config.to_prepare do
-          ::Refinery::Application.refinery!
-        end
-      end
-    end
-  end
-end

data/lib/refinery/application_helper.rb

@@ -1,19 +0,0 @@
-# Methods added to this helper will be available to all templates in the application.
-Dir[File.expand_path('../helpers/*.rb', __FILE__).to_s].each {|helper| require helper}
-
-module Refinery
-  module ApplicationHelper
-    def self.included(base)
-      base.send :include, Refinery::Helpers::HeadHelper
-      base.send :include, Refinery::Helpers::HtmlTruncationHelper
-      base.send :include, Refinery::Helpers::ImageHelper
-      base.send :include, Refinery::Helpers::MenuHelper
-      base.send :include, Refinery::Helpers::MetaHelper
-      base.send :include, Refinery::Helpers::PaginationHelper
-      base.send :include, Refinery::Helpers::ScriptHelper
-      base.send :include, Refinery::Helpers::SiteBarHelper
-      base.send :include, Refinery::Helpers::TagHelper
-      base.send :include, Refinery::Helpers::TranslationHelper
-    end
-  end
-end

data/lib/refinery/configuration.rb

@@ -1,29 +0,0 @@
-module Refinery
-  class Configuration
-
-    def after_inclusion_procs
-      @@after_inclusion_procs ||= []
-    end
-
-    def after_inclusion(&blk)
-      if blk && blk.respond_to?(:call)
-        after_inclusion_procs << blk
-      else
-        raise 'Anything added to be called before_inclusion must be callable.'
-      end
-    end
-
-    def before_inclusion_procs
-      @@before_inclusion_procs ||= []
-    end
-
-    def before_inclusion(&blk)
-      if blk && blk.respond_to?(:call)
-        before_inclusion_procs << blk
-      else
-        raise 'Anything added to be called before_inclusion must be callable.'
-      end
-    end
-
-  end
-end

data/lib/refinery/helpers/form_helper.rb

@@ -1,66 +0,0 @@
-require 'action_view'
-require 'action_view/helpers'
-
-ActionView::Helpers::FormHelper.module_eval do
-
-  def required_label(object_name, method, text = nil, options = {})
-    options = {:class => "required"}.merge!(options)
-
-    label(object_name, method, "#{label_humanize_text(object_name, method, text)} *", options)
-  end
-
-
-  def label_humanize_text object_name, method, text = nil
-    content = text unless text.is_a?(Hash)
-    if content.blank?
-      content = object_name.classify.constantize.respond_to?(:human_attribute_name) ? object_name.classify.constantize.human_attribute_name(method) : method.to_s
-    else
-      content = content.to_s
-    end
-    content.humanize
-  end
-
-end
-
-ActionView::Helpers::FormBuilder.module_eval do
-
-  def required_label(method, text = nil, options = {})
-    @template.required_label(@object_name, method, text, objectify_options(options))
-  end
-
-end
-
-ActionView::Helpers::FormTagHelper.module_eval do
-
-  def required_label_tag(name, text = nil, options = {})
-    options = {:class => "required"}.merge!(options)
-    text ||= "#{name.to_s.humanize} *"
-
-    label_tag(name, text, options)
-  end
-
-end
-
-# I18n labels automatically
-module ActionView
-  module Helpers
-    class InstanceTag
-      def to_label_tag(text = nil, options = {})
-        options = options.stringify_keys
-        name_and_id = options.dup
-        add_default_name_and_id(name_and_id)
-        options.delete("index")
-        options["for"] ||= name_and_id["id"]
-        if text.blank?
-          content = method_name.humanize
-          if object.class.respond_to?(:human_attribute_name)
-            content = object.class.human_attribute_name(method_name)
-          end
-        else
-          content = text.to_s
-        end
-        label_tag(name_and_id["id"], content, options)
-      end
-    end
-  end
-end

data/lib/refinery/helpers/head_helper.rb

@@ -1,17 +0,0 @@
-module Refinery
-  module Helpers
-    module HeadHelper
-
-      def stylesheets_for_head(stylesheets, theme = false)
-        # you can disable the use of the built-in refinery stylesheets by disabling the setting.
-        stylesheets.map! {|ss| ["refinery/#{ss}", ss] }.flatten! if RefinerySetting.find_or_set(:frontend_refinery_stylesheets_enabled, true)
-
-        # if theme is set, use themed stylesheet links.
-        stylesheets.map! {|ss| ss =~ /^refinery\// ? ss : "/theme/stylesheets/#{ss}" } if theme
-
-        stylesheets
-      end
-
-    end
-  end
-end

data/lib/refinery/helpers/html_truncation_helper.rb

@@ -1,25 +0,0 @@
-require 'truncate_html'
-
-module Refinery
-  module Helpers
-    module HtmlTruncationHelper
-
-      # Like the Rails _truncate_ helper but doesn't break HTML tags, entities, and words.
-      # <script> tags pass through and are not counted in the total.
-      # the omission specified _does_ count toward the total length count.
-      # use :link => link_to('more', post_path), or something to that effect
-      def truncate(text, options = {})
-        return unless text.present?
-        return super unless options.delete(:preserve_html_tags) == true # ensure preserve_html_tags doesn't pass through
-
-        max_length = options[:length] || 30
-        omission = options[:omission] || "..."
-
-        return truncate_html(text,
-                             :length => max_length,
-                             :word_boundary => true,
-                             :omission => omission)
-      end
-    end
-  end
-end

data/lib/refinery/helpers/image_helper.rb

@@ -1,42 +0,0 @@
-require 'ostruct'
-
-module Refinery
-  module Helpers
-    module ImageHelper
-
-      # replace all system images with a thumbnail version of them (handy for all images inside a page part)
-      # for example, <%= content_fu(@page[:body], '96x96#c') %> converts all /system/images to a 96x96 cropped thumbnail
-      def content_fu(content, thumbnail)
-        content.gsub(%r{<img.+?src=['"](/system/images/.+?)/.+?/>}) do |image_match|
-           begin
-             uid = Dragonfly::Job.from_path(
-                      "#{image_match.match(%r{(/system/images/.+?)/})[1]}", Dragonfly[:images]
-                   ).uid
-
-             image_fu Image.where(:image_uid => uid).first, thumbnail
-           rescue
-             # FAIL, don't care why but return what we found initially.
-             image_match
-           end
-         end
-      end
-
-      # image_fu is a helper for inserting an image that has been uploaded into a template.
-      # Say for example that we had a @model.image (@model having a belongs_to :image relationship)
-      # and we wanted to display a thumbnail cropped to 200x200 then we can use image_fu like this:
-      # <%= image_fu @model.image, '200x200' %> or with no thumbnail: <%= image_fu @model.image %>
-      def image_fu(image, geometry = nil, options={})
-        if image.present?
-          original_width = image.image_width
-          original_height = image.image_height
-
-          dimensions = (image.thumbnail_dimensions(geometry) rescue {})
-
-          image_tag(image.thumbnail(geometry).url, {
-            :alt => image.respond_to?(:title) ? image.title : image.image_name,
-          }.merge(dimensions).merge(options))
-        end
-      end
-    end
-  end
-end

data/lib/refinery/helpers/menu_helper.rb

@@ -1,98 +0,0 @@
-module Refinery
-  module Helpers
-    module MenuHelper
-
-      # Adds conditional caching
-      def cache_if(condition, name = {}, &block)
-        if condition
-          cache(name, &block)
-        else
-          yield
-        end
-
-        # for <%= style helpers vs <% style
-        nil
-      end
-
-      # This was extracted from app/views/shared/_menu_branch.html.erb
-      # to remove the complexity of that template by reducing logic in the view.
-      def css_for_menu_branch(item, counter, sibling_count = nil, collection = nil, selected_item = nil, warning = true)
-
-        Refinery.deprecate({
-          :what => 'css_for_menu_branch',
-          :when => '1.1',
-          :replacement => 'menu_branch_css(local_assigns)',
-          :caller => caller
-        }) if warning
-
-        Refinery.deprecate(:what => 'collection', :when => '1.1', :caller => caller) if collection
-        Refinery.deprecate(:what => 'selected_item', :when => '1.1', :caller => caller) if selected_item
-
-        css = []
-        css << "selected" if selected_page_or_descendant_page_selected?(item, collection, selected_item)
-        css << "first" if counter == 0
-        css << "last" if counter == (sibling_count ||= (item.shown_siblings.length - 1))
-        css
-      end
-
-      # New method which accepts the local_assigns hash.
-      # This maps to the older css_for_menu_branch method.
-      def menu_branch_css(local_assigns)
-        options = local_assigns.dup
-        options.update(:sibling_count => options[:menu_branch].shown_siblings.length) unless options[:sibling_count]
-
-        css_for_menu_branch(options[:menu_branch],
-                            options[:menu_branch_counter],
-                            options[:sibling_count],
-                            options[:collection],
-                            options[:selected_item], # TODO: DEPRECATED, remove at 1.1
-                            false)
-      end
-
-      # Determines whether any page underneath the supplied page is the current page according to rails.
-      # Just calls selected_page? for each descendant of the supplied page.
-      # if you pass a collection it won't check its own descendants but use the collection supplied.
-      def descendant_page_selected?(page, collection = nil, selected_item = nil)
-        return false if page.rgt == page.lft + 1
-        return false unless selected_item.nil? or !selected_item.in_menu?
-
-        page.descendants.any? { |descendant|
-          !selected_item ? selected_page?(descendant) : selected_item == descendant
-        }
-      end
-
-      def selected_page_or_descendant_page_selected?(page, collection = nil, selected_item = nil)
-        return true if selected_page?(page) || selected_item === page
-        return true if descendant_page_selected?(page, collection, selected_item)
-        false
-      end
-
-      # Determine whether the supplied page is the currently open page according to Refinery.
-      # Also checks whether Rails thinks it is selected after that using current_page?
-      def selected_page?(page)
-        path = request.path
-        path = path.force_encoding('utf-8') if path.respond_to?(:force_encoding)
-
-        # Ensure we match the path without the locale, if present.
-        if ::Refinery.i18n_enabled? and path =~ %r{^/#{::I18n.locale}/}
-          path = path.split(%r{^/#{::I18n.locale}}).last
-          path = "/" if path.blank?
-        end
-
-        # First try to match against a "menu match" value, if available.
-        return true if page.try(:menu_match).present? && path =~ Regexp.new(page.menu_match)
-
-        # Find the first url that is a string.
-        url = [page.url]
-        url << ['', page.url[:path]].compact.flatten.join('/') if page.url.respond_to?(:keys)
-        url = url.detect{|u| u.is_a?(String)}
-        url.chomp!('/') if url.size > 1
-
-        # Now use all possible vectors to try to find a valid match,
-        # finally passing to rails' "current_page?" method.
-        [path, URI.decode(path)].include?(url) || path == "/#{page.id}" || current_page?(page)
-      end
-
-    end
-  end
-end