refinerycms-core 2.1.5 → 3.0.0

data/lib/refinery/extension_generation.rb

@@ -60,34 +60,23 @@ module Refinery
     end
 
     def localized_attributes
-      @localized_attributes ||= attributes.select{|a| options[:i18n].include?(a.name)}
+      @localized_attributes ||= attributes.select{ |a| options[:i18n].include?(a.name)}
     end
 
     def attributes_for_translation_table
-      localized_attributes.inject([]) {|memo, attr| memo << ":#{attr.name} => :#{attr.type}"}.join(', ')
+      localized_attributes.inject([]) { |memo, attr| memo << ":#{attr.name} => :#{attr.type}"}.join(', ')
     end
 
     def string_attributes
-      @string_attributes ||= attributes.select {|a| /string|text/ === a.type.to_s}.uniq
+      @string_attributes ||= attributes.select { |a| /string|text/ === a.refinery_type.to_s}.uniq
     end
 
     def image_attributes
-      @image_attributes ||= attributes.select { |a| a.type == :image }.uniq
+      @image_attributes ||= attributes.select { |a| a.refinery_type == :image }.uniq
     end
 
     def resource_attributes
-      @resource_attributes ||= attributes.select { |a| a.type == :resource }.uniq
-    end
-
-    def names_for_attr_accessible
-      @attributes_for_attr_accessible ||= attributes.map do |a|
-        case a.type
-        when :image, :resource
-          "#{a.name}_id" unless a.name[-3..-1] == "_id"
-        else
-          a.name
-        end
-      end
+      @resource_attributes ||= attributes.select { |a| a.refinery_type == :resource }.uniq
     end
 
     protected
@@ -95,7 +84,7 @@ module Refinery
     def append_extension_to_gemfile!
       unless Rails.env.test? || (self.behavior != :revoke && extension_in_gemfile?)
         path = extension_pathname.parent.relative_path_from(gemfile.parent)
-        append_file gemfile, "\ngem '#{gem_name}', :path => '#{path}'"
+        append_file gemfile, "\ngem '#{gem_name}', path: '#{path}'"
       end
     end
 
@@ -118,7 +107,7 @@ module Refinery
       unless options[:pretend]
         merge_existing_files! if existing_extension?
 
-        copy_or_merge_seeds!
+        copy_or_merge_seeds! if self.behavior != :revoke
 
         append_extension_to_gemfile!
       end
@@ -162,7 +151,7 @@ module Refinery
 
     def evaluate_templates!
       viable_templates.each do |source_path, destination_path|
-        next if /seeds.rb.erb/ === source_path.to_s
+        next if /seeds.rb.erb/ === source_path.to_s && self.behavior != :revoke
 
         destination_path.sub!('.erb', '') if source_path.to_s !~ /views/
 
@@ -184,7 +173,7 @@ module Refinery
     end
 
     def finalize_extension!
-      if self.behavior != :revoke && !self.options['pretend']
+      if self.behavior != :revoke && !options[:pretend]
         instruct_user!
       else
         erase_destination!
@@ -319,8 +308,8 @@ module Refinery
 
     def prevent_invalid_extension!
       if options[:extension].present? && !extension_pathname.directory?
-        exit_with_message! "You can't use '--extension #{options[:extension]}' option because" \
-                           " extension with name #{options[:extension]} doesn't exist."
+        exit_with_message! "You can't use '--extension #{options[:extension]}' because an" \
+                           " extension with the name '#{options[:extension]}' doesn't exist."
       end
     end
 

data/lib/refinery/generators/generated_attribute.rb

@@ -0,0 +1,54 @@
+require 'rails/generators/generated_attribute'
+
+module Refinery
+  module Generators
+    class GeneratedAttribute < Rails::Generators::GeneratedAttribute
+      attr_accessor :refinery_type
+
+      class << self
+        def reference?(type)
+          [:references, :belongs_to, :image, :resource].include? type
+        end
+      end
+
+      def initialize(name, type=nil, index_type=false, attr_options={})
+        super
+        self.refinery_type  = type
+        self.type           = refinerize_type(type)
+      end
+
+      def reference?
+        self.class.reference?(refinery_type)
+      end
+
+      private
+
+      def refinerize_type(type)
+        if refinery_engine_type?(type)
+          :integer
+        elsif  refinery_form_type?(type)
+          if type == :checkbox
+            :boolean
+          else
+            :string
+          end
+        else
+          type
+        end
+      end
+
+      def refinerize_name(name, type)
+        refinery_engine_type?(type) ? "#{name}_id".gsub("_id_id", "_id") : name
+      end
+
+      def refinery_form_type?(type)
+        [:radio, :select, :checkbox].include? type
+
+      end
+
+      def refinery_engine_type?(type)
+        [:image, :resource].include? type
+      end
+    end
+  end
+end

