muck-users 3.0.0 → 3.0.1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Tatemae
+Copyright (c) 2009-2010 Tatemae
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -2,8 +2,8 @@
 
 == Installation
 
-The muck users engine is part of the muck framework and relies upon the muck_engine as well as authlogic.
-Both gems should be installed automatically when you install the muck_users engine.
+The muck users engine is part of the muck framework and relies upon the muck-engine as well as authlogic.
+Both gems should be installed automatically when you install the muck-users engine.
 
 Make sure that your 'Gemfile' contains the following:
 
@@ -15,7 +15,7 @@ secrets.yml file and then add the following to environment.rb right above Rails:
 
   require 'ostruct'
   require 'yaml'
-  ::Secrets = OpenStruct.new(YAML.load_file("\#{RAILS_ROOT}/config/secrets.yml")[RAILS_ENV])
+  ::Secrets = OpenStruct.new(YAML.load_file(File.expand_path('../secrets.yml', __FILE__))[Rails.env])
 
 Omit secrets.yml from your version control system and use it to keep sensitive data like email server credentials
 
@@ -142,7 +142,7 @@ After installing the engine just create a user model thus:
 
   class User < ActiveRecord::Base
     acts_as_authentic
-    include MuckUsers::Models::User
+    include MuckUsers::Models::MuckUser
   end
 
 Then you will be able to go to:

data/Rakefile

@@ -1,6 +1,14 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["--color", "-c", "-f progress", "-r test/rails_test/spec/spec_helper.rb"]
+  t.pattern = 'test/rails_test/spec/**/*_spec.rb'  
+end
 
 desc 'Translate this gem'
 task :translate do
@@ -21,7 +29,6 @@ begin
     gem.authors = ["Justin Ball", "Joel Duffin"]
     gem.rubyforge_project = "muck-users"
     gem.add_dependency "authlogic"
-    gem.add_dependency "searchlogic"
     gem.add_dependency "bcrypt-ruby"
     gem.add_dependency "muck-engine"
     gem.add_dependency "friendly_id"
@@ -50,8 +57,6 @@ rescue LoadError
   end
 end
 
-task :default => :spec
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')
@@ -62,7 +67,7 @@ Rake::RDocTask.new do |rdoc|
   end
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "muck_users #{version}"
+  rdoc.title = "muck-users #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/config/locales/ca.yml

@@ -89,7 +89,7 @@ ca:
       confirm_delete_account: "Esteu segur que voleu eliminar el seu compte? \\ NNo es pot desfer."
       confirm_password: "Confirmar contrasenya"
       confirm_select_new_password: "Confirmar canvi de contrasenya"
-      could_not_find_reset_code: "No s'ha trobat un codi per restablir contrasenya. Si us plau, intenti restablir la contrasenya de nou."
+      could_not_find_reset_code: "No s'ha pogut trobar un codi per restablir contrasenya. Si us plau, intenti restablir la contrasenya de nou."
       could_not_find_user_with_email: "No s'ha trobat un usuari amb aquesta adreça de correu electrònic."
       current_password: "Contrasenya actual"
       delete: Eliminar

data/config/locales/id.yml

@@ -70,7 +70,7 @@ id:
       bulk_access_code_message: Pesan
       bulk_access_code_problem: "Masalah menambahkan kode akses"
       bulk_access_code_subject: Subyek
-      bulk_access_code_tip: "Opsional. Jika kode tersebut ditentukan maka kode akan dikirimkan ke semua pengguna. Membiarkan field ini kosong untuk mengirim kode unik untuk tiap user."
+      bulk_access_code_tip: "Opsional. Jika kode ditetapkan maka kode akan dikirimkan ke semua pengguna. Membiarkan field ini kosong untuk mengirim kode unik untuk tiap user."
       bulk_access_codes: "Kode Akses Massal"
       bulk_access_codes_created: "Bulk kode akses dibuat dan email ke email %{email_count}."
       bulk_access_codes_description: "Ini akan menghasilkan kode, menggunakan akses tunggal yang unik untuk setiap email yang disediakan."
