obitum-rails_admin 0.0.4 → 0.0.5

data/app/helpers/rails_admin/application_helper.rb

@@ -79,7 +79,7 @@ module RailsAdmin
           o = a.send(:eval, 'bindings[:object]')
           content_tag(:li, :class => "#{"active" if current_action?(a, am, o)}") do
             if a.http_methods.include?(:get)
-              link_to wording_for(:breadcrumb, a, am, o), { :action => a.action_name, :controller => 'rails_admin/main', :model_name => am.try(:to_param), :id => o.try(:id) }
+              link_to wording_for(:breadcrumb, a, am, o), { :action => a.action_name, :controller => 'rails_admin/main', :model_name => am.try(:to_param), :id => (o.try(:persisted?) && o.try(:id) || nil) }
             else
               content_tag(:span, wording_for(:breadcrumb, a, am, o))
             end
@@ -95,7 +95,7 @@ module RailsAdmin
         wording = wording_for(:menu, action)
         %{
           <li data-original-title="#{wording}" rel="#{'tooltip' if only_icon}" class="icon #{action.key}_#{parent}_link #{'active' if current_action?(action)}">
-            <a href="#{url_for({ :action => action.action_name, :controller => 'rails_admin/main', :model_name => abstract_model.try(:to_param), :id => object.try(:id) })}">
+            <a 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/app/views/layouts/rails_admin/application.html.haml

@@ -32,7 +32,7 @@
                   = value
               = breadcrumb
               %ul.nav.nav-tabs
-                = menu_for((@abstract_model ? (@object.try(:id) ? :member : :collection) : :root), @abstract_model, @object)
+                = menu_for((@abstract_model ? (@object.try(:persisted?) ? :member : :collection) : :root), @abstract_model, @object)
                 = content_for :contextual_tabs
               = yield
               %footer

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

@@ -2,13 +2,15 @@
   .btn-group
     %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content, #{form.jquery_namespace(field)} > .controls > .nav", :class => (field.active? ? 'active' : '')}
       %i.icon-white
-    = form.link_to_add "<i class=\"icon-plus icon-white\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".html_safe, field.name, { :class => 'btn btn-info' }
+    - unless field.nested_form[:update_only]
+      = form.link_to_add "<i class=\"icon-plus icon-white\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".html_safe, field.name, { :class => 'btn btn-info' }
   = form.errors_for(field)
   = form.help_for(field)
   %ul.nav.nav-tabs{ :style => 'margin-top:5px' }
 .tab-content
   = form.fields_for field.name do |nested_form|
-    = nested_form.link_to_remove '<span class="btn btn-small btn-danger"><i class="icon-trash icon-white"></i></span>'.html_safe
+    - if field.nested_form[:allow_destroy]
+      = nested_form.link_to_remove '<span class="btn btn-small btn-danger"><i class="icon-trash icon-white"></i></span>'.html_safe
     = nested_form.generate({:action => :nested, :model_config => field.associated_model_config, :nested_in => field.name })
 
 = form.javascript_for(field) do

data/config/initializers/mongoid_extensions.rb

@@ -1,4 +1,5 @@
 if defined?(::Mongoid::Document)
   require 'rails_admin/adapters/mongoid/extension'
   Mongoid::Document.send(:include, RailsAdmin::Adapters::Mongoid::Extension)
+  Mongoid::NestedAttributes::ClassMethods.send(:include, RailsAdmin::Adapters::Mongoid::NestedAttributesExtension)
 end

data/lib/rails_admin/adapters/active_record.rb

@@ -93,6 +93,14 @@ module RailsAdmin
         model.serialized_attributes.keys
       end
 
+      def encoding
+        Rails.configuration.database_configuration[Rails.env]['encoding']
+      end
+
+      def embedded?
+        false
+      end
+
       private
 
       def query_conditions(query, fields = config.list.fields.select(&:queryable?))

data/lib/rails_admin/adapters/mongoid.rb

@@ -70,7 +70,7 @@ module RailsAdmin
             :polymorphic => association_polymorphic_lookup(association),
             :inverse_of => association_inverse_of_lookup(association),
             :read_only => nil,
-            :nested_form => nil
+            :nested_form => association_nested_attributes_options_lookup(association)
           }
         end
       end
