solidus_social 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fe49d36ea644340c59c66b5e8506ab57a466f6c
-  data.tar.gz: d42af370d565407ebdbccbe60d32fbcbef814478
+  metadata.gz: f1a51d0589d5c133e7feade204f1e502a9381ddc
+  data.tar.gz: 3a1c269db431f9221b2db01cf828dec5614981f2
 SHA512:
-  metadata.gz: 836eb284a9553b79eec6a3738a50cb30cb37162dad469fccee63ec153b4b7c888268d8beae8564a47efae281811c0f14f9ebf1f5f72136092eb32655428f4b79
-  data.tar.gz: 9b458f66b04f4ab4be83f0d4c151f5096cce9ff51790a2b9de95bba362e14e602d3fd392ae817491970ca4a6bd6cc55eb4c9eb30e788a615b566632ccd9e11b1
+  metadata.gz: 4bde42eaf3d0cfc966111ab8d0f094827b5d6004b74f37b0cc7d8ee677f20e44c6e579e57ace4a3599bdb23bd460f8b071c14aad6180e2896742d154cddc33c1
+  data.tar.gz: 74e0eac9c4637558d86d4bc1891a80712c921f03b9273e861123d06fcb9eba51b73140b0e7cf92063976b253b40c8c2a04cf3068bc97f93baba530a887053878

data/.rubocop.yml

@@ -1,8 +1,150 @@
----
-inherit_from: .hound.yml
-
 AllCops:
-  Exclude:
-    - spec/dummy/**/*
-    - bin/*
-    - Guardfile
+   Exclude:
+     - spec/dummy/**/*
+     - bin/*
+     - Guardfile
+     - vendor/**/*
+
+Style/MutableConstant:
+  Enabled: false
+
+# Relaxed.Ruby.Style
+
+Style/Alias:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylealias
+
+Style/BeginBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylebeginblock
+
+Style/BlockDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
+
+Style/Documentation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledocumentation
+
+Style/DotPosition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledotposition
+
+Style/DoubleNegation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
+
+Style/EndBlock:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleendblock
+
+Style/FormatString:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleformatstring
+
+Style/IfUnlessModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
+
+Style/Lambda:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylelambda
+
+Style/ModuleFunction:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemodulefunction
+
+Style/MultilineBlockChain:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
+
+Style/NegatedIf:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
+
+Style/NegatedWhile:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
+
+Style/ParallelAssignment:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
+
+Style/PerlBackrefs:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleperlbackrefs
+
+Style/Semicolon:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
+
+Style/SignalException:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesignalexception
+
+Style/SingleLineBlockParams:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelineblockparams
+
+Style/SingleLineMethods:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
+
+Style/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
+
+Style/SpecialGlobalVars:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespecialglobalvars
+
+Style/StringLiterals:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylestringliterals
+
+Style/WhileUntilModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
+
+Lint/AssignmentInCondition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false

data/.travis.yml

@@ -1,19 +1,21 @@
----
+sudo: false
+cache: bundler
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
-  - '2.3.0'
+  - 2.3.1
 env:
   matrix:
-    - SOLIDUS_BRANCH=master
-    - SOLIDUS_BRANCH=v1.2
-    - SOLIDUS_BRANCH=v1.1
-    - SOLIDUS_BRANCH=v1.0
-sudo: false
-before_script:
-  - sh -e /etc/init.d/xvfb start
-  - export DISPLAY=:99.0
-  - bundle exec rake test_app
-script:
-  - bundle exec rspec spec
+    - SOLIDUS_BRANCH=v1.0 DB=postgres
+    - SOLIDUS_BRANCH=v1.1 DB=postgres
+    - SOLIDUS_BRANCH=v1.2 DB=postgres
+    - SOLIDUS_BRANCH=v1.3 DB=postgres
+    - SOLIDUS_BRANCH=v1.4 DB=postgres
+    - SOLIDUS_BRANCH=v2.0 DB=postgres
+    - SOLIDUS_BRANCH=master DB=postgres
+    - SOLIDUS_BRANCH=v1.0 DB=mysql
+    - SOLIDUS_BRANCH=v1.1 DB=mysql
+    - SOLIDUS_BRANCH=v1.2 DB=mysql
+    - SOLIDUS_BRANCH=v1.3 DB=mysql
+    - SOLIDUS_BRANCH=v1.4 DB=mysql
+    - SOLIDUS_BRANCH=v2.0 DB=mysql
+    - SOLIDUS_BRANCH=master DB=mysql

