minnie 0.0.4 → 0.1.0

data/MINNIE.txt

@@ -0,0 +1,26 @@
+                           c<> ,
+                         ,CCC cC>       ...:  ...
+                        ,CCCC'CC>   .::::`.ccCCCCC
+                        CCCCCcCC'  :::'.cCCCCCCCCC
+                        CCCCCC-'  `:'.CcCC`CCCCCC ::
+                      ,C`CCC',cCCCc ` <CCCC,CCCC'::::
+                     ,CCCCC',CCCCC',cCCCCCCCCCC'.:::
+                     `CCCC' CCCCC cCCCCCCCCCC',C :'
+                      C>''.:  .,.  `CCCCCCCCCcCC        ...
+                     ,cd ,ud$$$$$$$c `CCCCCCCCCC    :::::::::::.
+                  ,c$$$,J$$$$$$$$$$$b `CCCCCCC'   .::::::::::::::
+                ,d$$$$$$?$$$$$$$$$$$$L:..`''' :   ::::::::::::::::
+            .\.\`-,$$"$,?"=$$$$$$$$$$E :::`CCC : .:::::::::::::::::
+             `/ ,,"?$h` =?$,?$$$$$$$$F ::::`CCC :::::::::::::::::::
+      .      J.$$$:$$'d$h,"$ $$$$$$$$'::::::`CC,`:::::::::::::::::
+    :::.`.   F`""?;$'d$$$$h J$$$$$$$P :::::::<CC : `:::::::::::::
+    ::::::   h    $$ ""?$$F,$$$$$$$P.'`,,``:: CC :  ``:::::::::'
+    `:::::: cc,. d$$    `",$$$$$$$6,c$$$$$$c <CC         ```
+      `:::'J$$$$$c`?=.,,c$$$$$$$$$$$$$$$$$$$h `C
+       hcc$$$$$$$$$i?h$$$$$$$$$$??(("?$$$$$$$>,'
+       `$$$$$$$$$$$$$$$$$$$$$$$$$$P,$c$$$$$$$
+        `$$$$$$$$$$$$$$$$$$$$$$$$",$$$$$$$$F
+          `?$$$$$$$$$$$$$$$$$FF",J$$$$$$$F
+             `"??$$$$$$$???",;d??$$$F".:.
+                    : =cddd??" `" . :::::::
+                 .:`.:::: :::::'.:::::::::::

data/lib/generators/minnie/install_generator.rb

@@ -7,8 +7,8 @@ module Minnie
 
       def install
         inject_into_class "app/controllers/application_controller.rb", ApplicationController do
-          "  include Minnie::Authentication\n\n  before_filter :authenticate_user!\n"       
-        end
+          "  include Minnie::Auth\n\n  before_filter :authenticate_user!\n"       
+        end      
       end
 
       def copy_sessions_controller
@@ -33,8 +33,8 @@ module Minnie
         unless File.exists?('app/models/user.rb')
           generate("model", "user email:string password_digest:string")
         end
-        inject_into_class 'app/models/user.rb', User do
-          "  has_secure_password\n\n  attr_accessible :email, :password\n  validates_presence_of :email\n  validates_presence_of :password, :on => :create\n\n"
+        inject_into_class "app/models/user.rb", ::User do
+          "  include Minnie::User::Auth\n\n  has_secure_password\n\n  attr_accessible :email, :password\n  validates_presence_of :email\n  validates_presence_of :password, :on => :create\n\n"
         end
       end
     end

data/lib/generators/minnie/templates/sessions_controller.rb

@@ -6,7 +6,7 @@ class SessionsController < ApplicationController
   end  
 
   def create  
-    if @user = authenticate(params[:user][:email], params[:user][:password])
+    if @user = User.authenticate(params[:user][:email], params[:user][:password])
       sign_in_and_redirect(@user)  
     else  
       @user = User.new

data/lib/minnie.rb

@@ -1,5 +1,8 @@
 require "minnie/version"
 
 module Minnie
-  autoload :Authentication, 'minnie/authentication'
+  autoload :Auth, 'minnie/auth'
+  module User
+    autoload :Auth, 'minnie/user/auth'
+  end
 end

data/lib/minnie/{authentication.rb → auth.rb}

@@ -1,17 +1,16 @@
 module Minnie
-  module Authentication
+  module Auth
     extend ActiveSupport::Concern    
 
     included do
       helper_method :current_user
 
       hide_action :authenticate_user!, :sign_in_and_redirect,
-                  :sign_out_and_redirect, :current_user,
-                  :authenticate      
+                  :sign_out_and_redirect, :current_user
     end
 
     def authenticate_user!
-      redirect unless session[:user_id] && User.first(:conditions => {:id => session[:user_id]})
+      redirect unless session[:user_id] && ::User.first(:conditions => {:id => session[:user_id]})
     end  
 
     def sign_in_and_redirect(user, options = {})
@@ -27,12 +26,7 @@ module Minnie
     end
 
     def current_user
-      @current_user ||= User.first(:conditions => {:id => session[:user_id]}) if session[:user_id]
-    end
-
-    def authenticate(email, password)
-      user = User.first(conditions: {email: params[:user][:email]})
-      return user && user.authenticate(password)        
+      @current_user ||= ::User.first(:conditions => {:id => session[:user_id]}) if session[:user_id]
     end
 
     private

data/lib/minnie/user/auth.rb

@@ -0,0 +1,14 @@
+module Minnie
+  module User
+    module Auth
+      extend ActiveSupport::Concern    
+
+      module ClassMethods
+        def authenticate(email, password)
+          user = self.first(conditions: {email: email})
+          return user && user.authenticate(password)        
+        end
+      end
+    end
+  end
+end

data/lib/minnie/version.rb

@@ -1,3 +1,3 @@
 module Minnie
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minnie
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70120924601820 !ruby/object:Gem::Requirement
+  requirement: &70212481399280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70120924601820
+  version_requirements: *70212481399280
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70120924601220 !ruby/object:Gem::Requirement
+  requirement: &70212481398220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70120924601220
+  version_requirements: *70212481398220
 description: The simplest that authentication can get while still being useful
 email:
 - mike@sideline.ca
@@ -42,6 +42,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- MINNIE.txt
 - README.md
 - Rakefile
 - lib/generators/minnie/install_generator.rb
@@ -49,7 +50,8 @@ files:
 - lib/generators/minnie/templates/sessions/new.html.erb
 - lib/generators/minnie/templates/sessions_controller.rb
 - lib/minnie.rb
-- lib/minnie/authentication.rb
+- lib/minnie/auth.rb
+- lib/minnie/user/auth.rb
 - lib/minnie/version.rb
 - minnie.gemspec
 homepage: https://github.com/mm53bar/minnie
@@ -66,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 505290612728215702
+      hash: -47571018539962695
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -75,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 505290612728215702
+      hash: -47571018539962695
 requirements: []
 rubyforge_project: minnie
 rubygems_version: 1.8.7