obitum-rails_admin 0.0.3 → 0.0.4

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

@@ -0,0 +1,32 @@
+require 'rails_admin/adapters/active_record/abstract_object'
+module RailsAdmin
+  module Adapters
+    module Mongoid
+      class AbstractObject < RailsAdmin::Adapters::ActiveRecord::AbstractObject
+        def initialize(object)
+          super
+          object.associations.each do |name, association|
+            if association.macro == :references_many
+              instance_eval <<-RUBY, __FILE__, __LINE__ + 1
+                def #{name.to_s.singularize}_ids
+                  #{name}.map{|item| item.id }
+                end
+
+                def #{name.to_s.singularize}_ids=(items)
+                  self.#{name} = items.
+                    map{|item_id| self.#{name}.klass.find(item_id) rescue nil }.
+                    compact
+                end
+RUBY
+            end
+          end
+        end
+
+        def destroy
+          object.destroy
+          object
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module RailsAdmin
+  module Adapters
+    module Mongoid
+      module Extension
+        extend ActiveSupport::Concern
+
+        included do
+          def self.rails_admin(&block)
+            RailsAdmin::Config.model(self, &block)
+          end
+        end
+
+        def rails_admin_default_object_label_method
+          self.new_record? ? "new #{self.class.to_s}" : "#{self.class.to_s} ##{self.id}"
+        end
+
+        def safe_send(value)
+          if self.attributes.find{ |k,v| k.to_s == value.to_s }
+            self.read_attribute(value)
+          else
+            self.send(value)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -73,11 +73,11 @@ module RailsAdmin
         register_instance_option :searchable_columns do
           @searchable_columns ||= case self.searchable
           when true
-            [{ :column => "#{self.abstract_model.model.table_name}.#{self.name}", :type => self.type }]
+            [{ :column => "#{self.abstract_model.table_name}.#{self.name}", :type => self.type }]
           when false
             []
           when :all # valid only for associations
-            table_name = self.associated_model_config.abstract_model.model.table_name
+            table_name = self.associated_model_config.abstract_model.table_name
             self.associated_model_config.list.fields.map { |f| { :column => "#{table_name}.#{f.name}", :type => f.type } }
           else
             [self.searchable].flatten.map do |f|
@@ -86,13 +86,13 @@ module RailsAdmin
                 type = nil
               elsif f.is_a?(Hash)                                              #  <Model|table_name> => <attribute|column>
                 am = f.keys.first.is_a?(Class) && AbstractModel.new(f.keys.first)
-                table_name = am && am.model.table_name || f.keys.first
+                table_name = am && am.table_name || f.keys.first
                 column = f.values.first
                 property = am && am.properties.find{ |p| p[:name] == f.values.first.to_sym }
                 type = property && property[:type]
               else                                                             #  <attribute|column>
                 am = (self.association? ? self.associated_model_config.abstract_model : self.abstract_model)
-                table_name = am.model.table_name
+                table_name = am.table_name
                 column = f
                 property = am.properties.find{ |p| p[:name] == f.to_sym }
                 type = property && property[:type]

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

@@ -4,7 +4,7 @@ require 'rails_admin/config/fields/types/belongs_to_association'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   if association = parent.abstract_model.associations.find {|a| a[:foreign_key] == properties[:name] }
-    field = RailsAdmin::Config::Fields::Types.load("#{association[:polymorphic] ? :polymorphic : :belongs_to}_association").new(parent, association[:name], association)
+    field = RailsAdmin::Config::Fields::Types.load("#{association[:polymorphic] ? :polymorphic : association[:type]}_association").new(parent, association[:name], association)
     fields << field
 
     child_columns = []
@@ -13,7 +13,10 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
 
     if association[:polymorphic]
       type_colum = parent.abstract_model.properties.find {|p| p[:name].to_s == association[:foreign_type].to_s }
-      child_columns << RailsAdmin::Config::Fields.default_factory.call(parent, type_colum, fields)
+      unless type_field = fields.find{|f| f.name.to_s == type_colum[:name].to_s }
+        type_field = RailsAdmin::Config::Fields.default_factory.call(parent, type_colum, fields)
+      end
+      child_columns << type_field
     end
 
     child_columns.each do |child_column|

data/lib/rails_admin/config/fields/factories/serialized.rb

@@ -8,7 +8,7 @@ require 'rails_admin/config/fields/types/serialized'
 # @see RailsAdmin::Config::Fields::Types::Password.column_names
 # @see RailsAdmin::Config::Fields.register_factory
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if parent.abstract_model.model.serialized_attributes.keys.include?(properties[:name].to_s)
+  if parent.abstract_model.serialized_attributes.include?(properties[:name].to_s)
     fields << RailsAdmin::Config::Fields::Types::Serialized.new(parent, properties[:name], properties)
     true
   else

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

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/string/inflections'
 require 'rails_admin/config/fields'
+require 'rails_admin/config/fields/association'
 
 module RailsAdmin
   module Config
@@ -8,7 +9,7 @@ module RailsAdmin
         @@registry = {}
 
         def self.load(type)
-          @@registry[type.to_sym] or logger.info "Unsupported field datatype: #{type}"
+          @@registry[type.to_sym] or raise "Unsupported field datatype: #{type}"
         end
 
         def self.register(type, klass = nil)

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

@@ -1,5 +1,6 @@
 require 'rails_admin/config/fields/types/belongs_to_association'
 require 'rails_admin/config/fields/types/boolean'
+require 'rails_admin/config/fields/types/bson_object_id'
 require 'rails_admin/config/fields/types/date'
 require 'rails_admin/config/fields/types/datetime'
 require 'rails_admin/config/fields/types/decimal'
@@ -13,6 +14,7 @@ require 'rails_admin/config/fields/types/has_and_belongs_to_many_association'
 require 'rails_admin/config/fields/types/has_many_association'
 require 'rails_admin/config/fields/types/has_one_association'
 require 'rails_admin/config/fields/types/integer'
+require 'rails_admin/config/fields/types/mongoid_type'
 require 'rails_admin/config/fields/types/password'
 require 'rails_admin/config/fields/types/polymorphic_association'
 require 'rails_admin/config/fields/types/string'

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

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

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

@@ -0,0 +1,42 @@
+require 'rails_admin/config/fields/types/string'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class BsonObjectId < RailsAdmin::Config::Fields::Types::String
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types::register(self)
+
+          register_instance_option(:label) do
+            label = ((@label ||= {})[::I18n.locale] ||= abstract_model.model.human_attribute_name name)
+            label = "_id" if label == ''
+            label
+          end
+
+          register_instance_option(:help) do
+            "BSON::ObjectId"
+          end
+
+          register_instance_option(:read_only) do
+            true
+          end
+
+          register_instance_option(:visible?) do
+            @name.to_s != '_id'
+          end
+
+          def parse_input(params)
+            begin
+              params[name] = (params[name].blank? ? nil : BSON::ObjectId(params[name])) if params[name].is_a?(::String)
+            rescue BSON::InvalidObjectId
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+
+

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

@@ -20,9 +20,9 @@ module RailsAdmin
           end
 
           register_instance_option(:pretty_value) do
-            if enum.is_a?(Hash)
+            if enum.is_a?(::Hash)
               enum.reject{|k,v| v.to_s != value.to_s}.keys.first.to_s.presence || value.presence || ' - '
-            elsif enum.is_a?(Array) && enum.first.is_a?(Array)
+            elsif enum.is_a?(::Array) && enum.first.is_a?(::Array)
               enum.find{|e|e[1].to_s == value.to_s}.try(:first).to_s.presence || value.presence || ' - '
             else
               value.presence || ' - '

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

@@ -0,0 +1,25 @@
+require 'rails_admin/config/fields/types/string'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class MongoidType < RailsAdmin::Config::Fields::Types::String
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types::register(self)
+
+          register_instance_option(:label) do
+            "Type"
+          end
+
+          register_instance_option(:visible) do
+            false
+          end
+        end
+      end
+    end
+  end
+end
+
+
+

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

@@ -60,7 +60,7 @@ module RailsAdmin
               [config.abstract_model.model.name, config.abstract_model.to_param]
             end
 
-            Hash[*types.collect { |v|
+            ::Hash[*types.collect { |v|
                   [v[0], bindings[:view].index_path(v[1])]
                 }.flatten]
           end

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

@@ -13,7 +13,7 @@ module RailsAdmin
           end
           
           def parse_input(params)
-            params[name] = (params[name].blank? ? nil : YAML.load(params[name]))
+            params[name] = (params[name].blank? ? nil : YAML.load(params[name])) if params[name].is_a?(::String)
           end
         end
       end

data/lib/rails_admin/engine.rb

@@ -4,6 +4,7 @@ require 'remotipart'
 require 'bootstrap-sass'
 require 'kaminari'
 require 'rack-pjax'
+require 'jquery-ui-rails'
 require 'nested_form'
 require 'rails_admin'
 

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.3"
+  VERSION = "0.0.4"
 end

data/spec/dummy_app/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2'
 gem 'devise', '~> 2.0'
+gem 'bson_ext'
+gem 'mongoid'
 gem 'rails_admin', :path => '../../'
 gem 'mlb', '~> 0.5'
 gem 'paperclip', '~> 2.4'

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

@@ -0,0 +1,9 @@
+class Article
+  include Mongoid::Document
+
+  field :title, :type => String
+  field :body,  :type => String
+
+  referenced_in :author
+  references_and_referenced_in_many :tags
+end

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

@@ -0,0 +1,6 @@
+class Author
+  include Mongoid::Document
+
+  field :name, :type => String
+  references_many :articles
+end

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

@@ -0,0 +1,22 @@
+class MongoidFieldTest
+  include Mongoid::Document
+
+  field :name, :type => String
+  field :title, :type => String
+  field :subject, :type => String
+  field :description, :type => String
+  field :short_text, :type => String
+  field :array_field, :type => Array
+  field :big_decimal_field, :type => BigDecimal
+  field :boolean_field, :type => Boolean
+  field :bson_object_id_field, :type => BSON::ObjectId
+  field :date_field, :type => Date
+  field :date_time_field, :type => DateTime
+  field :float_field, :type => Float
+  field :hash_field, :type => Hash
+  field :integer_field, :type => Integer
+  field :time_field, :type => Time
+  field :object_field, :type => Object
+
+  validates :short_text, :length => {:maximum => 255}
+end

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

@@ -0,0 +1,7 @@
+class Tag
+  include Mongoid::Document
+
+  field :name, :type => String
+
+  references_and_referenced_in_many :articles
+end

data/spec/dummy_app/config/environments/development.rb

@@ -30,8 +30,8 @@ DummyApp::Application.configure do
   config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
-  config.assets.compress = false
+  config.assets.compress = true
 
   # Expands the lines which load the assets
-  config.assets.debug = true
+  config.assets.debug = false
 end

data/spec/dummy_app/config/mongoid.yml

@@ -0,0 +1,17 @@
+defaults: &defaults
+  host: localhost
+  autocreate_indexes: false
+  allow_dynamic_fields: true
+  include_root_in_json: false
+  parameterize_keys: true
+  persist_in_safe_mode: false
+  raise_not_found_error: true
+  reconnect_time: 3
+
+development:
+  <<: *defaults
+  database: dummy_app_development
+
+test:
+  <<: *defaults
+  database: dummy_app_test

data/spec/dummy_app/db/seeds.rb

@@ -3,16 +3,16 @@ require 'mlb'
 User.create(:email => 'username@example.com', :password => 'password', :password_confirmation => 'password')
 
 MLB::Team.all.each do |mlb_team|
-  unless league = RailsAdmin::AbstractModel.new("League").first(:conditions => ["name = ?", mlb_team.league])
-    league = RailsAdmin::AbstractModel.new("League").create(:name => mlb_team.league)
+  unless league = League.first(:conditions => ["name = ?", mlb_team.league])
+    league = League.create(:name => mlb_team.league)
   end
-  unless division = RailsAdmin::AbstractModel.new("Division").first(:conditions => ["name = ?", mlb_team.division])
-    division = RailsAdmin::AbstractModel.new("Division").create(:name => mlb_team.division, :league => league)
+  unless division = Division.first(:conditions => ["name = ?", mlb_team.division])
+    division = Division.create(:name => mlb_team.division, :league => league)
   end
-  unless team = RailsAdmin::AbstractModel.new("Team").first(:conditions => ["name = ?", mlb_team.name])
-    team = RailsAdmin::AbstractModel.new("Team").create(:name => mlb_team.name, :logo_url => mlb_team.logo_url, :manager => mlb_team.manager, :ballpark => mlb_team.ballpark, :mascot => mlb_team.mascot, :founded => mlb_team.founded, :wins => mlb_team.wins, :losses => mlb_team.losses, :win_percentage => ("%.3f" % (mlb_team.wins.to_f / (mlb_team.wins + mlb_team.losses))).to_f, :division => division)
+  unless team = Team.first(:conditions => ["name = ?", mlb_team.name])
+    team = Team.create(:name => mlb_team.name, :logo_url => mlb_team.logo_url, :manager => mlb_team.manager, :ballpark => mlb_team.ballpark, :mascot => mlb_team.mascot, :founded => mlb_team.founded, :wins => mlb_team.wins, :losses => mlb_team.losses, :win_percentage => ("%.3f" % (mlb_team.wins.to_f / (mlb_team.wins + mlb_team.losses))).to_f, :division => division)
   end
   mlb_team.players.reject{|player| player.number.nil?}.each do |player|
-    RailsAdmin::AbstractModel.new("Player").create(:name => player.name, :number => player.number, :position => player.position, :team => team)
+    Player.create(:name => player.name, :number => player.number, :position => player.position, :team => team)
   end
 end

data/spec/factories.rb

@@ -31,6 +31,11 @@ FactoryGirl.define do
     sequence(:name) { |n| "League #{n}" }
   end
 
+  factory :division do
+    sequence(:custom_league_id)
+    sequence(:name) { |n| "Division #{n}" }
+  end
+
   factory :fan do
     sequence(:name) { |n| "Fan #{n}" }
   end
@@ -63,4 +68,22 @@ FactoryGirl.define do
   factory :hardball do
     color('blue')
   end
+
+  factory :article do
+    sequence(:title) { |n| "Article #{n}" }
+  end
+
+  factory :author do
+    sequence(:name) { |n| "Author #{n}" }
+  end
+
+  factory :tag do
+    sequence(:name) { |n| "Tag #{n}" }
+  end
+
+  factory :mongoid_field_test do
+    sequence(:name) { |n| "Mongoid Field Test #{n}" }
+    array_field([1])
+    hash_field({:a => 1})
+  end
 end

data/spec/integration/basic/create/rails_admin_basic_create_spec.rb

@@ -138,4 +138,17 @@ describe "RailsAdmin Basic Create" do
       should have_content("Player failed to be created. Player is cheating")
     end
   end
+
+  describe "creation of Mongoid habtm model object" do
+    before(:each) do
+      visit new_path(:model_name => "tag")
+      fill_in "tag[name]", :with => "Funny"
+      click_button "Save"
+      @tag = RailsAdmin::AbstractModel.new("Tag").first
+    end
+
+    it "should create an object with correct attributes" do
+      @tag.name.should eql("Funny")
+    end
+  end
 end