flushing-flash 0.3.0 → 0.4.1

data/flushing-flash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flushing-flash}
-  s.version = "0.3.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{PeterWong}]
-  s.date = %q{2011-11-05}
+  s.date = %q{2011-11-10}
   s.description = %q{To provide helper methods for handling rails flash messages.}
   s.email = %q{peter@peterwongpp.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,67 @@ Gem::Specification.new do |s|
     "lib/flushing-flash/action_controller_methods.rb",
     "lib/flushing-flash/action_view_methods.rb",
     "lib/flushing-flash/version.rb",
+    "test/dummy-with-devise/.gitignore",
+    "test/dummy-with-devise/Gemfile",
+    "test/dummy-with-devise/Gemfile.lock",
+    "test/dummy-with-devise/README",
+    "test/dummy-with-devise/Rakefile",
+    "test/dummy-with-devise/app/assets/images/rails.png",
+    "test/dummy-with-devise/app/assets/javascripts/application.js",
+    "test/dummy-with-devise/app/assets/javascripts/home.js.coffee",
+    "test/dummy-with-devise/app/assets/stylesheets/application.css",
+    "test/dummy-with-devise/app/assets/stylesheets/home.css.scss",
+    "test/dummy-with-devise/app/controllers/application_controller.rb",
+    "test/dummy-with-devise/app/controllers/home_controller.rb",
+    "test/dummy-with-devise/app/helpers/application_helper.rb",
+    "test/dummy-with-devise/app/helpers/home_helper.rb",
+    "test/dummy-with-devise/app/mailers/.gitkeep",
+    "test/dummy-with-devise/app/models/.gitkeep",
+    "test/dummy-with-devise/app/models/user.rb",
+    "test/dummy-with-devise/app/views/home/index.html.erb",
+    "test/dummy-with-devise/app/views/layouts/application.html.erb",
+    "test/dummy-with-devise/config.ru",
+    "test/dummy-with-devise/config/application.rb",
+    "test/dummy-with-devise/config/boot.rb",
+    "test/dummy-with-devise/config/database.yml",
+    "test/dummy-with-devise/config/environment.rb",
+    "test/dummy-with-devise/config/environments/development.rb",
+    "test/dummy-with-devise/config/environments/production.rb",
+    "test/dummy-with-devise/config/environments/test.rb",
+    "test/dummy-with-devise/config/initializers/backtrace_silencers.rb",
+    "test/dummy-with-devise/config/initializers/devise.rb",
+    "test/dummy-with-devise/config/initializers/inflections.rb",
+    "test/dummy-with-devise/config/initializers/mime_types.rb",
+    "test/dummy-with-devise/config/initializers/secret_token.rb",
+    "test/dummy-with-devise/config/initializers/session_store.rb",
+    "test/dummy-with-devise/config/initializers/wrap_parameters.rb",
+    "test/dummy-with-devise/config/locales/devise.en.yml",
+    "test/dummy-with-devise/config/locales/en.yml",
+    "test/dummy-with-devise/config/routes.rb",
+    "test/dummy-with-devise/db/migrate/20111110074559_devise_create_users.rb",
+    "test/dummy-with-devise/db/schema.rb",
+    "test/dummy-with-devise/db/seeds.rb",
+    "test/dummy-with-devise/lib/assets/.gitkeep",
+    "test/dummy-with-devise/lib/tasks/.gitkeep",
+    "test/dummy-with-devise/log/.gitkeep",
+    "test/dummy-with-devise/public/404.html",
+    "test/dummy-with-devise/public/422.html",
+    "test/dummy-with-devise/public/500.html",
+    "test/dummy-with-devise/public/favicon.ico",
+    "test/dummy-with-devise/public/robots.txt",
+    "test/dummy-with-devise/script/rails",
+    "test/dummy-with-devise/test/fixtures/.gitkeep",
+    "test/dummy-with-devise/test/fixtures/users.yml",
+    "test/dummy-with-devise/test/functional/.gitkeep",
+    "test/dummy-with-devise/test/functional/home_controller_test.rb",
+    "test/dummy-with-devise/test/integration/.gitkeep",
+    "test/dummy-with-devise/test/performance/browsing_test.rb",
+    "test/dummy-with-devise/test/test_helper.rb",
+    "test/dummy-with-devise/test/unit/.gitkeep",
+    "test/dummy-with-devise/test/unit/helpers/home_helper_test.rb",
+    "test/dummy-with-devise/test/unit/user_test.rb",
+    "test/dummy-with-devise/vendor/assets/stylesheets/.gitkeep",
+    "test/dummy-with-devise/vendor/plugins/.gitkeep",
     "test/dummy/.gitignore",
     "test/dummy/Gemfile",
     "test/dummy/Gemfile.lock",

data/lib/flushing-flash/action_controller_methods.rb

@@ -26,18 +26,28 @@ module FlushingFlash
         end
 
         flash[target] ||= []
-        flash[target] << { message_type: message_type, content: flash_content }
+        flash[target] << to_flushing_flash_message(message_type, flash_content)
       end
     
       def pull_flash(target=:default)
         @pulled_flashes ||= {}
         return @pulled_flashes[target] if @pulled_flashes[target]
-
-        @pulled_flashes[target] = flash[target] || []
+        
+        pulled_flashes = flash[target] || []
         flash.delete(target)
+        
+        if pulled_flashes.is_a?(Array)
+          @pulled_flashes[target] = pulled_flashes
+        else
+          @pulled_flashes[target] = [to_flushing_flash_message(target, pulled_flashes)]
+        end
 
         @pulled_flashes[target]
       end
+      
+      def to_flushing_flash_message(message_type, flash_content)
+        { message_type: message_type, content: flash_content }
+      end
     end
   end
 end

data/lib/flushing-flash/version.rb

@@ -1,8 +1,8 @@
 module FlushingFlash
   module Version
     MAJOR = 0
-    MINOR = 3
-    PATCH = 0
+    MINOR = 4
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/dummy/Gemfile

@@ -34,5 +34,7 @@ group :test do
   # Pretty printed test output
   gem 'turn', :require => false
 end
+gem 'minitest'
+gem 'mocha'
 
 gem 'flushing-flash'

data/test/dummy/Gemfile.lock

@@ -53,7 +53,11 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    metaclass (0.0.1)
     mime-types (1.17.2)
+    minitest (2.7.0)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
     multi_json (1.0.3)
     polyglot (0.3.3)
     rack (1.3.5)
@@ -114,6 +118,8 @@ DEPENDENCIES
   coffee-rails (~> 3.1.1)
   flushing-flash
   jquery-rails
+  minitest
+  mocha
   rails (= 3.1.1)
   sass-rails (~> 3.1.4)
   sqlite3

data/test/dummy/test/test_helper.rb

@@ -2,6 +2,8 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 
+require 'mocha'
+
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   #

data/test/dummy-with-devise/.gitignore

@@ -0,0 +1,5 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/
+.sass-cache/

data/test/dummy-with-devise/Gemfile

@@ -0,0 +1,39 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.1.1'
+
+# Bundle edge Rails instead:
+# gem 'rails',     :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.1.4'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+group :test do
+  # Pretty printed test output
+  gem 'turn', :require => false
+end
+
+gem 'flushing-flash'
+gem 'devise'

data/test/dummy-with-devise/Gemfile.lock

@@ -0,0 +1,130 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    ansi (1.4.1)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.3)
+    devise (1.4.9)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
+    erubis (2.7.0)
+    execjs (1.2.9)
+      multi_json (~> 1.0)
+    flushing-flash (0.4.1)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jquery-rails (1.0.17)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.1)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.3)
+    orm_adapter (0.0.5)
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
+      bundler (~> 1.0)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    sass (3.1.10)
+    sass-rails (3.1.4)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.4)
+      sprockets (~> 2.0.0)
+      tilt (~> 1.3.2)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    sqlite3 (1.3.4)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    turn (0.8.3)
+      ansi
+    tzinfo (0.3.31)
+    uglifier (1.0.4)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    warden (1.0.6)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coffee-rails (~> 3.1.1)
+  devise
+  flushing-flash
+  jquery-rails
+  rails (= 3.1.1)
+  sass-rails (~> 3.1.4)
+  sqlite3
+  turn
+  uglifier (>= 1.0.3)