@@ -179,7 +179,7 @@ id:
       terms_and_service_tip: "Untuk mendaftar Anda harus menyetujui persyaratan dan kondisi. Anda dapat meninjau kebijakan ini sebelum melanjutkan dengan mengklik pada link."
       terms_of_service_required: "Anda harus menerima persyaratan layanan."
       thanks_sign_up: "Terima kasih telah mendaftar!"
-      thanks_sign_up_check: "Akun Anda telah dibuat. Silakan cek e-mail Anda untuk instruksi aktivasi account anda!"
+      thanks_sign_up_check: "Akun Anda telah dibuat. Silakan cek e-mail Anda untuk mendapatkan petunjuk aktivasi account anda!"
       thanks_sign_up_login: "Terima kasih telah mendaftar! Anda dapat login sekarang"
       total_users: "Total Pengguna: %{total}"
       unlimited: "Menggunakan Unlimited"

data/config/locales/vi.yml

@@ -207,7 +207,7 @@ vi:
       username_help: "Bạn có thể sử dụng từ 6 đến 20 ký tự. Nếu tên bạn muốn không có thử thêm nhiều con số hay dấu chấm câu."
       username_not_available: "Tên người dùng không có sẵn"
       username_recover_prompt: "Hãy cung cấp email mà bạn sử dụng khi bạn tạo tài khoản, tên người dùng của bạn sẽ được gửi qua email cho bạn."
-      username_sent: "tên người dùng của bạn đã được gửi qua email cho bạn. Xin kiểm tra lại Email của bạn."
+      username_sent: "tên người dùng của bạn đã được gửi qua email cho bạn. Hãy kiểm tra email của bạn."
       users_admin: "Người dùng"
       users_in_role: "Người sử dụng trong vai trò: %{role}"
       validation_are_required: "được yêu cầu."

data/lib/{muck_users → muck-users}/engine.rb

@@ -1,4 +1,4 @@
-require 'muck_users'
+require 'muck-users'
 require 'rails'
 
 module MuckUsers
@@ -8,13 +8,12 @@ module MuckUsers
       'muck-users'
     end
     
-    initializer 'muck_users.filter_paramters' do |app|     
+    initializer 'muck-users.filter_paramters' do |app|     
       app.config.filter_parameters << :password
       app.config.filter_parameters << :password_confirmation
     end   
 
-    #initializer 'muck_users.add_admin_ui_links', :after => "i18n.callbacks" do
-    initializer 'muck_users.add_admin_ui_links', :after => 'muck_engine.add_admin_ui_links' do
+    initializer 'muck-users.add_admin_ui_links', :after => 'muck-engine.add_admin_ui_links' do
       # Add users to the dashboard
       MuckEngine.configuration.add_muck_dashboard_item('admin/users/dashboard_widget')
       # Add admin link for users and roles
@@ -25,30 +24,24 @@ module MuckUsers
       MuckEngine.configuration.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_access_codes'), '/admin/access_codes')
     end
             
-    initializer 'muck_users.controllers' do
+    initializer 'muck-users.controllers' do
       ActiveSupport.on_load(:action_controller) do
         include MuckUsers::AuthenticApplication
       end
     end
     
-    initializer 'muck_users.helpers' do
+    initializer 'muck-users.helpers' do
       ActiveSupport.on_load(:action_view) do
         include MuckUsersHelper
       end
     end
     
-    initializer 'muck_users.models' do
+    initializer 'muck-users.models' do
       ActiveSupport.on_load(:active_record) do
         include MuckUsers::SecureMethods
         include MuckUsers::Exceptions
       end
     end
-   
-    initializer 'muck_engine.i18n' do
-      ActiveSupport.on_load(:i18n) do
-        I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', '..', 'rails_i18n', '*.{rb,yml}') ]
-      end
-    end
     
   end
 end

data/lib/{muck_users → muck-users}/mailers/user_mailer.rb

@@ -1,6 +1,7 @@
+# include MuckUsers::Mailers::MuckUserMailer
 module MuckUsers
   module Mailers
-    module UserMailer
+    module MuckUserMailer
 
       extend ActiveSupport::Concern
       

