authstrategies 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQ3YmIyY2QwNDJhNWJiMjk3YWE5MTdjZGFjNGY3NDA0ZDY4ZTk1Yw==
+    MjAxN2FiZmE5MmYwZmQ5MTc3YWYyY2ZiYWE4OGY1YjAzN2JlNTQzYw==
   data.tar.gz: !binary |-
-    OGJlYjQ4NjM3YWJkZjI5MGExNWM3YjgyZWU0ZTYxNGI5M2U1YmQxYw==
+    NWNiNDJkNjUwMTdmYWZjNGI4MTEwODFlMTMyMzhjMGU4MDAxY2EyNQ==
 SHA512:
   metadata.gz: !binary |-
-    YWU5NmFhYmM4YzhjZDFlNmQ4OTFjZWI2ZDY4MzE3MTlkNzE4NDEzZDhjOTI5
-    Y2Y2NDdiYmQxYzA1NmFjY2MxZGZhNWE3MzU0MjU0MzdkNjZkNDBmNDYyM2M5
-    YmY4YWMxMDQ2ZTJjODUyN2QwNGY2OGVjNzI0N2Y5Njc4Nzc5ZTk=
+    MGZiNTU3MDAzN2FkNTc3MzRlM2I3NTAxYjE3OTA0NmRlMDU0ZmZkNjcxNmU3
+    MGIwNmMyNTg5YjgyNDFhOWFhMjc4OWJiOTQ3ZmRlYTY0M2ZkMjg3YmEwZDRm
+    NWVhZGE1NTBlMjI2ZWEyMjU3MTYzYTRlNGVlNjVjYmFkM2ZmZmE=
   data.tar.gz: !binary |-
-    MDVkYWI0NTNhOWRhOWJmYjIwZDdkYWQ0YTI1MGY1YjA1N2VlNTFjZDE2NDA1
-    OTY1N2IxYzZkZjk4ZDE3OTU5OWM4MmNjZGIxOTY5Nzg2MjRmODk3Y2ExY2Q4
-    YTUwZmQ4YTEyMDIzMmFjNWMxNDBmNjE5OTQzMTA3N2NkZmFiZTU=
+    ZTlhM2E4MzdhNTYyMjk5MDdiZjM1ZTU4OTY1OThhY2JmZDA5OGZhYzhmZTEw
+    OTBhZDc3MzRmZjI1OGZhYjQ3YzM0YmU3YTAxZDU5MGYwNDJkOWEzODg2Y2Zh
+    Y2QyY2VlOTRlODBiYmE2Y2M4NDFiZGNiZGY1NmU2MWExZWQyYzc=

data/README.md

@@ -19,137 +19,141 @@ Or install it yourself as:
 ## Usage
 
 Authstrategies uses sinatra-activerecord as orm. There is currently no rake task to generate a migration for the user model, but you can use the following: (courtesy of device)
+```ruby
+    def up
+      create_table :users do |t|
+        t.string :email,              :null => false, :defautl => ""
+        t.string :encrypted_password, :null => false, :default => ""
 
-	  def up
-			create_table :users do |t|
-				t.string :email,							:null => false, :defautl => ""
-				t.string :encrypted_password, :null => false, :default => ""
+        t.string  :remember_token
+        t.boolean :remember_me
 
-				t.string  :remember_token
-				t.boolean :remember_me
-
-				t.timestamps
-			end
-
-			add_index :users, :email,			     :unique => true
-			add_index :users, :remember_token, :unique => true
-	  end
+        t.timestamps
+      end
 
+      add_index :users, :email,          :unique => true
+      add_index :users, :remember_token, :unique => true
+    end
+```
 
 After that your application should be configurad similarly to the following:
