refinerycms-core 2.0.3 → 2.0.4

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

@@ -63,38 +63,40 @@ $.fn.applyMinimumHeightFromChildren = function() {
 }
 
 init_modal_dialogs = function(){
-  $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor) {
-    $(anchor).data({
-      'dialog-width': parseInt($($(anchor).attr('href').match("width=([0-9]*)")).last().get(0), 10)||928
-      , 'dialog-height': parseInt($($(anchor).attr('href').match("height=([0-9]*)")).last().get(0), 10)||473
-      , 'dialog-title': ($(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null)
-    }).attr('href', $(anchor).attr('href').replace(/(\&(amp\;)?)?dialog\=true/, '')
-                                          .replace(/(\&(amp\;)?)?width\=\d+/, '')
-                                          .replace(/(\&(amp\;)?)?height\=\d+/, '')
-                                          .replace(/(\?&(amp\;)?)/, '?')
-                                          .replace(/\?$/, ''))
-    .click(function(e){
-      $anchor = $(this);
-      iframe_src = (iframe_src = $anchor.attr('href'))
-                   + (iframe_src.indexOf('?') > -1 ? '&' : '?')
-                   + 'app_dialog=true&dialog=true';
-
-      iframe = $("<iframe id='dialog_iframe' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>");
-      if(!$.browser.msie) { iframe.corner('8px'); }
-      iframe.dialog({
-        title: $anchor.data('dialog-title')
-        , modal: true
-        , resizable: false
-        , autoOpen: true
-        , width: $anchor.data('dialog-width')
-        , height: $anchor.data('dialog-height')
-        , open: onOpenDialog
-        , close: onCloseDialog
-      });
-
-      iframe.attr('src', iframe_src);
-      e.preventDefault();
+  $(document).on('click', 'a[href*="dialog=true"]:not(#dialog_container a)', function(e) {
+    var $anchor = $(this),
+        href = $anchor.attr('href'),
+        width = parseInt($(href.match("width=([0-9]*)")).last().get(0), 10)||928,
+        height = parseInt($(href.match("height=([0-9]*)")).last().get(0), 10)||473,
+        title = $anchor.attr('title') || $anchor.attr('name') || $anchor.html() || null;
+
+    href = href.replace(/(\&(amp\;)?)?dialog\=true/, '')
+               .replace(/(\&(amp\;)?)?width\=\d+/, '')
+               .replace(/(\&(amp\;)?)?height\=\d+/, '')
+               .replace(/(\?&(amp\;)?)/, '?')
+               .replace(/\?$/, '');
+
+    iframe_src = (iframe_src = href)
+                 + (iframe_src.indexOf('?') > -1 ? '&' : '?')
+                 + 'app_dialog=true&dialog=true';
+
+    iframe = $("<iframe id='dialog_iframe' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>");
+    if(!$.browser.msie) { iframe.corner('8px'); }
+    iframe.dialog({
+      title: title
+      , modal: true
+      , resizable: false
+      , autoOpen: true
+      , width: width
+      , height: height
+      , open: onOpenDialog
+      , close: onCloseDialog
+			, open: function(event, ui) {
+				iframe.attr('src', iframe_src);
+			}
     });
+
+    e.preventDefault();
   });
 };
 

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

@@ -158,7 +158,7 @@ var wymeditor_boot_options = $.extend({
       + "</form>"
     + "</div>"
 
-  , dialogPath: "/refinery/dialogs/"
+  , dialogPath: "<%= Refinery::Core::Engine.routes.url_helpers.admin_dialogs_path %>/"
   , dialogFeatures: {
       width: 866
     , height: 455

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

@@ -1,36 +1,36 @@
 init_modal_dialogs = function(){
-  $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor) {
-    $(anchor).data({
-      'dialog-width': parseInt($($(anchor).attr('href').match("width=([0-9]*)")).last().get(0), 10)||928
-      , 'dialog-height': parseInt($($(anchor).attr('href').match("height=([0-9]*)")).last().get(0), 10)||473
-      , 'dialog-title': ($(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null)
-    }).attr('href', $(anchor).attr('href').replace(/(\&(amp\;)?)?dialog\=true/, '')
-                                          .replace(/(\&(amp\;)?)?width\=\d+/, '')
-                                          .replace(/(\&(amp\;)?)?height\=\d+/, '')
-                                          .replace(/(\?&(amp\;)?)/, '?')
-                                          .replace(/\?$/, ''))
-    .click(function(e){
-      $anchor = $(this);
-      iframe_src = (iframe_src = $anchor.attr('href'))
-                   + (iframe_src.indexOf('?') > -1 ? '&' : '?')
-                   + 'app_dialog=true&dialog=true';
-
-      iframe = $("<iframe id='dialog_iframe' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>");
-      if(!$.browser.msie) { iframe.corner('8px'); }
-      iframe.dialog({
-        title: $anchor.data('dialog-title')
-        , modal: true
-        , resizable: false
-        , autoOpen: true
-        , width: $anchor.data('dialog-width')
-        , height: $anchor.data('dialog-height')
-        , open: onOpenDialog
-        , close: onCloseDialog
-      });
-
-      iframe.attr('src', iframe_src);
-      e.preventDefault();
+  $(document).on('click', 'a[href*="dialog=true"]:not(#dialog_container a)', function(e) {
+    var $anchor = $(this),
+        href = $anchor.attr('href'),
+        width = parseInt($(href.match("width=([0-9]*)")).last().get(0), 10)||928,
+        height = parseInt($(href.match("height=([0-9]*)")).last().get(0), 10)||473,
+        title = $anchor.attr('title') || $anchor.attr('name') || $anchor.html() || null;
+
+    href = href.replace(/(\&(amp\;)?)?dialog\=true/, '')
+               .replace(/(\&(amp\;)?)?width\=\d+/, '')
+               .replace(/(\&(amp\;)?)?height\=\d+/, '')
+               .replace(/(\?&(amp\;)?)/, '?')
+               .replace(/\?$/, '');
+
+    iframe_src = (iframe_src = href)
+                 + (iframe_src.indexOf('?') > -1 ? '&' : '?')
+                 + 'app_dialog=true&dialog=true';
+
+    iframe = $("<iframe id='dialog_iframe' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>");
+    if(!$.browser.msie) { iframe.corner('8px'); }
+    iframe.dialog({
+      title: title
+      , modal: true
+      , resizable: false
+      , autoOpen: true
+      , width: width
+      , height: height
+      , open: onOpenDialog
+      , close: onCloseDialog
     });
+
+    iframe.attr('src', iframe_src);
+    e.preventDefault();
   });
 };
 

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

@@ -7,3 +7,6 @@
     $("#editor_switch a").click (e) ->
       if $("form[data-changes-made]").length > 0
         e.preventDefault() unless confirm("<%= ::I18n.t('confirm_changes', :scope => 'refinery.js.admin') %>")
+
+  $("input[id=page_custom_slug]").change ->
+    $("#submit_continue_button").remove()

data/app/controllers/refinery/admin/dialogs_controller.rb

@@ -1,6 +1,10 @@
 module ::Refinery
   module Admin
     class DialogsController < ::Refinery::AdminController
+      def index
+        redirect_to refinery.admin_root_path
+      end
+
       def show
         @dialog_type = params[:id].downcase
 

data/app/controllers/refinery/admin_controller.rb

@@ -3,6 +3,7 @@
 module Refinery
   class AdminController < ::ActionController::Base
     include ::Refinery::ApplicationController
+    helper ApplicationHelper
     helper Refinery::Core::Engine.helpers
     include Refinery::Admin::BaseController
 

data/app/helpers/refinery/image_helper.rb

@@ -6,18 +6,16 @@ module Refinery
     # replace all system images with a thumbnail version of them (handy for all images inside a page part)
     # for example, <%= content_fu(@page.content_for(: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[:refinery_images]
-                 ).uid
+      content.gsub(%r{<img.+?src=['"](/system/images/.+?)/.+?/>}) do |img|
+        begin
+          sha = img.match(%r{/system/images/(.+?)/})[1]
+          job = Dragonfly::Job.deserialize sha, Dragonfly[:refinery_images]
 
-           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
+          image_fu Image.where(:image_uid => job.uid).first, thumbnail
+        rescue Dragonfly::Serializer::BadString
+          img
+        end
+      end
     end
 
     # image_fu is a helper for inserting an image that has been uploaded into a template.

data/app/views/refinery/admin/_form_actions.html.erb

@@ -13,7 +13,7 @@
       cancel_title = t('.cancel_lose_changes')
     end
     cancel_button_id    ||= "cancel_button"
-    cancel_url          ||= (((back = url_for(:back)).include?('javascript') or action_name =~ /^(create|update)$/) ? refinery.send(Refinery.route_for_model(f.object.class, true)) : back)
+    cancel_url          ||= (((back = url_for(:back)).include?('javascript') or action_name =~ /^(create|update)$/) ? refinery.send(Refinery.route_for_model(f.object.class, :plural => true)) : back)
   end
 
   continue_editing = defined?(continue_editing) ? continue_editing : (f.object.present? and f.object.persisted?)

data/config/locales/cs.yml

@@ -36,8 +36,8 @@ cs:
         next: Další
         close: Zavřít
       image_picker:
-        none_selected: Zatím není vybrán žádný %{what}, klikněte zde pro přidání.
-        remove_current: Smazat vybraný %{what}
+        none_selected: Zatím není vybrán žádný obrázek, klikněte zde pro přidání.
+        remove_current: Smazat vybraný obrázek
         change: Klikněte zde pro vybrání obrázku
         show: Zobrazit
       resource_picker:

data/config/routes.rb

@@ -5,7 +5,7 @@ Refinery::Core::Engine.routes.draw do
 
   namespace :admin, :path => 'refinery' do
     root :to => 'dashboard#index'
-    resources :dialogs, :only => :show
+    resources :dialogs, :only => [:index, :show]
   end
 
   match '/refinery/update_menu_positions', :to => 'admin/core#update_plugin_positions'

data/lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb

@@ -2,6 +2,9 @@ Refinery::Core.configure do |config|
   # When true will rescue all not found errors and display a friendly error page
   config.rescue_not_found = Rails.env.production?
 
+  # When true this will force SSL redirection in all Refinery backend controllers.
+  # config.force_ssl = <%= Refinery::Core.force_ssl.inspect %>
+
   # When true will use Amazon's Simple Storage Service instead of
   # the default file system for storing resources and images
   config.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)

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

@@ -2,68 +2,70 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.0'
+gem 'refinerycms', '~> 2.0.3'
 
-# Refinery/rails should pull in the proper versions of these
-group :assets do
-  gem 'sass-rails'
-  gem 'coffee-rails'
-  gem 'uglifier'
+# Database Configuration
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+  gem 'jruby-openssl'
 end
 
-gem 'jquery-rails'
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'mysql2'
+  gem 'pg'
+end
 
 group :development, :test do
-  gem 'refinerycms-testing', '~> 2.0.0'
-  gem 'factory_girl_rails'
-  gem 'generator_spec'
-
-  require 'rbconfig'
-
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'jruby-openssl'
-  end
-
-  unless defined?(JRUBY_VERSION)
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-  end
+  gem 'refinerycms-testing', '~> 2.0.3'
+  gem 'guard-rspec', '~> 0.7.0'
 
   platforms :mswin, :mingw do
-    gem 'win32console'
+    gem 'win32console', '~> 1.3.0'
     gem 'rb-fchange', '~> 0.0.5'
     gem 'rb-notifu', '~> 0.0.4'
   end
 
   platforms :ruby do
-    gem 'spork', '0.9.0.rc9'
-    gem 'guard-spork'
+    gem 'spork', '~> 0.9.0'
+    gem 'guard-spork', '~> 0.5.2'
 
     unless ENV['TRAVIS']
+      require 'rbconfig'
       if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'rb-fsevent', '>= 0.3.9'
-        gem 'growl',      '~> 1.0.3'
+        gem 'rb-fsevent', '~> 0.9.0'
+        gem 'ruby_gntp', '~> 0.3.4'
       end
       if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
+        gem 'rb-inotify', '~> 0.8.8'
+        gem 'libnotify',  '~> 0.7.2'
+        gem 'therubyracer', '~> 0.10.0'
       end
     end
   end
 
   platforms :jruby do
     unless ENV['TRAVIS']
+      require 'rbconfig'
       if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'growl',      '~> 1.0.3'
+        gem 'ruby_gntp', '~> 0.3.4'
       end
       if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
+        gem 'rb-inotify', '~> 0.8.8'
+        gem 'libnotify',  '~> 0.7.2'
       end
     end
   end
 end
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails'
+  gem 'coffee-rails'
+  gem 'uglifier'
+end
+
+gem 'jquery-rails', '~> 2.0.0'

data/lib/generators/refinery/engine/templates/Guardfile

@@ -8,7 +8,7 @@ guard 'spork', :wait => 60, :cucumber => false, :rspec_env => { 'RAILS_ENV' => '
   watch(%r{^vendor/extensions/(.+)/spec/support/.+\.rb$})
 end
 
-guard 'rspec', :version => 2, :cli => "--color --drb --format Fuubar", :all_on_start => false, :all_after_pass => false do
+guard 'rspec', :version => 2, :cli => (['~/.rspec', '.rspec'].map{|f| File.read(File.expand_path(f)).split("\n").join(' ') if File.exists?(File.expand_path(f))}.join(' ')) do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb

@@ -1,28 +1,40 @@
 module Refinery
   module <%= namespacing %>
     class <%= class_name %> < Refinery::Core::BaseModel
-      <% if table_name == namespacing.underscore.pluralize -%>self.table_name = 'refinery_<%= plural_name %>'<% end -%>
-      <% if localized? %>
-      translates <%= localized_attributes.map{|a| ":#{a.name}"}.join(', ') %><% end %>
-    <% if (string_attributes = attributes.select{ |a| a.type.to_s =~ /string|text/ }.uniq).any? %>
+<% if table_name == namespacing.underscore.pluralize -%>
+      self.table_name = 'refinery_<%= plural_name %>'
+<% end -%>
+<% if localized? -%>
+
+      translates <%= localized_attributes.map{|a| ":#{a.name}"}.join(', ') %>
+
+      class Translation
+        attr_accessible :locale
+      end
+<% end -%>
+<% if (string_attributes = attributes.select{ |a| a.type.to_s =~ /string|text/ }.uniq).any? -%>
+
+      attr_accessible <%= string_attributes.first.name.to_sym.inspect %>, :position
+
       acts_as_indexed :fields => <%= string_attributes.map{|s| s.name.to_sym}.inspect %>
 
       validates <%= string_attributes.first.name.to_sym.inspect %>, :presence => true, :uniqueness => true
-      <% else %>
+<% else -%>
+
       # def title was created automatically because you didn't specify a string field
       # when you ran the refinery:engine generator. <3 <3 Refinery CMS.
       def title
         "Override def title in vendor/extensions/<%= namespacing.underscore %>/app/models/refinery/<%= namespacing.underscore %>/<%= singular_name %>.rb"
       end
-      <% end -%>
-    <% attributes.select{|a| a.type.to_s == 'image'}.uniq.each do |a| -%>
+<% end -%>
+<% attributes.select{|a| a.type.to_s == 'image'}.uniq.each do |a| -%>
 
       belongs_to :<%= a.name.gsub("_id", "") -%>, :class_name => '::Refinery::Image'
-    <% end -%>
-    <% attributes.select{|a| a.type.to_s == 'resource'}.uniq.each do |a| -%>
+<% end -%>
+<% attributes.select{|a| a.type.to_s == 'resource'}.uniq.each do |a| -%>
 
       belongs_to :<%= a.name.gsub("_id", "") %>, :class_name => '::Refinery::Resource'
-    <% end %>
+<% end -%>
     end
   end
 end

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_singular_name.html.erb

@@ -1,11 +1,12 @@
+<% title_attribute = (title = attributes.detect { |a| a.type.to_s == "string" }).present? ? title.name : title -%>
 <li class='clearfix record <%%= cycle("on", "on-hover") %>' id="<%%= dom_id(<%= singular_name %>) -%>">
   <span class='title'>
-    <%%= <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? -%>.<%= title.name %><% else %>.title<%end %> %>
+    <%%= <%= singular_name %>.<%= title_attribute %> %>
 <% if localized? %>
     <%% if Refinery.i18n_enabled? and Refinery::I18n.frontend_locales.many? %>
       <span class='preview'>
         <%% <%= singular_name %>.translations.each do |translation| %>
-          <%% if translation.title.present? %>
+          <%% if translation.<%= title_attribute %>.present? %>
             <%%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
                          refinery.edit_<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>, :switch_locale => translation.locale),
                          :class => 'locale' %>
@@ -26,7 +27,7 @@
     <%%= link_to refinery_icon_tag("delete.png"), refinery.<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>),
         :class => "cancel confirm-delete",
         :title => t('.delete'),
-        :confirm => t('message', :scope => 'refinery.admin.delete', :title => <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>.<%= title.name %><% else %>.title<% end %>),
+        :confirm => t('message', :scope => 'refinery.admin.delete', :title => <%= singular_name %>.<%= title_attribute %>),
         :method => :delete %>
   </span>
-</li>
+</li>

data/lib/generators/refinery/engine/templates/spec/spec_helper.rb

@@ -2,7 +2,14 @@ def setup_environment
   # Configure Rails Environment
   ENV["RAILS_ENV"] ||= 'test'
 
-  require File.expand_path("../dummy/config/environment", __FILE__)
+  if File.exist?(dummy_path = File.expand_path('../spec/dummy/config/environment.rb', __FILE__))
+    require dummy_path
+  elsif File.dirname(__FILE__) =~ %r{vendor/extensions}
+    # Require the path to the refinerycms application this is vendored inside.
+    require File.expand_path('../../../../../config/environment', __FILE__)
+  else
+    raise "Could not find a config/environment.rb file to require. Please specify this in spec/spec_helper.rb"
+  end
 
   require 'rspec/rails'
   require 'capybara/rspec'

data/lib/refinery/admin/base_controller.rb

@@ -1,5 +1,4 @@
 require 'action_controller'
-require 'application_helper'
 
 module Refinery
   module Admin
@@ -52,10 +51,13 @@ module Refinery
       end
 
       def restrict_controller
-        # if ::Refinery::Plugins.active.reject { |plugin| params[:controller] !~ Regexp.new(plugin.menu_match)}.empty?
-        #   warn "'#{current_refinery_user.username}' tried to access '#{params[:controller]}' but was rejected."
-        #   error_404
-        # end
+        # 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."
+          error_404
+        end
       end
 
     private

data/lib/refinery/application_controller.rb

@@ -17,6 +17,8 @@ module Refinery
 
       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?) }
 
@@ -63,12 +65,16 @@ module Refinery
 
   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

data/lib/refinery/core/configuration.rb

@@ -7,7 +7,7 @@ module Refinery
                     :menu_hide_children, :menu_css, :dragonfly_secret, :ie6_upgrade_message_enabled,
                     :show_internet_explorer_upgrade_message, :wymeditor_whitelist_tags,
                     :javascripts, :stylesheets, :s3_bucket_name, :s3_region, :s3_access_key_id,
-                    :s3_secret_access_key
+                    :s3_secret_access_key, :force_ssl
 
     self.rescue_not_found = false
     self.s3_backend = false
@@ -27,6 +27,7 @@ module Refinery
     self.s3_region = ENV['S3_REGION']
     self.s3_access_key_id = ENV['S3_KEY']
     self.s3_secret_access_key = ENV['S3_SECRET']
+    self.force_ssl = false
 
     def config.register_javascript(name)
       self.javascripts << name
@@ -36,12 +37,18 @@ module Refinery
       self.stylesheets << Stylesheet.new(*args)
     end
 
-    def self.clear_javascripts!
-      self.javascripts = []
-    end
+    class << self
+      def clear_javascripts!
+        self.javascripts = []
+      end
 
-    def self.clear_stylesheets!
-      self.stylesheets = []
+      def clear_stylesheets!
+        self.stylesheets = []
+      end
+
+      def site_name
+        ::I18n.t('site_name', :scope => 'refinery.core.config', :default => config.site_name)
+      end
     end
 
     # wrapper for stylesheet registration

data/lib/refinery/core/engine.rb

@@ -57,7 +57,7 @@ module Refinery
           plugin.version = Refinery.version
           plugin.hide_from_menu = true
           plugin.always_allow_access = true
-          plugin.menu_match = /refinery\/(refinery_core)$/
+          plugin.menu_match = /refinery\/(refinery_)?core$/
         end
       end
 
@@ -96,8 +96,12 @@ module Refinery
       end
 
       # set the manifests and assets to be precompiled
-      initializer "refinery.assets.precompile" do |app|
+      initializer "refinery.assets.precompile", :group => :all do |app|
         app.config.assets.precompile += [
+          "home.css",
+          "formatting.css",
+          "theme.css",
+          "admin.js",
           "refinery/*",
           "refinery/icons/*",
           "wymeditor/lang/*",

data/lib/refinery/core.rb

@@ -137,23 +137,39 @@ module Refinery
       Refinery::Version.to_s
     end
 
-    # Returns string version of url helper path. We need this to temporary support namespaces
+    # 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, true) => "admin_images_path"
+    #   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, true) => "blog_admin_posts_path"
-    def route_for_model(klass, plural = false)
-      parts = klass.to_s.underscore.split('/').delete_if { |p| p.blank? }
+    #   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)}
+        resource_name = parts.pop
+        resource_name = options[:plural] ? resource_name.pluralize : resource_name.singularize
 
-      resource_name = plural ? parts[-1].pluralize : parts[-1]
+        [parts.join("_"), "admin", resource_name, "path"].reject(&:blank?).join "_"
+      else
+        path = options[:plural] ? active_name.route_key : active_name.singular_route_key
 
-      if parts.size == 2
-        "admin_#{resource_name}_path"
-      elsif parts.size > 2
-        [parts[1..-2].join("_"), "admin", resource_name, "path"].join("_")
+        [path, 'path'].join '_'
       end
     end
 

data/lib/refinery/crud.rb

@@ -29,7 +29,7 @@ module Refinery
         :order => ('position ASC' if this_class.table_exists? && this_class.column_names.include?('position')),
         :paging => true,
         :per_page => false,
-        :redirect_to_url => "refinery.#{Refinery.route_for_model(class_name.constantize, true)}",
+        :redirect_to_url => "refinery.#{Refinery.route_for_model(class_name.constantize, :plural => true)}",
         :searchable => true,
         :search_conditions => '',
         :sortable => true,

data/lib/refinery/menu.rb

@@ -22,10 +22,6 @@ module Refinery
       items.map(&:title).join(' ')
     end
 
-    def inspect
-      items.map(&:inspect)
-    end
-
     # The delegation is specified so crazily so that it works on 1.8.x and 1.9.x
     delegate *((Array.instance_methods - Object.instance_methods) << {:to => :items})
   end

data/lib/refinery/version.rb

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

data/refinerycms-core.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski', 'David Jones', 'Steven Heidel']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'acts_as_indexed',             '~> 0.7.7'
   s.add_dependency 'friendly_id',                 '~> 4.0.1'
   s.add_dependency 'globalize3',                  '~> 0.2.0'
-  s.add_dependency 'awesome_nested_set',          '~> 2.1.0'
+  s.add_dependency 'awesome_nested_set',          '~> 2.1.3'
   s.add_dependency 'rails',                       ['>= 3.1.3', '< 3.3']
   s.add_dependency 'truncate_html',               '~> 0.5'
   s.add_dependency 'will_paginate',               '~> 3.0.2'

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

@@ -5,7 +5,7 @@ module Refinery
     describe CoreController do
       login_refinery_user
 
-      it "should update the plugin positions" do
+      it "updates the plugin positions" do
         plugins = refinery_user.plugins.reverse.collect(&:name)
 
         post 'update_plugin_positions', :menu => plugins

data/spec/lib/refinery/activity_spec.rb

@@ -1,38 +1,46 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Refinery::Activity do
   before { module X; module Y; class Z; end; end; end }
 
-  let(:activity) { Refinery::Activity.new(:class_name => "X::Y::Z") }
+  let(:activity) { Refinery::Activity.new(:class_name => 'X::Y::Z') }
 
-  describe "#base_class_name" do
-    it "should return the base class name, less module nesting" do
-      activity.base_class_name.should == "Z"
+  describe '#base_class_name' do
+    it 'returns the base class name, less module nesting' do
+      activity.base_class_name.should == 'Z'
     end
   end
 
-  describe "#klass" do
-    it "returns class constant" do
+  describe '#klass' do
+    it 'returns class constant' do
       activity.klass.should == X::Y::Z
     end
   end
 
-  describe "#url_prefix" do
-    it "returns edit_ by default" do
-      activity.url_prefix.should == "edit_"
+  describe '#url_prefix' do
+    it 'returns edit_ by default' do
+      activity.url_prefix.should == 'edit_'
     end
 
-    it "returns user specified prefix" do
-      activity.url_prefix = "testy"
-      activity.url_prefix.should == "testy_"
-      activity.url_prefix = "testy_"
-      activity.url_prefix.should == "testy_"
+    it 'returns user specified prefix' do
+      activity.url_prefix = 'testy'
+      activity.url_prefix.should == 'testy_'
+      activity.url_prefix = 'testy_'
+      activity.url_prefix.should == 'testy_'
     end
   end
 
-  describe "#url" do
-    it "should return the url" do
-      activity.url.should == "refinery.edit_y_admin_z_path"
+  describe '#url' do
+    it 'returns the url' do
+      activity.url.should == 'refinery.edit_x_y_admin_z_path'
+    end
+  end
+
+  describe '#url with Refinery namespace' do
+    before { module Refinery; module Y; class Z; end; end; end }
+    let(:activity) { Refinery::Activity.new(:class_name => 'Refinery::Y::Z') }
+    it 'returns the url' do
+      activity.url.should == 'refinery.edit_y_admin_z_path'
     end
   end
 end

data/spec/lib/refinery/application_controller_spec.rb

@@ -1,43 +1,76 @@
 require "spec_helper"
 
-describe "Refinery::ApplicationController" do
-  describe "DummyController", :type => :controller do
-    controller do
-      include ::Refinery::ApplicationController
-    end
+module Refinery
+  describe ApplicationController do
+    describe "DummyController", :type => :controller do
+      controller do
+        include ::Refinery::ApplicationController
 
-    describe ".home_page?" do
-      it "matches root url" do
-        controller.stub(:root_path).and_return("/")
-        request.stub(:path).and_return("/")
-        controller.home_page?.should be_true
+        def index
+          render :nothing => true
+        end
       end
 
-      it "matches localised root url" do
-        controller.refinery.stub(:root_path).and_return("/en/")
-        request.stub(:path).and_return("/en")
-        controller.home_page?.should be_true
-      end
+      describe ".home_page?" do
+        it "matches root url" do
+          controller.stub(:root_path).and_return("/")
+          request.stub(:path).and_return("/")
+          controller.home_page?.should be_true
+        end
 
-      it "escapes regexp" do
-        request.stub(:path).and_return("\/huh)")
-        expect { controller.home_page? }.to_not raise_error(RegexpError)
-      end
-    end
+        it "matches localised root url" do
+          controller.refinery.stub(:root_path).and_return("/en/")
+          request.stub(:path).and_return("/en")
+          controller.home_page?.should be_true
+        end
 
-    describe "#presenter_for" do
-      it "returns BasePresenter for nil" do
-        controller.send(:presenter_for, nil).should eq(BasePresenter)
+        it "escapes regexp" do
+          request.stub(:path).and_return("\/huh)")
+          expect { controller.home_page? }.to_not raise_error(RegexpError)
+        end
       end
 
-      it "returns BasePresenter when the instance's class does not have a presenter" do
-        controller.send(:presenter_for, Object.new).should eq(BasePresenter)
+      describe "#presenter_for" do
+        it "returns BasePresenter for nil" do
+          controller.send(:presenter_for, nil).should eq(BasePresenter)
+        end
+
+        it "returns BasePresenter when the instance's class does not have a presenter" do
+          controller.send(:presenter_for, Object.new).should eq(BasePresenter)
+        end
+
+        it "returns the class's presenter when the instance's class has a presenter" do
+          controller.send(:presenter_for, Page.new).should eq(PagePresenter)
+        end
       end
 
-      it "returns the class's presenter when the instance's class has a presenter" do
-        model = Refinery::Page.new
-        controller.send(:presenter_for, model).should eq(Refinery::PagePresenter)
+      describe "force_ssl" do
+        before(:each) do
+          controller.stub(:admin?).and_return(true)
+          controller.stub(:refinery_user_required?).and_return(false)
+        end
+
+        it "is false so standard HTTP is used" do
+          Refinery::Core.config.force_ssl = false
+
+          get :index
+
+          response.should_not be_redirect
+        end
+
+        it "is true so HTTPS is used" do
+          begin
+            Refinery::Core.config.force_ssl = true
+
+            get :index
+
+            response.should be_redirect
+          ensure
+            Refinery::Core.config.force_ssl = false
+          end
+        end
       end
+
     end
   end
 end

data/spec/lib/refinery/core/configuration_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+module Refinery
+  module Core
+    describe 'configuration' do
+      describe '.site_name' do
+        # reset any previously defined site name
+        before do
+          Refinery::Core.site_name = nil
+        end
+
+        context 'when set in configuration' do
+          it 'returns name set by Refinery::Core.config' do
+            Refinery::Core.stub(:site_name).and_return('Test Site Name')
+            Refinery::Core.site_name.should eq('Test Site Name')
+          end
+        end
+
+        context 'when set in locale file' do
+          before do
+            ::I18n.backend.store_translations :en, :refinery => {
+              :core => {
+                :config => {
+                  :site_name => 'I18n Site Name'
+                }
+              }
+            }
+          end
+
+          it 'returns name set in locale' do
+            Refinery::Core.site_name.should eq('I18n Site Name')
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/refinery/core_spec.rb

@@ -137,39 +137,70 @@ describe Refinery do
   end
 
   describe ".route_for_model" do
-    context "when passed Refinery::Dummy" do
+    context 'with Refinery::Dummy' do
+      module Refinery::Dummy
+      end
+
       it "returns admin_dummy_path" do
-        Refinery.route_for_model("Refinery::Dummy").should == "admin_dummy_path"
+        Refinery.route_for_model(Refinery::Dummy).should == "admin_dummy_path"
       end
-    end
 
-    context "when passed Refinery::Dummy and true" do
-      it "returns admin_dummies_path" do
-        Refinery.route_for_model("Refinery::Dummy", true).should == "admin_dummies_path"
+      context ":plural => true" do
+        it "returns admin_dummies_path" do
+          Refinery.route_for_model(Refinery::Dummy, :plural => true).should == "admin_dummies_path"
+        end
       end
     end
 
-    context "when passed Refinery::DummyName" do
+    context 'with Refinery::DummyName' do
+      module Refinery::DummyName
+      end
+
       it "returns admin_dummy_name_path" do
-        Refinery.route_for_model("Refinery::DummyName").should == "admin_dummy_name_path"
+        Refinery.route_for_model(Refinery::DummyName).should == "admin_dummy_name_path"
       end
-    end
 
-    context "when passed Refinery::DummyName and true" do
-      it "returns admin_dummy_names_path" do
-        Refinery.route_for_model("Refinery::DummyName", true).should == "admin_dummy_names_path"
+      context ":plural => true" do
+        it "returns admin_dummy_names_path" do
+          Refinery.route_for_model(Refinery::DummyName, :plural => true).should == "admin_dummy_names_path"
+        end
       end
     end
 
-    context "when passed Refinery::Dummy::Name" do
+    context 'with Refinery::Dummy::Name' do
+      module Refinery::Dummy
+        module Name
+        end
+      end
+
       it "returns dummy_admin_name_path" do
-        Refinery.route_for_model("Refinery::Dummy::Name").should == "dummy_admin_name_path"
+        Refinery.route_for_model(Refinery::Dummy::Name).should == "dummy_admin_name_path"
+      end
+
+      context ":plural => true" do
+        it "returns dummy_admin_names_path" do
+          Refinery.route_for_model(Refinery::Dummy::Name, :plural => true).should == "dummy_admin_names_path"
+        end
+      end
+
+      context ":admin => false" do
+        it "returns dummy_name_path" do
+          Refinery.route_for_model(Refinery::Dummy::Name, :admin => false).should == 'dummy_name_path'
+        end
+      end
+
+      context ":admin => false, :plural => true" do
+        it "returns dummy_names_path" do
+          Refinery.route_for_model(Refinery::Dummy::Name, :admin => false, :plural => true).should == 'dummy_names_path'
+        end
       end
     end
+  end
 
-    context "when passed Refinery::Dummy::Name and true" do
-      it "returns dummy_admin_names_path" do
-        Refinery.route_for_model("Refinery::Dummy::Name", true).should == "dummy_admin_names_path"
+  describe Refinery::Core::Engine do
+    describe "#helpers" do
+      it "should not include ApplicationHelper" do
+        Refinery::Core::Engine.helpers.ancestors.map(&:name).should_not include("ApplicationHelper")
       end
     end
   end

data/spec/lib/refinery/menu_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+module Refinery
+  describe Menu do
+
+    let(:menu) do
+      page1 = FactoryGirl.create(:page, :title => 'test1')
+      page2 = FactoryGirl.create(:page, :title => 'test2', :parent_id => page1.id)
+      Refinery::Menu.new([page1, page2])
+    end
+
+    describe '.initialize' do
+      it "returns a collection of menu item objects" do
+        menu.each { |item| item.should be_an_instance_of(MenuItem) }
+      end
+    end
+
+    describe '#items' do
+      it 'returns a collection' do
+        menu.items.count.should eq(2)
+      end
+    end
+
+    describe '#roots' do
+      it 'returns a collection of items with parent_id == nil' do
+        menu.roots.collect(&:parent_id).should eq([nil])
+      end
+    end
+
+    describe '#to_s' do
+      it 'returns string of joined page titles' do
+        menu.to_s.should eq('test1 test2')
+      end
+    end
+
+  end
+end

data/spec/requests/refinery/admin/controller_restriction_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+module Refinery
+  describe "plugin access" do
+    context "as refinery user" do
+      login_refinery_user
+
+      context "with permission" do
+        it "allows access" do
+          visit refinery.admin_pages_path
+          page.body.should_not include '404'
+        end
+      end
+
+      context "without permission" do
+        before do
+          Refinery::User.first.plugins = []
+        end
+
+        it "denies access" do
+          visit refinery.admin_pages_path
+          page.body.should include '404'
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-core
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
 - Philip Arndt
 - Uģis Ozols
+- Rob Yurkowski
 - David Jones
 - Steven Heidel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_indexed
@@ -69,7 +70,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +78,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -436,7 +437,6 @@ files:
 - app/controllers/refinery/admin_controller.rb
 - app/controllers/refinery/fast_controller.rb
 - app/controllers/refinery/sitemap_controller.rb
-- app/helpers/application_helper.rb
 - app/helpers/refinery/admin/core_helper.rb
 - app/helpers/refinery/admin/dialogs_helper.rb
 - app/helpers/refinery/admin_helper.rb
@@ -668,9 +668,12 @@ files:
 - spec/lib/generators/refinery/form/form_generator_spec.rb
 - spec/lib/refinery/activity_spec.rb
 - spec/lib/refinery/application_controller_spec.rb
+- spec/lib/refinery/core/configuration_spec.rb
 - spec/lib/refinery/core_spec.rb
+- spec/lib/refinery/menu_spec.rb
 - spec/lib/refinery/plugin_spec.rb
 - spec/lib/refinery/plugins_spec.rb
+- spec/requests/refinery/admin/controller_restriction_spec.rb
 - spec/requests/refinery/admin/custom_assets_spec.rb
 - spec/requests/refinery/admin/dialogs_spec.rb
 - spec/requests/refinery/search_spec.rb
@@ -695,7 +698,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1981756038234182476
+      hash: -1126553336485468710
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -704,10 +707,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1981756038234182476
+      hash: -1126553336485468710
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 1.8.19
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Core extension for Refinery CMS
@@ -728,9 +731,12 @@ test_files:
 - spec/lib/generators/refinery/form/form_generator_spec.rb
 - spec/lib/refinery/activity_spec.rb
 - spec/lib/refinery/application_controller_spec.rb
+- spec/lib/refinery/core/configuration_spec.rb
 - spec/lib/refinery/core_spec.rb
+- spec/lib/refinery/menu_spec.rb
 - spec/lib/refinery/plugin_spec.rb
 - spec/lib/refinery/plugins_spec.rb
+- spec/requests/refinery/admin/controller_restriction_spec.rb
 - spec/requests/refinery/admin/custom_assets_spec.rb
 - spec/requests/refinery/admin/dialogs_spec.rb
 - spec/requests/refinery/search_spec.rb

data/app/helpers/application_helper.rb

@@ -1,5 +0,0 @@
-# Methods added to this helper will be available to all templates in the application.
-
-module ::ApplicationHelper
-
-end