data/lib/{muck_users → muck-users}/models/access_code.rb

@@ -1,6 +1,7 @@
+# include MuckUsers::Models::MuckAccessCode
 module MuckUsers
   module Models
-    module AccessCode
+    module MuckAccessCode
       extend ActiveSupport::Concern
     
       included do

data/lib/{muck_users → muck-users}/models/access_code_request.rb

@@ -1,6 +1,7 @@
+# include MuckUsers::Models::MuckAccessCodeRequest
 module MuckUsers
   module Models
-    module AccessCodeRequest
+    module MuckAccessCodeRequest
       extend ActiveSupport::Concern
     
       included do

data/lib/{muck_users → muck-users}/models/user.rb

@@ -1,6 +1,7 @@
+# include MuckUsers::Models::MuckUser
 module MuckUsers
   module Models
-    module User
+    module MuckUser
       extend ActiveSupport::Concern
       
       included do

data/lib/muck-users.rb

@@ -0,0 +1,10 @@
+require 'muck-users/exceptions'
+require 'muck-users/secure_methods'
+require 'muck-users/config'
+require 'muck-users/form_builder'
+require 'muck-users/models/access_code'
+require 'muck-users/models/access_code_request'
+require 'muck-users/models/user'
+require 'muck-users/mailers/user_mailer'
+require 'muck-users/controllers/authentic_application'
+require 'muck-users/engine'

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-09-30}
+  s.date = %q{2010-10-14}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -450,17 +450,17 @@ Gem::Specification.new do |s|
      "db/migrate/20090327231918_create_users.rb",
      "db/migrate/20100123035450_create_access_codes.rb",
      "db/migrate/20100123233654_create_access_code_requests.rb",
-     "lib/muck_users.rb",
-     "lib/muck_users/config.rb",
-     "lib/muck_users/controllers/authentic_application.rb",
-     "lib/muck_users/engine.rb",
-     "lib/muck_users/exceptions.rb",
-     "lib/muck_users/form_builder.rb",
-     "lib/muck_users/mailers/user_mailer.rb",
-     "lib/muck_users/models/access_code.rb",
-     "lib/muck_users/models/access_code_request.rb",
-     "lib/muck_users/models/user.rb",
-     "lib/muck_users/secure_methods.rb",
+     "lib/muck-users.rb",
+     "lib/muck-users/config.rb",
+     "lib/muck-users/controllers/authentic_application.rb",
+     "lib/muck-users/engine.rb",
+     "lib/muck-users/exceptions.rb",
+     "lib/muck-users/form_builder.rb",
+     "lib/muck-users/mailers/user_mailer.rb",
+     "lib/muck-users/models/access_code.rb",
+     "lib/muck-users/models/access_code_request.rb",
+     "lib/muck-users/models/user.rb",
+     "lib/muck-users/secure_methods.rb",
      "lib/tasks/muck_users.rake",
      "muck-users.gemspec",
      "public/images/admin/roles.gif",
@@ -1100,7 +1100,6 @@ Gem::Specification.new do |s|
      "test/rails_test/public/stylesheets/styles.css",
      "test/rails_test/public/stylesheets/themes/blue/styles.css",
      "test/rails_test/public/stylesheets/themes/red/styles.css",
-     "test/rails_test/script/rails",
      "test/rails_test/spec/controllers/access_code_requests_controller_spec.rb",
      "test/rails_test/spec/controllers/activations_controller_spec.rb",
      "test/rails_test/spec/controllers/admin/access_codes_controller_spec.rb",
@@ -1110,14 +1109,15 @@ Gem::Specification.new do |s|
      "test/rails_test/spec/controllers/user_sessions_controller_spec.rb",
      "test/rails_test/spec/controllers/username_request_controller_spec.rb",
      "test/rails_test/spec/controllers/users_controller_spec.rb",
+     "test/rails_test/spec/mailers/user_mailer_spec.rb",
      "test/rails_test/spec/models/access_code_request_spec.rb",
      "test/rails_test/spec/models/access_code_spec.rb",
      "test/rails_test/spec/models/permission_spec.rb",
      "test/rails_test/spec/models/role_spec.rb",
      "test/rails_test/spec/models/secure_methods_spec.rb",
