activeadmin-mongoid 0.0.1 → 0.0.2.jpmckinney.0

data/README.md

@@ -10,11 +10,16 @@ For more on Mongoid support in ActiveAdmin see [this issue](https://github.com/g
 
 ## Installation
 
-Add this line to your application's Gemfile:
+### Some Gems
+Add the following gems to your application's Gemfile:
 
 ```ruby
 gem 'activeadmin-mongoid'
+gem 'devise'
 ```
+Devise is the gem used to managed admin authentication.
+The gem is required to force itself ORM configuration.
+Else the gem will try to use by default ActiveRecord ORM.
 
 You can safely remove the following lines, since are already activeadmin-mongoid dependencies:
 
@@ -24,10 +29,46 @@ gem 'meta_search', '>= 1.1.0.pre'
 gem 'sass-rails',  ['~> 3.1', '>= 3.1.4']
 ```
 
-And then execute:
+### Remove Application Dependencies
+In your config/application.rb, replace :
+
+```ruby
+require 'rails/all'
+```
+
+with :
+
+```ruby
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
+require "sprockets/railtie"
+require "rails/test_unit/railtie"
+```
+
+rails/all includes elements requiring ActiveRecord::Connection ...
+
+### Bundle & Crank
+
+Execute:
 
     $ bundle
+    $ rails g devise:install
+    $ rails g active_admin:install
+
+Check that the generated initializers/devise.rb file requires mongoid orm.
+You may find a line like this :
+
+```ruby
+require 'devise/orm/mongoid'
+```
+
+Then create the admin user:
+
+    $ rails console
+    >> AdminUser.create :email => 'admin@example.com', :password => 'password', :password_confirmation => 'password'
 
+And that's pretty much it !
 
 ## Contributing
 

data/activeadmin-mongoid.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = ActiveAdmin::Mongoid::VERSION
   gem.license       = 'MIT'
   
-  gem.add_runtime_dependency 'mongoid',     '~> 2.0'
+  gem.add_runtime_dependency 'mongoid',     '>= 2.0'
   gem.add_runtime_dependency 'activeadmin', '~> 0.4'
   gem.add_runtime_dependency 'meta_search', '>= 1.1.0.pre'
   gem.add_runtime_dependency 'sass-rails',  ['~> 3.1', '>= 3.1.4']

data/lib/active_admin/mongoid/document.rb

@@ -1,5 +1,3 @@
-require 'mongoid'
-
 module ActiveAdmin::Mongoid::Document
   extend ActiveSupport::Concern
   

data/lib/active_admin/mongoid/resource.rb

@@ -1,24 +1,26 @@
-require 'active_admin'
-require 'inherited_resources'
-
 ActiveAdmin::Resource # autoload
 class ActiveAdmin::Resource
   def resource_table_name
-    resource.collection_name
-  end
-
-  # Disable filters
-  def add_default_sidebar_sections
+    resource_class.collection_name
   end
 end
 
 ActiveAdmin::ResourceController # autoload
 class ActiveAdmin::ResourceController
+  before_filter :skip_sidebar!
+
+  protected
+
+  # @todo remove once https://github.com/gregbell/active_admin/pull/1454 is merged
+  def skip_sidebar!
+    @skip_sidebar = true
+  end
+
   # Use #desc and #asc for sorting.
   def sort_order(chain)
     params[:order] ||= active_admin_config.sort_order
-    table_name = active_admin_config.resource_table_name
-    if params[:order] && params[:order] =~ /^([\w\_\.]+)_(desc|asc)$/
+    # @todo remove once https://github.com/mongoid/mongoid/pull/2175 is fixed
+    if params[:order] && params[:order] != 'id_desc' && params[:order] =~ /^([\w\_\.]+)_(desc|asc)$/
       chain.send($2, $1)
     else
       chain # just return the chain

data/lib/active_admin/mongoid/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module Mongoid
-    VERSION = '0.0.1'
+    VERSION = '0.0.2.jpmckinney.0'
   end
 end

data/lib/active_admin/mongoid.rb

@@ -1,4 +1,5 @@
 require 'active_admin'
+require 'mongoid'
 
 module ActiveAdmin
   module Mongoid
@@ -12,7 +13,6 @@ module ActiveAdmin
       setup_without_mongoid *args, &block
       
       require 'active_admin/mongoid/comments'
-      require 'active_admin/mongoid/form_builder'
       require 'active_admin/mongoid/resource'
       require 'active_admin/mongoid/document'
     end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2.jpmckinney.0
+  prerelease: 6
 platform: ruby
 authors:
 - Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70117976268100 !ruby/object:Gem::Requirement
+  requirement: &70246963106980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117976268100
+  version_requirements: *70246963106980
 - !ruby/object:Gem::Dependency
   name: activeadmin
-  requirement: &70117976267460 !ruby/object:Gem::Requirement
+  requirement: &70246963106240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70117976267460
+  version_requirements: *70246963106240
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70117976266920 !ruby/object:Gem::Requirement
+  requirement: &70246963105180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70117976266920
+  version_requirements: *70246963105180
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70117976266280 !ruby/object:Gem::Requirement
+  requirement: &70246963104520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,7 +57,7 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70117976266280
+  version_requirements: *70246963104520
 description: ActiveAdmin hacks to support Mongoid (some ActiveAdmin features are disabled)
 email:
 - elia@schito.me
@@ -75,7 +75,6 @@ files:
 - lib/active_admin/mongoid.rb
 - lib/active_admin/mongoid/comments.rb
 - lib/active_admin/mongoid/document.rb
-- lib/active_admin/mongoid/form_builder.rb
 - lib/active_admin/mongoid/resource.rb
 - lib/active_admin/mongoid/version.rb
 - lib/activeadmin-mongoid.rb
@@ -95,9 +94,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17
@@ -105,3 +104,4 @@ signing_key:
 specification_version: 3
 summary: ActiveAdmin hacks to support Mongoid
 test_files: []
+has_rdoc: 

data/lib/active_admin/mongoid/form_builder.rb

@@ -1,13 +0,0 @@
-require 'active_admin/form_builder'
-
-class ActiveAdmin::FormBuilder
-  def inputs(*args, &block)
-    # Store that we are creating inputs without a block
-    @inputs_with_block = block_given? ? true : false
-    content = with_new_form_buffer do
-      super
-      # form_buffers.last
-    end
-    form_buffers.last << content.html_safe
-  end
-end