introspective_admin 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31c04925094186ee8656917b8d3a0072df365a4d
-  data.tar.gz: f2e55a36107edededc44be81a4589d3f383bcbca
+  metadata.gz: a04b4686389f2d6b41c43b26709343eccfa8a8e6
+  data.tar.gz: 76df689a036b43fe9f68358ca2ed1e0d19f31a33
 SHA512:
-  metadata.gz: 00d867fe289e8029f9364bcfcab98b7eca31154b06b4b2711c28e0e1b21dea49cd162acee0f82348b3320d5391bbe31e255bdb6b99cd29bacd3b74dcf13e2825
-  data.tar.gz: 321c9ba8b69d8abce6c719a8d73fcc8197491d46bb59974bf5c2c3f82338fc9b1f267a8c59fcff19906f03a00f57a61dabd8d54bd32828cf427231f7a2002414
+  metadata.gz: 974022287ba462dbbb425d70271db61a18d7cbe19ff3f2e32951db2078d4809ef630af64eba3426cc5d50defe0f2b5de14a79e79097d309924deb71505022824
+  data.tar.gz: 7135f978bfe933d6111bff64520ccf1e773ddb7a955c2aadc280e6dc1827e24cc92cdc0a5da99bd914317834e12c836be4820a57fe92f9f290aa670c8f1dae77

data/.travis.yml

@@ -3,10 +3,23 @@ install: bundle install --jobs=1 --retry=1
 script:
   - bundle install
   - bundle exec rspec
+
 rvm:
   - 1.9
-  - 2.2.3
-#  - jruby-9.0.0.0
+  - 2.0.0
+  - 2.1
+  - 2.2
+  - rbx-2.5.8
+  - jruby-19mode
+  - jruby-9.0.4.0
+  - ruby-head
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
 env:
   matrix:
     - RAILS=3.2.22
@@ -15,17 +28,7 @@ env:
     - RAILS=master
   global:
     - JRUBY_OPTS="-J-Xmx1024m --debug"
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 2.2.3
-      env: RAILS=3.2.22
-    - rvm: jruby-9.0.0.0
-      env: RAILS=3.2.22
-    - rvm: 1.9
-      env: RAILS=master
-  allow_failures:
-    - env: RAILS=master
+
 notifications:
   email: 
     recipients:

data/Gemfile

@@ -3,3 +3,4 @@ source "https://rubygems.org"
 
 gemspec
 gem 'activeadmin', github: 'activeadmin'
+gem 'devise'

data/Gemfile.lock

@@ -68,7 +68,6 @@ GEM
       sass (~> 3.4)
       thor (~> 0.19)
     builder (3.2.2)
-    byebug (6.0.2)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -212,7 +211,6 @@ PLATFORMS
 
 DEPENDENCIES
   activeadmin!
-  byebug
   devise
   devise-async
   introspective_admin!

data/README.md

@@ -32,6 +32,10 @@ And bundle install.  In app/admin/my_admin.rb:
 
 ```
 class MyAdmin < IntrospectiveAdmin::Base
+  def self.include_virtual_attributes
+    %w(password)
+  end
+
   def self.exclude_params
     %w(fields to exclude from the admin screen)
   end
@@ -44,7 +48,7 @@ class MyAdmin < IntrospectiveAdmin::Base
 end
 ```
 
-Registering MyModel will set up the index, show, and form configurations for every attribute and nested association on the model excluding those in MyAdmin.exclude_params, with links to associated records (if they have ActiveAdmin screens) and permitting every 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 
 "options_for_X" class method on the administrated model:

data/introspective_admin.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'sass-rails'
 
   if RUBY_PLATFORM == 'java'
-    s.add_development_dependency "jdbc-sqlite3"
+    s.add_development_dependency "activerecord-jdbcsqlite3-adapter"
   else
     s.add_development_dependency "sqlite3"
     if RUBY_VERSION > '2.0.0'
-      s.add_development_dependency 'byebug'
+      #s.add_development_dependency 'byebug'
     end
   end
   s.add_development_dependency "rspec-rails", '>= 3.0'

data/lib/introspective_admin/base.rb

@@ -24,6 +24,10 @@ module IntrospectiveAdmin
         [] # do not display the field in the index page and forms.
       end
 
+      def include_virtual_attributes 
+        [] #
+      end
+
       def polymorphic?(model,column)
         (model.reflections[column.sub(/_id$/,'')].try(:options)||{})[:polymorphic]
       end
@@ -31,13 +35,13 @@ module IntrospectiveAdmin
       def column_list(model)
         model.columns.map {|c|
           c.name.sub(/(_type|_id)$/,'')
-        }.uniq-['created_at','updated_at']-exclude_params
+        }.uniq-['created_at','updated_at']-exclude_params+include_virtual_attributes
       end
 
       def params_list(model)
         model.columns.map {|c|
           polymorphic?(model,c.name) ? c.name.sub(/_id$/,'')+"_assign" : c.name
-        }
+        }+include_virtual_attributes
       end
 
       def link_record(record)
@@ -58,7 +62,9 @@ module IntrospectiveAdmin
 
         klass         = self
         model_name    = model.to_s.underscore