data/Gemfile

@@ -1,7 +1,17 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
-gem 'solidus_auth_devise'
+gem "solidus", github: "solidusio/solidus", branch: branch
+
+if branch == 'master' || branch >= "v2.0"
+  gem "rails-controller-testing", group: :test
+end
+
+gem 'pg'
+gem 'mysql2'
+
+group :development, :test do
+  gem "pry-rails"
+end
 
 gemspec

data/README.md

@@ -3,49 +3,52 @@
 [![Build Status](https://travis-ci.org/solidusio-contrib/solidus_social.svg?branch=master)](https://travis-ci.org/solidusio-contrib/solidus_social)
 [![Code Climate](https://codeclimate.com/github/solidusio-contrib/solidus_social/badges/gpa.svg)](https://codeclimate.com/github/solidusio-contrib/solidus_social)
 
-Core for all social media related functionality for Solidus.
-The Solidus Social gem handles authorization, account creation and association through social media sources such as Twitter and Facebook.
-This gem is beta at best and should be treated as such.
-Features and code base will change rapidly as this is under active development.
-Use with caution.
+Social login support for Solidus. Solidus Social handles authorization, account
+creation and association through third-party services. Currently Twitter,
+Facebook, Github, Google OAuth2, and Amazon are available out of the box.
 
----
-
-## Setup for Production
+## Installation
 
 Add this extension to your `Gemfile`:
+
 ```ruby
 gem 'solidus_social'
 ```
 
 Then run:
+
 ```sh
 $ bundle && bundle exec rails g solidus_social:install
 $ bundle exec rake db:migrate
 ```
 
-Preference(optional): By default url will be '/users/auth/:provider'. If you wish to modify the url to: '/member/auth/:provider', '/profile/auth/:provider', or '/auth/:provider' then you can do this accordingly in your **config/initializers/spree.rb** file as described below -
+Optional: By default the login path will be '/users/auth/:provider'. If you
+want something else, configure it in `config/initializers/solidus_social.rb`.
 
 ```ruby
-Spree::SocialConfig[:path_prefix] = 'member' # for /member/auth/:provider
+Spree::SocialConfig[:path_prefix] = 'member'  # for /member/auth/:provider
 Spree::SocialConfig[:path_prefix] = 'profile' # for /profile/auth/:provider
-Spree::SocialConfig[:path_prefix] = '' # for /auth/:provider
+Spree::SocialConfig[:path_prefix] = ''        # for /auth/:provider
 ```
 
----
-
-## Spree Setup to Utilize OAuth Sources
+## Using OAuth Sources
 
 Login as an admin user and navigate to Configuration > Social Authentication Methods
 
-Click on the New Authentication Method button to enter the key obtained from their respective source, (See below for instructions on setting up the various providers).
+Click "New Authentication Method" and enter your API key for the service. (See
+below for instructions on setting up the different providers.)
 
-Multiple key entries can now be entered based on the rails environment. This allows for portability and the lack of need to check in your key to your repository. You also have the ability to enable and disable sources. These setting will be reflected on the client UI as well.
+Multiple key entries can now be entered based on the Rails environment. This
+allows for portability and the lack of need to check in your key to your
+repository. You also have the ability to enable and disable sources. These
+setting will be reflected on the client UI as well.
 
-Alternatively you can ship keys as environment variables and create these Authentication Method records on application boot via an initializer. Below is an example for facebook.
+If you store your configuration/credentials in environment variables, you can
+create Authentication Methods on application boot via an initializer if they
+don't already exist.
 
 ```ruby
-# Ensure our environment is bootstrapped with a facebook connect app
+# Ensure our environment is bootstrapped with a Facebook Connect app
 if ActiveRecord::Base.connection.table_exists? 'spree_authentication_methods'
   Spree::AuthenticationMethod.where(environment: Rails.env, provider: 'facebook').first_or_create do |auth_method|
     auth_method.api_key = ENV['FACEBOOK_APP_ID']
@@ -57,82 +60,105 @@ end
 
 **You MUST restart your application after configuring or updating an authentication method.**
 
----
-
-## Setup the Applications at the Respective Sources
+## Registering Your Application
 
-OAuth Applications @ Facebook, Twitter and / or Github are supported out of the box but you will need to setup applications are each respective site as follows for public use and for development.
+Facebook, Twitter, Github, Google OAuth2, and Amazon are supported out of the
+box but, you will need to register your application with each of the sites you
+want to use.
 
-> All URLs must be in the form of domain.tld you may add a port as well for development
+When setting up development applications, keep in mind that most services do
+not support `localhost` for your URL/domain. You will need to us a regular
+domain (i.e.  `domain.tld`, `hostname.local`) or an IP addresses (`127.0.0.1`).
+Make sure you specifity the right IP address.
 
 ### Facebook
 
 [Facebook / Developers / Apps][2]
 
-1. Name the app what you will and agree to the terms.
-2. Fill out the capcha
-3. Under the Web Site tab
-4. Site URL: http://your_computer.local:3000 for development / http://your-site.com for production
-5. Site domain: your-computer.local / your-site.com respectively
+1. Name the app and agree to the terms.
+2. Fill out the capcha.
+3. Under the "Web Site" tab enter:
+  - Site URL: `http://yourhostname.local:3000` for development and
+    `http://your-site.com` for production
+  - Site domain: `yourhostname.local` and `your-site.com` respectively
 
 ### Twitter
 
 [Twitter / Application Management / Create an application][3]
 
-1. Name and Description must be filled in with something
-2. Application Website: http://your_computer.local:3000 for development / http://your-site.com for production
-3. Application Type: Browser
-4. Callback URL: http://your_computer.local:3000 for development / http://your-site.com for production
-5. Default Access Type: Read & Write
-6. Save Application
+1. Fill in the name and description.
+2. Fill in the rest of the details:
+  - Application Website: `http://yourhostname.local:3000` for development and
+    `http://your-site.com` for production
+  - Application Type: "Browser"
+  - Callback URL: `http://yourhostname.local:3000 for development and
+    `http://your-site.com` for production
+  - Default Access Type: "Read & Write"
+6. Save the application.
 
 ### Github
 
 [Github / Applications / Register a new OAuth application][4]
 
-1. Name The Application
-2. Main URL: http://your_computer.local:3000 for development / http://your-site.com for production
-3. Callback URL: http://your_computer.local:3000 for development / http://your-site.com for production
-4. Click Create
-
-> This does not seem to be a listed Github item right now. To View and / or edit your applications goto [http://github.com/account/applications](http://github.com/account/applications)
+1. Name the application.
+2. Fill in the details
+  - Main URL: `http://yourhostname.local:3000` for development and
+    `http://your-site.com` for production
+  - Callback URL: `http://yourhostname.local:3000` for development and
+    `http://your-site.com` for production
+4. Click Create.
 
 ### Amazon
 
 [Amazon / App Console / Register a new OAuth application][10]
 
-1. Register New Application
-2. Name the Application, provide description and URL for Privacy Policy
-3. Click Save
-4. Add Your site under Web Settings > Allowed Return URLs (example: http://localhost:3000/users/auth/amazon/callback)
+1. Register New Application.
+2. Name the Application, provide description and URL for Privacy Policy.
+3. Click Save.
+4. Add Your site under Web Settings > Allowed Return URLs (example:
+   `http://localhost:3000/users/auth/amazon/callback`)
 
 > The app console is available at [https://login.amazon.com/manageApps](https://login.amazon.com/manageApps)
 
-### Other OAuth sources that are currently supported
+### Google OAuth2
 
-* Google (OAuth)
+_TODO: Write instructions._
 
-## Adding other OAuth sources
+### Other OAuth Providers
 
-It is easy to add any OAuth source, given there is an OmniAuth strategy gem for it (and if not, you can easily [write one by yourself](https://github.com/intridea/omniauth/wiki/Strategy-Contribution-Guide). For instance, if you want to add authorization via LinkedIn, the steps will be:
+Other OAuth providers are supported, given that there is an [OmniAuth
+strategy][12] for them. (If there isn't, you can [write one][13].)
 
-1. Add `gem "omniauth-linkedin"` to your Gemfile, run `bundle install`.
-2. In an initializer file, e.g. `config/initializers/devise.rb`, add and init a new provider for SolidusSocial:
+#### LinkedIn Example
 
-        SolidusSocial::OAUTH_PROVIDERS << ['LinkedIn', 'linkedin']
-        SolidusSocial.init_provider('linkedin')
+1. Add `gem "omniauth-linkedin"` to your Gemfile and run `bundle install`.
+2. In `config/initializers/solidus_social.rb` add and initialize a new provider
+   for SolidusSocial:
 
+   ```ruby
+   SolidusSocial::OAUTH_PROVIDERS << ['LinkedIn', 'linkedin']
+   SolidusSocial.init_provider('linkedin')
+   ```
 3. Activate your provider as usual (via initializer or admin interface).
-4. Override `spree/users/social` view to render OAuth links in preferred way for a new one to be displayed. Or alternatively, include to your CSS a definition for `.icon-spree-linkedin-circled` and an embedded icon font for LinkedIn from [fontello.com](http://fontello.com/) (the way existing icons for Facebook, Twitter, etc are implemented). You can also override CSS classes for other providers, `.icon-spree-<provider>-circled`, to use different font icons or classic background images, without having to override views.
+4. Do **one** of the following:
+
+   - Override the `spree/users/social` view to render OAuth links to display
+     your LinkedIn link.
+   - Include in your CSS a definition for `.icon-spree-linkedin-circled` and an
+     embedded icon font for LinkedIn from [Fontello][14] (the way existing
+     icons for Facebook, Twitter, etc are implemented). You can also override
+     CSS classes for other providers, `.icon-spree-<provider>-circled`, to use
+     different font icons or classic background images, without having to
+     override views.
 
----
+## Documentation
+
+API documentation is available [on RubyDoc.info][15].
 
 ## Contributing
 
 See corresponding [guidelines][11].
 
----
-
 Copyright (c) 2014 [John Dyer][7] and [contributors][8], released under the [New BSD License][9]
 
 [1]: https://github.com/spree/spree
@@ -146,3 +172,7 @@ Copyright (c) 2014 [John Dyer][7] and [contributors][8], released under the [New
 [9]: https://github.com/solidusio-contrib/solidus_social/blob/master/LICENSE.md
 [10]: https://login.amazon.com/manageApps
 [11]: https://github.com/solidusio-contrib/solidus_social/blob/master/CONTRIBUTING.md
+[12]: https://github.com/intridea/omniauth/wiki/List-of-Strategies
+[13]: https://github.com/intridea/omniauth/wiki/Strategy-Contribution-Guide
+[14]: http://fontello.com/
+[15]: http://www.rubydoc.info/github/solidusio-contrib/solidus_social/

data/Rakefile

@@ -6,7 +6,13 @@ require 'spree/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 
-task default: :spec
+task :default do
+  if Dir["spec/dummy"].empty?
+    Rake::Task[:test_app].invoke
+    Dir.chdir("../../")
+  end
+  Rake::Task[:spec].invoke
+end
 
 desc 'Generates a dummy app for testing'
 task :test_app do

data/app/controllers/spree/omniauth_callbacks_controller.rb

@@ -4,47 +4,11 @@ class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Store
 
-  def self.provides_callback_for(*providers)
-    providers.each do |provider|
-      class_eval <<-FUNCTION_DEFS, __FILE__, __LINE__ + 1
-        def #{provider}
-          if request.env['omniauth.error'].present?
-            flash[:error] = I18n.t('devise.omniauth_callbacks.failure', kind: auth_hash['provider'], reason: Spree.t(:user_was_not_valid))
-            redirect_back_or_default(root_url)
-            return
-          end
-
-          authentication = Spree::UserAuthentication.find_by_provider_and_uid(auth_hash['provider'], auth_hash['uid'])
-
-          if authentication.present? and authentication.try(:user).present?
-            flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: auth_hash['provider'])
-            sign_in_and_redirect :spree_user, authentication.user
-          elsif spree_current_user
-            spree_current_user.apply_omniauth(auth_hash)
-            spree_current_user.save!
-            flash[:notice] = I18n.t('devise.sessions.signed_in')
-            redirect_back_or_default(account_url)
-          else
-            user = Spree::User.find_by_email(auth_hash['info']['email']) || Spree::User.new
-            user.apply_omniauth(auth_hash)
-            if user.save
-              flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: auth_hash['provider'])
-              sign_in_and_redirect :spree_user, user
-            else
-              session[:omniauth] = auth_hash.except('extra')
-              flash[:notice] = Spree.t(:one_more_step, kind: auth_hash['provider'].capitalize)
-              redirect_to new_spree_user_registration_url
-              return
-            end
-          end
-
-          if current_order
-            user = spree_current_user || authentication.user
-            current_order.associate_user!(user)
-            session[:guest_token] = nil
-          end
-        end
-      FUNCTION_DEFS
+  class << self
+    def provides_callback_for(*providers)
+      providers.each do |provider|
+        define_method(provider) { omniauth_callback }
+      end
     end
   end
 
@@ -52,6 +16,44 @@ class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
     provides_callback_for provider[1].to_sym
   end
 
+  def omniauth_callback
+    if request.env['omniauth.error'].present?
+      flash[:error] = I18n.t('devise.omniauth_callbacks.failure', kind: auth_hash['provider'], reason: Spree.t(:user_was_not_valid))
+      redirect_back_or_default(root_url)
+      return
+    end
+
+    authentication = Spree::UserAuthentication.find_by_provider_and_uid(auth_hash['provider'], auth_hash['uid'])
+
+    if authentication.present? and authentication.try(:user).present?
+      flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: auth_hash['provider'])
+      sign_in_and_redirect :spree_user, authentication.user
+    elsif spree_current_user
+      spree_current_user.apply_omniauth(auth_hash)
+      spree_current_user.save!
+      flash[:notice] = I18n.t('devise.sessions.signed_in')
+      redirect_back_or_default(account_url)
+    else
+      user = Spree::User.find_by_email(auth_hash['info']['email']) || Spree::User.new
+      user.apply_omniauth(auth_hash)
+      if user.save
+        flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: auth_hash['provider'])
+        sign_in_and_redirect :spree_user, user
+      else
+        session[:omniauth] = auth_hash.except('extra')
+        flash[:notice] = Spree.t(:one_more_step, kind: auth_hash['provider'].capitalize)
+        redirect_to new_spree_user_registration_url
+        return
+      end
+    end
+
+    if current_order
+      user = spree_current_user || authentication.user
+      current_order.associate_user!(user)
+      session[:guest_token] = nil
+    end
+  end
+
   def failure
     set_flash_message :alert, :failure, kind: failed_strategy.name.to_s.humanize, reason: failure_message
     redirect_to spree.login_path

data/app/views/spree/shared/_social.html.erb

@@ -2,10 +2,10 @@
   <% if (!spree_current_user || !spree_current_user.user_authentications) && Spree::AuthenticationMethod.active_authentication_methods? %>
     <h2><%= Spree.t(:sign_in_through_one_of_these_services) %></h2>
   <% end %>
-
-  <% Spree::AuthenticationMethod.available_for(@spree_user).each do |method| %>
+  
+  <% Spree::AuthenticationMethod.available_for(spree_current_user).each do |method| %>
     <%= link_to(content_tag(:i, '', class: "icon-spree-#{method.provider.to_url}-circled"),
-          spree.spree_user_omniauth_authorize_url(provider: method.provider),
+          spree.send("spree_user_#{method.provider}_omniauth_authorize_path"),
           title: Spree.t(:sign_in_with, provider: method.provider)) if method.active %>
   <% end %>
 </div>

data/app/views/spree/users/_social.html.erb

@@ -1,28 +1,30 @@
 <% if Spree::AuthenticationMethod.active_authentication_methods? %>
-<% @body_id = 'login' %>
-<div id="existing-customer">
-  <% if spree_current_user.user_authentications %>
-    <% unless spree_current_user.user_authentications.empty? %>
-      <p><strong><%= Spree.t(:you_have_signed_in_with_these_services) %>:</strong></p>
-      <div class="authentications">
-        <% for user_authentication in spree_current_user.user_authentications %>
-          <div class="authentication">
-            <div class="provider columns two">
-              <%= content_tag(:i, '', class: "icon-spree-#{user_authentication.provider.to_url}-circled columns") %>
-              <%= user_authentication.provider %>
+  <% @body_id = 'login' %>
+  <div id="existing-customer">
+    <% if spree_current_user.user_authentications %>
+      <% unless spree_current_user.user_authentications.empty? %>
+        <p><strong><%= Spree.t(:you_have_signed_in_with_these_services) %>:</strong></p>
+        <div class="authentications">
+          <% for user_authentication in spree_current_user.user_authentications %>
+            <div class="authentication">
+              <div class="provider columns two">
+                <%= content_tag(:i, '', class: "icon-spree-#{user_authentication.provider.to_url}-circled columns") %>
+                <%= user_authentication.provider %>
+              </div>
+              <div class="uid columns two"><%= user_authentication.uid %></div>
+              <%= link_to 'X', user_authentication, data: { confirm: "#{Spree.t(:remove_authentication_option_confirmation)}" }, method: :delete, class: 'remove' %>
             </div>
-            <div class="uid columns two"><%= user_authentication.uid %></div>
-            <%= link_to 'X', user_authentication, data: { confirm: "#{Spree.t(:remove_authentication_option_confirmation)}" }, method: :delete, class: 'remove' %>
-          </div>
-        <% end %>
-        <div class="clear"></div>
-      </div>
+          <% end %>
+          <div class="clear"></div>
+        </div>
+      <% end %>
     <% end %>
+    
+    <% if Spree::AuthenticationMethod.available_for(spree_current_user).present? %>
+      <%= content_tag(:p, content_tag(:strong, Spree.t(:add_another_service))) %>
+      <%= render 'spree/shared/social' %>
+    <% end %>
+  </div>
 
-  <% end %>
-  <%= content_tag(:p, content_tag(:strong, Spree.t(:add_another_service))) if Spree::AuthenticationMethod.available_for(spree_current_user).exists? %>
-  <%= render 'spree/shared/social' %>
-</div>
-
-<div class="clear"></div>
+  <div class="clear"></div>
 <% end %>

data/lib/generators/solidus_social/install/install_generator.rb

@@ -4,7 +4,7 @@ module SolidusSocial
       class_option :auto_run_migrations, type: :boolean, default: false
 
       def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_social\n", before: /\*\//, verbose: true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_social\n", before: %r(\*/), verbose: true
       end
 
       def add_migrations
@@ -12,7 +12,7 @@ module SolidusSocial
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
         if run_migrations
           run 'bundle exec rake db:migrate'
         else

data/lib/solidus_social/version.rb

@@ -9,7 +9,7 @@ module SolidusSocial
 
   module VERSION
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
     PRE   = nil
 

data/solidus_social.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_runtime_dependency 'solidus_core', ["~> 1.0"]
+  s.add_runtime_dependency 'solidus_core', [">= 1.0", "< 3"]
+  s.add_runtime_dependency 'solidus_auth_devise'
   s.add_runtime_dependency 'omniauth'
   s.add_runtime_dependency 'oa-core'
   s.add_runtime_dependency 'omniauth-twitter'
@@ -30,18 +31,14 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'omniauth-google-oauth2'
   s.add_runtime_dependency 'omniauth-amazon'
 
-  s.add_development_dependency 'capybara', '~> 2.4.1'
-  s.add_development_dependency 'database_cleaner', '1.3.0'
-  s.add_development_dependency 'rspec-rails', '~> 3.1.0'
+  s.add_development_dependency 'capybara', '~> 2.4'
+  s.add_development_dependency 'database_cleaner', '1.3'
+  s.add_development_dependency 'rspec-rails', '~> 3.1'
   s.add_development_dependency 'factory_girl', '~> 4.4'
-  s.add_development_dependency 'pry-rails'
   s.add_development_dependency 'selenium-webdriver', '>= 2.41.0'
-  s.add_development_dependency 'poltergeist', '~> 1.5.0'
+  s.add_development_dependency 'poltergeist', '~> 1.5'
   s.add_development_dependency 'simplecov', '~> 0.9.0'
   s.add_development_dependency 'sqlite3', '~> 1.3.10'
-  s.add_development_dependency 'coffee-rails'
-  s.add_development_dependency 'sass-rails'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'rubocop', '>= 0.24.1'
+  s.add_development_dependency 'rubocop', '~> 0.39.0'
   s.add_development_dependency 'rake', '< 11'
 end

data/spec/features/spree/admin/authentication_methods_configuration_spec.rb

@@ -5,7 +5,7 @@ RSpec.feature 'Admin Authentication Methods', :js do
     scenario 'has configuration tab' do
       visit spree.admin_path
       click_link 'Settings'
-      expect(page).to have_text 'SOCIAL AUTHENTICATION METHODS'
+      expect(page).to have_text(/Social Authentication Methods/i)
     end
   end
 
@@ -17,10 +17,10 @@ RSpec.feature 'Admin Authentication Methods', :js do
     end
 
     scenario 'can create new' do
-      expect(page).to have_text 'NO AUTHENTICATION METHODS FOUND, ADD ONE!'
+      expect(page).to have_text /NO AUTHENTICATION METHODS FOUND, ADD ONE!/i
 
       click_link 'New Authentication Method'
-      expect(page).to have_text 'BACK TO AUTHENTICATION METHODS LIST'
+      expect(page).to have_text /BACK TO AUTHENTICATION METHODS LIST/i
       select 'Test', from: 'authentication_method[environment]'
       select2 'Github', from: 'Social Provider'
       fill_in 'API Key', with: 'KEY123'

data/spec/features/spree/sign_in_spec.rb

@@ -43,6 +43,15 @@ RSpec.feature 'signing in using Omniauth', :js do
       click_link 'My Account'
       expect(page).to have_text 'My Account'
     end
+
+    scenario "view 'My Account'" do
+      visit spree.root_path
+      click_link 'Login'
+      find('a[title="Login with facebook"]').trigger('click')
+      expect(page).to have_text 'You are now signed in with your facebook account.'
+      click_link 'My Account'
+      expect(page).not_to have_selector 'div#social-signin-links'
+    end
   end
 
   context 'twitter' do

data/spec/support/database_cleaner.rb

@@ -1,7 +1,6 @@
 require 'database_cleaner'
 
 RSpec.configure do |config|
-
   config.before(:suite) do
     DatabaseCleaner.clean_with :truncation
   end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: solidus_social
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - John Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: solidus_auth_devise
+  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: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +148,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +198,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
-- !ruby/object:Gem::Dependency
-  name: pry-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +218,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -248,62 +254,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.10
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -332,7 +296,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
@@ -411,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Adds social network login services (OAuth) to Spree

data/Guardfile

@@ -1,10 +0,0 @@
-guard 'rspec', cmd: 'bundle exec rspec' do
-  watch('spec/spec_helper.rb')                        { 'spec' }
-  watch('config/routes.rb')                           { 'spec/controllers' }
-  watch(%r{^spec/(.+)_spec\.rb$})                     { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.+)_decorator\.rb$})                 { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb)$})                        { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb" }
-end