noodall-devise 0.1.8 → 0.2.1

data/Gemfile

@@ -2,21 +2,16 @@ source :rubygems
 
 gemspec
 
-gem "rails", "~> 3.0.1"
-gem 'noodall-ui'
-gem "capybara", ">= 0.3.9"
-gem "rspec-rails", ">= 2.0.0.beta"
-gem 'database_cleaner'
-gem 'cucumber-rails'
-gem 'launchy'    # So you can do Then show me the page
-gem 'rmagick', :require => 'RMagick'
-gem 'dragonfly', '~> 0.7.6'
-gem 'factory_girl', '~> 1.3.2'
-gem "faker", "~> 0.3.1"
-gem "bson_ext", "~> 1.2.0"
-
-
-if RUBY_VERSION < '1.9'
-  gem "ruby-debug", ">= 0.10.3"
+group :development, :test do
+  gem "rails", "> 3.0.1"
+  gem 'noodall-ui'
+  gem 'noodall-core'
+  gem "rspec-rails"
+  gem 'cucumber-rails'
+  gem 'launchy'    # So you can do Then show me the page
+  gem 'factory_girl'
+  gem "faker"
+  gem "bson_ext"
+  gem "dragonfly"
+  gem "database_cleaner"
 end
-

data/app/models/user.rb

@@ -1,10 +1,5 @@
 class User
   include MongoMapper::Document
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable,
-         :recoverable, :rememberable, :trackable, :validatable
-
   include Canable::Cans
   plugin Noodall::Tagging
 
@@ -13,8 +8,15 @@ class User
   key :bio, String
   timestamps!
 
-  alias_attribute :groups, :tags
-  alias_attribute :group_list, :tag_list
+  alias_method :groups=, :tags=
+  alias_method :groups, :tags
+  alias_method :group_list=, :tag_list=
+  alias_method :group_list, :tag_list
+
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :confirmable, :lockable and :timeoutable
+  devise :database_authenticatable,
+         :recoverable, :rememberable, :trackable, :validatable
 
 
   #-- Dragonfly -----------
@@ -49,7 +51,7 @@ class User
   def self.find_for_authentication(conditions)
     filter_auth_params(conditions)
     # Search using case sensitive stripped email
