rails_admin 0.1.1 → 0.1.2

data/README.md

@@ -1,8 +1,9 @@
-# RailsAdmin [![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] [![Click here to lend your support to: RailsAdmin and make a donation at www.pledgie.com !](https://www.pledgie.com/campaigns/15917.png)][pledgie]
+# RailsAdmin [![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] [![Click here to lend your support to: RailsAdmin and make a donation at www.pledgie.com !](https://www.pledgie.com/campaigns/15917.png)][pledgie]
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 
 [travis]: http://travis-ci.org/sferik/rails_admin
 [gemnasium]: https://gemnasium.com/sferik/rails_admin
+[codeclimate]: https://codeclimate.com/github/sferik/rails_admin
 [pledgie]: http://www.pledgie.com/campaigns/15917
 
 It started as a port of [MerbAdmin][merb-admin] to Rails 3 and was implemented
@@ -23,7 +24,7 @@ Hoeven][plukevdh], and [Rein Henrichs][reinh].
 * for those with `rake db:migrate` errors, update to master and check that you see the line: "[RailsAdmin] RailsAdmin initialization disabled by default." when you launch the task. If not (or if migrations still don't work), open a ticket with an application on Github that can reproduce the issue.
 
 * `config.models do ... end` is deprecated (note the 's' to models, `config.model(MyModel) do .. end` is fine), for performance reasons (forces early loading of all application's models). Duplicate to each model instead, before next release. If you really need the old behavior:
- 
+
 ```ruby
 config.models.each do |m|
   config.model m do
@@ -73,8 +74,8 @@ And then run:
 
 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.  
+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:
@@ -83,19 +84,18 @@ It will modify your `config/routes.rb`, adding:
 mount RailsAdmin::Engine => '/admin', :as => 'rails_admin' # Feel free to change '/admin' to any namespace you need.
 ```
 
-Note: Your RailsAdmin namespace cannot match your Devise model name, or you will get an infinite redirect error.
-The following will generate infinite redirects.
+Note: The `devise_for` route must be placed before the mounted engine. The following will generate infinite redirects.
 
 ```ruby
 mount RailsAdmin::Engine => '/admin', :as => 'rails_admin'
 devise_for :admins
 ```
 
-Consider renaming your RailsAdmin namespace:
+This will resolve the infinite redirect error:
 
 ```ruby
-mount RailsAdmin::Engine => '/rails_admin', :as => 'rails_admin'
 devise_for :admins
+mount RailsAdmin::Engine => '/rails_admin', :as => 'rails_admin'
 ```
 
 See [#715](https://github.com/sferik/rails_admin/issues/715) for more details.
@@ -147,55 +147,6 @@ list][list].
 
 If you think you found a bug in RailsAdmin, you can [submit an issue][issues].
 
-## Contributing
-
-In the spirit of [free software][free-sw], **everyone** is encouraged to help
-improve this project.
-
-[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
-
-Here are some ways *you* can contribute:
-
-* by using alpha, beta, and prerelease versions
-* by reporting bugs
-* by suggesting new features
-* by writing or editing documentation
-* by writing specifications
-* by writing code (**no patch is too small**: fix typos, add comments, clean up
-  inconsistent whitespace)
-* by refactoring code
-* by fixing [issues][]
-* by reviewing patches
-* [financially][pledgie]
-
-[issues]: https://github.com/sferik/rails_admin/issues
-
-## Submitting an Issue
-We use the [GitHub issue tracker][issues] to track bugs and features. Before
-submitting a bug report or feature request, check to make sure it hasn't
-already been submitted. When submitting a bug report, please include a [Gist][]
-that includes a stack trace and any details that may be necessary to reproduce
-the bug, including your gem version, Ruby version, and operating system.
-Ideally, a bug report should include a pull request with failing specs.
-
-[gist]: https://gist.github.com/
-
-## Submitting a Pull Request
-1. [Fork the repository.][fork]
-2. [Create a topic branch.][branch]
-3. Add specs for your unimplemented feature or bug fix.
-4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
-5. Implement your feature or bug fix.
-6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
-7. Run `open coverage/index.html`. If your changes are not completely covered
-   by your tests, return to step 3.
-8. Add, commit, and push your changes.
-9. [Submit a pull request.][pr]
-
-[fork]: http://help.github.com/fork-a-repo/
-[branch]: http://learn.github.com/p/branching.html
-[pr]: http://help.github.com/send-pull-requests/
-
 ## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby implementations:
 

data/app/assets/stylesheets/rails_admin/base/{README → README.txt}

@@ -1,2 +1,2 @@
-For RailsAdmin developpers;
+For RailsAdmin developers:
 We should use sass variables & mixins as much as possible so that themers/users can override them cleanly

data/app/assets/stylesheets/rails_admin/imports.css.scss.erb

@@ -20,7 +20,6 @@
 
 /*** Reset ***/
 @import "bootstrap/reset";
-
 /***  Libraries  ***/
 
 @import "rails_admin/aristo/jquery-ui-1.8.7.custom";
@@ -31,6 +30,10 @@
 @import "rails_admin/jquery.colorpicker";
 
 
+/*** Font-awesome ***/
+
+@import 'font-awesome';
+
 /***  Bootstrap Theming  ***/
 
 @import "bootstrap/scaffolding";
@@ -39,7 +42,6 @@
 @import "bootstrap/type";
 @import "bootstrap/forms";
 @import "bootstrap/tables";
-@import "bootstrap/sprites";
 @import "bootstrap/dropdowns";
 @import "bootstrap/wells";
 @import "bootstrap/component-animations";

data/app/assets/stylesheets/rails_admin/themes/cerulean/theming.css.scss

@@ -16,7 +16,7 @@
 // -----------------------------------------------------
 
 .navbar-inner {
-  @include gradient-vertical-three-colors($navbarBackground, $navbarBackground, 90%, $navbarBackgroundHighlight);
+  @include gradient-vertical-three-colors($navbarBackground, $navbarBackground, 0.9, $navbarBackgroundHighlight);
 }
 
 .navbar .nav .active > a,
@@ -55,7 +55,7 @@
 // -----------------------------------------------------
 
 .btn {
-  @include gradient-vertical-three-colors($white, $white, 5%, darken($white, 0%));
+  @include gradient-vertical-three-colors($white, $white, 0.05, darken($white, 0%));
   $shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   @include box-shadow($shadow);
   

data/app/helpers/rails_admin/application_helper.rb

@@ -44,46 +44,39 @@ module RailsAdmin
 
     def main_navigation
       nodes_stack = RailsAdmin::Config.visible_models(:controller => self.controller)
+      node_model_names = nodes_stack.map{ |c| c.abstract_model.model_name }
+
       nodes_stack.group_by(&:navigation_label).map do |navigation_label, nodes|
 
-        li_stack = nodes.select{|n| n.parent.nil? || !n.parent.to_s.in?(nodes_stack.map{|c| c.abstract_model.model_name }) }.map do |node|
-          %{
-            <li data-model="#{node.abstract_model.to_param}">
-              <a class="pjax" href="#{url_for(:action => :index, :controller => 'rails_admin/main', :model_name => node.abstract_model.to_param)}">#{node.label_plural}</a>
-            </li>
-            #{navigation(nodes_stack, nodes_stack.select{|n| n.parent.to_s == node.abstract_model.model_name}, 1)}
-          }.html_safe
-        end.join.html_safe
-
-        if li_stack.present?
-          li_stack = %{<li class='nav-header'>#{navigation_label || t('admin.misc.navigation')}</li>}.html_safe + li_stack
-        end
+        nodes = nodes.select{ |n| n.parent.nil? || !n.parent.to_s.in?(node_model_names) }
+        li_stack = navigation nodes_stack, nodes
 
-        li_stack
+        label = navigation_label || t('admin.misc.navigation')
+        %{<li class='nav-header'>#{label}</li>#{li_stack}} if li_stack.present?
       end.join.html_safe
     end
 
     def static_navigation
       li_stack = RailsAdmin::Config.navigation_static_links.map do |title, url|
-        content_tag(:li, link_to(title.to_s, url, :target => '_blank')).html_safe
-      end.join.html_safe
-
-      if li_stack.present?
-        li_stack = %{<li class='nav-header'>#{RailsAdmin::Config.navigation_static_label || t('admin.misc.navigation_static_label')}</li>}.html_safe + li_stack
-      end
+        content_tag(:li, link_to(title.to_s, url, :target => '_blank'))
+      end.join
 
+      label = RailsAdmin::Config.navigation_static_label || t('admin.misc.navigation_static_label')
+      li_stack = %{<li class='nav-header'>#{label}</li>#{li_stack}}.html_safe if li_stack.present?
       li_stack
     end
 
-    def navigation nodes_stack, nodes, level
+    def navigation nodes_stack, nodes, level=0
       nodes.map do |node|
-        %{
-          <li data-model="#{node.abstract_model.to_param}">
-            <a class="pjax nav-level-#{level}" href="#{url_for(:action => :index, :controller => 'rails_admin/main', :model_name => node.abstract_model.to_param)}">#{node.label_plural}</a>
-          </li>
-          #{navigation(nodes_stack, nodes_stack.select{ |n| n.parent.to_s == node.abstract_model.model_name}, level + 1)}
-        }.html_safe
-      end.join
+        model_param = node.abstract_model.to_param
+        url         = url_for(:action => :index, :controller => 'rails_admin/main', :model_name => model_param)
+        level_class = "nav-level-#{level}" if level > 0
+
+        li = content_tag :li, "data-model"=>model_param do
+          link_to 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
     end
 
     def breadcrumb action = @action, acc = []
@@ -134,8 +127,9 @@ module RailsAdmin
             end
           end.join.html_safe
         end
-      end
+      end.html_safe
     end
+
   end
 end
 

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

@@ -43,5 +43,5 @@
 = form.select field.method_name, collection, { :selected => selected_ids, :object => form.object }, field.html_attributes.reverse_merge({:data => { :filteringmultiselect => true, :options => js_data.to_json }, :multiple => true})
 - if authorized? :new, config.abstract_model
   - path_hash = { :model_name => config.abstract_model.to_param, :modal => true }
-  - path_hash.merge!({ :associations => { field.inverse_of => (form.object.id || 'new') } }) if field.inverse_of
+  - path_hash.merge!({ :associations => { field.inverse_of => (form.object.persisted? ? form.object.id : 'new') } }) if field.inverse_of
   = link_to "<i class=\"icon-plus icon-white\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', :data => { :link => new_path(path_hash) }, :class => "create btn btn-info", :style => 'margin-left:10px'

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

@@ -30,7 +30,7 @@
 
 - if authorized? :new, config.abstract_model
   - path_hash = { :model_name => config.abstract_model.to_param, :modal => true }
-  - path_hash.merge!({ :associations => { field.inverse_of => (form.object.id || 'new') } }) if field.inverse_of
+  - path_hash.merge!({ :associations => { field.inverse_of => (form.object.persisted? ? form.object.id : 'new') } }) if field.inverse_of
   = link_to "<i class=\"icon-plus icon-white\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', :data => { :link => new_path(path_hash) }, :class => "btn btn-info create", :style => 'float:left; margin-left:10px'
 
 - if edit_url.present?

data/lib/generators/rails_admin/install_generator.rb

@@ -37,6 +37,10 @@ module RailsAdmin
         display "Looks like you've already installed it, good!"
       end
 
+      namespace = ask_for("Where do you want to mount rails_admin?", "admin", _namespace)
+      gsub_file "config/routes.rb", /mount RailsAdmin::Engine => \'\/.+\', :as => \'rails_admin\'/, ''
+      route("mount RailsAdmin::Engine => '/#{namespace}', :as => 'rails_admin'")
+
       unless routes.index("devise_for")
         model_name = ask_for("What would you like the user model to be called?", "user", _model_name)
         display "Now setting up devise with user model name '#{model_name}':"
@@ -75,9 +79,6 @@ module RailsAdmin
       end
       display "Adding a migration..."
       migration_template 'migration.rb', 'db/migrate/create_rails_admin_histories_table.rb' rescue display $!.message
-      namespace = ask_for("Where do you want to mount rails_admin?", "admin", _namespace)
-      gsub_file "config/routes.rb", /mount RailsAdmin::Engine => \'\/.+\', :as => \'rails_admin\'/, ''
-      route("mount RailsAdmin::Engine => '/#{namespace}', :as => 'rails_admin'")
       display "Job's done: migrate, start your server and visit '/#{namespace}'!", :blue
     end
   end

data/lib/rails_admin/adapters/mongoid.rb

@@ -251,6 +251,7 @@ module RailsAdmin
           "DateTime"       => { :type => :datetime },
           "Float"          => { :type => :float },
           "Hash"           => { :type => :serialized },
+          "Money"          => { :type => :serialized },
           "Integer"        => { :type => :integer },
           "Object"         => (
             if associations.find{|a| a[:type] == :belongs_to && a[:foreign_key] == name.to_sym}
@@ -270,7 +271,7 @@ module RailsAdmin
           ),
             "Symbol"         => { :type => :string, :length => 255 },
             "Time"           => { :type => :datetime },
-        }[field.type.to_s] or raise "Need to map field #{field.type.to_s} for field name #{name} in #{model.inspect}"
+        }[field.type.to_s] or raise "Type #{field.type.to_s} for field :#{name} in #{model.inspect} not supported"
       end
 
       def association_model_proc_lookup(association)

data/lib/rails_admin/engine.rb

@@ -2,6 +2,7 @@ require 'rails'
 require 'jquery-rails'
 require 'remotipart'
 require 'bootstrap-sass'
+require 'font-awesome-sass-rails'
 require 'kaminari'
 require 'rack-pjax'
 require 'jquery-ui-rails'

data/lib/rails_admin/version.rb

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

data/spec/controllers/application_controller_spec.rb

@@ -3,20 +3,20 @@ require 'spec_helper'
 describe RailsAdmin::ApplicationController do
   describe "#to_model_name" do
     it "works with modules" do
-      controller.to_model_name("conversations~conversation").should eq("Conversations::Conversation")
+      expect(controller.to_model_name("conversations~conversation")).to eq("Conversations::Conversation")
     end
   end
 
   describe "helper method _get_plugin_name" do
     it "works by default" do
-      controller.send(:_get_plugin_name).should == ['Dummy App', 'Admin']
+      expect(controller.send(:_get_plugin_name)).to eq(['Dummy App', 'Admin'])
     end
 
     it "works for static names" do
       RailsAdmin.config do |config|
         config.main_app_name = ['static','value']
       end
-      controller.send(:_get_plugin_name).should == ['static', 'value']
+      expect(controller.send(:_get_plugin_name)).to eq(['static', 'value'])
     end
 
     it "works for dynamic names in the controller context" do
@@ -24,7 +24,7 @@ describe RailsAdmin::ApplicationController do
         config.main_app_name = Proc.new { |controller| [Rails.application.engine_name.try(:titleize), controller.params[:action].titleize] }
       end
       controller.params[:action] = "dashboard"
-      controller.send(:_get_plugin_name).should == ["Dummy App Application", "Dashboard"]
+      expect(controller.send(:_get_plugin_name)).to eq(["Dummy App Application", "Dashboard"])
     end
   end
 end

data/spec/controllers/main_controller_spec.rb

@@ -3,17 +3,17 @@
 require 'spec_helper'
 
 describe RailsAdmin::MainController do
-  
+
   describe "#dashboard" do
     before do
       controller.stub(:render).and_return(true) # no rendering
     end
-    
+
     it "should show statistics by default" do
       RailsAdmin.config(Player).abstract_model.should_receive(:count).and_return(0)
       controller.dashboard
     end
-    
+
     it "should not show statistics if turned off" do
       RailsAdmin.config do |c|
         c.actions do
@@ -22,14 +22,14 @@ describe RailsAdmin::MainController do
           end
         end
       end
-      
+
       RailsAdmin.config(Player).abstract_model.should_not_receive(:count)
       controller.dashboard
     end
   end
-  
+
   describe "#check_for_cancel" do
-    
+
     it "should redirect to back if params[:bulk_ids] is nil when params[:bulk_action] is present" do
       controller.stub(:back_or_index) { raise StandardError.new('redirected back') }
       expect { get :bulk_delete, { :model_name => "player", :bulk_action =>"bulk_delete" } }.to raise_error('redirected back')
@@ -40,12 +40,12 @@ describe RailsAdmin::MainController do
   describe "#get_sort_hash" do
     it 'should work with belongs_to associations with label method virtual' do
       controller.params = { :sort => "parent_category", :model_name =>"categories" }
-      controller.send(:get_sort_hash, RailsAdmin.config(Category)).should == {:sort=>"categories.parent_category_id", :sort_reverse=>true}
+      expect(controller.send(:get_sort_hash, RailsAdmin.config(Category))).to eq({:sort=>"categories.parent_category_id", :sort_reverse=>true})
     end
 
     it 'should work with belongs_to associations with label method real column' do
       controller.params = { :sort => "team", :model_name =>"players" }
-      controller.send(:get_sort_hash, RailsAdmin.config(Player)).should == {:sort=>"teams.name", :sort_reverse=>true}
+      expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to eq({:sort=>"teams.name", :sort_reverse=>true})
     end
   end
 
@@ -56,8 +56,8 @@ describe RailsAdmin::MainController do
     end
 
     it "should paginate" do
-      controller.list_entries(RailsAdmin.config(Team), :index, nil, false).to_a.length.should == 21
-      controller.list_entries(RailsAdmin.config(Team), :index, nil, true).to_a.length.should == 20
+      expect(controller.list_entries(RailsAdmin.config(Team), :index, nil, false).to_a.length).to eq(21)
+      expect(controller.list_entries(RailsAdmin.config(Team), :index, nil, true).to_a.length).to eq(20)
     end
   end
 
@@ -68,7 +68,7 @@ describe RailsAdmin::MainController do
     end
 
     it "should not paginate" do
-      controller.list_entries(RailsAdmin.config(Team), :bulk_delete).to_a.length.should == 21
+      expect(controller.list_entries(RailsAdmin.config(Team), :bulk_delete).to_a.length).to eq(21)
     end
   end
 
@@ -90,7 +90,7 @@ describe RailsAdmin::MainController do
         end
       end
 
-      controller.list_entries.to_a.length.should == @players.size
+      expect(controller.list_entries.to_a.length).to eq(@players.size)
     end
 
     it "scopes associated collection records according to associated_collection_scope" do
@@ -106,7 +106,7 @@ describe RailsAdmin::MainController do
         end
       end
 
-      controller.list_entries.to_a.length.should == 3
+      expect(controller.list_entries.to_a.length).to eq(3)
     end
 
     it "scopes associated collection records according to bindings" do
@@ -128,7 +128,7 @@ describe RailsAdmin::MainController do
         end
       end
 
-      controller.list_entries.to_a.length.should == @team.revenue.to_i
+      expect(controller.list_entries.to_a.length).to eq(@team.revenue.to_i)
     end
 
 
@@ -142,14 +142,14 @@ describe RailsAdmin::MainController do
           associated_collection_cache_all false
         end
       end
-      controller.list_entries.to_a.length.should == 30
+      expect(controller.list_entries.to_a.length).to eq(30)
 
       RailsAdmin.config Team do
         field :players do
           associated_collection_cache_all true
         end
       end
-      controller.list_entries.length.should == @players.size
+      expect(controller.list_entries.length).to eq(@players.size)
     end
 
     it "orders associated collection records by desc" do
@@ -157,7 +157,7 @@ describe RailsAdmin::MainController do
         FactoryGirl.create :player
       end
 
-      controller.list_entries.to_a.first.should == @players.last
+      expect(controller.list_entries.to_a.first).to eq(@players.last)
     end
   end
 
@@ -169,10 +169,10 @@ describe RailsAdmin::MainController do
       FactoryGirl.create :team
       TeamWithNumberedPlayers.first.numbered_players = [FactoryGirl.create(:player, :number => 123)]
       returned = get :index, {:model_name => 'player', :source_object_id => Team.first.id, :source_abstract_model => 'team_with_numbered_players', :associated_collection => 'numbered_players', :current_action => :create, :compact => true, :format => :json}
-      returned.body.should =~ /\"id\"\:123/
+      expect(returned.body).to match /\"id\"\:123/
     end
   end
-  
+
   describe "sanitize_params_for!" do
     it 'sanitize params recursively in nested forms' do
       RailsAdmin.config Comment do
@@ -190,7 +190,7 @@ describe RailsAdmin::MainController do
       I18n.locale = :fr
       controller.params = {
         "field_test"=>{
-          :"datetime_field"=>"1 août 2010", 
+          :"datetime_field"=>"1 août 2010",
           "nested_field_tests_attributes"=>{
             "new_1330520162002"=>{
               "comment_attributes"=>{
@@ -198,7 +198,7 @@ describe RailsAdmin::MainController do
               },
               :"created_at"=>"3 août 2010"
             }
-          }, 
+          },
           "comment_attributes"=>{
             :"created_at"=>"4 août 2010"
           }
@@ -207,22 +207,22 @@ describe RailsAdmin::MainController do
 
       controller.send(:sanitize_params_for!, :create, RailsAdmin.config(FieldTest), controller.params['field_test'])
 
-      controller.params.should == {
+      expect(controller.params).to eq({
         "field_test"=>{
-          :datetime_field=>'Sun, 01 Aug 2010 00:00:00 UTC +00:00', 
+          :datetime_field=>'Sun, 01 Aug 2010 00:00:00 UTC +00:00',
           "nested_field_tests_attributes"=>{
             "new_1330520162002"=>{
               "comment_attributes"=>{
                 :created_at=>'Mon, 02 Aug 2010 00:00:00 UTC +00:00'
-              }, 
+              },
               :created_at=>'Tue, 03 Aug 2010 00:00:00 UTC +00:00'
             }
-          }, 
+          },
           "comment_attributes"=>{
             :created_at=>'Wed, 04 Aug 2010 00:00:00 UTC +00:00'
           }
         }
-      }
+      })
       I18n.locale = :en
     end
   end