-
+```ruby
     require 'authstrategies'
 
-		class YourApp < Sinatra::Application
-			use Rack::Session::Cookie, {
-				:secret => 'such secret many secure wow',
-				:expire_after => 3600
-			}
-			use Rack::Flash
-			use Authstrategies::Middleware
-		end
-
+    class YourApp < Sinatra::Application
+      use Rack::Session::Cookie, {
+        :secret => 'such secret many secure wow',
+        :expire_after => 3600
+      }
+      use Rack::Flash
+      use Authstrategies::Middleware
+    end
+```
 The expire after for Rack::Session::Cookie is optional, but I set it, because
 some modern browsers will not delete session cookies after the user closes his browser like you would normally expect. This may pose a security thread if your users log in from a public computer.
 
 If you want to use the helpers provided with authstrategies put:
 
-		require 'authstrategies/helpers'
-
-		helpers Authstrategies::Helpers
+    require 'authstrategies/helpers'
+    helpers Authstrategies::Helpers
 
 in your code.
 
-To authenticate a user call authenticate!
-To check if a user is authenticated call authenticated?
-To get the currently logged in user call current_user
-To logout the user class logout.
+## Helpers
+
+    authenticate!
+To authenticate a user call
+
+    authenticated?
+To check if a user is authenticated
+
+    current_user
+To get the currently logged in user
+
+    logout
+To logout the user
+
+    login_path
+returns the login path as a string
 
-login_path returns the login path as a string
-logout_path returns the logout path as a string
-signup_path returns the signup path as a string
+    logout_path
+returns the logout path as a string
+
+    signup_path
+returns the signup path as a string
 
 ## Callbacks
 
     after_set_user
 This is called every time the user is set. The user is set:
-=> on each request when they are accessed for the first time via env['warden'].user
-=> when the user is initially authenticated
-=> when the user is set via the set_user method
+  on each request when they are accessed for the first time via env['warden'].user
+  when the user is initially authenticated
+  when the user is set via the set_user method
 Courtesy of Warden, for more information check the warden callbacks wiki
 
     after_authentication
 
 Executed every time the user is authenticated
 (first time in each session).
-Courtesy of Warden, for more information check the warden callbacks wiki
+Courtesy of Warden, for more information check the warden callbacks wiki.
 
     before_login_failure
 
 This callback is run right before the failure application is called.
-Courtesy of Warden, for more information
-check the warden callbacks wiki
+Courtesy of Warden, for more information check the warden callbacks wiki.
 
     after_login_failure
 
-This is called in the failure application
-Useful for redirecting the user after he logs in
+This is called in the failure application.
 2 params are passed to this callback
-=>request - the request data
-=>response - the response data
+  request - the request data
+  response - the response data
 
     before_logout
 
 This callback is run before each user is logged out.
-Courtesy of Warden, for more information
-check the warden callbacks wiki
+Courtesy of Warden, for more information check the warden callbacks wiki.
 
     after_logout
 
 This is called after the user is logged out.
-Useful for redirecting the user after logging out
 2 parameters are passed to this callback
-=>request - the request data
-=>response - the response data
-
-    after_logout_path
-
-This defines a path to redirect the user to
-after he logs out and a flash message to print
-path default is root path
-message default is 'Logged out successfully!'
+  request - the request data
+  response - the response data
 
     after_login
 
 This is called each time after the user logs in
 3 parameters are passed to this callback
-=>current_user - the user that hase just been set
-=>request - the request data
-=>response - the response data
-
-    after_login_path
-
-This defines a path to redirect the user to
-after he logs in and a flash message to print
-path default is root path
-message default is 'Logged in successfully!'
+  current_user - the user that hase just been set
+  request - the request data
+  response - the response data
 
     after_signup
 
-This is called after the user is saved into
-the database
+This is called after the user is saved into the database.
 3 parameters are passed to this callback
-=>user - the user that just signed up
-=>request - the request data
-=>response - the response data
+  user - the user that just signed up
+  request - the request data
+  response - the response data
 Also since the user is set to session via env['warden'].set_user
 after_set_user is also called after the user signs up
 