-    find(:first, :conditions => conditions.merge(:email => /^#{Regexp.escape(conditions[:email].strip)}$/i))
+    first(conditions.merge(:email => /^#{Regexp.escape(conditions[:email].strip)}$/i))
   end
 
   def web_image_extension

data/features/step_definitions/web_steps.rb

@@ -100,7 +100,7 @@ end
 Then /^(?:|I )should see JSON:$/ do |expected_json|
   require 'json'
   expected = JSON.pretty_generate(JSON.parse(expected_json))
-  actual   = JSON.pretty_generate(JSON.parse(page.body))
+  actual   = JSON.pretty_generate(JSON.parse(page.source))
   expected.should == actual
 end
 

data/features/support/env.rb

@@ -1,21 +1,16 @@
-# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a
-# newer version of cucumber-rails. Consider adding your own code to a new file
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
-
 ENV["RAILS_ENV"] ||= "test"
 require File.expand_path("../../../spec/dummy/config/environment.rb",  __FILE__)
 
-require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
-require 'cucumber/rails/rspec'
+require 'cucumber/rails/action_controller'
+require 'action_dispatch/testing/test_process'
+require 'action_dispatch/testing/integration'
 require 'cucumber/rails/world'
+require 'cucumber/rails/hooks'
+require 'cucumber/rails/capybara'
+
 require 'cucumber/web/tableish'
 require 'cucumber/rspec/doubles'
 
-require 'capybara/rails'
-require 'capybara/cucumber'
-require 'capybara/session'
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your

data/lib/noodall/devise/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module Devise
-    VERSION = "0.1.8"
+    VERSION = "0.2.1"
   end
 end

data/noodall-devise.gemspec

@@ -5,16 +5,16 @@ Gem::Specification.new do |s|
   s.name        = "noodall-devise"
   s.version     = Noodall::Devise::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = []
+  s.authors     = ["Steve England"]
   s.email       = []
   s.homepage    = "http://rubygems.org/gems/noodall-components-gallery"
   s.summary     = "Noodall Devise: User sign in and managent with devise"
   s.description = "User sign in and managent with devise. Provides administration of users in the admin area"
 
   s.required_rubygems_version = ">= 1.3.6"
-#  s.rubyforge_project         = "noodall-component-gallery"
-  s.add_dependency 'devise', '~> 1.1.8'
-  s.add_dependency 'mm-devise', '~> 1.1.6'
+  s.add_dependency 'devise', '~> 1.4.0'
+  s.add_dependency 'mm-devise', '~> 1.3'
+  s.add_dependency 'noodall-ui', ">= 0.4.1"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
 

data/spec/dummy/config/application.rb

@@ -5,7 +5,7 @@ require "action_controller/railtie"
 require "action_view/railtie"
 require "action_mailer/railtie"
 
-Bundler.require
+Bundler.require(:default, Rails.env) if defined?(Bundler)
 require "noodall-devise"
 
 module Dummy

data/spec/dummy/config/boot.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+puts gemfile
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +8,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

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

@@ -43,7 +43,7 @@ Devise.setup do |config|
   # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
   # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
   # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :bcrypt
+  #config.encryptor = :bcrypt
 
   # Setup a pepper to generate the encrypted password.
   config.pepper = "ff451bfc0dcc9987ebe7ec1c2bea150ec1d17c44be03521c61ba54c00b23b91f0f64d21b64802ab6817fdbb75b0423ef1482e36187230c532c6b5f50edcb4108"
@@ -51,10 +51,10 @@ Devise.setup do |config|
   # ==> Configuration for :confirmable
   # The time you want to give your user to confirm his account. During this time
   # he will be able to access your application without confirming. Default is nil.
-  # When confirm_within is zero, the user won't be able to sign in without confirming. 
-  # You can use this to let your user access some features of your application 
-  # without confirming the account, but blocking it after a certain period 
-  # (ie 2 days). 
+  # When confirm_within is zero, the user won't be able to sign in without confirming.
+  # You can use this to let your user access some features of your application
+  # without confirming the account, but blocking it after a certain period
+  # (ie 2 days).
   # config.confirm_within = 2.days
 
   # ==> Configuration for :rememberable
@@ -113,7 +113,7 @@ Devise.setup do |config|
   # devise role declared in your routes.
   # config.default_scope = :user
 
-  # Configure sign_out behavior. 
+  # Configure sign_out behavior.
   # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
   # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
   # config.sign_out_all_scopes = false

metadata

@@ -1,57 +1,74 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-devise
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 21
   prerelease: 
   segments: 
   - 0
+  - 2
   - 1
-  - 8
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
-authors: []
-
+authors: 
+- Steve England
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +01:00
+date: 2011-07-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 1
-        - 1
-        - 8
-        version: 1.1.8
+        - 4
+        - 0
+        version: 1.4.0
+  version_requirements: *id001
   name: devise
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *id001
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 9
         segments: 
         - 1
-        - 1
-        - 6
-        version: 1.1.6
+        - 3
+        version: "1.3"
+  version_requirements: *id002
   name: mm-devise
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *id002
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 4
+        - 1
+        version: 0.4.1
+  version_requirements: *id003
+  name: noodall-ui
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,10 +79,8 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  version_requirements: *id004
   name: bundler
-  prerelease: false
-  version_requirements: *id003
-  type: :development
 description: User sign in and managent with devise. Provides administration of users in the admin area
 email: []
 
@@ -122,14 +137,12 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/factories/user.rb
-- spec/integration/navigation_spec.rb
 - spec/noodall_devise_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -164,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: "Noodall Devise: User sign in and managent with devise"

data/spec/integration/navigation_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "Navigation" do
-  include Capybara
-  
-  it "should be a valid app" do
-    ::Rails.application.should be_a(Dummy::Application)
-  end
-end