orm renamed to object_mapper

Zhomart · Jan 31, 2015 · 8c58247 · 8c58247
1 parent 9cc7465
commit 8c58247
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 10 deletions.
diff --git a/lib/active_admin.rb b/lib/active_admin.rb
@@ -128,5 +128,5 @@ def after_load(&block)
 require 'active_admin/filters'
 
 # Require ORM-specific plugins
-require 'active_admin/orm/active_record' if defined? ActiveRecord
-require 'active_admin/orm/mongoid'       if defined? Mongoid
+require 'active_admin/object_mapper/active_record' if defined? ActiveRecord
+require 'active_admin/object_mapper/mongoid'       if defined? Mongoid
diff --git a/lib/active_admin/orm/active_record.rb → ...tive_admin/object_mapper/active_record.rb b/lib/active_admin/orm/active_record.rb → ...tive_admin/object_mapper/active_record.rb
@@ -2,4 +2,4 @@
 
 ActiveAdmin::DatabaseHitDuringLoad.database_error_classes << ActiveRecord::StatementInvalid
 
-require 'active_admin/orm/active_record/comments'
+require 'active_admin/object_mapper/active_record/comments'
diff --git a/...ctive_admin/orm/active_record/comments.rb → ...n/object_mapper/active_record/comments.rb b/...ctive_admin/orm/active_record/comments.rb → ...n/object_mapper/active_record/comments.rb
@@ -1,7 +1,7 @@
-require 'active_admin/orm/active_record/comments/views'
-require 'active_admin/orm/active_record/comments/show_page_helper'
-require 'active_admin/orm/active_record/comments/namespace_helper'
-require 'active_admin/orm/active_record/comments/resource_helper'
+require 'active_admin/object_mapper/active_record/comments/views'
+require 'active_admin/object_mapper/active_record/comments/show_page_helper'
+require 'active_admin/object_mapper/active_record/comments/namespace_helper'
+require 'active_admin/object_mapper/active_record/comments/resource_helper'
 
 # Add the comments configuration
 ActiveAdmin::Application.inheritable_setting :comments,                   true
@@ -14,7 +14,7 @@
 ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comments::ShowPageHelper
 
 # Load the model as soon as it's referenced. By that point, Rails & Kaminari will be ready
-ActiveAdmin.autoload :Comment, 'active_admin/orm/active_record/comments/comment'
+ActiveAdmin.autoload :Comment, 'active_admin/object_mapper/active_record/comments/comment'
 
 # Walk through all the loaded namespaces after they're loaded
 ActiveAdmin.after_load do |app|

diff --git a/...min/orm/active_record/comments/comment.rb → ..._mapper/active_record/comments/comment.rb b/...min/orm/active_record/comments/comment.rb → ..._mapper/active_record/comments/comment.rb
diff --git a/...ctive_record/comments/namespace_helper.rb → ...ctive_record/comments/namespace_helper.rb b/...ctive_record/comments/namespace_helper.rb → ...ctive_record/comments/namespace_helper.rb
diff --git a/...active_record/comments/resource_helper.rb → ...active_record/comments/resource_helper.rb b/...active_record/comments/resource_helper.rb → ...active_record/comments/resource_helper.rb
diff --git a/...ctive_record/comments/show_page_helper.rb → ...ctive_record/comments/show_page_helper.rb b/...ctive_record/comments/show_page_helper.rb → ...ctive_record/comments/show_page_helper.rb
diff --git a/lib/active_admin/object_mapper/active_record/comments/views.rb b/lib/active_admin/object_mapper/active_record/comments/views.rb
@@ -0,0 +1,2 @@
+require 'active_admin/views'
+require 'active_admin/object_mapper/active_record/comments/views/active_admin_comments'
diff --git a/...d/comments/views/active_admin_comments.rb → ...d/comments/views/active_admin_comments.rb b/...d/comments/views/active_admin_comments.rb → ...d/comments/views/active_admin_comments.rb
diff --git a/lib/active_admin/orm/mongoid.rb → lib/active_admin/object_mapper/mongoid.rb b/lib/active_admin/orm/mongoid.rb → lib/active_admin/object_mapper/mongoid.rb
diff --git a/lib/active_admin/orm/mongoid/.gitkeep → ...tive_admin/object_mapper/mongoid/.gitkeep b/lib/active_admin/orm/mongoid/.gitkeep → ...tive_admin/object_mapper/mongoid/.gitkeep
diff --git a/lib/active_admin/orm/active_record/comments/views.rb b/lib/active_admin/orm/active_record/comments/views.rb
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		ActiveAdmin::DatabaseHitDuringLoad.database_error_classes << ActiveRecord::StatementInvalid

		require 'active_admin/orm/active_record/comments'
		require 'active_admin/object_mapper/active_record/comments'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		require 'active_admin/views'
		require 'active_admin/object_mapper/active_record/comments/views/active_admin_comments'