rails_admin 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c86449582de5ab777e81d629158c4238c48c2ca7
-  data.tar.gz: 6150b0d9059fe530f05f6fa68cce04c40da04a53
+  metadata.gz: ff40da91adcba8c203cd5af3bb133509b19c1d81
+  data.tar.gz: cff626f20081add424aac93223be0cd285af990a
 SHA512:
-  metadata.gz: f3c83aabfb441a0ea5573d8c58bfa76e55f2f24608bc79ee1cd49a86b5cae0d8d922267e2b62c3f72560a1e497f1603595fa49c55d8deadc174a1707fa5dad75
-  data.tar.gz: c70a5f7f1edd3d61aa543ee2554a6048524ed18719a858d3e7fe30ab36409ab5318e63979a712cd19970c8a9a36bfb8ebf971621c00b6bcdb36140b9df3fb1c0
+  metadata.gz: fdd3d32778bb7e3348797355f51e9c8c0495d962c3b9079914f2ba7a6662f3f69806078c2b67569cef7f0ba41bf124412b90607cf780d1a65cf2da35644c74cb
+  data.tar.gz: e511121058ddeb05c07a4bdd2675568d283cb7ca3814e680f0e302c880c5351a937b75077357863197f9698a7973b258a15e531ed1f3e0d8e5d8bedacb43ada5

data/Gemfile

@@ -1,10 +1,16 @@
 source 'https://rubygems.org'
 
 case ENV['RAILS_VERSION']
+when '4.2'
+  gem 'rails', '~> 4.2.0.beta1'
+  gem 'sass-rails', '~> 5.0.0.beta1'
+  gem 'devise', github: 'plataformatec/devise', branch: 'lm-rails-4-2'
 when '4.0'
   gem 'rails', '~> 4.0.0'
+  gem 'devise', '>= 3.2'
 else
-  gem 'rails', '~> 4.1'
+  gem 'rails', '~> 4.1.0'
+  gem 'devise', '>= 3.2'
 end
 
 case ENV['CI_ORM']
@@ -12,7 +18,6 @@ when 'mongoid'
   gem 'mongoid', '~> 4.0.0.beta1'
   gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
   gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-  gem 'mongoid-grid_fs', '1.9.1' # workaround for mime-types version issue
 else
   platforms :jruby do
     case ENV['CI_DB_ADAPTER']
@@ -38,6 +43,8 @@ else
       gem 'sqlite3', '>= 1.3'
     end
   end
+
+  gem 'paper_trail', '~> 3.0'
 end
 
 group :development, :test do
@@ -46,17 +53,17 @@ end
 
 group :test do
   gem 'cancan', '>= 1.6'
+  gem 'cancancan', '~> 1.9'
   gem 'capybara', '>= 2.1'
   gem 'carrierwave', '>= 0.8'
   gem 'coveralls'
   gem 'database_cleaner', '>= 1.2'
-  gem 'devise', '>= 3.2'
   gem 'dragonfly', '~> 1.0'
   gem 'factory_girl', '>= 4.2'
   gem 'generator_spec', '>= 0.8'
   gem 'launchy', '>= 2.2'
   gem 'mini_magick', '>= 3.4'
-  gem 'paperclip', '3.5.2'
+  gem 'paperclip', '>= 3.4'
   gem 'poltergeist', '~> 1.5'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'

data/app/assets/javascripts/rails_admin/rails_admin.js

@@ -1,10 +1,10 @@
 //=  require 'jquery'
 //=  require 'jquery_ujs'
 //=  require 'rails_admin/jquery.remotipart.fixed'
-//=  require 'jquery.ui.effect'
-//=  require 'jquery.ui.sortable'
-//=  require 'jquery.ui.autocomplete'
-//=  require 'jquery.ui.datepicker'
+//=  require 'jquery-ui/effect'
+//=  require 'jquery-ui/sortable'
+//=  require 'jquery-ui/autocomplete'
+//=  require 'jquery-ui/datepicker'
 //=  require 'rails_admin/jquery.ui.timepicker'
 //=  require 'rails_admin/ra.datetimepicker'
 //=  require 'rails_admin/jquery.colorpicker'

