Make SpreeGlobalize optional

Appraisals

@@ -1,23 +1,19 @@
 appraise 'spree-3-2' do
   gem 'spree', '~> 3.2.0'
-  gem "globalize", '~> 5.1'
   gem 'rails-controller-testing'
 end
 
 appraise 'spree-3-3' do
   gem 'spree', '~> 3.3.0'
-  gem "globalize", '~> 5.1'
   gem 'rails-controller-testing'
 end
 
 appraise 'spree-3-4' do
   gem 'spree', '~> 3.4.0'
-  gem "globalize", '~> 5.1'
   gem 'rails-controller-testing'
 end
 
 appraise 'spree-master' do
   gem 'spree', github: 'spree/spree', branch: 'master'
-  gem "globalize", '~> 5.1'
   gem 'rails-controller-testing'
 end

Gemfile

@@ -2,9 +2,5 @@ source 'https://rubygems.org/'
 
 gem 'rails-controller-testing'
 gem 'spree', github: 'spree/spree', branch: 'master'
-gem 'globalize', github: 'globalize/globalize', branch: 'master'
-gem 'spree_i18n', github: 'spree-contrib/spree_i18n', branch: 'master'
-gem 'spree_globalize', github: 'spree-contrib/spree_globalize', branch: 'master'
-
 
 gemspec

README.md

@@ -46,15 +46,11 @@ Finally, toggle the visibility using the 'Visible' checkbox. If it is unchecked,
 
 ## Installation
 
-1. Add these extensions(unfortunately we need them all because of broken dependency on globalize) to your Gemfile with this line:
+1. Add this extension to your Gemfile with this line:
 
   #### Spree >= 3.1
 
   ```ruby
-
-  gem 'globalize', github: 'globalize/globalize'
-  gem 'spree_i18n', github: 'spree-contrib/spree_i18n'
-  gem 'spree_globalize', github: 'spree-contrib/spree_globalize', branch: 'master'
   gem 'spree_static_content', github: 'spree-contrib/spree_static_content'
   ```
 

app/controllers/spree/static_content_controller.rb

@@ -6,7 +6,7 @@ class StaticContentController < StoreController
     layout :determine_layout
 
     def show
-      @page = Spree::Page.joins(:translations).by_store(current_store).visible.find_by!(slug: request.path)
+      @page = Spree::StaticPage.finder_scope.by_store(current_store).find_by!(slug: request.path)
     end
 
     private

app/models/spree/page.rb

@@ -18,10 +18,12 @@ class Spree::Page < ActiveRecord::Base
 
   before_save :update_positions_and_slug
 
-  translates :title, :body, :slug, :layout, :foreign_link, :meta_keywords, :meta_title, :meta_description,
-             fallbacks_for_empty_translations: true
+  if defined?(SpreeGlobalize)
+    translates :title, :body, :slug, :layout, :foreign_link, :meta_keywords, :meta_title, :meta_description,
+               fallbacks_for_empty_translations: true
 
-  include SpreeGlobalize::Translatable
+    include SpreeGlobalize::Translatable
+  end
 
   def initialize(*args)
     super(*args)

app/views/spree/admin/pages/index.html.erb

@@ -30,7 +30,9 @@
           <td class="text-center"><%= content_tag(:i, '', class: 'icon icon-ok') if page.visible %></td>
           <td class="actions text-right" data-hook="admin_pages_index_row_actions">
             <%= link_to_edit page, no_text: true %>
-            <%= link_to '', spree.admin_translations_path('page', page.id), class: 'btn btn-primary btn-sm icon icon-translate with-tip', data: { 'original-title' => Spree.t(:'i18n.translations') } %>
+            <% if defined?(SpreeGlobalize) %>
+              <%= link_to '', spree.admin_translations_path('page', page.id), class: 'btn btn-primary btn-sm icon icon-translate with-tip', data: { 'original-title' => Spree.t(:'i18n.translations') } %>
+            <% end %>
             <%= link_to_delete page, no_text: true %>
           </td>
         </tr>

db/migrate/20170827000001_add_translation_to_spree_pages.rb

@@ -1,10 +1,14 @@
 class AddTranslationToSpreePages < SpreeExtension::Migration[4.2]
   def up
     params = { title: :string, body: :text, slug: :string, foreign_link: :string, meta_keywords: :string, meta_title: :string, meta_description: :string }
-    Spree::Page.create_translation_table!(params, { migrate_data: true })
+    if defined?(SpreeGlobalize)
+      Spree::Page.create_translation_table!(params, { migrate_data: true })
+    end
   end
 
   def down
-    Spree::Page.drop_translation_table! migrate_data: true
+    if defined?(SpreeGlobalize)
+      Spree::Page.drop_translation_table! migrate_data: true
+    end
   end
 end

db/migrate/20170827000002_add_layout_to_translatable_fields.rb

@@ -1,9 +1,13 @@
 class AddLayoutToTranslatableFields < SpreeExtension::Migration[4.2]
   def up
-    Spree::Page.add_translation_fields! layout: :string
+    if defined?(SpreeGlobalize)
+      Spree::Page.add_translation_fields! layout: :string
+    end
   end
 
   def down
-    remove_column :spree_page_translations, :layout
+    if defined?(SpreeGlobalize)
+      remove_column :spree_page_translations, :layout
+    end
   end
 end

gemfiles/spree_3_2.gemfile

@@ -4,8 +4,5 @@ source "https://rubygems.org/"
 
 gem "rails-controller-testing"
 gem "spree", "~> 3.2.0"
-gem "globalize", "~> 5.1"
-gem "spree_i18n", github: "spree-contrib/spree_i18n", branch: "master"
-gem "spree_globalize", github: "spree-contrib/spree_globalize", branch: "master"
 
 gemspec path: "../"

gemfiles/spree_3_3.gemfile

@@ -4,8 +4,5 @@ source "https://rubygems.org/"
 
 gem "rails-controller-testing"
 gem "spree", "~> 3.3.0"
-gem "globalize", "~> 5.1"
-gem "spree_i18n", github: "spree-contrib/spree_i18n", branch: "master"
-gem "spree_globalize", github: "spree-contrib/spree_globalize", branch: "master"
 
 gemspec path: "../"

gemfiles/spree_3_4.gemfile

@@ -4,8 +4,5 @@ source "https://rubygems.org/"
 
 gem "rails-controller-testing"
 gem "spree", "~> 3.4.0"
-gem "globalize", "~> 5.1"
-gem "spree_i18n", github: "spree-contrib/spree_i18n", branch: "master"
-gem "spree_globalize", github: "spree-contrib/spree_globalize", branch: "master"
 
 gemspec path: "../"

gemfiles/spree_master.gemfile

@@ -4,8 +4,5 @@ source "https://rubygems.org/"
 
 gem "rails-controller-testing"
 gem "spree", github: "spree/spree", branch: "master"
-gem "globalize", "~> 5.1"
-gem "spree_i18n", github: "spree-contrib/spree_i18n", branch: "master"
-gem "spree_globalize", github: "spree-contrib/spree_globalize", branch: "master"
 
 gemspec path: "../"

lib/spree_static_content.rb

@@ -18,7 +18,15 @@ module Spree
   class StaticPage
     def self.matches?(request)
       return false if request.path =~ %r{\A\/+(admin|account|cart|checkout|content|login|pg\/|orders|products|s\/|session|signup|shipments|states|t\/|tax_categories|user)+}
-      !Spree::Page.joins(:translations).visible.find_by(slug: request.path).nil?
+      !self.finder_scope.find_by(slug: request.path).nil?
+    end
+
+    protected
+
+    def self.finder_scope
+      scope = Spree::Page.visible
+      scope = scope.joins(:translations) if defined?(SpreeGlobalize)
+      scope
     end
   end
 end