refinerycms-core 2.1.5 → 3.0.0

data/lib/generators/refinery/engine/templates/readme.md

@@ -1,10 +1,10 @@
 # <%= extension_plural_name.titleize %> extension for Refinery CMS.
 
-## How to build this extension as a gem
+## How to build this extension as a gem (not required)
 
     cd vendor/extensions/<%= extension_plural_name %>
     gem build refinerycms-<%= extension_plural_name %>.gemspec
     gem install refinerycms-<%= extension_plural_name %>.gem
 
-    # Sign up for a http://rubygems.org/ account and publish the gem
-    gem push refinerycms-<%= extension_plural_name %>.gem
+    # Sign up for a https://rubygems.org/ account and publish the gem
+    gem push refinerycms-<%= extension_plural_name %>.gem

data/lib/generators/refinery/engine/templates/refinerycms-extension_plural_name.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
 
   # Runtime dependencies
   s.add_dependency             'refinerycms-core',    '~> <%= Refinery::Version %>'
+  s.add_dependency             'acts_as_indexed',     '~> 0.8.0'
 
   # Development dependencies (usually used for testing)
   s.add_development_dependency 'refinerycms-testing', '~> <%= Refinery::Version %>'

data/lib/generators/refinery/engine/templates/spec/features/refinery/namespace/admin/plural_name_spec.rb.erb

@@ -4,8 +4,8 @@ require "spec_helper"
 describe Refinery do
   describe "<%= namespacing %>" do
     describe "Admin" do
-      describe "<%= plural_name %>" do
-        refinery_login_with :refinery_user
+      describe "<%= plural_name %>", type: :feature do
+        refinery_login
 <% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
         describe "<%= plural_name %> list" do
           before do
@@ -15,8 +15,8 @@ describe Refinery do
 
           it "shows two items" do
             visit refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path
-            page.should have_content("UniqueTitleOne")
-            page.should have_content("UniqueTitleTwo")
+            expect(page).to have_content("UniqueTitleOne")
+            expect(page).to have_content("UniqueTitleTwo")
           end
         end
 
@@ -30,19 +30,17 @@ describe Refinery do
           context "valid data" do
             it "should succeed" do
               fill_in "<%= title.name.titleize %>", :with => "This is a test of the first string field"
-              click_button "Save"
+              expect { click_button "Save" }.to change(Refinery::<%= namespacing %>::<%= class_name %>, :count).from(0).to(1)
 
-              page.should have_content("'This is a test of the first string field' was successfully added.")
-              Refinery::<%= namespacing %>::<%= class_name %>.count.should == 1
+              expect(page).to have_content("'This is a test of the first string field' was successfully added.")
             end
           end
 
           context "invalid data" do
             it "should fail" do
-              click_button "Save"
+              expect { click_button "Save" }.not_to change(Refinery::<%= namespacing %>::<%= class_name %>, :count)
 
-              page.should have_content("<%= title.name.titleize %> can't be blank")
-              Refinery::<%= namespacing %>::<%= class_name %>.count.should == 0
+              expect(page).to have_content("<%= title.name.titleize %> can't be blank")
             end
           end
 
@@ -55,10 +53,9 @@ describe Refinery do
               click_link "Add New <%= singular_name.titleize %>"
 
               fill_in "<%= title.name.titleize %>", :with => "UniqueTitle"
-              click_button "Save"
+              expect { click_button "Save" }.not_to change(Refinery::<%= namespacing %>::<%= class_name %>, :count)
 
-              page.should have_content("There were problems")
-              Refinery::<%= namespacing %>::<%= class_name %>.count.should == 1
+              expect(page).to have_content("There were problems")
             end
           end
 <% if localized? %>
@@ -76,20 +73,20 @@ describe Refinery do
               end
 
               it "should succeed" do
-                Refinery::<%= namespacing %>::<%= class_name %>.count.should == 1
+                expect(Refinery::<%= namespacing %>::<%= class_name %>.count).to eq(1)
               end
 