data/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss

@@ -1,10 +1,12 @@
 .ui-timepicker-table table th.periods {
+  z-index: 3!important;
   padding:0;
 }
 
 .ui-datepicker {
   /* fix glitches */
   border-width:0px;
+  z-index: 3!important;
   table{
     margin:0px;
   }

data/app/controllers/rails_admin/main_controller.rb

@@ -90,9 +90,7 @@ module RailsAdmin
     def sanitize_params_for!(action, model_config = @model_config, target_params = params[@abstract_model.param_key])
       return unless target_params.present?
       fields = model_config.send(action).with(controller: self, view: view_context, object: @object).visible_fields
-      allowed_methods = fields.collect do|f|
-        f.allowed_methods
-      end.flatten.uniq.collect(&:to_s) << 'id' << '_destroy'
+      allowed_methods = fields.collect(&:allowed_methods).flatten.uniq.collect(&:to_s) << 'id' << '_destroy'
       fields.each { |f| f.parse_input(target_params) }
       target_params.slice!(*allowed_methods)
       target_params.permit! if target_params.respond_to?(:permit!)
@@ -105,8 +103,8 @@ module RailsAdmin
     end
 
     def handle_save_error(whereto = :new)
-      flash.now[:error] = t('admin.flash.error', name: @model_config.label, action: t("admin.actions.#{@action.key}.done"))
-      flash.now[:error] += ". #{@object.errors[:base].to_sentence}" unless @object.errors[:base].blank?
+      flash.now[:error] = t('admin.flash.error', name: @model_config.label, action: t("admin.actions.#{@action.key}.done").html_safe).html_safe
+      flash.now[:error] += %(<br>- #{@object.errors.full_messages.join('<br>- ')}).html_safe
 
       respond_to do |format|
         format.html { render whereto, status: :not_acceptable }

data/app/helpers/rails_admin/application_helper.rb

@@ -4,6 +4,14 @@ module RailsAdmin
   module ApplicationHelper
     include RailsAdmin::I18nSupport
 
+    def capitalize_first_letter(wording)
+      return nil unless wording.present? && wording.is_a?(String)
+
+      wording = wording.dup
+      wording[0] = wording[0].mb_chars.capitalize.to_s
+      wording
+    end
+
     def authorized?(action, abstract_model = nil, object = nil)
       object = nil if object.try :new_record?
       @authorization_adapter.nil? || @authorization_adapter.authorized?(action, abstract_model, object)
@@ -31,9 +39,17 @@ module RailsAdmin
     end
 
     def logout_path
-      return unless defined?(Devise)
-      scope = Devise::Mapping.find_scope!(_current_user)
-      main_app.send("destroy_#{scope}_session_path") rescue false
+      if defined?(Devise)
+        scope = Devise::Mapping.find_scope!(_current_user)
+        main_app.send("destroy_#{scope}_session_path") rescue false
+      else
+        main_app.logout_path if main_app.respond_to?(:logout_path)
+      end
+    end
+
+    def logout_method
+      return Devise.sign_out_via if defined?(Devise)
+      :delete
     end
 
     def wording_for(label, action = @action, abstract_model = @abstract_model, object = @object)
@@ -41,10 +57,11 @@ module RailsAdmin
       object = abstract_model && object.is_a?(abstract_model.model) ? object : nil
       action = RailsAdmin::Config::Actions.find(action.to_sym) if action.is_a?(Symbol) || action.is_a?(String)
 
-      I18n.t("admin.actions.#{action.i18n_key}.#{label}",
-             model_label: model_config && model_config.label,
-             model_label_plural: model_config && model_config.label_plural,
-             object_label: model_config && object.try(model_config.object_label_method),
+      capitalize_first_letter I18n.t(
+        "admin.actions.#{action.i18n_key}.#{label}",
+        model_label: model_config && model_config.label,
+        model_label_plural: model_config && model_config.label_plural,
+        object_label: model_config && object.try(model_config.object_label_method),
       )
     end
 
@@ -58,7 +75,8 @@ module RailsAdmin
         li_stack = navigation nodes_stack, nodes
 
         label = navigation_label || t('admin.misc.navigation')
-        %(<li class='nav-header'>#{label}</li>#{li_stack}) if li_stack.present?
+
+        %(<li class='nav-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
       end.join.html_safe
     end
 
@@ -80,7 +98,7 @@ module RailsAdmin
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
 
         li = content_tag :li, 'data-model' => model_param do
-          link_to nav_icon + node.label_plural, url, class: "pjax#{level_class}"
+          link_to nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
         end
         li + navigation(nodes_stack, nodes_stack.select { |n| n.parent.to_s == node.abstract_model.model_name }, level + 1)
       end.join.html_safe

data/app/helpers/rails_admin/form_builder.rb

@@ -1,6 +1,7 @@
 module RailsAdmin
   class FormBuilder < ::ActionView::Helpers::FormBuilder
     include ::NestedForm::BuilderMixin
+    include ::RailsAdmin::ApplicationHelper
 
     def generate(options = {})
       without_field_error_proc_added_div do
@@ -34,8 +35,7 @@ module RailsAdmin
         # do not show nested field if the target is the origin
         unless nested_field_association?(field, nested_in)
           @template.content_tag(:div, class: "control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
-            label(field.method_name, field.label, class: 'control-label') +
-            (field.nested_form ? field_for(field) : input_for(field))
+            label(field.method_name, capitalize_first_letter(field.label), class: 'control-label') + (field.nested_form ? field_for(field) : input_for(field))
           end
         end
       else
@@ -52,7 +52,7 @@ module RailsAdmin
     end
 
     def errors_for(field)
-      field.errors.present? ? @template.content_tag(:span, "#{field.label} #{field.errors.to_sentence}", class: 'help-inline') : ''.html_safe
+      field.errors.present? ? @template.content_tag(:span, field.errors.to_sentence, class: 'help-inline') : ''.html_safe
     end
 
     def help_for(field)

data/app/views/layouts/rails_admin/_navigation.html.haml

@@ -0,0 +1,7 @@
+.navbar-inner
+  .container-fluid
+    %a.brand.pjax{href: dashboard_path}
+      = _get_plugin_name[0] || 'Rails'
+      %small= _get_plugin_name[1] || 'Admin'
+    .nav-collapse
+      = render partial: 'layouts/rails_admin/secondary_navigation'

data/app/views/layouts/rails_admin/_secondary_navigation.html.haml

@@ -7,6 +7,6 @@
     - if user_link = edit_user_link
       %li= user_link
     - if logout_path.present?
-      %li= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-important'), logout_path, method: Devise.sign_out_via
+      %li= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-important'), logout_path, method: logout_method
     - if _current_user.respond_to?(:email) && _current_user.email.present?
       %li= image_tag "#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", style: 'padding-top:5px'

data/app/views/layouts/rails_admin/application.html.haml

@@ -12,13 +12,7 @@
   %body.rails_admin
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
     .navbar.navbar-fixed-top
-      .navbar-inner
-        .container-fluid
-          %a.brand.pjax{href: dashboard_path}
-            = _get_plugin_name[0] || 'Rails'
-            %small= _get_plugin_name[1] || 'Admin'
-          .nav-collapse
-            = render partial: 'layouts/rails_admin/secondary_navigation'
+      = render "layouts/rails_admin/navigation"
     .container-fluid
       .row-fluid
         .span3

data/app/views/rails_admin/main/dashboard.html.haml

@@ -15,7 +15,7 @@
             - last_used = @most_recent_changes[abstract_model.pretty_name]
             - active = last_used.try(:today?)
             %td
-              %span.show= link_to abstract_model.config.label_plural, index_path, class: 'pjax'
+              %span.show= link_to capitalize_first_letter(abstract_model.config.label_plural), index_path, class: 'pjax'
             %td
               - if last_used
                 = time_ago_in_words last_used

data/app/views/rails_admin/main/export.html.haml

@@ -25,11 +25,11 @@
             - polymorphic_type_column_name = @abstract_model.properties.find {|p| field.association.foreign_type == p.name }.name
             %label.checkbox{for: "schema_#{list}_#{polymorphic_type_column_name}"}
               = check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { id: "schema_#{list}_#{polymorphic_type_column_name}" }
-              = field.label + " [type]"
+              = capitalize_first_letter(field.label) + " [type]"
           - else
             %label.checkbox{for: "schema_#{list}_#{field.name}"}
               = check_box_tag "schema[#{list}][]", field.name, true, { id: "schema_#{list}_#{field.name}" }
-              = field.label
+              = capitalize_first_letter(field.label)
 
     - visible_fields.select{ |f| f.association? && !f.association.polymorphic? }.each do |field|
       - fields = field.associated_model_config.export.with(controller: self.controller, view: self, object: (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
@@ -40,7 +40,7 @@
             - list = associated_model_field.virtual? ? 'methods' : 'only'
             %label.checkbox{for: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}"}
               = check_box_tag "schema[include][#{field.name}][#{list}][]", associated_model_field.name, true, { id: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}" }
-              = associated_model_field.label
+              = capitalize_first_letter(associated_model_field.label)
 
   %fieldset
     %legend

data/app/views/rails_admin/main/index.html.haml

@@ -38,6 +38,9 @@
     filter_name = filter_for_field.keys.first
     filter_hash = filter_for_field.values.first
     field = @filterable_fields.find{ |field| field.name == filter_name.to_sym }
+    unless field
+      fail "#{filter_name} is not currently filterable; filterable fields are #{@filterable_fields.map(&:name).join(', ')}"
+    end
     field_options = case field.type
     when :enum
       options_for_select(field.with(object: @abstract_model.model.new).enum, filter_hash['v'])
@@ -65,7 +68,7 @@
           - else
             - ''
           %li
-            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => ""}= field.label
+            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => ""}= capitalize_first_letter(field.label)
 
 #list
   %script
@@ -123,7 +126,7 @@
             - if property.sortable
               - sort_location = index_path params.except('sort_reverse').except('page').merge(sort: property.name).merge(selected && sort_reverse != "true" ? {sort_reverse: "true"} : {})
               - sort_direction = (sort_reverse == 'true' ? "headerSortUp" : "headerSortDown" if selected)
-            %th{class: "#{property.sortable && "header pjax" || nil} #{sort_direction if property.sortable && sort_direction} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location), rel: "tooltip", title: "#{property.hint}"}= property.label
+            %th{class: "#{property.sortable && "header pjax" || nil} #{sort_direction if property.sortable && sort_direction} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location), rel: "tooltip", title: "#{property.hint}"}= capitalize_first_letter(property.label)
           - if other_right
             %th.other.right.shrink= "..."
           %th.last.shrink

data/config/routes.rb

@@ -1,11 +1,11 @@
 RailsAdmin::Engine.routes.draw do
   controller 'main' do
-    RailsAdmin::Config::Actions.all(:root).each { |action| match "/#{action.route_fragment}", to: action.action_name, as: action.action_name, via: action.http_methods }
+    RailsAdmin::Config::Actions.all(:root).each { |action| match "/#{action.route_fragment}", action: action.action_name, as: action.action_name, via: action.http_methods }
     scope ':model_name' do
-      RailsAdmin::Config::Actions.all(:collection).each { |action| match "/#{action.route_fragment}", to: action.action_name, as: action.action_name, via: action.http_methods }
-      post '/bulk_action', to: :bulk_action, as: 'bulk_action'
+      RailsAdmin::Config::Actions.all(:collection).each { |action| match "/#{action.route_fragment}", action: action.action_name, as: action.action_name, via: action.http_methods }
+      post '/bulk_action', action: :bulk_action, as: 'bulk_action'
       scope ':id' do
-        RailsAdmin::Config::Actions.all(:member).each { |action| match "/#{action.route_fragment}", to: action.action_name, as: action.action_name, via: action.http_methods }
+        RailsAdmin::Config::Actions.all(:member).each { |action| match "/#{action.route_fragment}", action: action.action_name, as: action.action_name, via: action.http_methods }
       end
     end
   end

data/lib/rails_admin.rb

@@ -3,6 +3,7 @@ require 'rails_admin/abstract_model'
 require 'rails_admin/config'
 require 'rails_admin/extension'
 require 'rails_admin/extensions/cancan'
+require 'rails_admin/extensions/cancancan'
 require 'rails_admin/extensions/paper_trail'
 require 'rails_admin/extensions/history'
 require 'rails_admin/support/csv_converter'

data/lib/rails_admin/abstract_model.rb

@@ -27,7 +27,7 @@ module RailsAdmin
       def polymorphic_parents(adapter, model_name, name)
         @@polymorphic_parents[adapter.to_sym] ||= {}.tap do |hash|
           all(adapter).each do |am|
-            am.associations.select { |r| r.as }.each do |association|
+            am.associations.select(&:as).each do |association|
               (hash[[association.klass.to_s.underscore, association.as].join('_').to_sym] ||= []) << am.model
             end
           end

data/lib/rails_admin/adapters/active_record/property.rb

@@ -34,7 +34,7 @@ module RailsAdmin
         end
 
         def serial?
-          property.primary
+          model.primary_key == property.name
         end
 
         def association?

data/lib/rails_admin/config/fields/base.rb

@@ -152,7 +152,7 @@ module RailsAdmin
         # Accessor for field's length restrictions per validations
         #
         register_instance_option :valid_length do
-          @valid_length ||= abstract_model.model.validators_on(name).detect { |v| v.kind == :length }.try { |v| v.options } || {}
+          @valid_length ||= abstract_model.model.validators_on(name).detect { |v| v.kind == :length }.try(&:options) || {}
         end
 
         register_instance_option :partial do

data/lib/rails_admin/config/fields/types/all.rb

@@ -27,3 +27,4 @@ require 'rails_admin/config/fields/types/ck_editor'
 require 'rails_admin/config/fields/types/code_mirror'
 require 'rails_admin/config/fields/types/wysihtml5'
 require 'rails_admin/config/fields/types/json'
+require 'rails_admin/config/fields/types/inet'

data/lib/rails_admin/config/fields/types/belongs_to_association.rb

@@ -12,11 +12,11 @@ module RailsAdmin
           end
 
           register_instance_option :sortable do
-            @sortable ||= abstract_model.adapter_supports_joins? && associated_model_config.abstract_model.properties.collect { |p| p.name }.include?(associated_model_config.object_label_method) ? associated_model_config.object_label_method : {abstract_model.table_name => method_name}
+            @sortable ||= abstract_model.adapter_supports_joins? && associated_model_config.abstract_model.properties.collect(&:name).include?(associated_model_config.object_label_method) ? associated_model_config.object_label_method : {abstract_model.table_name => method_name}
           end
 
           register_instance_option :searchable do
-            @searchable ||= associated_model_config.abstract_model.properties.collect { |p| p.name }.include?(associated_model_config.object_label_method) ? [associated_model_config.object_label_method, {abstract_model.model => method_name}] : {abstract_model.model => method_name}
+            @searchable ||= associated_model_config.abstract_model.properties.collect(&:name).include?(associated_model_config.object_label_method) ? [associated_model_config.object_label_method, {abstract_model.model => method_name}] : {abstract_model.model => method_name}
           end
 
           register_instance_option :partial do

data/lib/rails_admin/config/fields/types/inet.rb

@@ -0,0 +1,13 @@
+require 'rails_admin/config/fields/base'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Inet < RailsAdmin::Config::Fields::Base
+          RailsAdmin::Config::Fields::Types.register(self)
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/has_fields.rb

@@ -83,7 +83,7 @@ module RailsAdmin
         return all_fields if field_names.empty? && !block
 
         if field_names.empty?
-          defined = _fields.select { |f| f.defined }
+          defined = _fields.select(&:defined)
           defined = _fields if defined.empty?
         else
           defined = field_names.collect { |field_name| _fields.detect { |f| f.name == field_name } }

data/lib/rails_admin/config/sections/base.rb

@@ -2,6 +2,7 @@ require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
 require 'rails_admin/config/has_fields'
 require 'rails_admin/config/has_groups'
+require 'rails_admin/config/has_description'
 
 module RailsAdmin
   module Config

data/lib/rails_admin/extensions/cancancan.rb

@@ -0,0 +1,5 @@
+require 'rails_admin/extensions/cancancan/authorization_adapter'
+
+RailsAdmin.add_extension(:cancan, RailsAdmin::Extensions::CanCanCan,
+                         authorization: true
+)

data/lib/rails_admin/extensions/cancancan/authorization_adapter.rb

@@ -0,0 +1,55 @@
+module RailsAdmin
+  module Extensions
+    module CanCanCan
+      # This adapter is for the CanCanCan[https://github.com/CanCanCommunity/cancancan] authorization library.
+      class AuthorizationAdapter
+        # See the +authorize_with+ config method for where the initialization happens.
+        def initialize(controller, ability = ::Ability)
+          @controller = controller
+          @controller.instance_variable_set '@ability', ability
+          @controller.extend ControllerExtension
+          @controller.current_ability.authorize! :access, :rails_admin
+        end
+
+        # This method is called in every controller action and should raise an exception
+        # when the authorization fails. The first argument is the name of the controller
+        # action as a symbol (:create, :bulk_delete, etc.). The second argument is the
+        # AbstractModel instance that applies. The third argument is the actual model
+        # instance if it is available.
+        def authorize(action, abstract_model = nil, model_object = nil)
+          @controller.current_ability.authorize!(action, model_object || abstract_model && abstract_model.model) if action
+        end
+
+        # This method is called primarily from the view to determine whether the given user
+        # has access to perform the action on a given model. It should return true when authorized.
+        # This takes the same arguments as +authorize+. The difference is that this will
+        # return a boolean whereas +authorize+ will raise an exception when not authorized.
+        def authorized?(action, abstract_model = nil, model_object = nil)
+          @controller.current_ability.can?(action, model_object || abstract_model && abstract_model.model) if action
+        end
+
+        # This is called when needing to scope a database query. It is called within the list
+        # and bulk_delete/destroy actions and should return a scope which limits the records
+        # to those which the user can perform the given action on.
+        def query(action, abstract_model)
+          abstract_model.model.accessible_by(@controller.current_ability, action)
+        end
+
+        # This is called in the new/create actions to determine the initial attributes for new
+        # records. It should return a hash of attributes which match what the user
+        # is authorized to create.
+        def attributes_for(action, abstract_model)
+          @controller.current_ability.attributes_for(action, abstract_model && abstract_model.model)
+        end
+
+        module ControllerExtension
+          def current_ability
+            # use _current_user instead of default current_user so it works with
+            # whatever current user method is defined with RailsAdmin
+            @current_ability ||= @ability.new(_current_user)
+          end
+        end
+      end
+    end
+  end
+end