socialite 0.1.0.pre.5 → 0.1.0.pre.6

data/app/controllers/socialite/sessions_controller.rb

@@ -7,7 +7,7 @@ module Socialite
     # Login Page
     def new
       if current_user
-        redirect_to main_app.root_path, :alert => 'You are already registered.'
+        redirect_to main_app.root_path, :alert => I18n.t('socialite.already_registered')
       end
     end
 
@@ -22,20 +22,20 @@ module Socialite
           # account. But we found the identity and the user associated with it
           # is the current user. So the identity is already associated with
           # this user. So let's display an error message.
-          redirect_to after_link_path, :notice => "You have already linked this account"
+          redirect_to after_link_path, :notice => I18n.t('socialite.already_linked_account')
         else
           # The identity is not associated with the current_user so lets
           # associate the identity.
           @identity.user = current_user
           @identity.save
-          redirect_to after_link_path, :notice => "Account successfully authenticated"
+          redirect_to after_link_path, :notice => I18n.t('socialite.successful_signup')
         end
       else # User is not logged in, this is a new signin
         if @identity.user.present?
           # The identity we found had a user associated with it so let's
           # just log them in here
           self.current_user = @identity.user
-          redirect_to after_login_path, :notice => "Signed in!"
+          redirect_to after_login_path, :notice => I18n.t('socialite.successful_signin')
         else
           # The authentication has no user assigned and there is no user signed in
           # Our decision here is to create a new account for the user
@@ -54,7 +54,7 @@ module Socialite
           # We can now link the authentication with the user and log him in
           user.identities << @identity
           self.current_user = user
-          redirect_to after_signup_path, notice: "Welcome to the app!"
+          redirect_to after_signup_path, notice: I18n.t('socialite.welcome')
 
           # No user associated with the identity so we need to create a new one
           # redirect_to new_user_url, :notice => "Please finish registering"
@@ -64,11 +64,11 @@ module Socialite
 
     def destroy
       logout!
-      redirect_to(main_app.root_url, :notice => 'Signed out!')
+      redirect_to(main_app.root_url, :notice => I18n.t('socialite.successful_signout'))
     end
 
     def failure
-      redirect_to after_failure_path, :alert => "Authentication failed, please try again."
+      redirect_to after_failure_path, :alert => I18n.t('socialite.unsuccessful_signup')
     end
   end
 end

data/app/controllers/socialite/users_controller.rb

@@ -4,7 +4,7 @@ module Socialite
 
     def new
       if current_user
-        redirect_to main_app.root_path, notice: 'You are already registered.'
+        redirect_to main_app.root_path, notice: I18n.t('socialite.already_registered')
       end
       @user = env['omniauth.identity'] ||= Socialite.user_class.new
     end

data/app/views/socialite/identities/_identities.html.haml

@@ -1,14 +1,15 @@
+- i18n_scope = "socialite.labels"
 %table
   %thead
-    %th Provider
-    %th Unique ID
-    %th Additional
-    %th Actions
+    %th= I18n.t('provider', scope: i18n_scope)
+    %th= I18n.t('unique_id', scope: i18n_scope)
+    %th= I18n.t('additional_auth_information', scope: i18n_scope)
+    %th= I18n.t('actions', scope: i18n_scope)
   - identities.each do |identity|
     %tr
       %td= identity.provider
       %td= identity.unique_id
       %td= identity.auth_hash
       %td
-        = link_to 'Unlink', user_identity_path(identity), :method => :delete, :confirm => 'Are you sure?'
+        = link_to I18n.t('unlink_account', scope: i18n_scope), user_identity_path(identity), :method => :delete, :confirm => I18n.t('socialite.confirm_unlink')
 

data/app/views/socialite/identities/new.html.haml

@@ -1,14 +1,15 @@
-%h1 New Account
+- i18n_scope = "socialite.identities.new"
+%h1= I18n.t('header', scope: i18n_scope)
 
 = simple_form_for @identity, :url => '/auth/identity/register' do |f|
   - if @identity && @identity.errors.any?
     .error_messages
-      %h2 #{pluralize(@identity.errors.count, "error")} prohibited this account from being saved:
+      %h2= I18n.t('socialite.errors.create_fail', :count => @identity.errors.count)
       %ul
       - @identity.errors.full_messages.each do |msg|
         %li= msg
 
   = f.input :email, :input_html => {:name => 'email'}
   = f.input :password, :as => 'password', :input_html => {:name => 'password'}