@@ -124,6 +124,14 @@ module RailsAdmin
         []
       end
 
+      def encoding
+        'UTF-8'
+      end
+
+      def embedded?
+        @embedded ||= !!model.associations.values.find{|a| a.macro.to_sym == :embedded_in }
+      end
+
       private
 
       def query_conditions(query, fields = config.list.fields.select(&:queryable?))
@@ -256,6 +264,10 @@ module RailsAdmin
         end
       end
 
+      def association_nested_attributes_options_lookup(association)
+        model.nested_attributes_options.try { |o| o[association.name.to_sym] }
+      end
+
       def association_as_lookup(association)
         association.as.try :to_sym
       end

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

@@ -22,6 +22,27 @@ module RailsAdmin
           end
         end
       end
+
+      module NestedAttributesExtension
+        extend ActiveSupport::Concern
+
+        included do
+          attr_reader :nested_attributes_options
+          alias_method_chain :accepts_nested_attributes_for, :rails_admin
+        end
+
+        # Mongoid accepts_nested_attributes_for does not store options in accessible scope,
+        # so we intercept the call and store it in instance variable which can be accessed from outside
+        def accepts_nested_attributes_for_with_rails_admin(*args)
+          @nested_attributes_options = {}
+          options = args.extract_options!
+          args.each do |arg|
+            @nested_attributes_options[arg.to_sym] = options.reverse_merge(:allow_destroy=>false, :update_only=>false)
+          end
+          args << options
+          accepts_nested_attributes_for_without_rails_admin(*args)
+        end
+      end
     end
   end
 end

data/lib/rails_admin/config.rb

@@ -304,7 +304,7 @@ module RailsAdmin
       # @see RailsAdmin::Config::Hideable
 
       def visible_models(bindings)
-        models.map{|m| m.with(bindings) }.select{|m| m.visible? && bindings[:controller].authorized?(:index, m.abstract_model)}.sort do |a, b|
+        models.map{|m| m.with(bindings) }.select{|m| m.visible? && bindings[:controller].authorized?(:index, m.abstract_model) && !m.abstract_model.embedded?}.sort do |a, b|
           (weight_order = a.weight <=> b.weight) == 0 ? a.label.downcase <=> b.label.downcase : weight_order
         end
       end

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

@@ -21,7 +21,7 @@ module RailsAdmin
             amc = polymorphic? ? RailsAdmin::Config.model(associated) : associated_model_config # perf optimization for non-polymorphic associations
             am = amc.abstract_model
             wording = associated.send(amc.object_label_method)
-            can_see = v.authorized?(:show, am, associated)
+            can_see = v.authorized?(:show, am, associated) && !am.embedded?
             can_see = can_see && (show_action = RailsAdmin::Config::Actions.find(:show, { :controller => v.controller, :abstract_model => am, :object => associated }))
             can_see ? v.link_to(wording, v.url_for(:action => show_action.action_name, :model_name => am.to_param, :id => associated.id)) : wording
           end.to_sentence.html_safe

data/lib/rails_admin/support/csv_converter.rb

@@ -42,7 +42,7 @@ module RailsAdmin
       return '' if @objects.blank?
 
       # encoding shenanigans first
-      @encoding_from = if [nil, '', 'utf8', 'utf-8', 'UTF8', 'UTF-8'].include?(encoding = Rails.configuration.database_configuration[Rails.env]['encoding'])
+      @encoding_from = if [nil, '', 'utf8', 'utf-8', 'UTF8', 'UTF-8'].include?(encoding = @abstract_model.encoding)
         'UTF-8'
       else
         encoding

data/lib/rails_admin/version.rb

@@ -2,5 +2,5 @@ module RailsAdmin
   # FIXME: this needs to be manually kept in sync with the gemspec's
   # s.version until http://jira.codehaus.org/browse/JRUBY-5319 is
   # fixed
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/dummy_app/app/models/article.rb

