introspective_admin 0.0.8 → 0.9.0

data/README.md

@@ -18,7 +18,7 @@
 
 IntrospectiveAdmin is a Rails Plugin for DRYing up ActiveAdmin configurations by
 laying out simple defaults and including nested relations according to the models'
-accepts_nested_attributes_for :relation declarations. 
+accepts_nested_attributes_for :relation declarations.
 
 ## Documentation
 
@@ -28,7 +28,9 @@ In your Gemfile:
 gem 'introspective_admin'
 ```
 
-And bundle install.  In app/admin/my_admin.rb:
+And bundle install.
+
+In app/admin/my_admin.rb:
 
 ```
 class MyAdmin < IntrospectiveAdmin::Base
@@ -39,7 +41,7 @@ class MyAdmin < IntrospectiveAdmin::Base
   def self.exclude_params
     %w(fields to exclude from the admin screen)
   end
-  
+
   register MyModel do
     # It yields the ActiveAdmin DSL context back, allowing further configuration to
     # be added here, just as you would normally, to the Admin::MyModelController
@@ -48,29 +50,32 @@ class MyAdmin < IntrospectiveAdmin::Base
 end
 ```
 
-Registering MyModel will set up the index, show, and form configurations for every attribute, virtual attribute listed in MyAdmin.include_virtual_attributes (e.g. a password field for a Devise model), and nested association on the model excluding those in MyAdmin.exclude_params. It will link to associated records (if they have ActiveAdmin screens), perform eager loading of nested associations, and permit parameters for every non-excluded attribute on the model. 
+Registering MyModel will set up the index, show, and form configurations for every attribute, virtual attribute listed in MyAdmin.include_virtual_attributes (e.g. a password field for a Devise model), and nested association on the model excluding those in MyAdmin.exclude_params. It will link to associated records (if they have ActiveAdmin screens), perform eager loading of nested associations, and permit parameters for every non-excluded attribute on the model.
 
-Customizing select box options for associations is done by adding an 
+Customizing select box options for associations is done by adding an
 "options_for_X" class method on the administrated model:
 
 ```
+app/models/my_model.rb
 class MyModel < ActiveRecord::Base
   belongs_to :parent
   has_many :other_models
   accepts_nested_attributes_for :other_models, :allow_destroy => true
 
   def self.options_for_parent(instance_of_my_model)
-    Parent.order(:appelation).map.{|p| ["#{p.appelation}", p.id] } 
+    Parent.order(:appelation).map.{|p| ["#{p.appelation}", p.id] }
   end
 end
 ```
 
 IntrospectiveAdmin will detect nested polymorphic relations and attempt to handle
-them using virutal attributes that you must add to the model instance, plus a class 
+them using virutal attributes that you must add to the model instance, plus a class
 method for the select box options, using a shared delimiter string for the compound ID.
-E.g. here we use a hyphen: 
+
+E.g. here we use a hyphen:
 
 ```
+app/models/my_model.rb
 class MyModel < ActiveRecord::Base
   belongs_to :poly_model, polymorphic: true
   accepts_nested_attributes_for :poly_model, :allow_destroy => true