-  = f.input :password_confirmation, :label => "Confirm Password", :as => 'password', :input_html => {:name => 'password_confirmation'}
-  = f.button :submit, 'Register'
+  = f.input :password_confirmation, :label => I18n.t('socialite.labels.confirm_password'), :as => 'password', :input_html => {:name => 'password_confirmation'}
+  = f.button :submit, I18n.t(:sign_up, scope: labels_scope)

data/app/views/socialite/sessions/new.html.haml

@@ -1,30 +1,33 @@
-%h1 Sign In
+- i18n_scope = "socialite.sessions.new"
+- labels_scope = "socialite.labels"
+
+%h1= I18n.t(:header, scope: i18n_scope)
 
 %p
-  %strong Sign in through one of these services:
+  %strong= I18n.t(:services_header, scope: i18n_scope)
 
 .auth_providers
   - if defined?(OmniAuth::Strategies::Twitter)
     %a.auth_provider{:href => "/auth/twitter"}
-      = image_tag "twitter_64.png", :size => "64x64", :alt => "Twitter"
-      Twitter
+      = image_tag "twitter_64.png", :size => "64x64", :alt => I18n.t('socialite.providers.twitter')
+      = I18n.t('socialite.providers.twitter')
   - if defined?(OmniAuth::Strategies::Facebook)
     %a.auth_provider{:href => "/auth/facebook"}
-      = image_tag "facebook_64.png", :size => "64x64", :alt => "Facebook"
-      Facebook
+      = image_tag "facebook_64.png", :size => "64x64", :alt => I18n.t('socialite.providers.facebook')
+      = I18n.t('socialite.providers.facebook')
 
 %p
-  %strong Don't use these services?
-  #{link_to "Create an account", signup_path} or login below.
+  %strong= I18n.t(:identity_header, scope: i18n_scope)
+  = I18n.t('create_account_text.html', scope: i18n_scope, :create_account_link => link_to(I18n.t('create_account_link_text', scope: i18n_scope), signup_path))
 
 = form_tag "/auth/identity/callback" do
   .field
-    = label_tag :auth_key, "Email"
+    = label_tag :auth_key, I18n.t(:auth_key, scope: labels_scope)
     %br
     = text_field_tag :auth_key
   .field
-    = label_tag :password
+    = label_tag :password, I18n.t(:password, scope: labels_scope)
     %br
     = password_field_tag :password
   .actions
-    = submit_tag "Sign in"
+    = submit_tag I18n.t(:sign_in, scope: labels_scope)

data/app/views/socialite/users/new.html.haml

@@ -1,10 +1,12 @@
 -# UsersController#new registration form is ONLY used with omniauth-identity
+- i18n_scope = "socialite.users.new"
+- labels_scope = "socialite.labels"
 
-= simple_form_for @user, :url => '/auth/identity/register' do |f|
-  %h1 Create an Account
+= simple_form_for(@user, :url => '/auth/identity/register') do |f|
+  %h1= I18n.t(:header, scope: i18n_scope)
   -# specify :input_html to avoid params nesting
   -# = f.input :name, :input_html => {:name => 'name'}
   = f.input :email, :input_html => {:name => 'email'}
   = f.input :password, :as => 'password', :input_html => {:name => 'password'}
-  = f.input :password_confirmation, :label => "Confirm Password", :as => 'password', :input_html => {:name => 'password_confirmation'}
-  = f.button :submit, 'Sign Up'
+  = f.input :password_confirmation, :label => I18n.t(:confirm_password, scope: labels_scope), :as => 'password', :input_html => {:name => 'password_confirmation'}
+  = f.button :submit, I18n.t(:sign_up, scope: labels_scope)

data/config/locales/en.yml

