rails_admin 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d80a5575faa7784d6f5d17ddebb05038a5416969
-  data.tar.gz: c30c5b1ffb5839b5b387b7935e7ed201966efdbb
+  metadata.gz: c69e517eca7e9a2fd7b5f93c966f86f9eadd57d5
+  data.tar.gz: c2df6d3bcda5e4ccd0cadef10ddc46a4e8f6c283
 SHA512:
-  metadata.gz: ee5a0326bd91f3b04e1b7711cddb648772bbc29f47f76784a69508fcfa3bf590528321b86faddace87c3bd1d6334100e0fea04cf18dbd04ecf6bd3e3ed2c85e9
-  data.tar.gz: 4565950fa8e26c5c5b7a0d79cb522e91d1256575287e7b637165c2c03b82053461aa3e6317479c5ca2340439b5a9d8e4e5768efe52939b7d32b1bb1cfd443919
+  metadata.gz: e6fc0cb49d89c389de0afffdc0e17215d6e9d6a702ef8c263106058ed1f4a5bdd13e0d57ce9d39cc691a88de83669bfaeaaeb21c9657aaa096f2e387091b125e
+  data.tar.gz: fafcc0bb5ada22245b595107ee6c65c2b816de55d48d969e9ca4c225e428118ba4d4b8e5af6a4a2138e4c5b52a100fb1673970e31b0e087cc73d15d5da97d030

data/Gemfile

@@ -1,18 +1,11 @@
 source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'
+gem 'rails', '~> 5.0.0'
+gem 'haml'
 gem 'devise'
 
 group :active_record do
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter', '>= 1.2'
-    gem 'jdbc-mysql', '>= 5.1'
-    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2'
-    gem 'jdbc-postgres', '>= 9.2'
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta1'
-    gem 'jdbc-sqlite3', '>= 3.7'
-  end
-
   platforms :ruby, :mswin, :mingw do
     gem 'mysql2', '~> 0.3.14'
     gem 'pg', '>= 0.14'

data/README.md

@@ -42,7 +42,7 @@ This problem was reported by SourceClear, Inc.
 
 ## Installation
 
-1. On your gemfile: `gem 'rails_admin', '~> 1.0'`
+1. On your gemfile: `gem 'rails_admin', '~> 1.2'`
 2. Run `bundle install`
 3. Run `rails g rails_admin:install`
 4. Provide a namespace for the routes when asked

data/app/assets/javascripts/rails_admin/ra.filtering-select.js

@@ -40,7 +40,7 @@
       // When using the browser back and forward buttons, it is possible that
       // the autocomplete field will be cached which causes duplicate fields
       // to be generated.
-      if (filtering_select.size() > 0) {
+      if (filtering_select.length > 0) {
         this.input = filtering_select.children('input');
         this.button = filtering_select.children('.input-group-btn');
       } else {

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

@@ -8,10 +8,11 @@
     = csrf_meta_tag
     = stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
     = javascript_include_tag "rails_admin/rails_admin.js"
+  %body.rails_admin
+    #admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
     -# Initialize JS simple i18n
     :javascript
-      RailsAdmin.I18n.init('#{I18n.locale}', JSON.parse("#{j I18n.t("admin.js").to_json}"))
-  %body.rails_admin
+      RailsAdmin.I18n.init('#{I18n.locale}', document.getElementById("admin-js").dataset.i18nOptions);
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
     %nav.navbar.navbar-default.navbar-fixed-top
       = render "layouts/rails_admin/navigation"

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

@@ -90,7 +90,7 @@
           %th.last.shrink
       %tbody
         - @objects.each do |object|
-          %tr{class: "#{@abstract_model.param_key}_row"}
+          %tr{class: "#{@abstract_model.param_key}_row #{@model_config.list.with(object: object).row_css_class}"}
             %td
               = check_box_tag "bulk_ids[]", object.id, false
             - if @other_left_link ||= other_left && index_path(params.except('set').merge(params[:set].to_i != 1 ? {set: (params[:set].to_i - 1)} : {}))

data/config/initializers/haml.rb

@@ -1,2 +1,5 @@
 require 'haml'
-Haml::Template.options[:ugly] = true
+require 'haml/template'
+if Haml::Options.buffer_option_keys.include?(:ugly)
+  Haml::Template.options[:ugly] = true
+end

data/lib/generators/rails_admin/templates/initializer.erb

@@ -21,7 +21,7 @@ RailsAdmin.config do |config|
 
   ## == Gravatar integration ==
   ## To disable Gravatar integration in Navigation Bar set to false
-  # config.show_gravatar true
+  # config.show_gravatar = true
 
   config.actions do
     dashboard                     # mandatory

data/lib/rails_admin/adapters/active_record.rb

@@ -204,6 +204,7 @@ module RailsAdmin
           when :string, :text             then build_statement_for_string_or_text
           when :enum                      then build_statement_for_enum
           when :belongs_to_association    then build_statement_for_belongs_to_association
+          when :uuid                      then build_statement_for_uuid
           end
         end
 
@@ -223,22 +224,27 @@ module RailsAdmin
 
         def build_statement_for_string_or_text
           return if @value.blank?
+
+          unless ['postgresql', 'postgis'].include? ar_adapter
+            @value = @value.mb_chars.downcase
+          end
+
           @value = begin
             case @operator
             when 'default', 'like'
-              "%#{@value.downcase}%"
+              "%#{@value}%"
             when 'starts_with'
-              "#{@value.downcase}%"
+              "#{@value}%"
             when 'ends_with'
-              "%#{@value.downcase}"
+              "%#{@value}"
             when 'is', '='
-              @value.downcase
+              @value
             else
               return
             end
           end
 
-          if ar_adapter == 'postgresql'
+          if ['postgresql', 'postgis'].include? ar_adapter
             ["(#{@column} ILIKE ?)", @value]
           else
             ["(LOWER(#{@column}) LIKE ?)", @value]
@@ -250,6 +256,12 @@ module RailsAdmin
           ["(#{@column} IN (?))", Array.wrap(@value)]
         end
 
+        def build_statement_for_uuid
+          if @value.to_s =~ /\A[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}\z/
+            column_for_value(@value)
+          end
+        end
+
         def ar_adapter
           ::ActiveRecord::Base.connection.adapter_name.downcase
         end

data/lib/rails_admin/adapters/mongoid/extension.rb

@@ -11,7 +11,9 @@ module RailsAdmin
             def rails_admin(&block)
               RailsAdmin.config(self, &block)
             end
-            alias_method_chain :accepts_nested_attributes_for, :rails_admin
+
+            alias_method :accepts_nested_attributes_for_without_rails_admin, :accepts_nested_attributes_for
+            alias_method :accepts_nested_attributes_for, :accepts_nested_attributes_for_with_rails_admin
           end
         end
 

data/lib/rails_admin/config.rb

@@ -323,7 +323,7 @@ module RailsAdmin
         included_models.collect(&:to_s).presence || begin
           @@system_models ||= # memoization for tests
             ([Rails.application] + Rails::Engine.subclasses.collect(&:instance)).flat_map do |app|
-              (app.paths['app/models'].to_a + app.config.autoload_paths).collect do |load_path|
+              (app.paths['app/models'].to_a + app.paths.eager_load).collect do |load_path|
                 Dir.glob(app.root.join(load_path)).collect do |load_dir|
                   Dir.glob(load_dir + '/**/*.rb').collect do |filename|
                     # app/models/module/class.rb => module/class.rb => module/class => Module::Class

data/lib/rails_admin/config/actions/new.rb

@@ -20,7 +20,7 @@ module RailsAdmin
               @authorization_adapter && @authorization_adapter.attributes_for(:new, @abstract_model).each do |name, value|
                 @object.send("#{name}=", value)
               end
-              if object_params = params[@abstract_model.to_param]
+              if object_params = params[@abstract_model.param_key]
                 sanitize_params_for!(request.xhr? ? :modal : :create)
                 @object.set_attributes(@object.attributes.merge(object_params.to_h))
               end

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

@@ -25,6 +25,10 @@ module RailsAdmin
         register_instance_option :scopes do
           []
         end
+
+        register_instance_option :row_css_class do
+          ''
+        end
       end
     end
   end

data/lib/rails_admin/version.rb

@@ -1,8 +1,8 @@
 module RailsAdmin
   class Version
     MAJOR = 1
-    MINOR = 1
-    PATCH = 1
+    MINOR = 2
+    PATCH = 0
     PRE = nil
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -66,16 +66,22 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,16 +120,22 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nested_form
   requirement: !ruby/object:Gem::Requirement
@@ -592,7 +604,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Admin for Rails