-    after_signup_path
-This defines a path to redirect the user to
-after he signs up and a flash message to print
-path default is root path
-message default is 'Successfully signed up!
+## Configuration
+
+You can cofigure authstrategies throug:
+```ruby
+    Authstrategies::Manager.config do |config|
+     config[:after_login_path] = '/' #sets a path to redirect the user after logging in
+     config[:after_login_msg] = 'Successfully logged in!' #sets a message to give to the user after he logs in
+
+     config[:after_logout_path] = '/' #sets a path to redirect the user after logging out
+     config[:after_logout_msg] = 'Successfully logged out!' #sets a message to give to the user after he logs out
+
+     config[:after_signup_path] = '/' #sets a path to redirect the user after he signs up
+     config[:after_signup_msg] = 'Successfully signed up!' #sets a message to give to the user after he signs up
+    end
+```
 ## Contributing
 
 1. Fork it

data/authstrategies.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
 	spec.add_runtime_dependency "protected_attributes"
 	spec.add_runtime_dependency "warden"
 	spec.add_runtime_dependency "bcrypt-ruby"
-	spec.add_runtime_dependency "rack-flash3", '1.0.5'
+	spec.add_runtime_dependency "sinatra-flash"
+	spec.add_runtime_dependency "i18n"
+	spec.add_runtime_dependency "rack-contrib"
 
 end

data/lib/authstrategies.rb

@@ -1,9 +1,12 @@
 require "authstrategies/version"
 require "warden"
-require "rack-flash"
+require "sinatra/flash"
+require "rack/contrib"
 require "sinatra/base"
 require "active_record"
 require "bcrypt"
+require "i18n"
+require "i18n/backend/fallbacks"
 require "authstrategies/session_serializer.rb"
 require "authstrategies/helpers.rb"
 require "authstrategies/password.rb"
@@ -16,14 +19,11 @@ module Authstrategies
     @@callbacks = {}
 
     @@config = {
-      :after_login_path => '/',
-      :after_login_msg => 'Successfully logged in!',
+      :default_locales => :en,
 
+      :after_login_path => '/',
       :after_logout_path => '/',
-      :after_logout_msg => 'Successfully logged out!',
-
       :after_signup_path => '/',
-      :after_signup_msg => 'Successfully signed up!',
     }
 
     def self.registered? hook

data/lib/authstrategies/helpers.rb

@@ -1,7 +1,7 @@
 module Authstrategies
 	module Helpers
-		def authenticate! strategy= :password
-			env['warden'].authenticate! strategy
+		def authenticate!
+			env['warden'].authenticate!
 		end
 
 		def authenticated?

data/lib/authstrategies/locales/bg.yml

@@ -0,0 +1,13 @@
+bg:
+  login_msg: Успешен вход в системата!
+  logout_msg: Вие излязохте от системата!
+  signup_msg: Успешна регистрация!
+  email: E-mail
+  password: Парола
+  remember_me: Запомни ме!
+  submit: Изпращане
+  not_registered: Нямаш акаунт?
+  signup: Регистрация
+  confirm: Потвърждаване
+  register: Регистрация
+  login: Вход

data/lib/authstrategies/locales/en.yml

@@ -0,0 +1,13 @@
+en:
+  login_msg: Successfully logged in!
+  logout_msg: Successgully logged out!
+  signup_msg: Successfully signed up!
+  email: E-mail
+  password: Password
+  remember_me: Remember me!
+  submit: Submit
+  not_registered: Don't have an account?
+  signup: Signup
+  confirm: Confirm
+  register: Register
+  login: Log in

data/lib/authstrategies/middleware.rb

@@ -2,9 +2,18 @@ module Authstrategies
 	class Middleware < Sinatra::Base
     register Base
     register RememberMe
+    register Sinatra::Flash
+
+    use Rack::Locale
 
     include Manager
 
+    I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+    I18n.load_path = Dir[File.join(File.dirname(__FILE__)+'/locales', '*.yml')]
+    I18n.backend.load_translations
+    I18n.enforce_available_locales = true
+    I18n.default_locale = Manager.config[:default_locales]
+
     get '/login/?' do
       redirect '/' if authenticated?
       erb :login