data/test/dummy-with-devise/README

@@ -0,0 +1,261 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
+
+This pattern splits the view (also called the presentation) into "dumb"
+templates that are primarily responsible for inserting pre-built data in between
+HTML tags. The model contains the "smart" domain objects (such as Account,
+Product, Person, Post) that holds all the business logic and knows how to
+persist themselves to a database. The controller handles the incoming requests
+(such as Save New Account, Update Product, Show Post) by manipulating the model
+and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails. You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, create a new Rails application:
+       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+
+2. Change directory to <tt>myapp</tt> and start the web server:
+       <tt>cd myapp; rails server</tt> (run with --help for options)
+
+3. Go to http://localhost:3000/ and you'll see:
+       "Welcome aboard: You're riding Ruby on Rails!"
+
+4. Follow the guidelines to start developing your application. You can find
+the following resources handy:
+
+* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
+* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong. Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files. Have "tail -f" commands
+running on the server.log and development.log. Rails will automatically display
+debugging and runtime information to these files. Debugging info will also be
+shown in the browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code
+using the Ruby logger class from inside your controllers. Example:
+
+  class WeblogController < ActionController::Base
+    def destroy
+      @weblog = Weblog.find(params[:id])
+      @weblog.destroy
+      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+    end
+  end
+
+The result will be a message in your log file along the lines of:
+
+  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
+several books available online as well:
+
+* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
+* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
+
+These two books will bring you up to speed on the Ruby language and also on
+programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your
+Mongrel or WEBrick server with --debugger. This means that you can break out of
+execution at any point in the code, investigate and change the model, and then,
+resume execution! You need to install ruby-debug to run the server in debugging
+mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.all
+      debugger
+    end
+  end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+  >> @posts.inspect
+  => "[#<Post:0x14a6be8
+          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
+       #<Post:0x14a6620
+          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
+
+...and even better, you can examine how your runtime objects actually work:
+
+  >> f = @posts.first
+  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+  >> f.
+  Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you can enter "cont".
+
+
+== Console
+
+The console is a Ruby shell, which allows you to interact with your
+application's domain model. Here you'll have all parts of the application
+configured, just like it is when the application is running. You can inspect
+domain models, change values, and save to the database. Starting the script
+without arguments will launch it in the development environment.
+
+To start the console, run <tt>rails console</tt> from the application
+directory.
+
+Options:
+
+* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
+  made to the database.
+* Passing an environment name as an argument will load the corresponding
+  environment. Example: <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run
+<tt>reload!</tt>
+
+More information about irb can be found at:
+link:http://www.rubycentral.org/pickaxe/irb.html
+
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails
+dbconsole</tt>. You would be connected to the database with the credentials
+defined in database.yml. Starting the script without arguments will connect you
+to the development database. Passing an argument will connect you to a different
+database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
+PostgreSQL and SQLite 3.
+
+== Description of Contents
+
+The default directory structure of a generated Ruby on Rails application:
+
+  |-- app
+  |   |-- assets
+  |       |-- images
+  |       |-- javascripts
+  |       `-- stylesheets
+  |   |-- controllers
+  |   |-- helpers
+  |   |-- mailers
+  |   |-- models
+  |   `-- views
+  |       `-- layouts
+  |-- config
+  |   |-- environments
+  |   |-- initializers
+  |   `-- locales
+  |-- db
+  |-- doc
+  |-- lib
+  |   `-- tasks
+  |-- log
+  |-- public
+  |-- script
+  |-- test
+  |   |-- fixtures
+  |   |-- functional
+  |   |-- integration
+  |   |-- performance
+  |   `-- unit
+  |-- tmp
+  |   |-- cache
+  |   |-- pids
+  |   |-- sessions
+  |   `-- sockets
+  `-- vendor
+      |-- assets
+          `-- stylesheets
+      `-- plugins
+
+app
+  Holds all the code that's specific to this particular application.
+
+app/assets
+  Contains subdirectories for images, stylesheets, and JavaScript files.
+
+app/controllers
+  Holds controllers that should be named like weblogs_controller.rb for
+  automated URL mapping. All controllers should descend from
+  ApplicationController which itself descends from ActionController::Base.
+
+app/models
+  Holds models that should be named like post.rb. Models descend from
+  ActiveRecord::Base by default.
+
+app/views
+  Holds the template files for the view that should be named like
+  weblogs/index.html.erb for the WeblogsController#index action. All views use
+  eRuby syntax by default.
+
+app/views/layouts
+  Holds the template files for layouts to be used with views. This models the
+  common header/footer method of wrapping views. In your views, define a layout
+  using the <tt>layout :default</tt> and create a file named default.html.erb.
+  Inside default.html.erb, call <% yield %> to render the view using this
+  layout.
+
+app/helpers
+  Holds view helpers that should be named like weblogs_helper.rb. These are
+  generated for you automatically when using generators for controllers.
+  Helpers can be used to wrap functionality for your views into methods.
+
+config
+  Configuration files for the Rails environment, the routing map, the database,
+  and other dependencies.
+
+db
+  Contains the database schema in schema.rb. db/migrate contains all the
+  sequence of Migrations for your schema.
+
+doc
+  This directory is where your application documentation will be stored when
+  generated using <tt>rake doc:app</tt>
+
+lib
+  Application specific libraries. Basically, any kind of custom code that
+  doesn't belong under controllers, models, or helpers. This directory is in
+  the load path.
+
+public
+  The directory available for the web server. Also contains the dispatchers and the
+  default HTML files. This should be set as the DOCUMENT_ROOT of your web
+  server.
+
+script
+  Helper scripts for automation and generation.
+
+test
+  Unit and functional tests along with fixtures. When using the rails generate
+  command, template test files will be generated for you and placed in this
+  directory.
+
+vendor
+  External libraries that the application depends on. Also includes the plugins
+  subdirectory. If the app has frozen rails, those gems also go here, under
+  vendor/rails/. This directory is in the load path.

data/test/dummy-with-devise/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+DummyWithDevise::Application.load_tasks

data/test/dummy-with-devise/app/assets/javascripts/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/test/dummy-with-devise/app/assets/javascripts/home.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

data/test/dummy-with-devise/app/assets/stylesheets/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/

data/test/dummy-with-devise/app/assets/stylesheets/home.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the home controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

data/test/dummy-with-devise/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/test/dummy-with-devise/app/controllers/home_controller.rb

@@ -0,0 +1,5 @@
+class HomeController < ApplicationController
+  def index
+  end
+
+end

data/test/dummy-with-devise/app/helpers/application_helper.rb

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

data/test/dummy-with-devise/app/helpers/home_helper.rb

@@ -0,0 +1,2 @@
+module HomeHelper
+end

data/test/dummy-with-devise/app/models/user.rb

@@ -0,0 +1,9 @@
+class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me
+end