@@ -6,4 +6,7 @@ class Article
 
   referenced_in :author
   references_and_referenced_in_many :tags
+
+  embeds_many :notes
+  accepts_nested_attributes_for :notes, :allow_destroy => true
 end

data/spec/dummy_app/app/models/note.rb

@@ -0,0 +1,7 @@
+class Note
+  include Mongoid::Document
+
+  embedded_in :article
+  field :subject, :type => String
+  field :description, :type => String
+end

data/spec/integration/basic/export/rails_admin_mongoid_export_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "RailsAdmin Mongoid Export" do
+
+  subject { page }
+
+  before(:each) do
+    @authors = 3.times.map { FactoryGirl.create :author }
+  end
+
+  describe "POST /admin/author/export (prompt)" do
+
+    it "should allow to export to CSV" do
+      visit export_path(:model_name => 'author')
+      should have_content 'Select fields to export'
+      Rails.configuration.should_not_receive(:database_configuration)
+      click_button 'Export to csv'
+      should have_content "Name"
+      should have_content @authors[0].name
+      should have_content @authors[2].name
+    end
+  end
+end

data/spec/integration/config/edit/rails_admin_config_edit_spec.rb

@@ -814,6 +814,16 @@ describe "RailsAdmin Config DSL Edit Section" do
       visit new_path(:model_name => "field_test")
       should have_no_selector('.add_nested_fields')
     end
+
+    it 'should work with Mongoid' do
+      RailsAdmin::Config.excluded_models = [RelTest]
+      @record = Article.create :notes => [{:subject => 'nested'}]
+      visit edit_path(:model_name => "article", :id => @record.id)
+      fill_in "article_notes_attributes_0_subject", :with => 'note subject 1 edited'
+      click_button "Save"
+      @record.reload
+      @record.notes[0].subject.should == 'note subject 1 edited'
+    end
   end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: obitum-rails_admin
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-13 00:00:00 Z
+date: 2012-03-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bbenezech-nested_form
@@ -619,6 +619,7 @@ files:
 - spec/dummy_app/app/models/league.rb
 - spec/dummy_app/app/models/mongoid_field_test.rb
 - spec/dummy_app/app/models/nested_field_test.rb
+- spec/dummy_app/app/models/note.rb
 - spec/dummy_app/app/models/player.rb
 - spec/dummy_app/app/models/rel_test.rb
 - spec/dummy_app/app/models/tag.rb
@@ -717,6 +718,7 @@ files:
 - spec/integration/basic/destroy/rails_admin_basic_destroy_spec.rb
 - spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
 - spec/integration/basic/export/rails_admin_basic_export_spec.rb
+- spec/integration/basic/export/rails_admin_mongoid_export_spec.rb
 - spec/integration/basic/list/rails_admin_basic_list_spec.rb
 - spec/integration/basic/new/rails_admin_basic_new_spec.rb
 - spec/integration/basic/new/rails_admin_namespaced_model_new_spec.rb
@@ -770,7 +772,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Admin for Rails
@@ -803,6 +805,7 @@ test_files:
 - spec/dummy_app/app/models/league.rb
 - spec/dummy_app/app/models/mongoid_field_test.rb
 - spec/dummy_app/app/models/nested_field_test.rb
+- spec/dummy_app/app/models/note.rb
 - spec/dummy_app/app/models/player.rb
 - spec/dummy_app/app/models/rel_test.rb
 - spec/dummy_app/app/models/tag.rb
@@ -901,6 +904,7 @@ test_files:
 - spec/integration/basic/destroy/rails_admin_basic_destroy_spec.rb
 - spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
 - spec/integration/basic/export/rails_admin_basic_export_spec.rb
+- spec/integration/basic/export/rails_admin_mongoid_export_spec.rb
 - spec/integration/basic/list/rails_admin_basic_list_spec.rb
 - spec/integration/basic/new/rails_admin_basic_new_spec.rb
 - spec/integration/basic/new/rails_admin_namespaced_model_new_spec.rb