-              it "should show locale flag for page" do
+              it "should show locale marker for page" do
                 p = Refinery::<%= namespacing %>::<%= class_name %>.last
                 within "#<%= singular_name %>_#{p.id}" do
-                  page.should have_css("img[src='/assets/refinery/icons/flags/en.png']")
+                  expect(page).to have_css(".locale_marker", content: 'EN')
                 end
               end
 
               it "should show <%= title.name %> in the admin menu" do
                 p = Refinery::<%= namespacing %>::<%= class_name %>.last
                 within "#<%= singular_name %>_#{p.id}" do
-                  page.should have_content('First column')
+                  expect(page).to have_content('First column')
                 end
               end
             end
@@ -113,22 +110,22 @@ describe Refinery do
               end
 
               it "should succeed" do
-                Refinery::<%= namespacing %>::<%= class_name %>.count.should == 1
-                Refinery::<%= namespacing %>::<%= class_name %>::Translation.count.should == 2
+                expect(Refinery::<%= namespacing %>::<%= class_name %>.count).to eq(1)
+                expect(Refinery::<%= namespacing %>::<%= class_name %>::Translation.count).to eq(2)
               end
 
               it "should show locale flag for page" do
                 p = Refinery::<%= namespacing %>::<%= class_name %>.last
                 within "#<%= singular_name %>_#{p.id}" do
-                  page.should have_css("img[src='/assets/refinery/icons/flags/en.png']")
-                  page.should have_css("img[src='/assets/refinery/icons/flags/cs.png']")
+                  expect(page).to have_css(".locale_marker", content: 'EN')
+                  expect(page).to have_css(".locale_marker", content: 'CS')
                 end
               end
 
               it "should show <%= title.name %> in backend locale in the admin menu" do
                 p = Refinery::<%= namespacing %>::<%= class_name %>.last
                 within "#<%= singular_name %>_#{p.id}" do
-                  page.should have_content('First column')
+                  expect(page).to have_content('First column')
                 end
               end
             end
@@ -148,14 +145,14 @@ describe Refinery do
               it "should show title in backend locale in the admin menu" do
                 p = Refinery::<%= namespacing %>::<%= class_name %>.last
                 within "#<%= singular_name %>_#{p.id}" do
-                  page.should have_content('First translated column')
+                  expect(page).to have_content('First translated column')
                 end
               end
 
               it "should show locale flag for page" do
                 p = Refinery::<%= namespacing %>::<%= class_name %>.last
                 within "#<%= singular_name %>_#{p.id}" do
-                  page.should have_css("img[src='/assets/refinery/icons/flags/cs.png']")
+                  expect(page).to have_css(".locale_marker", content: 'CS')
                 end
               end
             end
@@ -176,8 +173,8 @@ describe Refinery do
             fill_in "<%= title.name.titleize %>", :with => "A different <%= title.name %>"
             click_button "Save"
 
-            page.should have_content("'A different <%= title.name %>' was successfully updated.")
-            page.should have_no_content("A <%= title.name %>")
+            expect(page).to have_content("'A different <%= title.name %>' was successfully updated.")
+            expect(page).not_to have_content("A <%= title.name %>")
           end
         end
 
@@ -189,8 +186,8 @@ describe Refinery do
 
             click_link "Remove this <%= singular_name.titleize.downcase %> forever"
 
-            page.should have_content("'UniqueTitleOne' was successfully removed.")
-            Refinery::<%= namespacing %>::<%= class_name %>.count.should == 0
+            expect(page).to have_content("'UniqueTitleOne' was successfully removed.")
+            expect(Refinery::<%= namespacing %>::<%= class_name %>.count).to eq(0)
           end
         end
 <% end %>

data/lib/generators/refinery/engine/templates/spec/models/refinery/namespace/singular_name_spec.rb.erb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Refinery
   module <%= namespacing %>
     describe <%= class_name %> do