-     "test/rails_test/spec/models/user_mailer_spec.rb",
      "test/rails_test/spec/models/user_spec.rb",
-     "test/rails_test/spec/spec_helper.rb"
+     "test/rails_test/spec/spec_helper.rb",
+     "test/rails_test/test/fixtures/rails.png"
   ]
   s.homepage = %q{http://github.com/jbasdf/muck_users}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -1171,12 +1171,12 @@ Gem::Specification.new do |s|
      "test/rails_test/spec/controllers/user_sessions_controller_spec.rb",
      "test/rails_test/spec/controllers/username_request_controller_spec.rb",
      "test/rails_test/spec/controllers/users_controller_spec.rb",
+     "test/rails_test/spec/mailers/user_mailer_spec.rb",
      "test/rails_test/spec/models/access_code_request_spec.rb",
      "test/rails_test/spec/models/access_code_spec.rb",
      "test/rails_test/spec/models/permission_spec.rb",
      "test/rails_test/spec/models/role_spec.rb",
      "test/rails_test/spec/models/secure_methods_spec.rb",
-     "test/rails_test/spec/models/user_mailer_spec.rb",
      "test/rails_test/spec/models/user_spec.rb",
      "test/rails_test/spec/spec_helper.rb"
   ]
@@ -1187,20 +1187,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<authlogic>, [">= 0"])
-      s.add_runtime_dependency(%q<searchlogic>, [">= 0"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])
       s.add_runtime_dependency(%q<friendly_id>, [">= 0"])
     else
       s.add_dependency(%q<authlogic>, [">= 0"])
-      s.add_dependency(%q<searchlogic>, [">= 0"])
       s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
       s.add_dependency(%q<muck-engine>, [">= 0"])
       s.add_dependency(%q<friendly_id>, [">= 0"])
     end
   else
     s.add_dependency(%q<authlogic>, [">= 0"])
-    s.add_dependency(%q<searchlogic>, [">= 0"])
     s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
     s.add_dependency(%q<muck-engine>, [">= 0"])
     s.add_dependency(%q<friendly_id>, [">= 0"])

data/test/rails_test/Gemfile

@@ -6,23 +6,17 @@ gem 'mysql'
 # gem 'authlogic'
 # TODO this is temporary until the official authlogic gem is updated for rails 3
 gem 'authlogic', :git => 'git://github.com/odorcicd/authlogic.git', :branch => 'rails3'
-gem 'will_paginate', "~> 3.0.pre2"
-
-# TODO Remove this once the validation_reflection gem is released for Rails 3 and the version has been updated in muck-engine
-gem "validation_reflection", :git => "http://github.com/redinger/validation_reflection.git", :branch => "rails-3"
-
 gem "bcrypt-ruby", :require => "bcrypt"
-gem 'overlord'
 
-gem 'muck-engine', :require => 'muck_engine', :path => "~/projects/muck-engine"
-gem 'muck-users', :require => 'muck_users', :path => '../../'
+gem 'muck-engine', :path => "~/projects/muck-engine"
+gem 'muck-users', :path => "~/projects/muck-users"
 
 if RUBY_VERSION < '1.9'
   gem "ruby-debug"
 end
 
 group :test, :development do
-  gem "rspec-rails", ">=2.0.0.beta.22"
+  gem "rspec-rails", ">=2.0.0"
   gem "cucumber-rails"
 end
 
@@ -34,7 +28,7 @@ group :test do
   gem "factory_girl"
   gem "cucumber"
   gem "rcov"
-  gem "rspec", ">=2.0.0.beta.22"
+  gem "rspec", ">=2.0.0"
   gem "database_cleaner"
   gem "spork"
   gem "launchy"

data/test/rails_test/Gemfile.lock

@@ -6,20 +6,13 @@ GIT
     authlogic (2.1.3)
       activesupport
 