@@ -90,6 +95,27 @@ class MyModel < ActiveRecord::Base
 end
 ```
 
+ActiveAdmin relies on [Ransack](https://github.com/activerecord-hackery/ransack) to power its searches. You will need
+to explicitly declare attributes and associations to be accessible to ActiveAdmin. You can defeat the purpose by declaring everything accessible via your models' abstract base class, but be sure to exclude sensitive data:
+
+```
+app/models/application_record.rb
+def ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+
+  class << self
+    def ransackable_attributes(auth_object = nil)
+      @ransackable_attributes ||= column_names + _ransackers.keys - %w(password)
+    end
+
+    def ransackable_associations(auth_object = nil)
+      @ransackable_associations ||= reflect_on_all_associations.map { |a| a.name.to_s } + _ransackers.keys
+    end
+  end
+end
+```
+
+
 ## Dependencies
 
 Tool                  | Description

data/introspective_admin.gemspec

@@ -18,24 +18,17 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n").sort
   s.test_files    = `git ls-files -- spec/*`.split("\n")
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.7.0'
 
+  s.add_dependency 'rails'
+  s.add_dependency 'activeadmin'
   s.add_dependency 'sass-rails'
+  s.add_dependency 'sass'
 
   if RUBY_PLATFORM == 'java'
     s.add_development_dependency "activerecord-jdbcsqlite3-adapter"
   else
     s.add_development_dependency "sqlite3"
-    if RUBY_VERSION > '2.0.0'
-      #s.add_development_dependency 'byebug'
-    end
   end
-  s.add_development_dependency "rspec-rails", '>= 3.0'
-  s.add_development_dependency 'devise'
-  s.add_development_dependency 'devise-async'
-  s.add_development_dependency 'machinist'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'rufus-mnemo'
-
 end
 

data/lib/introspective_admin/base.rb

@@ -1,5 +1,5 @@
 module IntrospectiveAdmin
-  class Base 
+  class Base
     # Generate an active admin interface by introspecting on the models.
 
     # For polymorphic associations set up virtual 'assign' attributes on the model like so:
@@ -20,11 +20,11 @@ module IntrospectiveAdmin
 
     class << self
 
-      def exclude_params 
+      def exclude_params
         [] # do not display the field in the index page and forms.
       end
 
-      def include_virtual_attributes 
+      def include_virtual_attributes
         [] #
       end
 
@@ -42,7 +42,7 @@ module IntrospectiveAdmin
       def params_list(model, extras=[])
         model.columns.map {|c|
           polymorphic?(model,c.name) ? c.name.sub(/_id$/,'')+"_assign" : c.name
-        }+extras 
+        }+extras
       end
 
       def link_record(dsl, record)
@@ -59,7 +59,7 @@ module IntrospectiveAdmin
 
       def register(model, &block)
         # Defining activeadmin pages will break pending migrations:
-        begin ActiveRecord::Migration.check_pending! rescue return end 
+        begin ActiveRecord::Migration.check_all_pending! rescue return end
 
         klass         = self
         model_name    = model.to_s.underscore
@@ -68,7 +68,7 @@ module IntrospectiveAdmin
         }.map {|assoc,options|
           reflection       = model.reflections[assoc.to_s]
           reflection_class = reflection.class_name.constantize
-          # merge the options of the nested attribute and relationship declarations  
+          # merge the options of the nested attribute and relationship declarations
           options = options.merge(reflection_class.reflections[assoc.to_s].try(:options) || {})
           options[:class]   = reflection_class
           options[:columns] = klass.column_list(reflection_class)
@@ -78,7 +78,7 @@ module IntrospectiveAdmin
           [assoc, options]
         }]
 
-        ActiveAdmin.register model do 
+        ActiveAdmin.register model do
           instance_eval &block if block_given? # Evalutate the passed black for overrides to the defaults
 
           controller do
@@ -87,14 +87,14 @@ module IntrospectiveAdmin
             end
           end
 
-          index do 
+          index do
             selectable_column
             cols = model.columns.map(&:name)-klass.exclude_params
             cols.each_with_index do |c,i|
               reflection = model.reflections.detect {|k,v| v.foreign_key == c }
               if reflection
                 column c do |o|
-                  klass.link_record(self,o.send(reflection.first)) 
+                  klass.link_record(self,o.send(reflection.first))
                 end
               else
                 column c
@@ -103,7 +103,7 @@ module IntrospectiveAdmin
             actions
           end
 
-          show do 
+          show do
             instance = self.send(model_name)
 
             attributes_table do
@@ -112,7 +112,7 @@ module IntrospectiveAdmin
                 reflection = model.reflections.detect {|k,v| v.foreign_key == c.name }
                 if reflection
                   row c.name do |o|
-                    klass.link_record(self,instance.send(reflection.first)) 
+                    klass.link_record(self,instance.send(reflection.first))
                   end
                 else
                   row c.name
@@ -122,13 +122,13 @@ module IntrospectiveAdmin
 
               nested_config.each do |assoc,options|
                 panel assoc.capitalize do
-                  table_for instance.send(assoc) do 
+                  table_for instance.send(assoc) do
                     options[:columns].each do |c|
                       if options[:class].reflections[c]
                         column( c ) do |r|
                           klass.link_record(self,r.send(c)) if r
                         end
-                      else 
+                      else
                         column c
                       end
                     end
@@ -152,7 +152,7 @@ module IntrospectiveAdmin
           }]]
 
           form do |f|
-            f.semantic_errors *f.object.errors.keys
+            f.semantic_errors *f.object.errors.messages.keys
             f.actions
 
             klass.column_list(model, klass.include_virtual_attributes).each do |column|
@@ -166,7 +166,7 @@ module IntrospectiveAdmin
               end
             end
 
-            div { '&nbsp'.html_safe } 
+            div { '&nbsp'.html_safe }
 
             nested_config.each do |assoc,options|
               aclass  = options[:class]
@@ -176,7 +176,7 @@ module IntrospectiveAdmin
                   columns.each do |c|
                     if c == model_name || c == options[:polymorphic_reference]
                       # the join to the parent is implicit
-                    elsif klass.polymorphic?(aclass,c) 
+                    elsif klass.polymorphic?(aclass,c)
                       r.input "#{c}_assign", collection: aclass.send("#{c}_assign_options")
                     elsif aclass.reflections[c] && aclass.respond_to?("options_for_#{c}")
                       # If the class has an options_for_<column> method defined use that
@@ -184,7 +184,7 @@ module IntrospectiveAdmin
                       # e.g. UserProjectJob.options_for_job is scoped by the Project's
                       # jobs:
                       r.input c, collection: aclass.send("options_for_#{c}",f.object)
-                    else 
+                    else
                       r.input c
                     end
                   end

data/lib/introspective_admin/version.rb

@@ -1,3 +1,3 @@
 module IntrospectiveAdmin
-  VERSION = "0.0.8"
+  VERSION = "0.9.0"
 end

data/spec/admin/company_admin_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Admin::CompaniesController, :type => :controller do
   describe "SHOW record" do 
     it "finds the record" do
       c = Company.make!
-      get :show, id: c.id
+      get :show, params: { id: c.id }
       response.status.should == 200 
     end
   end
@@ -36,7 +36,7 @@ RSpec.describe Admin::CompaniesController, :type => :controller do
   describe "CREATE record" do 
     it "creates the record" do
       c = Company.make
-      post :create, company: c.attributes
+      post :create, params: { company: c.attributes }
       response.should redirect_to action: :show, id: Company.last.id
       Company.last.name.should == c.name
     end
@@ -44,9 +44,9 @@ RSpec.describe Admin::CompaniesController, :type => :controller do
     it "creates a record with an admin" do
       u = User.make!
       c = Company.make
-      post :create, company: c.attributes.merge({
+      post :create, params: { company: c.attributes.merge({
         roles_attributes: {'0'=>{ user_id: u.id }}
-      })
+      }) }
       response.should redirect_to action: :show, id: Company.last.id
       Company.last.admins.include?(u).should be_truthy
     end
@@ -56,7 +56,7 @@ RSpec.describe Admin::CompaniesController, :type => :controller do
   describe "EDIT record" do 
     it "renders the edit form for an existing record" do 
       r = Company.make!
-      get :edit, id: r.id
+      get :edit, params: { id: r.id }
       response.status.should == 200 
     end
   end
@@ -64,7 +64,7 @@ RSpec.describe Admin::CompaniesController, :type => :controller do
   describe "UPDATE record" do 
     it "updates the record" do
       c = Company.make!
-      put :update, id: c.id, company: { name: "New Name" } 
+      put :update, params: { id: c.id, company: { name: "New Name" }  }
       response.should redirect_to action: :show, id: c.id
       Company.find(c.id).name.should == "New Name"
     end

data/spec/admin/job_admin_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Admin::JobsController, :type => :controller do
   describe "SHOW record" do 
     it "finds the record" do
       r = Job.make!
-      get :show, id: r.id
+      get :show, params: { id: r.id }
       response.status.should == 200 
     end
   end
@@ -36,7 +36,7 @@ RSpec.describe Admin::JobsController, :type => :controller do
   describe "CREATE record" do 
     it "creates the record" do
       r = Job.make
-      post :create, job: r.attributes
+      post :create, params: { job: r.attributes }
       response.should redirect_to action: :show, id: Job.last.id
       Job.last.title.should == r.title
     end
@@ -45,7 +45,7 @@ RSpec.describe Admin::JobsController, :type => :controller do
   describe "EDIT record" do 
     it "renders the edit form for an existing record" do 
       r = Job.make!
-      get :edit, id: r.id
+      get :edit, params: { id: r.id }
       response.status.should == 200 
     end
   end
@@ -53,7 +53,7 @@ RSpec.describe Admin::JobsController, :type => :controller do
   describe "UPDATE record" do 
     it "updates the record" do
       r = Job.make!
-      put :update, id: r.id, job: { title: "New Name" } 
+      put :update, params: { id: r.id, job: { title: "New Name" }  }
       response.should redirect_to action: :show, id: r.id
       Job.find(r.id).title.should == "New Name"
     end

data/spec/admin/location_admin_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Admin::LocationsController, :type => :controller do
   describe "SHOW record" do 
     it "finds the record" do
       c = Location.make!
-      get :show, id: c.id
+      get :show, params: { id: c.id }
       response.status.should == 200 
     end
   end
@@ -39,7 +39,7 @@ RSpec.describe Admin::LocationsController, :type => :controller do
     it "creates the record" do
       c = Location.make
       gps = LocationGps.make
-      post :create, location: c.attributes.merge(gps_attributes: gps.attributes) 
+      post :create, params: { location: c.attributes.merge(gps_attributes: gps.attributes)  }
       response.should redirect_to action: :show, id: Location.last.id
       Location.last.name.should == c.name
       Location.last.gps.lat.round(10).should == gps.lat.round(10)
@@ -50,7 +50,7 @@ RSpec.describe Admin::LocationsController, :type => :controller do
   describe "EDIT record" do 
     it "renders the edit form for an existing record" do 
       r = Location.make!
-      get :edit, id: r.id
+      get :edit, params: { id: r.id }
       response.status.should == 200 
     end
   end
@@ -58,7 +58,7 @@ RSpec.describe Admin::LocationsController, :type => :controller do
   describe "UPDATE record" do 
     it "updates the record" do
       r = Location.make!
-      put :update, id: r.id, location: { name: "New Name" } 
+      put :update, params: { id: r.id, location: { name: "New Name" }  }
       response.should redirect_to action: :show, id: r.id
       Location.find(r.id).name.should == "New Name"
     end

data/spec/admin/location_beacon_admin_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Admin::LocationBeaconsController, :type => :controller do
     it "scopes location beacons by low battery level" do 
       c = LocationBeacon.make!(last_known_battery_level: 50)
       d = LocationBeacon.make!(last_known_battery_level: 4)
-      get :index, { scope: 'low_battery' } 
+      get :index, params: { scope: 'low_battery' } 
       response.status.should == 200 
       assigns(:location_beacons).include?(c).should == false
       assigns(:location_beacons).include?(d).should == true
@@ -32,7 +32,7 @@ RSpec.describe Admin::LocationBeaconsController, :type => :controller do
   describe "SHOW record" do 
     it "finds the record" do
       c = LocationBeacon.make!
-      get :show, id: c.id
+      get :show, params: { id: c.id }
       response.status.should == 200 
     end
   end
@@ -48,7 +48,7 @@ RSpec.describe Admin::LocationBeaconsController, :type => :controller do
   describe "CREATE record" do 
     it "creates the record" do
       c = LocationBeacon.make
-      post :create, location_beacon: c.attributes
+      post :create, params: { location_beacon: c.attributes }
       response.should redirect_to action: :show, id: LocationBeacon.last.id
       LocationBeacon.last.mac_address.should =~ /#{c.mac_address}/i
     end
@@ -57,7 +57,7 @@ RSpec.describe Admin::LocationBeaconsController, :type => :controller do
   describe "EDIT record" do 
     it "renders the edit form for an existing record" do 
       r = LocationBeacon.make!
-      get :edit, id: r.id
+      get :edit, params: { id: r.id }
       response.status.should == 200 
     end
   end
@@ -65,7 +65,7 @@ RSpec.describe Admin::LocationBeaconsController, :type => :controller do
   describe "UPDATE record" do 
     it "updates the record" do
       r = LocationBeacon.make!
-      put :update, id: r.id, location_beacon: { last_known_battery_level: 30 } 
+      put :update, params: { id: r.id, location_beacon: { last_known_battery_level: 30 }  }
       response.should redirect_to action: :show, id: r.id
       LocationBeacon.find(r.id).last_known_battery_level.should == 30
     end

data/spec/admin/project__admin_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Admin::ProjectsController, :type => :controller do
   describe "SHOW record" do 
     it "finds the record" do
       r = Project.make!
-      get :show, id: r.id
+      get :show, params: { id: r.id }
       response.status.should == 200 
     end
   end
@@ -35,7 +35,7 @@ RSpec.describe Admin::ProjectsController, :type => :controller do
   describe "CREATE record" do 
     it "creates the record" do
       r = Project.make
-      post :create, project: r.attributes
+      post :create, params: { project: r.attributes }
       response.should redirect_to action: :show, id: Project.last.id
       Project.last.name.should == r.name
     end
@@ -43,7 +43,7 @@ RSpec.describe Admin::ProjectsController, :type => :controller do
     it "the inverse_of declaration allows a new project to be created with a project_job" do
       j = Job.make!
       r = Project.make
-      post :create, project: r.attributes.merge({project_jobs_attributes:{'0'=>{job_id: j.id}}}) 
+      post :create, params: { project: r.attributes.merge({project_jobs_attributes:{'0'=>{job_id: j.id}}})  }
       p = Project.last
       p.name.should == r.name
       p.project_jobs.size.should == 1
@@ -55,7 +55,7 @@ RSpec.describe Admin::ProjectsController, :type => :controller do
   describe "EDIT record" do 
     it "renders the edit form for an existing record" do 
       r = Project.make!
-      get :edit, id: r.id
+      get :edit, params: { id: r.id }
       response.status.should == 200 
     end
   end
@@ -63,7 +63,7 @@ RSpec.describe Admin::ProjectsController, :type => :controller do
   describe "UPDATE record" do 
     it "updates the record" do
       r = Project.make!
-      put :update, id: r.id, project: { name: "New Name" } 
+      put :update, params: { id: r.id, project: { name: "New Name" }  }
       response.should redirect_to action: :show, id: r.id
       Project.find(r.id).name.should == "New Name"
     end

data/spec/admin/user_admin_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Admin::UsersController, :type => :controller do
   describe "SHOW record" do 
     it "finds the record" do
       u = User.make!
-      get :show, id: u.id
+      get :show, params: { id: u.id }
       response.status.should == 200 
     end
   end
@@ -35,7 +35,7 @@ RSpec.describe Admin::UsersController, :type => :controller do
 
   describe "CREATE record" do 
     it "creates the record" do
-      post :create, user: { first_name: 'first', last_name: 'last', email: 'test@blah.com', password: "abcd1234" }
+      post :create, params: { user: { first_name: 'first', last_name: 'last', email: 'test@blah.com', password: "abcd1234" } }
       response.should redirect_to action: :show, id: User.last.id
       u = User.last
       u.first_name.should == 'first'
@@ -48,7 +48,7 @@ RSpec.describe Admin::UsersController, :type => :controller do
   describe "EDIT record" do 
     it "renders the edit form for an existing record" do 
       r = User.make!
-      get :edit, id: r.id
+      get :edit, params: { id: r.id }
       response.status.should == 200 
     end
   end
@@ -56,7 +56,7 @@ RSpec.describe Admin::UsersController, :type => :controller do
   describe "UPDATE record" do 
     it "updates the record" do
       u = User.make!
-      put :update, id: u.id, user: { first_name: "New Name" } 
+      put :update, params: { id: u.id, user: { first_name: "New Name" }  }
       response.should redirect_to action: :show, id: u.id
       User.find(u.id).first_name.should == "New Name"
     end

data/spec/dummy/Gemfile

@@ -0,0 +1,15 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gemspec
+gem 'coveralls', require: false
+gem 'devise'
+gem 'devise-async'
+gem 'machinist_redux'
+gem 'rails-controller-testing'
+gem "rspec-rails"
+gem 'rufus-mnemo'
+gem 'simplecov'
+gem 'sprockets-rails'
+
+

data/spec/dummy/app/admin/admin_users.rb

@@ -0,0 +1,28 @@
+ActiveAdmin.register AdminUser do
+  permit_params :email, :password, :password_confirmation
+
+  index do
+    selectable_column
+    id_column
+    column :email
+    column :current_sign_in_at
+    column :sign_in_count
+    column :created_at
+    actions
+  end
+
+  filter :email
+  filter :current_sign_in_at
+  filter :sign_in_count
+  filter :created_at
+
+  form do |f|
+    f.inputs do
+      f.input :email
+      f.input :password
+      f.input :password_confirmation
+    end
+    f.actions
+  end
+
+end

data/spec/dummy/app/admin/dashboard.rb

@@ -0,0 +1,32 @@
+ActiveAdmin.register_page "Dashboard" do
+  menu priority: 1, label: proc { I18n.t("active_admin.dashboard") }
+
+  content title: proc { I18n.t("active_admin.dashboard") } do
+    div class: "blank_slate_container", id: "dashboard_default_message" do
+      span class: "blank_slate" do
+        span I18n.t("active_admin.dashboard_welcome.welcome")
+        small I18n.t("active_admin.dashboard_welcome.call_to_action")
+      end
+    end
+
+    # Here is an example of a simple dashboard with columns and panels.
+    #
+    # columns do
+    #   column do
+    #     panel "Recent Posts" do
+    #       ul do
+    #         Post.recent(5).map do |post|
+    #           li link_to(post.title, admin_post_path(post))
+    #         end
+    #       end
+    #     end
+    #   end
+
+    #   column do
+    #     panel "Info" do
+    #       para "Welcome to ActiveAdmin."
+    #     end
+    #   end
+    # end
+  end # content
+end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/app/assets/javascripts/active_admin.js

@@ -0,0 +1 @@
+//= require active_admin/base

data/spec/dummy/app/assets/stylesheets/active_admin.scss

@@ -0,0 +1,17 @@
+// Sass variable overrides must be declared before loading up Active Admin's styles.
+//
+// To view the variables that Active Admin provides, take a look at
+// `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the
+// Active Admin source.
+//
+// For example, to change the sidebar width:
+// $sidebar-width: 242px;
+
+// Active Admin's got SASS!
+@import "active_admin/mixins";
+@import "active_admin/base";
+
+// Overriding any non-variable Sass must be done after the fact.
+// For example, to change the default status-tag color:
+//
+//   .status_tag { background: #6090DB; }

data/spec/dummy/app/controllers/application_controller.rb

@@ -2,4 +2,7 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+
+  # Load the test database schema into memory on startup
+  load "#{Rails.root}/db/schema.rb"
 end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,3 @@
 module ApplicationHelper
+
 end

data/spec/dummy/app/models/abstract_adapter.rb

@@ -6,7 +6,13 @@ class AbstractAdapter < ActiveRecord::Base
       # The default formatting of validation errors sucks, this helps a little syntatically:
       super.titleize+":"
     end
-  end
 
-end
+		def ransackable_attributes(auth_object = nil)
+			@ransackable_attributes ||= column_names + _ransackers.keys
+		end
 
+		def ransackable_associations(auth_object = nil)
+			@ransackable_associations ||= reflect_on_all_associations.map { |a| a.name.to_s } + _ransackers.keys
+		end
+	end
+end

data/spec/dummy/app/models/admin_user.rb

@@ -1,5 +1,9 @@
 class AdminUser < ActiveRecord::Base
   # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+  devise :database_authenticatable, 
+         :recoverable, :rememberable, :validatable
+  # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, 
          :recoverable, :rememberable, :trackable, :validatable

data/spec/dummy/app/models/role.rb

@@ -2,7 +2,7 @@ class Role < AbstractAdapter
   belongs_to :user
   belongs_to :ownable, polymorphic: true
 
-  validates_uniqueness_of :user_id, scope: [:ownable_type,:ownable_id], unless: "user_id.nil?", message: "user has already been assigned that role"
+  validates_uniqueness_of :user_id, scope: [:ownable_type,:ownable_id], unless: Proc.new {|u| u.user_id.nil? }, message: "user has already been assigned that role"
   validates_inclusion_of :ownable_type, in: ['Company', 'Project']
 
   delegate :email, to: :user,              allow_nil: true