solidus_social 1.2.0 → 1.3.0

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+bundle update
+bin/rake clobber

data/config/locales/en.yml

@@ -10,6 +10,7 @@ en:
       destroy: 'Successfully destroyed authentication method.'
     back_to_authentication_methods_list: "Back To Authentication Methods List"
     edit_social_method: "Editing Social Authentication Method"
+    environment: "Environment"
     new_social_method: "New Authentication Method"
     no_authentication_methods_found: "No Authentication Methods Found"
     one_more_step: 'One more step to complete your registration from %{kind}'

data/config/routes.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 Spree::Core::Engine.routes.draw do
   devise_for :spree_user,
-             class_name: Spree.user_class,
-             only: [:omniauth_callbacks],
-             controllers: { omniauth_callbacks: 'spree/omniauth_callbacks' },
-             path: Spree::SocialConfig[:path_prefix]
+    class_name: Spree.user_class,
+    only: [:omniauth_callbacks],
+    controllers: { omniauth_callbacks: 'spree/omniauth_callbacks' },
+    path: Spree::SocialConfig[:path_prefix]
   resources :user_authentications
 
   get 'account' => 'users#show', as: 'user_root'

data/db/migrate/20120120163432_create_user_authentications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateUserAuthentications < SolidusSupport::Migration[4.2]
   def change
     create_table :spree_user_authentications do |t|

data/db/migrate/20120123163222_create_authentication_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAuthenticationMethods < SolidusSupport::Migration[4.2]
   def change
     create_table :spree_authentication_methods do |t|

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

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 module SolidusSocial
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.dirname(__FILE__) + "/templates"
+      source_root "#{__dir__}/templates"
 
       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: %r(\*/), 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
-        run 'bundle exec rake railties:install:migrations FROM=solidus_social'
+        run 'bin/rails railties:install:migrations FROM=solidus_social'
       end
 
       def copy_initializer
@@ -20,9 +22,9 @@ module SolidusSocial
       def run_migrations
         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'
+          run 'bin/rails db:migrate'
         else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
         end
       end
     end

data/lib/generators/solidus_social/install/templates/config/initializers/solidus_social.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Spree::SocialConfig.configure do |config|
   config.use_static_preferences!
 
@@ -42,7 +44,7 @@ OmniAuth.logger.progname = 'omniauth'
 
 OmniAuth.config.on_failure = proc do |env|
   env['devise.mapping'] = Devise.mappings[Spree.user_class.table_name.singularize.to_sym]
-  controller_name  = ActiveSupport::Inflector.camelize(env['devise.mapping'].controllers[:omniauth_callbacks])
+  controller_name = ActiveSupport::Inflector.camelize(env['devise.mapping'].controllers[:omniauth_callbacks])
   controller_klass = ActiveSupport::Inflector.constantize("#{controller_name}Controller")
   controller_klass.action(:failure).call(env)
 end

data/lib/solidus_social.rb

@@ -1,11 +1,26 @@
+# frozen_string_literal: true
+
 require 'solidus_core'
 require 'solidus_support'
 require 'solidus_auth_devise'
-require 'omniauth-twitter'
-require 'omniauth-facebook'
-require 'omniauth-github'
-require 'omniauth-google-oauth2'
-require 'omniauth-amazon'
-require 'solidus_social/engine'
+
 require 'solidus_social/version'
-require 'coffee_script'
+require 'solidus_social/engine'
+
+module SolidusSocial
+  def self.configured_providers
+    ::Spree::SocialConfig.providers.keys.map(&:to_s)
+  end
+
+  def self.init_providers
+    ::Spree::SocialConfig.providers.each do |provider, credentials|
+      setup_key_for(provider, credentials[:api_key], credentials[:api_secret])
+    end
+  end
+
+  def self.setup_key_for(provider, key, secret)
+    Devise.setup do |config|
+      config.omniauth provider, key, secret, setup: true
+    end
+  end
+end

data/lib/solidus_social/engine.rb

@@ -1,68 +1,43 @@
+# frozen_string_literal: true
+
+require 'omniauth-twitter'
+require 'omniauth-facebook'
+require 'omniauth-github'
+require 'omniauth-google-oauth2'
+require 'omniauth-amazon'
+require 'deface'
+require 'coffee_script'
+require 'spree/core'
+require 'solidus_social/facebook_omniauth_strategy_ext'
+
 module SolidusSocial
   class Engine < Rails::Engine
-    engine_name 'solidus_social'
-
-    config.autoload_paths += %W(#{config.root}/lib)
-
-    initializer 'solidus_social.environment', before: 'spree.environment' do
-      Spree::SocialConfig = Spree::SocialConfiguration.new
-    end
+    include SolidusSupport::EngineExtensions::Decorators
 
-    initializer 'solidus_social.decorate_spree_user' do
-      next unless Rails.application.respond_to?(:reloader)
+    isolate_namespace ::Spree
 
-      Rails.application.reloader.after_class_unload do
-        # Reload and decorate the spree user class immediately after it is
-        # unloaded so that it is available to devise when loading routes
-        load File.join(__dir__, '../../app/models/spree/user_decorator.rb')
-      end
-    end
+    engine_name 'solidus_social'
 
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
     end
 
-    config.to_prepare(&method(:activate).to_proc)
-  end
-
-  def self.configured_providers
-    Spree::SocialConfig.providers.keys.map(&:to_s)
-  end
-
-  def self.init_providers
-    Spree::SocialConfig.providers.each do |provider, credentials|
-      setup_key_for(provider, credentials[:api_key], credentials[:api_secret])
-    end
-  end
+    USER_DECORATOR_PATH = root.join(
+      "app/decorators/models/solidus_social/spree/user_decorator.rb"
+    ).to_s
 
-  def self.setup_key_for(provider, key, secret)
-    Devise.setup do |config|
-      config.omniauth provider, key, secret, setup: true
+    initializer 'solidus_social.environment', before: 'spree.environment' do
+      ::Spree::SocialConfig = ::Spree::SocialConfiguration.new
     end
-  end
-end
 
-module OmniAuth
-  module Strategies
-    class Facebook < OAuth2
-      MOBILE_USER_AGENTS =  'palm|blackberry|nokia|phone|midp|mobi|symbian|chtml|ericsson|minimo|' \
-                            'audiovox|motorola|samsung|telit|upg1|windows ce|ucweb|astel|plucker|' \
-                            'x320|x240|j2me|sgh|portable|sprint|docomo|kddi|softbank|android|mmp|' \
-                            'pdxgw|netfront|xiino|vodafone|portalmmm|sagem|mot-|sie-|ipod|up\\.b|' \
-                            'webos|amoi|novarra|cdm|alcatel|pocket|ipad|iphone|mobileexplorer|' \
-                            'mobile'
-      def request_phase
-        options[:scope] ||= 'email'
-        options[:info_fields] ||= 'email'
-        options[:display] = mobile_request? ? 'touch' : 'page'
-        super
-      end
+    initializer 'solidus_social.decorate_spree_user' do |app|
+      next unless app.respond_to?(:reloader)
 
-      def mobile_request?
-        ua = Rack::Request.new(@env).user_agent.to_s
-        ua.downcase =~ Regexp.new(MOBILE_USER_AGENTS)
+      app.reloader.after_class_unload do
+        # Reload and decorate the spree user class immediately after it is
+        # unloaded so that it is available to devise when loading routes
+        load USER_DECORATOR_PATH
       end
     end
   end

data/lib/solidus_social/facebook_omniauth_strategy_ext.rb

@@ -0,0 +1,25 @@
+module SolidusSocial
+  # Patch the Facebook strategy discriminating between mobile and desktop.
+  module FacebookOmniauthStrategyExt
+    MOBILE_USER_AGENTS =  'palm|blackberry|nokia|phone|midp|mobi|symbian|chtml|ericsson|minimo|' \
+                          'audiovox|motorola|samsung|telit|upg1|windows ce|ucweb|astel|plucker|' \
+                          'x320|x240|j2me|sgh|portable|sprint|docomo|kddi|softbank|android|mmp|' \
+                          'pdxgw|netfront|xiino|vodafone|portalmmm|sagem|mot-|sie-|ipod|up\\.b|' \
+                          'webos|amoi|novarra|cdm|alcatel|pocket|ipad|iphone|mobileexplorer|' \
+                          'mobile'
+
+    def request_phase
+      options[:scope] ||= 'email'
+      options[:info_fields] ||= 'email'
+      options[:display] = mobile_request? ? 'touch' : 'page'
+      super
+    end
+
+    def mobile_request?
+      ua = Rack::Request.new(@env).user_agent.to_s
+      ua.downcase =~ Regexp.new(MOBILE_USER_AGENTS)
+    end
+
+    OmniAuth::Strategies::Facebook.prepend self
+  end
+end

data/lib/solidus_social/factories.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+end

data/lib/solidus_social/version.rb

@@ -1,18 +1,5 @@
-module SolidusSocial
-  module_function
-
-  # Returns the version of the currently loaded SolidusSocial as a
-  # <tt>Gem::Version</tt>.
-  def version
-    Gem::Version.new VERSION::STRING
-  end
+# frozen_string_literal: true
 
-  module VERSION
-    MAJOR = 1
-    MINOR = 2
-    TINY  = 0
-    PRE   = nil
-
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-  end
+module SolidusSocial
+  VERSION = '1.3.0'
 end

data/solidus_social.gemspec

@@ -1,47 +1,44 @@
-lib = File.expand_path('../lib/', __FILE__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
-
-require 'solidus_social/version'
-
-Gem::Specification.new do |s|
-  s.platform    = Gem::Platform::RUBY
-  s.name        = 'solidus_social'
-  s.version     = SolidusSocial.version
-  s.summary     = 'Adds social network login services (OAuth) to Spree'
-  s.description = s.summary
-  s.required_ruby_version = '>= 1.9.3'
-
-  s.author   = 'John Dyer'
-  s.email    = 'jdyer@spreecommerce.com'
-  s.homepage = 'http://www.spreecommerce.com'
-  s.license  = 'BSD-3'
-
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
-  s.require_path = 'lib'
-  s.requirements << 'none'
-
-  s.add_runtime_dependency 'solidus_core', [">= 1.0", "< 3"]
-  s.add_runtime_dependency 'solidus_support'
-  s.add_runtime_dependency 'solidus_auth_devise'
-  s.add_runtime_dependency 'omniauth'
-  s.add_runtime_dependency 'oa-core'
-  s.add_runtime_dependency 'omniauth-twitter'
-  s.add_runtime_dependency 'omniauth-facebook'
-  s.add_runtime_dependency 'omniauth-github'
-  s.add_runtime_dependency 'omniauth-google-oauth2'
-  s.add_runtime_dependency 'omniauth-amazon'
-
-  s.add_development_dependency 'capybara', '~> 2.4'
-  s.add_development_dependency 'capybara-screenshot'
-  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 'selenium-webdriver', '>= 2.41.0'
-  s.add_development_dependency 'chromedriver-helper'
-  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 'rubocop', '~> 0.39.0'
-  s.add_development_dependency 'rake', '< 11'
+# frozen_string_literal: true
+
+require_relative 'lib/solidus_social/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'solidus_social'
+  spec.version = SolidusSocial::VERSION
+  spec.authors = ['John Dyer']
+  spec.email = 'jdyer@spreecommerce.com'
+
+  spec.summary = 'Adds social network login services (OAuth) to Solidus'
+  spec.homepage = 'https://github.com/solidusio-contrib/solidus_social#readme'
+  spec.license = 'BSD-3-Clause'
+
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_social'
+  spec.metadata['changelog_uri'] = 'https://github.com/solidusio-contrib/solidus_social/blob/master/CHANGELOG.md'
+
+  spec.required_ruby_version = Gem::Requirement.new('~> 2.4')
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
+  spec.files = files.grep_v(%r{^(test|spec|features)/})
+  spec.test_files = files.grep(%r{^(test|spec|features)/})
+  spec.bindir = "exe"
+  spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'deface'
+  spec.add_dependency 'oa-core'
+  spec.add_dependency 'omniauth'
+  spec.add_dependency 'omniauth-amazon'
+  spec.add_dependency 'omniauth-facebook'
+  spec.add_dependency 'omniauth-github'
+  spec.add_dependency 'omniauth-google-oauth2'
+  spec.add_dependency 'omniauth-twitter'
+  spec.add_dependency 'solidus_auth_devise'
+  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
+  spec.add_dependency 'solidus_support', '~> 0.4.0'
+
+  spec.add_development_dependency 'solidus_dev_support'
 end

data/spec/controllers/spree/omniauth_callbacks_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
   let(:user) { create(:user) }
   let(:omni_params) { double('omni', :[] => nil).as_null_object }
@@ -45,18 +47,19 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
     end
   end
 
-  context '#callback' do
+  describe '#callback' do
     context 'when user is authenticated' do
       before do
         allow(controller).to receive(:spree_current_user).and_return(user)
       end
 
-      it_should_behave_like 'denied_permissions'
+      it_behaves_like 'denied_permissions'
 
       context 'when existing user_authentication' do
         let(:user_authentication) { double('user_authentication', user: user) }
+
         before do
-          allow(Spree::UserAuthentication).to receive(:find_by_provider_and_uid).and_return(user_authentication)
+          allow(Spree::UserAuthentication).to receive(:find_by).and_return(user_authentication)
         end
 
         it 'does not need to create the user_authentication' do
@@ -77,7 +80,7 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
 
       context 'when no existing user_authentication' do
         before do
-          allow(Spree::UserAuthentication).to receive(:find_by_provider_and_uid).and_return(nil)
+          allow(Spree::UserAuthentication).to receive(:find_by).and_return(nil)
         end
 
         it 'creates a new user_authentication' do
@@ -96,7 +99,7 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
           controller.twitter
         end
 
-        it_should_behave_like 'associate_order'
+        it_behaves_like 'associate_order'
       end
     end
 
@@ -105,12 +108,13 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
         allow(controller).to receive(:spree_current_user).and_return(nil)
       end
 
-      it_should_behave_like 'denied_permissions'
+      it_behaves_like 'denied_permissions'
 
       context 'when existing user_authentication' do
         let(:user_authentication) { double('user_authentication', user: user) }
+
         before do
-          allow(Spree::UserAuthentication).to receive(:find_by_provider_and_uid).and_return(user_authentication)
+          allow(Spree::UserAuthentication).to receive(:find_by).and_return(user_authentication)
         end
 
         it 'does not need to create the user_authentication' do
@@ -131,8 +135,9 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
 
       context 'when no existing user_authentication' do
         let(:user) { Spree::User.new }
+
         before do
-          allow(Spree::UserAuthentication).to receive(:find_by_provider_and_uid).and_return(nil)
+          allow(Spree::UserAuthentication).to receive(:find_by).and_return(nil)
           allow(controller).to receive(:auth_hash).and_return('provider' => 'facebook', 'info' => { 'email' => 'spree@gmail.com' }, 'uid' => '123')
         end
 
@@ -175,7 +180,7 @@ RSpec.describe Spree::OmniauthCallbacksController, type: :controller do
           before { @user = create(:user, email: 'spree@gmail.com') }
 
           it 'does not create new user' do
-            expect { controller.twitter }.to_not change(Spree::User, :count)
+            expect { controller.twitter }.not_to change(Spree::User, :count)
           end
 
           it 'assigns authentication to existing user' do