-GIT
-  remote: http://github.com/redinger/validation_reflection.git
-  revision: f0d81d3732304e2baa66e6caad1bb2ba09e9f293
-  branch: rails-3
-  specs:
-    validation_reflection (1.0.0.rc.1)
-
 PATH
   remote: /Users/jbasdf/projects/muck-engine
   specs:
-    muck-engine (3.0.0)
+    muck-engine (3.0.2)
       overlord
-      validation_reflection (>= 1.0.0.rc.1)
-      will_paginate
+      validation_reflection
+      will_paginate (~> 3.0.beta)
 
 PATH
   remote: /Users/jbasdf/projects/muck-users
@@ -29,7 +22,6 @@ PATH
       bcrypt-ruby
       friendly_id
       muck-engine
-      searchlogic
 
 PATH
   remote: /Users/jbasdf/projects/other_apps/shoulda
@@ -68,7 +60,7 @@ GEM
     activesupport (3.0.0)
     arel (1.0.1)
       activesupport (~> 3.0.0)
-    autotest (4.4.0)
+    autotest (4.4.1)
     babosa (0.2.0)
     bcrypt-ruby (2.1.2)
     builder (2.1.2)
@@ -79,13 +71,15 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
+    childprocess (0.0.7)
+      ffi (~> 0.6.3)
     columnize (0.3.1)
     configuration (1.1.0)
     crack (0.1.8)
-    cucumber (0.9.0)
+    cucumber (0.9.2)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.2)
+      gherkin (~> 2.2.5)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     cucumber-rails (0.3.2)
@@ -100,10 +94,9 @@ GEM
       rake (>= 0.8.7)
     friendly_id (3.1.7)
       babosa (~> 0.2.0)
-    gherkin (2.2.4)
+    gherkin (2.2.8)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
-      trollop (~> 1.16.2)
     httparty (0.6.1)
       crack (= 0.1.8)
     i18n (0.4.1)
@@ -113,7 +106,7 @@ GEM
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     linecache (0.43)
-    mail (2.2.6.1)
+    mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
@@ -143,37 +136,36 @@ GEM
       thor (~> 0.14.0)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    rspec-rails (2.0.0.beta.22)
-      rspec (= 2.0.0.beta.22)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+    rspec-rails (2.0.0)
+      rspec (= 2.0.0)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
     ruby-debug-base (0.10.3)
       linecache (>= 0.3)
     rubyzip (0.9.4)
-    searchlogic (2.4.26)
-      activerecord (>= 2.0.0)
-    selenium-webdriver (0.0.28)
-      ffi (>= 0.6.1)
+    selenium-webdriver (0.0.29)
+      childprocess (>= 0.0.7)
+      ffi (~> 0.6.3)
       json_pure
       rubyzip
     spork (0.8.4)
     term-ansicolor (1.0.5)
-    thor (0.14.2)
+    thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
-    trollop (1.16.2)
     tzinfo (0.3.23)
+    validation_reflection (1.0.0)
     will_paginate (3.0.pre2)
 
 PLATFORMS
@@ -192,13 +184,10 @@ DEPENDENCIES
   muck-engine!
   muck-users!
   mysql
-  overlord
   rails (= 3.0.0)
   rcov
-  rspec (>= 2.0.0.beta.22)
-  rspec-rails (>= 2.0.0.beta.22)
+  rspec (>= 2.0.0)
+  rspec-rails (>= 2.0.0)
   ruby-debug
   shoulda!
   spork
-  validation_reflection!
-  will_paginate (~> 3.0.pre2)

data/test/rails_test/app/mailers/user_mailer.rb

@@ -1,3 +1,3 @@
 class UserMailer < ActionMailer::Base
-  include MuckUsers::Mailers::UserMailer
+  include MuckUsers::Mailers::MuckUserMailer
 end

data/test/rails_test/app/models/access_code.rb

@@ -1,3 +1,3 @@
 class AccessCode < ActiveRecord::Base
-  include MuckUsers::Models::AccessCode
+  include MuckUsers::Models::MuckAccessCode
 end

data/test/rails_test/app/models/access_code_request.rb

@@ -1,3 +1,3 @@
 class AccessCodeRequest < ActiveRecord::Base