-      describe "validations" do
+      describe "validations", type: :model do
         subject do
           FactoryGirl.create(:<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? -%>,
           :<%= title.name %> => "Refinery CMS"<% end %>)

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

@@ -24,7 +24,7 @@ end
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories including factories.
-([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
+([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{ |p|
   Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
 }.flatten.sort.each do |support_file|
   require support_file

data/lib/refinery.rb

@@ -17,10 +17,6 @@ module Refinery
   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
@@ -142,13 +138,15 @@ module Refinery
       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))
+      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|
+        parts = active_name.to_s.underscore.split('/').reject do |name|
           active_name.singular_route_key.exclude?(name)
-        }
+        end
 
         # Get the singular resource_name from the url parts
         resource_name = parts.pop
@@ -169,14 +167,14 @@ module Refinery
     private
     def detect_invoker(the_caller = caller)
       return '' unless the_caller && the_caller.respond_to?(:detect)
-      the_caller.detect{|c| /#{Rails.root}/ === c }.inspect.to_s.split(':in').first
+      the_caller.detect{ |c| /#{Rails.root}/ === c }.inspect.to_s.split(':in').first
     end
 
     # plain Module#included? or Module#included_modules doesn't cut it here
     def included_extension_module?(base, extension_module)
       if base.kind_of?(Class)
         direct_superclass = base.superclass
-        base.ancestors.take_while {|ancestor| ancestor != direct_superclass}.include?(extension_module)
+        base.ancestors.take_while { |ancestor| ancestor != direct_superclass}.include?(extension_module)
       else
         base < extension_module # can't do better than that for modules
       end

data/lib/refinery/admin/base_controller.rb

@@ -1,4 +1,6 @@
 require 'action_controller'
+require 'refinery/core/authorisation_manager'
+require 'zilch/authorisation/users_manager'
 
 module Refinery
   module Admin
@@ -7,12 +9,13 @@ module Refinery
       def self.included(base)
         base.layout :layout?
 
-        base.before_filter :require_refinery_users!, :force_ssl!,
-                           :authenticate_refinery_user!, :restrict_plugins,
+        base.before_action :force_ssl!,
+                           :authenticate_refinery_user!,
                            :restrict_controller
-        base.after_filter :store_location?, :only => [:index] # for redirect_back_or_default
 
-        base.helper_method :searching?, :group_by_date
+        base.after_action :store_location?, :only => [:index] # for redirect_back_or_default
+
+        base.helper_method :searching?, :group_by_date, :refinery_admin_root_path
       end
 
       def admin?
@@ -23,60 +26,54 @@ module Refinery
         params[:search].present?
       end
 
+      def refinery_admin_root_path
+        current_refinery_user.landing_url
+      end
+
       protected
 
       def force_ssl!
         redirect_to :protocol => 'https' if Refinery::Core.force_ssl && !request.ssl?
       end
 
+      def authenticate_refinery_user!
+        authorisation_manager.authenticate!
+      end
+
       def group_by_date(records)
         new_records = []
 
         records.each do |record|
           key = record.created_at.strftime("%Y-%m-%d")
-          record_group = new_records.collect{|records| records.last if records.first == key }.flatten.compact << record
-          (new_records.delete_if {|i| i.first == key}) << [key, record_group]
+          record_group = new_records.map{ |r| r.last if r.first == key }.flatten.compact << record
+          (new_records.delete_if { |i| i.first == key}) << [key, record_group]
         end
 
         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
-
-        # Superusers get granted access if they don't already have access.
-        if current_refinery_user.has_role?(:superuser)
-          if (plugins = plugins | ::Refinery::Plugins.registered.names).length > current_length
-            current_refinery_user.plugins = plugins
-          end
-        end
-
-        ::Refinery::Plugins.set_active(plugins)
-      end
-
       def restrict_controller
-        unless allow_controller? params[:controller].gsub 'admin/', ''
-          logger.warn "'#{current_refinery_user.username}' tried to access '#{params[:controller]}' but was rejected."
+        unless allow_controller?(params[:controller].gsub('admin/', ''))
+          logger.warn "'#{current_refinery_user}' tried to access '#{params[:controller]}' but was rejected."
           error_404
         end
       end
 
       private
 
-      def allow_controller?(controller_path)
-        ::Refinery::Plugins.active.any? {|plugin|
-          Regexp.new(plugin.menu_match) === controller_path
-        }
+      def allow_controller?(controller_name)
+        authorisation_manager.allow?(:controller, controller_name)
+      end
+
+      def authorisation_manager
+        @authorisation_manager ||= ::Refinery::Core::AuthorisationManager.new
       end
 
       def layout?
         "refinery/admin#{'_dialog' if from_dialog?}"
       end
 
+      # TODO: all store_location stuff should be in its own object..
       # 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.
@@ -84,9 +81,22 @@ module Refinery
         store_location unless request.xhr? || from_dialog?
       end
 
-      # Override authorized? so that only users with the Refinery role can admin the website.
-      def authorized?
-        refinery_user?
+      # Store the URI of the current request in the session.
+      #
+      # We can return to this location by calling #redirect_back_or_default.
+      def store_location
+        session[:return_to] = request.fullpath
+      end
+
+      # Clear and return the stored location
+      def pop_stored_location
+        session.delete(:return_to)
+      end
+
+      # Redirect to the URI stored by the most recent store_location call or
+      # to the passed default.
+      def redirect_back_or_default(default)
+        redirect_to(pop_stored_location || default)
       end
     end
   end

data/lib/refinery/application_controller.rb

@@ -1,68 +1,76 @@
+require 'refinery/core/authorisation_manager'
+
 module Refinery
   module ApplicationController
 
     def self.included(base) # Extend controller
-      base.helper_method :home_page?, :local_request?, :just_installed?,
-                         :from_dialog?, :admin?, :login?
+      base.helper_method :home_page?,
+                         :local_request?,
+                         :from_dialog?,
+                         :admin?,
+                         :current_refinery_user,
+                         :authorisation_manager, :authorization_manager
 
       base.protect_from_forgery # See ActionController::RequestForgeryProtection
 
       base.send :include, Refinery::Crud # basic create, read, update and delete methods
 
       if Refinery::Core.rescue_not_found
-        base.rescue_from ActiveRecord::RecordNotFound,
+        base.rescue_from ::ActiveRecord::RecordNotFound,
                          ::AbstractController::ActionNotFound,
-                         ActionView::MissingTemplate,
+                         ::ActionView::MissingTemplate,
                          :with => :error_404
       end
     end
 
     def admin?
-      %r{^admin/} === controller_name
+      %r{\Aadmin/} === controller_name
     end
 
-    def error_404(exception=nil)
+    def error_404(exception = nil)
       # fallback to the default 404.html page.
       file = Rails.root.join 'public', '404.html'
-      file = Refinery.roots(:'refinery/core').join('public', '404.html') unless file.exist?
+      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]
+             :layout  => false, :status => 404, :formats => [:html]
       return false
     end
 
     def from_dialog?
-      params[:dialog] == 'true' or params[:modal] == 'true'
+      params[:dialog] == 'true' || params[:modal] == 'true'
     end
 
     def home_page?
       %r{^#{Regexp.escape(request.path)}} === refinery.root_path
     end
 
-    def just_installed?
-      Refinery::Role[:refinery].users.empty?
-    end
-
     def local_request?
       Rails.env.development? || /(::1)|(127.0.0.1)|((192.168).*)/ === request.remote_ip
     end
 
-    def login?
-      (/^(user|session)(|s)/ === controller_name && !admin?) || just_installed?
+    def current_refinery_user
+      authorisation_manager.current_user
     end
 
-  protected
+    protected
 
     # 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 authorisation_manager
+      @authorisation_manager ||= ::Refinery::Core::AuthorisationManager.new
+    end
+    # We ❤ you, too ️
+    alias_method :authorization_manager, :authorisation_manager
   end
 end