data/lib/refinery/generators/named_base.rb

@@ -0,0 +1,16 @@
+require 'rails/generators/named_base'
+
+module Refinery
+  module Generators
+    class NamedBase < Rails::Generators::NamedBase
+
+      protected
+
+      def parse_attributes! #:nodoc:
+        self.attributes = (attributes || []).map do |attr|
+          Refinery::Generators::GeneratedAttribute.parse(attr)
+        end
+      end
+    end
+  end
+end

data/lib/refinery/menu.rb

@@ -19,7 +19,7 @@ module Refinery
     end
 
     def roots
-      @roots ||= select {|item| item.orphan? && item.depth == minimum_depth }
+      @roots ||= select { |item| item.orphan? && item.depth == minimum_depth }
     end
 
     def to_s
@@ -29,8 +29,9 @@ module Refinery
     delegate :inspect, :map, :select, :detect, :first, :last, :length, :size, :to => :items
 
     protected
+
     def minimum_depth
-      map(&:depth).min
+      map(&:depth).compact.min
     end
 
   end

data/lib/refinery/menu_item.rb

@@ -40,7 +40,7 @@ module Refinery
     end
 
     def orphan?
-      parent_id.nil? || menu.detect{|item| compatible_with?(item) && item.original_id == parent_id}.nil?
+      parent_id.nil? || menu.detect{ |item| compatible_with?(item) && item.original_id == parent_id}.nil?
     end
 
     def leaf?

data/lib/refinery/plugin.rb

@@ -2,22 +2,21 @@ module Refinery
   class Plugin
 
     attr_accessor :name, :class_name, :controller, :directory, :url,
-                  :dashboard, :always_allow_access, :menu_match,
-                  :hide_from_menu, :pathname, :plugin_activity
+                  :always_allow_access, :menu_match, :hide_from_menu,
+                  :pathname
 
-    def self.register(&block)
-      yield(plugin = self.new)
+    def self.register(&_block)
+      yield(plugin = new)
 