-  include MuckUsers::Models::AccessCodeRequest
+  include MuckUsers::Models::MuckAccessCodeRequest
 end

data/test/rails_test/app/models/country.rb

@@ -9,5 +9,5 @@
 #
 
 class Country < ActiveRecord::Base
-  include MuckEngine::Models::Country  
+  include MuckEngine::Models::MuckCountry  
 end

data/test/rails_test/app/models/language.rb

@@ -11,5 +11,5 @@
 #
 
 class Language < ActiveRecord::Base
-  include MuckEngine::Models::Language
+  include MuckEngine::Models::MuckLanguage
 end

data/test/rails_test/app/models/state.rb

@@ -9,5 +9,5 @@
 #
 
 class State < ActiveRecord::Base
-  include MuckEngine::Models::State
+  include MuckEngine::Models::MuckState
 end

data/test/rails_test/app/models/user.rb

@@ -34,7 +34,7 @@ class User < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
   end
-  include MuckUsers::Models::User
+  include MuckUsers::Models::MuckUser
   
   # these are just for testing
   def creator_id

data/test/rails_test/config/environments/test.rb

@@ -15,7 +15,7 @@ RailsTest::Application.configure do
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
+  config.action_dispatch.show_exceptions = true
 
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false

data/test/rails_test/spec/models/access_code_request_spec.rb

@@ -6,7 +6,7 @@ describe AccessCodeRequest do
     @access_code_request = Factory(:access_code_request)
   end
   
-  subject { @access_code_request }
+  
   
   it { should validate_presence_of :email }
   it { should validate_uniqueness_of :email }

data/test/rails_test/spec/models/user_spec.rb

@@ -274,8 +274,8 @@ describe User do
   end
   
   describe "emails" do
-    before(:all) do
-      @email = mock(:email, :deliver)
+    before(:each) do
+      @email = RSpec::Mocks::Mock.new('Email')
     end
     describe "deliver_welcome_email" do
       before(:each) do
@@ -287,6 +287,7 @@ describe User do
         MuckUsers.configuration.send_welcome = @send_welcome
       end
       it "should deliver activation instructions" do
+        @email.should_receive(:deliver)
         UserMailer.should_receive(:welcome_notification).with(@user).and_return(@email)
         @user.deliver_welcome_email
       end
@@ -298,6 +299,7 @@ describe User do
       end
       it "should deliver activation instructions" do
         @user.should_receive(:reset_perishable_token!)
+        @email.should_receive(:deliver)
         UserMailer.should_receive(:activation_confirmation).with(@user).and_return(@email)
         @user.deliver_activation_confirmation!
       end
@@ -309,6 +311,7 @@ describe User do
       end
       it "should deliver activation instructions" do
         @user.should_receive(:reset_perishable_token!)
+        @email.should_receive(:deliver)
         UserMailer.should_receive(:activation_instructions).with(@user).and_return(@email)
         @user.deliver_activation_instructions!
       end
@@ -321,10 +324,12 @@ describe User do
       end
       it "should send password reset instructions" do
         UserMailer.should_receive(:password_reset_instructions).and_return(@email)
+        @email.should_receive(:deliver)
         @user_active.deliver_password_reset_instructions!
       end
       it "should send not active instructions" do
         UserMailer.should_receive(:password_not_active_instructions).and_return(@email)
+        @email.should_receive(:deliver)
         @user_inactive.deliver_password_reset_instructions!
       end
     end

data/test/rails_test/spec/spec_helper.rb

@@ -1,29 +1,5 @@
 $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'muck_test_helper'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-
-RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  config.mock_with :rspec
 
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
-  
-end
+require 'muck_test_helper'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -06:00
+date: 2010-10-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: searchlogic
+  name: bcrypt-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,7 +48,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
+  name: muck-engine
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,7 +62,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: muck-engine
+  name: friendly_id
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,20 +75,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: friendly_id
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
 description: Easily add user signup, login and other features to your application
 email: justin@tatemae.com
 executables: []