-        nested_config = Hash[model.nested_attributes_options.map {|assoc,options|
+        nested_config = Hash[model.nested_attributes_options.reject {|name,o|
+          klass.exclude_params.include?("#{name}_attributes")
+        }.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  
@@ -71,7 +77,6 @@ module IntrospectiveAdmin
           [assoc, options]
         }]
 
-
         ActiveAdmin.register model do 
           controller do
             def scoped_collection

data/lib/introspective_admin/version.rb

@@ -1,3 +1,3 @@
 module IntrospectiveAdmin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/admin/user_admin_spec.rb

@@ -0,0 +1,64 @@
+require 'rails_helper'
+
+RSpec.describe Admin::UsersController, :type => :controller do 
+  render_views
+
+  before :each do 
+    user = double('user')
+    allow(request.env['warden']).to receive(:authenticate!) { user }
+    allow(controller).to receive(:current_user) { user }
+  end
+
+  describe "GET index" do
+    it "finds all users" do
+      u = User.make!
+      get :index
+      response.status.should == 200 
+      assigns(:users).include?(u).should == true
+    end
+  end
+
+  describe "SHOW record" do 
+    it "finds the record" do
+      u = User.make!
+      get :show, id: u.id
+      response.status.should == 200 
+    end
+  end
+
+  describe "NEW record" do 
+    it "renders the form for a new record" do
+      get :new
+      response.status.should == 200 
+    end
+  end
+
+  describe "CREATE record" do 
+    it "creates the record" do
+      post :create, 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'
+      u.last_name.should == 'last'
+      u.email.should == 'test@blah.com'
+    end
+
+  end
+
+  describe "EDIT record" do 
+    it "renders the edit form for an existing record" do 
+      r = User.make!
+      get :edit, id: r.id
+      response.status.should == 200 
+    end
+  end
+
+  describe "UPDATE record" do 
+    it "updates the record" do
+      u = User.make!
+      put :update, 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
+  end
+end

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

@@ -1,4 +1,8 @@
 class UserAdmin < IntrospectiveAdmin::Base
+  def self.include_virtual_attributes
+    %w(password)
+  end
+
   def self.exclude_params
     %w(reset_password_at current_sign_in_at current_sign_in_ip remember_created_at sign_in_count encrypted_password reset_password_sent_at reset_password_token password authentication_token unlock_token failed_attempts last_sign_in_at locked_at last_sign_in_ip)
   end

data/spec/dummy/config/initializers/devise.rb

@@ -5,13 +5,15 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  config.secret_key = '111ac0356c712deb49e3153ab04eda25c4aa36c837765e8f34f7737110e092adc94280f5071f1a6900132cfb3996676965425fc9a32cc0ec20c7c6fc63969d51'
+  # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
+  # by default. You can change it below and use your own secret key.
+  config.secret_key = '16f3eba693fcd1a875d60e96961501c7e78eb7167a68bdff3bb0fa14b66f985f0e07cccbb2c38ca105b71a4ab051adf35d5f7b368172e02a138d1cc8966fe530'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'dummy@test.com'
+  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
@@ -30,7 +32,7 @@ Devise.setup do |config|
   # session. If you need permissions, you should implement that in a before filter.
   # You can also supply a hash where the value is a boolean determining whether
   # or not authentication should be aborted when the value is not present.
-  # config.authentication_keys = [ :email ]
+  # config.authentication_keys = [:email]
 
   # Configure parameters from the request object used for authentication. Each entry
   # given should be a request method and it will automatically be passed to the
@@ -42,12 +44,12 @@ Devise.setup do |config|
   # Configure which authentication keys should be case-insensitive.
   # These keys will be downcased upon creating or modifying a user and when used
   # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [ :email ]
+  config.case_insensitive_keys = [:email]
 
   # Configure which authentication keys should have whitespace stripped.
   # These keys will have whitespace before and after removed upon creating or
   # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [ :email ]
+  config.strip_whitespace_keys = [:email]
 
   # Tell if authentication through request.params is enabled. True by default.
   # It can be set to an array that will enable params authentication only for the
@@ -62,7 +64,7 @@ Devise.setup do |config|
   # :database      = Support basic authentication with authentication key + password
   # config.http_authenticatable = false
 
-  # If http headers should be returned for AJAX requests. True by default.
+  # If 401 status code should be returned for AJAX requests. True by default.
   # config.http_authenticatable_on_xhr = true
 
   # The realm used in Http Basic Authentication. 'Application' by default.
@@ -98,7 +100,7 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = 'ddbaee3a470626533816cc347decce699130ee5eb72ef545cb12f2c6c1f2e75b6b7c6e2cc98bcdf7e2675acacc6b1874c1cbe21e5a3b3927e85551c987a96650'
+  # config.pepper = '7d483ef48a0c859652bd623cba800fd76a8a45662f246b2dd2602b02635dbdf935ce0384f1c3bf13fdbe23880eab9f5fdf87fa46f92a1f36098f6051313383fe'
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without
@@ -123,7 +125,7 @@ Devise.setup do |config|
   config.reconfirmable = true
 
   # Defines which key will be used when confirming an account
-  # config.confirmation_keys = [ :email ]
+  # config.confirmation_keys = [:email]
 
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
@@ -141,7 +143,7 @@ Devise.setup do |config|
 
   # ==> Configuration for :validatable
   # Range for password length.
-  config.password_length = 6..64
+  config.password_length = 8..72
 
   # Email regex used to validate email formats. It simply asserts that
   # one (and only one) @ exists in the given string. This is mainly
@@ -153,9 +155,6 @@ Devise.setup do |config|
   # time the user will be asked for credentials again. Default is 30 minutes.
   # config.timeout_in = 30.minutes
 
-  # If true, expires auth token on session timeout.
-  # config.expire_auth_token_on_timeout = false
-
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.
   # :failed_attempts = Locks an account after a number of failed attempts to sign in.
@@ -163,7 +162,7 @@ Devise.setup do |config|
   # config.lock_strategy = :failed_attempts
 
   # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [ :email ]
+  # config.unlock_keys = [:email]
 
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
@@ -180,18 +179,22 @@ Devise.setup do |config|
   # config.unlock_in = 1.hour
 
   # Warn on the last attempt before the account is locked.
-  # config.last_attempt_warning = false
+  # config.last_attempt_warning = true
 
   # ==> Configuration for :recoverable
   #
   # Defines which key will be used when recovering the password for an account
-  # config.reset_password_keys = [ :email ]
+  # config.reset_password_keys = [:email]
 
   # Time interval you can reset your password with a reset password key.
   # Don't put a too small interval or your users won't have the time to
   # change their passwords.
   config.reset_password_within = 6.hours
 
+  # When set to false, does not sign a user in automatically after their password is
+  # reset. Defaults to true, so a user is signed in automatically after a reset.
+  # config.sign_in_after_reset_password = true
+
   # ==> Configuration for :encryptable
   # Allow you to use another encryption algorithm besides bcrypt (default). You can use
   # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
@@ -254,7 +257,7 @@ Devise.setup do |config|
   # The router that invoked `devise_for`, in the example above, would be:
   # config.router_name = :my_engine
   #
-  # When using omniauth, Devise cannot automatically set Omniauth path,
+  # When using OmniAuth, Devise cannot automatically set OmniAuth path,
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = '/my_engine/users/auth'
 end

data/spec/dummy/config/locales/devise.en.yml

@@ -0,0 +1,60 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"

data/spec/dummy/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
   #devise_for :admin_users, ActiveAdmin::Devise.config
-  #devise_for :users
+  devise_for :users
   ActiveAdmin.routes(self)
 
   # You can have the root of your site routed with "root"

data/spec/dummy/config/secrets.yml

@@ -16,7 +16,5 @@ development:
 test:
   secret_key_base: ca9d4587a556cfc28464dcf7f9d73b396e53b814cd339a469bc817011485510d3a9d1d6a7fa08f65cce65bcd55727a7110de0077a952f50ce58a956b255c6903
 
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
 production:
-  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+  secret_key_base: 993285c8b7c44547fa1cf053bf88fa75d6f8fdf33d8e033b8915e025b252c620ef102e9c16a463c3a60b356cf5b57f27ebb35eb90f4f2674bda82c69cac4142d

data/spec/rails_helper.rb

@@ -3,9 +3,20 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 Dir[Rails.root.join("../support/**/*.rb")].each { |f| require f }
 
+
 RSpec.configure do |config|
   config.include Devise::TestHelpers, type: :controller
   config.use_transactional_fixtures = true
   config.infer_spec_type_from_file_location!
   config.expect_with(:rspec) { |c| c.syntax = :should }
 end
+
+# Devise isn't initializing properly in the dummy app, stub it out for now.
+Devise.token_generator ||= Devise::TokenGenerator.new(Devise::CachingKeyGenerator.new(Devise::KeyGenerator.new(Devise.secret_key)))
+class Devise::Mailer
+  def self.confirmation_instructions(a,b,c)
+    Devise::Mailer.new
+  end
+  def deliver
+  end
+end

data/spec/support/blueprints.rb

@@ -32,7 +32,7 @@ User.blueprint do
   email       { "test-"+syllable+'@springshot.com' }
   first_name  { word(4) }
   last_name   { word(5) }
-  password    { 'abc123' }
+  password    { 'abcd1234' }
   confirmed_at { Time.now }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: introspective_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Josh Buermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +147,7 @@ files:
 - spec/admin/job_admin_spec.rb
 - spec/admin/location_admin_spec.rb
 - spec/admin/project__admin_spec.rb
+- spec/admin/user_admin_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/admin/company_admin.rb
@@ -217,6 +204,7 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/devise.en.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
@@ -285,6 +273,7 @@ test_files:
 - spec/admin/job_admin_spec.rb
 - spec/admin/location_admin_spec.rb
 - spec/admin/project__admin_spec.rb
+- spec/admin/user_admin_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/admin/company_admin.rb
@@ -341,6 +330,7 @@ test_files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/devise.en.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml