solidus_social 1.2.0 → 1.3.0

data/Rakefile

@@ -1,21 +1,6 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+# frozen_string_literal: true
 
-require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'solidus_dev_support/rake_tasks'
+SolidusDevSupport::RakeTasks.install
 
-RSpec::Core::RakeTask.new
-
-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
-  ENV['LIB_NAME'] = 'solidus_social'
-  Rake::Task['common:test_app'].invoke('Spree::User')
-end
+task default: 'extension:specs'

data/app/controllers/spree/admin/authentication_methods_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class AuthenticationMethodsController < ResourceController

data/app/controllers/spree/omniauth_callbacks_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Order
@@ -18,14 +20,14 @@ class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
   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))
+      flash[:error] = I18n.t('devise.omniauth_callbacks.failure', kind: auth_hash['provider'], reason: I18n.t('spree.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'])
+    authentication = Spree::UserAuthentication.find_by(provider: auth_hash['provider'], uid: auth_hash['uid'])
 
-    if authentication.present? and authentication.try(:user).present?
+    if authentication.present? && 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
@@ -34,14 +36,14 @@ class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
       flash[:notice] = I18n.t('devise.sessions.signed_in')
       redirect_back_or_default(account_url)
     else
-      user = Spree.user_class.find_by_email(auth_hash['info']['email']) || Spree.user_class.new
+      user = Spree.user_class.find_by(email: auth_hash['info']['email']) || Spree.user_class.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)
+        flash[:notice] = I18n.t('spree.one_more_step', kind: auth_hash['provider'].capitalize)
         redirect_to new_spree_user_registration_url
         return
       end
@@ -60,7 +62,7 @@ class Spree::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def passthru
-    render file: "#{Rails.root}/public/404", formats: [:html], status: 404, layout: false
+    render file: "#{Rails.root}/public/404", formats: [:html], status: :not_found, layout: false
   end
 
   def auth_hash

data/app/controllers/spree/user_authentications_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::UserAuthenticationsController < Spree::StoreController
   def index
     @authentications = spree_current_user.user_authentications if spree_current_user
@@ -6,7 +8,7 @@ class Spree::UserAuthenticationsController < Spree::StoreController
   def destroy
     @authentication = spree_current_user.user_authentications.find(params[:id])
     @authentication.destroy
-    flash[:notice] = Spree.t(:destroy, scope: :authentications)
+    flash[:notice] = I18n.t('spree.destroy', scope: :authentications)
     redirect_to spree.account_path
   end
 end

data/app/decorators/controllers/solidus_social/spree/user_registrations_controller_decorator.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module SolidusSocial
+  module Spree
+    module UserRegistrationsControllerDecorator
+      def self.prepended(base)
+        base.class_eval do
+          after_action :clear_omniauth, only: :create
+        end
+      end
+
+      private
+
+      def build_resource(*args)
+        super
+        @spree_user.apply_omniauth(session[:omniauth]) if session[:omniauth]
+        @spree_user
+      end
+
+      def clear_omniauth
+        session[:omniauth] = nil unless @spree_user.new_record?
+      end
+
+      ::Spree::UserRegistrationsController.prepend self
+    end
+  end
+end

data/app/decorators/models/solidus_social/spree/user_decorator.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module SolidusSocial
+  module Spree
+    module UserDecorator
+      def self.prepended(base)
+        base.class_eval do
+          has_many :user_authentications, dependent: :destroy
+
+          devise :omniauthable
+        end
+      end
+
+      def apply_omniauth(omniauth)
+        if omniauth.fetch('info', {})['email'].present?
+          self.email = omniauth['info']['email'] if email.blank?
+        end
+        user_authentications.build(provider: omniauth['provider'], uid: omniauth['uid'])
+      end
+
+      def password_required?
+        (user_authentications.empty? || password.present?) && super
+      end
+
+      ::Spree.user_class.prepend self
+    end
+  end
+end

data/app/helpers/spree/omniauth_callbacks_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module OmniauthCallbacksHelper
     include Spree::BaseHelper

data/app/models/spree/authentication_method.rb

@@ -1,4 +1,6 @@
-class Spree::AuthenticationMethod < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Spree::AuthenticationMethod < ApplicationRecord
   def self.provider_options
     SolidusSocial.configured_providers.map { |provider_name| [provider_name.split("_").first.camelize, provider_name] }
   end

data/app/models/spree/social_configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   class SocialConfiguration < Preferences::Configuration
     attr_accessor :providers

data/app/models/spree/user_authentication.rb

@@ -1,3 +1,5 @@
-class Spree::UserAuthentication < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Spree::UserAuthentication < ApplicationRecord
   belongs_to :user
 end

data/app/overrides/add_authentications_to_account_summary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(virtual_path: 'spree/users/show',
                      name: 'add_socials_to_account_summary',
                      insert_after: '[data-hook="account_my_orders"]',

data/app/overrides/admin_configuration_decorator.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 Deface::Override.new(virtual_path: 'spree/admin/shared/_configuration_menu',
                      name: 'add_social_providers_link_configuration_menu',
                      insert_bottom: '[data-hook="admin_configurations_sidebar_menu"]',
-                     text: '<%= configurations_sidebar_menu_item Spree.t(:social_authentication_methods), spree.admin_authentication_methods_path %>',
+                     text: '<%= configurations_sidebar_menu_item I18n.t("spree.social_authentication_methods"), spree.admin_authentication_methods_path %>',
                      disabled: false)

data/app/overrides/user_registrations_decorator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(virtual_path: 'spree/user_registrations/new',
                      name: 'add_socials_to_login_extras',
                      insert_after: '[data-hook="login_extras"]',

data/app/views/spree/admin/authentication_methods/_form.html.erb

@@ -10,7 +10,7 @@
   <div class="alpha five columns">
     <div data-hook="environment" class="field">
       <%= f.field_container :provider do %>
-        <%= f.label :provider, Spree.t(:social_provider) %>
+        <%= f.label :provider, I18n.t('spree.social_provider') %>
         <%= f.select :provider, Spree::AuthenticationMethod.provider_options, {}, { include_blank: false, class: 'select2 fullwidth' } %>
       <% end %>
     </div>
@@ -18,11 +18,11 @@
   <div class="alpha five columns">
     <div data-hook="environment" class="field">
       <%= f.field_container :active do %>
-        <span style="padding:0 10px 2px;"><%= f.label :active, Spree.t(:active) %></span>
+        <span style="padding:0 10px 2px;"><%= f.label :active, I18n.t('spree.active') %></span>
         <%= f.radio_button :active, :true %>
-        <span style="padding:0 2px;"><%= Spree.t(:say_yes) %></span>
+        <span style="padding:0 2px;"><%= I18n.t('spree.say_yes') %></span>
         <%= f.radio_button :active, :false %>
-        <span style="padding:0 2px"><%= Spree.t(:say_no) %></span>
+        <span style="padding:0 2px"><%= I18n.t('spree.say_no') %></span>
       <% end %>
     </div>
   </div>

data/app/views/spree/admin/authentication_methods/edit.html.erb

@@ -1,11 +1,11 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:edit_social_method) %>
+  <%= I18n.t('spree.edit_social_method') %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_authentication_methods_list), admin_authentication_methods_path, class: 'button' %></li>
+  <li><%= link_to_with_icon 'icon-arrow-left', I18n.t('spree.back_to_authentication_methods_list'), admin_authentication_methods_path, class: 'button' %></li>
 <% end %>
 
 <%= render 'spree/shared/error_messages', target: @authentication_method %>

data/app/views/spree/admin/authentication_methods/index.html.erb

@@ -1,13 +1,13 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:social_authentication_methods) %>
+  <%= I18n.t('spree.social_authentication_methods') %>
 <% end %>
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <li>
-      <%= button_link_to Spree.t(:new_social_method), new_object_url, icon: 'icon-plus', id: 'admin_new_slide_link' %>
+      <%= link_to I18n.t('spree.new_social_method'), new_object_url, id: 'admin_new_slide_link' %>
     </li>
   </ul>
 <% end %>
@@ -23,11 +23,11 @@
       <col style="width: 20%" />
     </colgroup>
     <thead data-hook="admin_social_methods_index_headers">
-      <th><%= Spree.t(:social_provider) %></th>
-      <th><%= Spree.t(:social_api_key) %></th>
-      <th><%= Spree.t(:social_api_secret) %></th>
-      <th><%= Spree.t(:environment) %></th>
-      <th><%= Spree.t(:active) %></th>
+      <th><%= I18n.t('spree.social_provider') %></th>
+      <th><%= I18n.t('spree.social_api_key') %></th>
+      <th><%= I18n.t('spree.social_api_secret') %></th>
+      <th><%= I18n.t('spree.environment') %></th>
+      <th><%= I18n.t('spree.active') %></th>
       <th data-hook="admin_social_methods_index_header_actions" class="actions"></th>
     </thead>
     <tbody>
@@ -37,7 +37,7 @@
           <td class="align-center"><%= truncate method.api_key, length: 10 %></td>
           <td class="align-center"><%= truncate method.api_secret, length: 10 %></td>
           <td class="align-center"><%= method.environment.to_s.titleize %></td>
-          <td class="align-center"><%= method.active ? Spree.t(:yes) : Spree.t(:no) %></td>
+          <td class="align-center"><%= method.active ? I18n.t('spree.yes') : I18n.t('spree.no') %></td>
           <td class="actions">
             <%= link_to_edit method, no_text: true %>
             <%= link_to_delete method, no_text: true %>
@@ -48,7 +48,7 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_authentication_methods_found) %>,
-    <%= Spree.t(:add_one) %>!
+    <%= I18n.t('spree.no_authentication_methods_found') %>,
+    <%= I18n.t('spree.add_one') %>!
   </div>
 <% end %>

data/app/views/spree/admin/authentication_methods/new.html.erb

@@ -1,11 +1,11 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:new_social_method) %>
+  <%= I18n.t('spree.new_social_method') %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_authentication_methods_list), admin_authentication_methods_path, class: 'button' %></li>
+  <li><%= link_to_with_icon 'icon-arrow-left', I18n.t('spree.back_to_authentication_methods_list'), admin_authentication_methods_path, class: 'button' %></li>
 <% end %>
 
 <%= render 'spree/shared/error_messages', target: @authentication_method %>

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

@@ -1,11 +1,11 @@
 <div id="social-signin-links">
   <% 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>
+    <h2><%= I18n.t('spree.sign_in_through_one_of_these_services') %></h2>
   <% end %>
-  
+
   <% Spree::AuthenticationMethod.available_for(spree_current_user).each do |method| %>
-    <%= link_to(content_tag(:i, '', class: "icon-spree-#{method.provider.to_url}-circled"),
-          spree.send("spree_user_#{method.provider}_omniauth_authorize_path"),
-          title: Spree.t(:sign_in_with, provider: method.provider)) if method.active %>
+    <%= link_to(content_tag(:i, '', class: "icon-spree-#{method.provider.dasherize}-circled"),
+          spree.send("spree_user_#{method.provider}_omniauth_authorize_path", r: rand),
+          title: t('spree.sign_in_with', provider: method.provider)) if method.active %>
   <% end %>
 </div>

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

@@ -1,16 +1,16 @@
 <p>
-  <%= f.label :email, Spree.t(:email) %><br />
+  <%= f.label :email, I18n.t('spree.email') %><br />
   <%= f.email_field :email, class: 'title' %>
 </p>
 <% if spree_current_user.nil? || spree_current_user.password_required? %>
   <div id="password-credentials">
     <p>
-      <%= f.label :password, Spree.t(:password) %><br />
+      <%= f.label :password, I18n.t('spree.password') %><br />
       <%= f.password_field :password, class: 'title' %>
     </p>
 
     <p>
-      <%= f.label :password_confirmation, Spree.t(:confirm_password) %><br />
+      <%= f.label :password_confirmation, I18n.t('spree.confirm_password') %><br />
       <%= f.password_field :password_confirmation, class: 'title' %>
     </p>
   </div>

data/app/views/spree/users/_new-customer.html.erb

@@ -1,5 +1,5 @@
 <% if session[:omniauth] %>
-  <h6><%= Spree.t(:please_confirm_your_email) %></h6>
+  <h6><%= I18n.t('spree.please_confirm_your_email') %></h6>
 <% else %>
-  <h6><%= Spree.t(:new_customer) %></h6>
+  <h6><%= I18n.t('spree.new_customer') %></h6>
 <% end %>

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

@@ -3,25 +3,25 @@
   <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>
+        <p><strong><%= I18n.t('spree.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") %>
+                <%= content_tag(:i, '', class: "icon-spree-#{user_authentication.provider.dasherize}-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' %>
+              <%= link_to 'X', user_authentication, data: { confirm: I18n.t('spree.remove_authentication_option_confirmation') }, method: :delete, class: 'remove' %>
             </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))) %>
+      <%= content_tag(:p, content_tag(:strong, I18n.t('spree.add_another_service'))) %>
       <%= render 'spree/shared/social' %>
     <% end %>
   </div>

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_social"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+$LOAD_PATH.unshift(*Dir["#{__dir__}/../app/*"])
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rails

@@ -1,7 +1,18 @@
 #!/usr/bin/env ruby
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/solidus_social/engine', __FILE__)
+# frozen_string_literal: true
 
-require 'rails/all'
-require 'rails/engine/commands'
+app_root = 'sandbox'
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the sandbox app...'
+  Dir.chdir "#{__dir__}/.." do
+    system "#{__dir__}/sandbox" or begin # rubocop:disable Style/AndOr
+      warn 'Automatic creation of the sandbox app failed'
+      exit 1
+    end
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/rake

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/sandbox

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+set -e
+
+case "$DB" in
+postgres|postgresql)
+  RAILSDB="postgresql"
+  ;;
+mysql)
+  RAILSDB="mysql"
+  ;;
+sqlite|'')
+  RAILSDB="sqlite3"
+  ;;
+*)
+  echo "Invalid DB specified: $DB"
+  exit 1
+  ;;
+esac
+
+extension_name="solidus_social"
+
+# Stay away from the bundler env of the containing extension.
+function unbundled {
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@
+}
+
+rm -rf ./sandbox
+unbundled bundle exec rails new sandbox --database="$RAILSDB" \
+  --skip-bundle \
+  --skip-git \
+  --skip-keeps \
+  --skip-rc \
+  --skip-spring \
+  --skip-test \
+  --skip-javascript
+
+if [ ! -d "sandbox" ]; then
+  echo 'sandbox rails application failed'
+  exit 1
+fi
+
+cd ./sandbox
+cat <<RUBY >> Gemfile
+
+gem '$extension_name', path: '..'
+gem 'solidus_auth_devise', '>= 2.1.0'
+gem 'rails-i18n'
+gem 'solidus_i18n'
+
+group :test, :development do
+  platforms :mri do
+    gem 'pry-byebug'
+  end
+end
+RUBY
+
+unbundled bundle install --gemfile Gemfile
+
+unbundled bundle exec rake db:drop db:create
+
+unbundled bundle exec rails generate spree:install \
+  --auto-accept \
+  --user_class=Spree::User \
+  --enforce_available_locales=true \
+  $@
+
+unbundled bundle exec rails generate solidus:auth:install
+
+echo
+echo "🚀 Sandbox app successfully created for $extension_name!"
+echo "🚀 This app is intended for test purposes."