@@ -532,17 +518,17 @@ files:
 - db/migrate/20090327231918_create_users.rb
 - db/migrate/20100123035450_create_access_codes.rb
 - db/migrate/20100123233654_create_access_code_requests.rb
-- lib/muck_users.rb
-- lib/muck_users/config.rb
-- lib/muck_users/controllers/authentic_application.rb
-- lib/muck_users/engine.rb
-- lib/muck_users/exceptions.rb
-- lib/muck_users/form_builder.rb
-- lib/muck_users/mailers/user_mailer.rb
-- lib/muck_users/models/access_code.rb
-- lib/muck_users/models/access_code_request.rb
-- lib/muck_users/models/user.rb
-- lib/muck_users/secure_methods.rb
+- lib/muck-users.rb
+- lib/muck-users/config.rb
+- lib/muck-users/controllers/authentic_application.rb
+- lib/muck-users/engine.rb
+- lib/muck-users/exceptions.rb
+- lib/muck-users/form_builder.rb
+- lib/muck-users/mailers/user_mailer.rb
+- lib/muck-users/models/access_code.rb
+- lib/muck-users/models/access_code_request.rb
+- lib/muck-users/models/user.rb
+- lib/muck-users/secure_methods.rb
 - lib/tasks/muck_users.rake
 - muck-users.gemspec
 - public/images/admin/roles.gif
@@ -1182,7 +1168,6 @@ files:
 - test/rails_test/public/stylesheets/styles.css
 - test/rails_test/public/stylesheets/themes/blue/styles.css
 - test/rails_test/public/stylesheets/themes/red/styles.css
-- test/rails_test/script/rails
 - test/rails_test/spec/controllers/access_code_requests_controller_spec.rb
 - test/rails_test/spec/controllers/activations_controller_spec.rb
 - test/rails_test/spec/controllers/admin/access_codes_controller_spec.rb
@@ -1192,14 +1177,15 @@ files:
 - test/rails_test/spec/controllers/user_sessions_controller_spec.rb
 - test/rails_test/spec/controllers/username_request_controller_spec.rb
 - test/rails_test/spec/controllers/users_controller_spec.rb
+- test/rails_test/spec/mailers/user_mailer_spec.rb
 - test/rails_test/spec/models/access_code_request_spec.rb
 - test/rails_test/spec/models/access_code_spec.rb
 - test/rails_test/spec/models/permission_spec.rb
 - test/rails_test/spec/models/role_spec.rb
 - test/rails_test/spec/models/secure_methods_spec.rb
-- test/rails_test/spec/models/user_mailer_spec.rb
 - test/rails_test/spec/models/user_spec.rb
 - test/rails_test/spec/spec_helper.rb
+- test/rails_test/test/fixtures/rails.png
 has_rdoc: true
 homepage: http://github.com/jbasdf/muck_users
 licenses: []
@@ -1280,11 +1266,11 @@ test_files:
 - test/rails_test/spec/controllers/user_sessions_controller_spec.rb
 - test/rails_test/spec/controllers/username_request_controller_spec.rb
 - test/rails_test/spec/controllers/users_controller_spec.rb
+- test/rails_test/spec/mailers/user_mailer_spec.rb
 - test/rails_test/spec/models/access_code_request_spec.rb
 - test/rails_test/spec/models/access_code_spec.rb
 - test/rails_test/spec/models/permission_spec.rb
 - test/rails_test/spec/models/role_spec.rb
 - test/rails_test/spec/models/secure_methods_spec.rb
-- test/rails_test/spec/models/user_mailer_spec.rb
 - test/rails_test/spec/models/user_spec.rb
 - test/rails_test/spec/spec_helper.rb

data/lib/muck_users.rb

@@ -1,10 +0,0 @@
-require 'muck_users/exceptions'
-require 'muck_users/secure_methods'
-require 'muck_users/config'
-require 'muck_users/form_builder'
-require 'muck_users/models/access_code'
-require 'muck_users/models/access_code_request'
-require 'muck_users/models/user'
-require 'muck_users/mailers/user_mailer'
-require 'muck_users/controllers/authentic_application'
-require 'muck_users/engine'

data/test/rails_test/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'