-      raise "A plugin MUST have a name!: #{plugin.inspect}" if plugin.name.blank?
+      raise ArgumentError, "A plugin MUST have a name!: #{plugin.inspect}" if plugin.name.blank?
 
       # Set defaults.
       plugin.menu_match ||= %r{refinery/#{plugin.name}(/.+?)?$}
       plugin.always_allow_access ||= false
-      plugin.dashboard ||= false
       plugin.class_name ||= plugin.name.camelize
 
       # add the new plugin to the collection of registered plugins
-      ::Refinery::Plugins.registered << plugin
+      ::Refinery::Plugins.registered.unshift plugin
     end
 
     # Returns the internationalized version of the title
@@ -30,24 +29,18 @@ module Refinery
       ::I18n.translate(['refinery', 'plugins', name, 'description'].join('.'))
     end
 
-    # Retrieve information about how to access the latest activities of this plugin.
-    def activity
-      self.plugin_activity ||= []
-    end
-
     # Stores information that can be used to retrieve the latest activities of this plugin
-    def activity=(activities)
-      [activities].flatten.each { |activity| add_activity(activity) }
+    def activity=(_)
+      Refinery.deprecate('Refinery::Plugin#activity=', when: '3.1')
     end
 
-    # Given a record's class name, find the related activity object.
-    def activity_by_class_name(class_name)
-      self.activity.select{ |a| a.class_name == class_name.to_s.camelize }
+    def dashboard=(_)
+      Refinery.deprecate('Refinery::Plugin#dashboard=', when: '3.1')
     end
 
     # Used to highlight the current tab in the admin interface
     def highlighted?(params)
-      !!(params[:controller].try(:gsub, "admin/", "") =~ menu_match) || (dashboard && params[:action] == 'error_404')
+      !!(params[:controller].try(:gsub, "admin/", "") =~ menu_match)
     end
 
     def pathname=(value)
@@ -55,18 +48,16 @@ module Refinery
       @pathname = value
     end
 
+    def landable?
+      !hide_from_menu && url.present?
+    end
+
     # Returns a hash that can be used to create a url that points to the administration part of the plugin.
     def url
-      @url ||= if controller.present?
-        { :controller => "refinery/admin/#{controller}" }
-      elsif directory.present?
-        { :controller => "refinery/admin/#{directory.split('/').pop}" }
-      else
-        { :controller => "refinery/admin/#{name}" }
-      end
+      @url ||= build_url
 
       if @url.is_a?(Hash)
-        {:only_path => true}.merge(@url)
+        { only_path: true }.merge(@url)
       elsif @url.respond_to?(:call)
         @url.call
       else
@@ -74,27 +65,20 @@ module Refinery
       end
     end
 
-    def version
-      Refinery.deprecate "Refinery::Plugin#version", :when => '2.2',
-                         :caller => caller.detect{|c| /#{pathname}/ === c }
-    end
-
-    def version=(*args)
-      Refinery.deprecate "Refinery::Plugin#version=", :when => '2.2',
-                         :caller => caller.detect{|c| /#{pathname}/ === c }
-    end
-
-  # Make this protected, so that only Plugin.register can use it.
-  protected
-
-    def add_activity(options)
-      (self.plugin_activity ||= []) << Activity::new(options)
-    end
-
     def initialize
       # provide a default pathname to where this plugin is using its lib directory.
       depth = RUBY_VERSION >= "1.9.2" ? 4 : 3
       self.pathname ||= Pathname.new(caller(depth).first.match("(.*)#{File::SEPARATOR}lib")[1])
     end
+
+    private
+
+    def build_url
+      action = controller.presence ||
+               directory.to_s.split('/').pop.presence ||
+               name
+
+      { controller: "refinery/admin/#{action}" }
+    end
   end
 end

data/lib/refinery/plugins.rb

@@ -9,12 +9,7 @@ module Refinery
       @plugins = Array.new(*args)
     end
 
-    def_delegators :@plugins, :<<, :each, :delete_if
-
-    def find_by_model(model)
-      model = model.constantize if model.is_a? String
-      detect { |plugin| plugin.activity.any? {|activity| activity.klass == model } }
-    end
+    def_delegators :@plugins, :<<, :each, :delete_if, :length, :size, :to_ary, :unshift
 
     def find_by_name(name)
       detect { |plugin| plugin.name == name }
@@ -25,8 +20,10 @@ module Refinery
       detect { |plugin| plugin.title == title }
     end
 
+    # TODO: Review necessary?
     def in_menu
-      self.class.new(reject(&:hide_from_menu))
+      items_in_menu = reject(&:hide_from_menu)
+      self.class.new((prioritised & items_in_menu) | items_in_menu)
     end
 
     def names
@@ -41,11 +38,22 @@ module Refinery
       map(&:title)
     end
 
-    class << self
-      def active
-        @active_plugins ||= new
+    def first_in_menu_with_url
+      find(&:landable?)
+    end
+
+    def first_url_in_menu
+      first_in_menu_with_url.try(:url)
+    end
+
+    def update_positions(plugin_list)
+      plugins = plugin_list.map {|p| find_by_name(p) }.reject(&:blank?)
+      plugins.each_with_index do |plugin, index|
+        plugin.update_attributes(position: index)
       end
+    end
 
+    class << self
       def always_allowed
         new registered.select(&:always_allow_access)
       end
@@ -53,26 +61,14 @@ module Refinery
       def registered
         @registered_plugins ||= new
       end
-
-      def activate(name)
-        active << registered[name] if registered[name] && !active[name]
-      end
-
-      def deactivate(name)
-        active.delete_if {|p| p.name == name}
-      end
-
-      def set_active(names)
-        @active_plugins = new
-
-        names.each do |name|
-          activate(name)
-        end
-      end
     end
 
     private
 
     attr_reader :plugins
+
+    def prioritised
+      Refinery::Core.config.plugin_priority.map { |name| find_by_name(name) }
+    end
   end
 end

data/lib/refinery/users_manager.rb

@@ -0,0 +1,8 @@
+require 'zilch/authorisation/users_manager'
+
+module Refinery
+  module Core
+    class UsersManager < Zilch::Authorisation::UsersManager
+    end
+  end
+end

data/lib/refinery/version.rb

@@ -1,8 +1,8 @@
 module Refinery
   class Version
-    @major = 2
-    @minor = 1
-    @tiny  = 5
+    @major = 3
+    @minor = 0
+    @tiny  = 0
     @build = nil
 
     class << self
@@ -11,6 +11,10 @@ module Refinery
       def to_s
         [@major, @minor, @tiny, @build].compact.join('.')
       end
+
+      def required_ruby_version
+        '>= 2.0.0'
+      end
     end
   end
 end

data/lib/tasks/refinery.rake

@@ -4,6 +4,13 @@ namespace :refinery do
     Refinery::CLI.new.override(ENV)
   end
 
+  desc "Override files for use in an application"
+  namespace :override do
+    task :list => :environment do
+      Refinery::CLI.new.override_list(ENV)
+    end
+  end
+
   desc "Un-crudify a method on a controller that uses crudify"
   task :uncrudify => :environment do
     Refinery::CLI.new.uncrudify(ENV['controller'], ENV['action'])

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
  
-Copyright (c) 2005-2013 [Resolve Digital](http://www.resolvedigital.com)
+Copyright (c) 2005-2015 [Resolve Digital](http://resolve.digital)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal