rails_admin 0.4.4 → 0.4.5

data.tar.gz.sig

@@ -1 +1,2 @@
-
+4�b��’(
��C1$aCH�k�`��Zm&�v�BQ�'�M*���FQ��*����j,����SMZ݋:l�&��t��.
+�,��)�1�w%x��[���3��	K�=N�D��d�	j����&,�'W`�;�&�f���`<��%	
�qsm�u�}Վ��l��h&A8k2#J,,7�ŗ�f�^�D#:���X��'D�`/#�3�l(*k�,��qn��

data/Gemfile

@@ -1,51 +1,59 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :active_record do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2'
-    gem 'jdbc-sqlite3', '~> 3.6'
+    case ENV['CI_DB_ADAPTER']
+    when 'mysql'
+      gem 'activerecord-jdbcmysql-adapter', '>= 1.2'
+      gem 'jdbc-mysql', '>= 5.1'
+    when 'postgresql'
+      gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2'
+      gem 'jdbc-postgres', '>= 9.2'
+    else
+      gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2'
+      gem 'jdbc-sqlite3', '>= 3.7'
+    end
   end
 
   platforms :ruby, :mswin, :mingw do
     case ENV['CI_DB_ADAPTER']
     when 'mysql'
-      gem 'mysql', '2.8.1'
+      gem 'mysql', '~> 2.8.1'
     when 'postgresql'
-      gem 'pg', '~> 0.13'
+      gem 'pg', '>= 0.14'
     else
-      gem 'sqlite3', '~> 1.3'
+      gem 'sqlite3', '>= 1.3'
     end
   end
 end
 
 group :mongoid do
-  gem 'mongoid', '~> 3.0'
-  gem 'mongoid-paperclip', '~> 0.0.8', :require => 'mongoid_paperclip'
-  gem 'carrierwave-mongoid', '~> 0.3', :require => 'carrierwave/mongoid'
+  gem 'mongoid', '>= 3.0'
+  gem 'mongoid-paperclip', '>= 0.0.8', :require => 'mongoid_paperclip'
+  gem 'carrierwave-mongoid', '>= 0.4', :require => 'carrierwave/mongoid'
 end
 
-group :debug do
-  platform :mri_19 do
-    gem 'debugger', '~> 1.2'
-    gem 'simplecov', '~> 0.6', :require => false
-  end
+group :development do
+  gem 'pry', '>= 0.9'
+  gem 'pry-debugger', '>= 0.2', :platforms => :mri_19
 end
 
-group :development, :test do
-  gem 'strong_parameters', '~> 0.1.5'
-  gem 'cancan', '~> 1.6'
-  gem 'capybara', '~> 1.1'
-  gem 'carrierwave', '~> 0.6'
-  gem 'database_cleaner', '~> 0.8'
-  gem 'devise', '~> 2.1'
-  gem 'dragonfly', '~> 0.9'
-  gem 'factory_girl', '~> 4.1'
-  gem 'generator_spec', '~> 0.8'
-  gem 'launchy', '~> 2.1'
-  gem 'mini_magick', '~> 3.4'
-  gem 'paperclip', '~> 3.3'
-  gem 'rspec-rails', '~> 2.11'
-  gem 'timecop', '~> 0.5'
+group :test do
+  gem 'cancan', '>= 1.6'
+  gem 'capybara', '>= 2.0'
+  gem 'carrierwave', '>= 0.8'
+  gem 'database_cleaner', '>= 0.8'
+  gem 'devise', '>= 2.1'
+  gem 'dragonfly', '>= 0.9'
+  gem 'factory_girl', '>= 4.2'
+  gem 'generator_spec', '>= 0.8'
+  gem 'launchy', '>= 2.2'
+  gem 'mini_magick', '>= 3.4'
+  gem 'paperclip', '>= 3.4'
+  gem 'rspec-rails', '>= 2.11'
+  gem 'simplecov', :require => false
+  gem 'strong_parameters', '>= 0.1.6'
+  gem 'timecop', '>= 0.5'
 end
 
 gemspec

data/README.md

@@ -2,12 +2,10 @@
 [![Gem Version](https://badge.fury.io/rb/rails_admin.png)][gem]
 [![Build Status](https://secure.travis-ci.org/sferik/rails_admin.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/sferik/rails_admin.png?travis)][gemnasium]
-[![Code Climate](https://codeclimate.com/badge.png)][codeclimate]
+[![Code Climate](https://codeclimate.com/github/sferik/rails_admin.png)][codeclimate]
 [![Pledgie](http://www.pledgie.com/campaigns/15917.png)][pledgie]
 [![Flattr](http://api.flattr.com/button/flattr-badge-large.png)][flattr]
 
-RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
-
 [gem]: https://rubygems.org/gems/rails_admin
 [travis]: http://travis-ci.org/sferik/rails_admin
 [gemnasium]: https://gemnasium.com/sferik/rails_admin
@@ -15,23 +13,10 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 [pledgie]: http://www.pledgie.com/campaigns/15917
 [flattr]: http://flattr.com/thing/799416/sferikrailsadmin-on-GitHub
 
-It started as a port of [MerbAdmin][merb-admin] to Rails 3 and was implemented
-as a [Ruby Summer of Code project][rubysoc] by [Bogdan Gaza][hurrycane] with
-mentors [Erik Michaels-Ober][sferik], [Yehuda Katz][wycats], [Luke van der
-Hoeven][plukevdh], and [Rein Henrichs][reinh].
-
-[merb-admin]: https://github.com/sferik/merb-admin
-[rubysoc]: http://www.rubysoc.org/projects
-[hurrycane]: https://github.com/hurrycane
-[sferik]: https://github.com/sferik
-[wycats]: https://github.com/wycats
-[plukevdh]: https://github.com/plukevdh
-[reinh]: https://github.com/reinh
+RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 
 ## Announcements
-
 ### [Action required] Security issue
-
 `RailsAdmin::Config::Fields::Types::Serialized#parse_input` was unsafe, because it was using the infamous `YAML#load`.
 
 To fix this, RailsAdmin now uses [safe_yaml](https://github.com/dtao/safe_yaml), with `enable_arbitrary_object_deserialization` and `suppress_warnings` on, for maximum compatibity with all existing apps.
@@ -44,9 +29,7 @@ Rails3.0 and other non-maintained branches may be at risk too, I strongly advise
 
 More information about the whole drama [here](https://github.com/tenderlove/psych/issues/119).
 
-
 ## Features
-
 * Display database tables
 * Create new data
 * Easily update data
@@ -63,14 +46,12 @@ More information about the whole drama [here](https://github.com/tenderlove/psyc
   * Mongoid [new]
 
 ## Demo
-
 Take RailsAdmin for a [test drive][demo] with sample data. ([Source code.][dummy_app])
 
 [demo]: http://rails-admin-tb.herokuapp.com/
 [dummy_app]: https://github.com/bbenezech/dummy_app
 
 ## Installation
-
 In your `Gemfile`, add the following dependencies:
 
     gem 'fastercsv' # Only required on Ruby 1.8 and below
@@ -78,18 +59,17 @@ In your `Gemfile`, add the following dependencies:
 
 Run:
 
-    $ bundle install
+    bundle install
 
 And then run:
 
-    $ rails g rails_admin:install
+    rails g rails_admin:install
 
 This generator will install RailsAdmin and [Devise](https://github.com/plataformatec/devise) if you
 don't already have it installed. [Devise](https://github.com/plataformatec/devise) is strongly
 recommended to protect your data from anonymous users. Note: If you do not already have [Devise](https://github.com/plataformatec/devise)
 installed, make sure you remove the registerable module from the generated user model.
 
-
 It will modify your `config/routes.rb`, adding:
 
 ```ruby
@@ -114,10 +94,9 @@ See [#715](https://github.com/sferik/rails_admin/issues/715) for more details.
 
 It will also add an intializer that will help you getting started. (head for config/initializers/rails_admin.rb)
 
-
 Finally run:
 
-    $ bundle exec rake db:migrate
+    bundle exec rake db:migrate
 
 Optionally, you may wish to set up [Cancan](https://github.com/ryanb/cancan),
 [PaperTrail](https://github.com/airblade/paper_trail), [CKeditor](https://github.com/galetahub/ckeditor), [CodeMirror](https://github.com/fixlr/codemirror-rails)
@@ -125,20 +104,17 @@ Optionally, you may wish to set up [Cancan](https://github.com/ryanb/cancan),
 More on that in the [Wiki](https://github.com/sferik/rails_admin/wiki)
 
 ## Usage
-
 Start the server:
 
-    $ rails server
+    rails server
 
 You should now be able to administer your site at
 [http://localhost:3000/admin](http://localhost:3000/admin).
 
 ## Configuration
-
 All configuration documentation has moved to the wiki: https://github.com/sferik/rails_admin/wiki
 
 ## Screenshots
-
 ![Dashboard view](https://github.com/sferik/rails_admin/raw/master/screenshots/dashboard.png "dashboard view")
 ![Delete view](https://github.com/sferik/rails_admin/raw/master/screenshots/delete.png "delete view")
 ![List view](https://github.com/sferik/rails_admin/raw/master/screenshots/list.png "list view")
@@ -146,7 +122,6 @@ All configuration documentation has moved to the wiki: https://github.com/sferik
 ![Polymorphic edit view](https://github.com/sferik/rails_admin/raw/master/screenshots/polymorphic.png "polymorphic view")
 
 ## Support
-
 If you have a question, please check this README, the wiki, and the [list of
 known issues][troubleshoot].
 
@@ -164,6 +139,7 @@ This library aims to support and is [tested against][travis] the following Ruby
 
 * Ruby 1.9.2
 * Ruby 1.9.3
+* Ruby 2.0.0
 * [Rubinius][]
 * [JRuby][]
 

data/app/assets/javascripts/rails_admin/ra.widgets.coffee

@@ -150,11 +150,7 @@ $(document).on 'rails_admin.dom_ready', ->
 
     goCkeditors = ->
       $('form [data-richtext=ckeditor]').not('.ckeditored').each (index, domEle) ->
-        options = $(this).data
-        if instance = window.CKEDITOR.instances[this.id]
-          instance.destroy(true)
-
-        window.CKEDITOR.replace(this, options['options'])
+        window.CKEDITOR.replace(this, $(this).data['options'])
         $(this).addClass('ckeditored')
 
     $editors = $('form [data-richtext=ckeditor]').not('.ckeditored')

data/app/helpers/rails_admin/application_helper.rb

@@ -118,7 +118,7 @@ module RailsAdmin
         wording = wording_for(:menu, action)
         %{
           <li title="#{wording if only_icon}" rel="#{'tooltip' if only_icon}" class="icon #{action.key}_#{parent}_link #{'active' if current_action?(action)}">
-            <a class="#{action.key == :show_in_app ? '' : 'pjax'}" href="#{url_for({ :action => action.action_name, :controller => 'rails_admin/main', :model_name => abstract_model.try(:to_param), :id => (object.try(:persisted?) && object.try(:id) || nil) })}">
+            <a class="#{action.pjax? ? 'pjax' : ''}" href="#{url_for({ :action => action.action_name, :controller => 'rails_admin/main', :model_name => abstract_model.try(:to_param), :id => (object.try(:persisted?) && object.try(:id) || nil) })}">
               <i class="#{action.link_icon}"></i>
               <span#{only_icon ? " style='display:none'" : ""}>#{wording}</span>
             </a>

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

@@ -54,6 +54,11 @@ module RailsAdmin
           false
         end
 
+        # Render via pjax?
+        register_instance_option :pjax? do
+          true
+        end
+
         # This block is evaluated in the context of the controller when action is called
         # You can access:
         # - @objects if you're on a model scope

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

@@ -21,6 +21,10 @@ module RailsAdmin
         register_instance_option :link_icon do
           'icon-eye-open'
         end
+
+        register_instance_option :pjax? do
+          false
+        end
       end
     end
   end

data/lib/rails_admin/config/model.rb

@@ -60,7 +60,7 @@ module RailsAdmin
       end
 
       register_instance_option :label_plural do
-        (@label_plural ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(:count => 2, :default => label.pluralize)
+        (@label_plural ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(:count => 'other', :default => label.pluralize)
       end
 
       def pluralize(count)

data/lib/rails_admin/version.rb

@@ -2,7 +2,7 @@ module RailsAdmin
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 4 unless defined? MINOR
-    PATCH = 4 unless defined? PATCH
+    PATCH = 5 unless defined? PATCH
     PRE = nil unless defined? PRE
 
     class << self

data/spec/dummy_app/Gemfile

@@ -1,38 +1,47 @@
 source :rubygems
 
 gem 'rails', '~> 3.2'
-gem 'strong_parameters'
+gem 'strong_parameters', '>= 0.1.6'
 
 group :active_record do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2'
-    gem 'jdbc-sqlite3', '~> 3.6'
+    case ENV['CI_DB_ADAPTER']
+    when 'mysql'
+      gem 'activerecord-jdbcmysql-adapter', '>= 1.2'
+      gem 'jdbc-mysql', '>= 5.1'
+    when 'postgresql'
+      gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2'
+      gem 'jdbc-postgres', '>= 9.2'
+    else
+      gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2'
+      gem 'jdbc-sqlite3', '>= 3.7'
+    end
   end
 
   platforms :ruby, :mswin, :mingw do
     case ENV['CI_DB_ADAPTER']
     when 'mysql'
-      gem 'mysql', '2.8.1'
+      gem 'mysql', '~> 2.8.1'
     when 'postgresql'
-      gem 'pg', '~> 0.13'
+      gem 'pg', '>= 0.14'
     else
-      gem 'sqlite3', '~> 1.3'
+      gem 'sqlite3', '>= 1.3'
     end
   end
 end
 
 group :mongoid do
-  gem 'mongoid', '~> 3.0'
-  gem 'mongoid-paperclip', '~> 0.0.8', :require => 'mongoid_paperclip'
-  gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
+  gem 'mongoid', '>= 3.0'
+  gem 'mongoid-paperclip', '>= 0.0.8', :require => 'mongoid_paperclip'
+  gem 'carrierwave-mongoid', '>= 0.4', :require => 'carrierwave/mongoid'
 end
 
-gem 'carrierwave', '~> 0.6'
-gem 'devise', '~> 2.1'
-gem 'dragonfly', '~> 0.9'
-gem 'mini_magick', '~> 3.4'
-gem 'mlb', '~> 0.5'
-gem 'paperclip', '~> 3.3'
+gem 'carrierwave', '>= 0.8'
+gem 'devise', '>= 2.2'
+gem 'dragonfly', '>= 0.9'
+gem 'mini_magick', '>= 3.4'
+gem 'mlb', '>= 0.6'
+gem 'paperclip', '>= 3.4'
 gem 'rails_admin', :path => '../../'
 
 # Gems used only for assets and not required
@@ -44,5 +53,5 @@ group :assets do
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   # gem 'therubyracer'
 
-  gem 'uglifier', '>= 1.0.3'
+  gem 'uglifier', '>= 1.3'
 end

data/spec/dummy_app/Gemfile.lock

@@ -0,0 +1,212 @@
+PATH
+  remote: ../../
+  specs:
+    rails_admin (0.4.4)
+      bootstrap-sass (~> 2.2)
+      builder (~> 3.0)
+      coffee-rails (~> 3.1)
+      font-awesome-sass-rails (~> 3.0, >= 3.0.0.1)
+      haml (~> 3.1)
+      jquery-rails (~> 2.1)
+      jquery-ui-rails (~> 3.0)
+      kaminari (~> 0.14)
+      nested_form (~> 0.3)
+      rack-pjax (~> 0.6)
+      rails (~> 3.1)
+      remotipart (~> 1.0)
+      safe_yaml (~> 0.6)
+      sass-rails (~> 3.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
+      mail (~> 2.4.4)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    bcrypt-ruby (3.0.1)
+    bootstrap-sass (2.2.2.0)
+      sass (~> 3.2)
+    builder (3.0.4)
+    carrierwave (0.8.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+    carrierwave-mongoid (0.4.0)
+      carrierwave (~> 0.8.0)
+      mongoid (~> 3.0)
+      mongoid-grid_fs (~> 1.3)
+    cocaine (0.4.2)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.4.0)
+    devise (2.2.3)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
+    dragonfly (0.9.13)
+      multi_json (~> 1.0)
+      rack
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    faraday (0.8.5)
+      multipart-post (~> 1.1)
+    font-awesome-sass-rails (3.0.0.1)
+      railties (>= 3.1.1)
+      sass-rails (>= 3.1.1)
+    haml (3.1.7)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.2.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (3.0.1)
+      jquery-rails
+      railties (>= 3.1.0)
+    json (1.7.7)
+    kaminari (0.14.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.21)
+    mini_magick (3.4)
+      subexec (~> 0.2.1)
+    mlb (0.6.3)
+      faraday (~> 0.8, < 0.10)
+      multi_json (~> 1.0)
+    mongoid (3.0.21)
+      activemodel (~> 3.1)
+      moped (~> 1.2)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.22)
+    mongoid-grid_fs (1.7.0)
+      mime-types (~> 1.19)
+      mongoid (~> 3.0)
+    mongoid-paperclip (0.0.8)
+      paperclip (>= 2.3.6)
+    moped (1.4.2)
+    multi_json (1.5.1)
+    multipart-post (1.1.5)
+    nested_form (0.3.1)
+    nokogiri (1.5.6)
+    origin (1.0.11)
+    orm_adapter (0.4.0)
+    paperclip (3.4.0)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.4.0)
+      mime-types
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-pjax (0.7.0)
+      nokogiri (~> 1.5)
+      rack (~> 1.3)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
+      bundler (~> 1.0)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12.1)
+      json (~> 1.4)
+    remotipart (1.0.5)
+    safe_yaml (0.7.1)
+    sass (3.2.5)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
+    strong_parameters (0.1.6)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+      railties (~> 3.0)
+    subexec (0.2.2)
+    thor (0.17.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+    warden (1.2.1)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  carrierwave
+  carrierwave-mongoid
+  coffee-rails
+  devise
+  dragonfly
+  jdbc-sqlite3
+  mini_magick
+  mlb
+  mongoid
+  mongoid-paperclip
+  paperclip
+  rails (~> 3.2)
+  rails_admin!
+  sass-rails
+  sqlite3
+  strong_parameters
+  uglifier