@@ -22,7 +31,7 @@ module Authstrategies
           )
         end
         Manager.call :after_login, [current_user, request, response]
-        flash[:notice] = Manager.config[:after_login_msg]
+        flash[:notice] = I18n.t 'login_msg'
         redirect Manager.config[:after_login_path]
       end
     end
@@ -39,7 +48,7 @@ module Authstrategies
         user.save
         env['warden'].set_user(user)
         Manager.call :after_signup, [user, request, response]
-        flash[:notice] = Manager.config[:after_signup_msg]
+        flash[:notice] = I18n.t 'signup_msg'
         redirect Manager.config[:after_signup_path]
       else
         flash[:error] = user.errors.messages
@@ -53,7 +62,7 @@ module Authstrategies
         response.delete_cookie("authstrategies")
         logout
         Manager.call :after_logout, [request, response]
-        flash[:notice] = Manager.config[:after_logout_msg]
+        flash[:notice] = I18n.t 'logout_msg'
         redirect Manager.config[:after_logout_path]
       end
       redirect '/'

data/lib/authstrategies/version.rb

@@ -1,3 +1,3 @@
 module Authstrategies
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/authstrategies/views/login.erb

@@ -1,8 +1,9 @@
 <%= flash[:error] %>
 <%= flash[:notice] %>
 <form action="login" method="post">
-	<p>Username:<input type="text" name="email" /></p>
-	<p>Password:<input type="password" name="password" /></p>
-	<p>Remember Me: <input type="checkbox" name="remember_me" /></p>
-	<p><input type="submit" name="Submit" /></p>
+  <p><%= I18n.t 'email' %>:<input type="email" name="email" required/></p>
+  <p><%= I18n.t 'password' %>:<input type="password" name="password" required/></p>
+  <p><%= I18n.t 'remember_me' %> <input type="checkbox" name="remember_me" /></p>
+  <p><input type="submit" value=<%= I18n.t 'submit' %> /></p>
+  <%= I18n.t 'not_registered' %><a href=<%= signup_path%>><%= I18n.t 'signup' %></a>
 </form>

data/lib/authstrategies/views/signup.erb

@@ -1,8 +1,22 @@
 <%= flash[:error] %>
 <%= flash[:notice] %>
 <form action="signup" method="post">
-	<p>E-mail:<input type="text" name="email" /></p>
-	<p>Password:<input type="password" name="password" /></p>
-	<p>Confirm password:<input type="password" name="password_confirmation" /></p>
-	<input type="submit" value="Register!" />
+  <table border="0">
+    <tr>
+      <td><%= I18n.t 'email' %>:</td>
+      <td><input type="email" name="email" required/></td>
+    </tr>
+    <tr>
+      <td><%= I18n.t 'password' %>:</td>
+      <td><input type="password" name="password" required/></td>
+    </tr>
+    <tr>
+      <td><%= I18n.t 'confirm' %>:</td>
+      <td><input type="password" name="password_confirmation" /></td>
+    </tr>
+    <tr>
+      <td><input type="submit" value=<%= I18n.t 'register' %> /></td>
+    </tr>
+  </table>
 </form>
+<%= I18n.t 'already_registered' %> <a href=<%= login_path %>><%= I18n.t 'login' %></a>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authstrategies
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dobromir Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,19 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-flash3
+  name: sinatra-flash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '0'
 description: AuthStrategies is a Warden implementation for sinatra.
 email:
 - dobromir0ivanov@gmail.com
@@ -137,6 +165,8 @@ files:
 - authstrategies.gemspec
 - lib/authstrategies.rb
 - lib/authstrategies/helpers.rb
+- lib/authstrategies/locales/bg.yml
+- lib/authstrategies/locales/en.yml
 - lib/authstrategies/middleware.rb
 - lib/authstrategies/models/user.rb
 - lib/authstrategies/password.rb