@@ -0,0 +1,53 @@
+en:
+  socialite:
+    already_registered: "You are already registered"
+    already_linked_account: "You have already linked this account"
+    successful_signup: "Account successfully authenticated"
+    successful_signin: "Signed in!"
+    successful_signout: "Signed out!"
+    unsuccessful_signup: "Authentication failed, please try again."
+    welcome: "Welcome to the app!"
+    confirm_unlink: "Are your sure?"
+    login_required: "You must be logged in to use this feature"
+
+    identities:
+      new:
+        header: "New Account"
+        submit_label: "Register"
+
+    sessions:
+      new:
+        header: "Sign In"
+        services_header: "Sign in through one of these services:"
+        identity_header: "Don't use these services?"
+        create_account_link_text: "Create an account"
+        create_account_text:
+          html: "%{create_account_link} or login below."
+
+    users:
+      new:
+        header: "Create an Account"
+
+    #### Providers
+    providers:
+      twitter: "Twitter"
+      facebook: "Facebook"
+
+    #### LABELS
+    labels:
+      provider: "Provider"
+      unique_id: "Unique ID"
+      additional_auth_information: "Additional"
+      actions: "Actions"
+      auth_key: "Email"
+      password: "Password"
+      unlink_account: "Unlink"
+      register: "Register"
+      confirm_password: "Confirm Password"
+      sign_up: "Sign Up!"
+      sign_in: "Sign in"
+
+    errors:
+      create_fail:
+        one: "%{error_count} error prohibited this account from being saved:"
+        other: "%{error_count} errors prohibited this account from being saved:"

data/lib/socialite/controllers/helpers.rb

@@ -20,7 +20,7 @@ module Socialite
           super
         else
           unless user_signed_in?
-            redirect_to login_path, :alert => 'You must be logged in to use this feature.'
+            redirect_to login_path, :alert => I18n.t('socialite.login_required')
           end
         end
       end

data/lib/socialite/models/user_concern.rb

@@ -20,7 +20,8 @@ module Socialite
         validates :email,
           :presence => true,
           :format => { :with => /.+@.+\..+/i },
-          :uniqueness => { :case_sensitive => false }
+          :uniqueness => { :case_sensitive => false },
+          :if => :authorized?
       end
 
       module ClassMethods
@@ -91,6 +92,13 @@ module Socialite
           # save(:validate => false)
         # end
       # end
+
+      # Used for overloading the validations on username and email.
+      #
+      # @return [Boolean]
+      def authorized?
+        true
+      end
     end
   end
 end

data/lib/socialite/version.rb

@@ -1,3 +1,3 @@
 module Socialite
-  VERSION = '0.1.0.pre.5'
+  VERSION = '0.1.0.pre.6'
 end

metadata

@@ -1,267 +1,304 @@
 --- !ruby/object:Gem::Specification
 name: socialite
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.5
+  prerelease: 6
+  version: 0.1.0.pre.6
 platform: ruby
 authors:
 - Justin Smestad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.12
-  type: :runtime
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.12
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: sass-rails
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: haml
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: omniauth
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-  type: :runtime
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
+  name: omniauth-identity
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
+        version: '0'
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: bcrypt-ruby
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
+        version: 3.0.0
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: omniauth-identity
+  name: simple_form
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: omniauth-twitter
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: sqlite3
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: yard
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec-rails
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: ffaker
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: capybara
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: database_cleaner
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: ammeter
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 description: Rails engine supporting multiple auth providers per user.
 email: justin.smestad@gmail.com
 executables: []
@@ -280,6 +317,7 @@ files:
 - app/views/socialite/identities/new.html.haml
 - app/views/socialite/sessions/new.html.haml
 - app/views/socialite/users/new.html.haml
+- config/locales/en.yml
 - config/routes.rb
 - lib/generators/socialite/install_generator.rb
 - lib/generators/socialite/migrations_generator.rb
@@ -361,26 +399,30 @@ files:
 - spec/support/omniauth.rb
 homepage: http://github.com/jsmestad/socialite
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 1237804995330320058
       version: '0'
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Rails engine supporting multiple auth providers per user.
 test_files:
 - spec/dummy/README.rdoc

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 47169664caee3fd761cc4d1f36008e7539a099f3
-  data.tar.gz: 8f57aed1133b3c8fccc9146bbc41d27c3d26dbb2
-SHA512:
-  metadata.gz: 6f46c8c1b4a86827ade860a5fa23ddb856c76bf89bafd0f57de5a764055f3cf4621fb713ef2d21e4533716545146fdc477dd1b098d950f4cd79e1c9e7a15e2d6
-  data.tar.gz: e663c6e8582dca08e4a9a2e099ebbb1ac0c228c452b4cce16fb83d97bf59fbed5c5441e9113dd604c0a47431c6274e9c43161a303fd2f09cc5a2ee732ce5036a