solidus_product_assembly 1.0.0 → 1.2.0

data/app/views/spree/admin/products/_product_assembly_fields.html.erb

@@ -1,12 +1,12 @@
 <div class="left six columns alpha">
   <div class="field">
-    <%= f.label :can_be_part, Spree.t(:can_be_part)%>
+    <%= f.label :can_be_part, t('spree.can_be_part')%>
     <%= f.check_box(:can_be_part) %>
   </div>
 </div>
 <div class="right six columns omega">
   <div class="field">
-    <%= f.label :individual_sale, Spree.t(:individual_sale)%>
+    <%= f.label :individual_sale, t('spree.individual_sale')%>
     <%= f.check_box(:individual_sale) %>
   </div>
 </div>

data/app/views/spree/admin/shared/_product_assembly_product_tabs.html.erb

@@ -1,3 +1,3 @@
 <li<%= ' class="active"' if current == "Parts" %>>
-  <%= link_to_with_icon 'sitemap', Spree.t(:parts), admin_product_parts_url(@product) %>
+  <%= link_to_with_icon 'sitemap', t('spree.parts'), admin_product_parts_url(@product) %>
 </li>

data/app/views/spree/api/line_items/show.v1.rabl

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+object @line_item
+cache [I18n.locale, root_object]
+attributes *line_item_attributes
+node(:single_display_amount) { |li| li.single_display_amount.to_s }
+node(:display_amount) { |li| li.display_amount.to_s }
+node(:total, &:total)
+glue variant: :parts do
+  glue :product do
+    child parts: :parts do
+      extends "spree/api/variants/small"
+      attributes :product_id
+
+      child(images: :images) { extends "spree/api/images/show" }
+    end
+  end
+end
+child :variant do
+  extends "spree/api/variants/small"
+  attributes :product_id
+  child(images: :images) { extends "spree/api/images/show" }
+end
+
+child adjustments: :adjustments do
+  extends "spree/api/adjustments/show"
+end

data/app/views/spree/checkout/_line_item_manifest.html.erb

@@ -1,6 +1,8 @@
 <% ship_form.object.line_item_manifest.each do |item| %>
   <tr class="stock-item">
-    <td class="item-image"><%= mini_image(item.variant) %></td>
+    <td class="item-image"><%= render 'spree/shared/image',
+                      image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+                      size: :mini %></td>
     <td class="item-name">
       <%= item.variant.name %>
       <%= render 'spree/orders/cart_description', variant: item.variant, line_item: item.line_item %>

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_product_assembly"
+
+# 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,7 @@
 #!/usr/bin/env ruby
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/solidus_product_assembly/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'
+if %w[g generate].include? ARGV.first
+  exec "#{__dir__}/rails-engine", *ARGV
+else
+  exec "#{__dir__}/rails-sandbox", *ARGV
+end

data/bin/rails-engine

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/solidus_product_assembly/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/bin/rails-sandbox

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+app_root = 'sandbox'
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the sandbox app...'
+  Dir.chdir "#{__dir__}/.." do
+    system "#{__dir__}/sandbox" or begin
+      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,86 @@
+#!/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
+
+if [ ! -z $SOLIDUS_BRANCH ]
+then
+  BRANCH=$SOLIDUS_BRANCH
+else
+  BRANCH="master"
+fi
+
+extension_name="solidus_product_assembly"
+
+# 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 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
+gem 'solidus_auth_devise', '>= 2.1.0'
+gem 'rails-i18n'
+gem 'solidus_i18n'
+
+gem '$extension_name', path: '..'
+
+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 solidus:install \
+  --auto-accept \
+  --user_class=Spree::User \
+  --enforce_available_locales=true \
+  --with-authentication=false \
+  --payment-method=none \
+  $@
+
+unbundled bundle exec rails generate solidus:auth:install
+unbundled bundle exec rails generate ${extension_name}:install
+
+echo
+echo "🚀 Sandbox app successfully created for $extension_name!"
+echo "🚀 Using $RAILSDB and Solidus $BRANCH"
+echo "🚀 Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
+echo "🚀 Use 'export SOLIDUS_BRANCH=<BRANCH-NAME>' to control the Solidus version"
+echo "🚀 This app is intended for test purposes."

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/routes.rb

@@ -1,5 +1,6 @@
-Spree::Core::Engine.add_routes do
+# frozen_string_literal: true
 
+Spree::Core::Engine.routes.draw do
   namespace :admin do
     resources :products do
       resources :parts do
@@ -15,5 +16,4 @@ Spree::Core::Engine.add_routes do
       end
     end
   end
-
 end

data/db/migrate/20091028152124_add_many_to_many_relation_to_products.rb

@@ -1,9 +1,11 @@
-class AddManyToManyRelationToProducts < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddManyToManyRelationToProducts < SolidusSupport::Migration[4.2]
   def self.up
-    create_table :assemblies_parts, :id => false do |t|
-      t.integer "assembly_id", :null => false
-      t.integer "part_id", :null => false
-      t.integer "count", :null => false, :default => 1
+    create_table :assemblies_parts, id: false do |t|
+      t.integer "assembly_id", null: false
+      t.integer "part_id", null: false
+      t.integer "count", null: false, default: 1
     end
   end
 

data/db/migrate/20091029165620_add_parts_fields_to_products.rb

@@ -1,24 +1,26 @@
-class AddPartsFieldsToProducts < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddPartsFieldsToProducts < SolidusSupport::Migration[4.2]
   def self.up
-    table = if table_exists?(:products)
-      'products'
-    elsif table_exists?(:spree_products)
-      'spree_products'
-    end 
-    
+    table = if data_source_exists?(:products)
+              'products'
+            elsif data_source_exists?(:spree_products)
+              'spree_products'
+    end
+
     change_table(table) do |t|
-      t.column :can_be_part, :boolean, :default => false, :null => false
-      t.column :individual_sale, :boolean, :default => true, :null => false
-    end  
+      t.column :can_be_part, :boolean, default: false, null: false
+      t.column :individual_sale, :boolean, default: true, null: false
+    end
   end
 
   def self.down
-    table = if table_exists?(:products)
-      'products'
-    elsif table_exists?(:spree_products)
-      'spree_products'
-    end 
-    
+    table = if data_source_exists?(:products)
+              'products'
+            elsif data_source_exists?(:spree_products)
+              'spree_products'
+    end
+
     change_table(table) do |t|
       t.remove :can_be_part
       t.remove :individual_sale

data/db/migrate/20120316141830_namespace_product_assembly_for_spree_one.rb

@@ -1,4 +1,6 @@
-class NamespaceProductAssemblyForSpreeOne < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class NamespaceProductAssemblyForSpreeOne < SolidusSupport::Migration[4.2]
   def up
     rename_table :assemblies_parts, :spree_assemblies_parts
   end

data/db/migrate/20140620223938_add_id_to_spree_assemblies_parts.rb

@@ -1,9 +1,11 @@
-class AddIdToSpreeAssembliesParts < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddIdToSpreeAssembliesParts < SolidusSupport::Migration[4.2]
   def up
     add_column :spree_assemblies_parts, :id, :primary_key
   end
 
   def down
-    add_column :spree_assemblies_parts, :id
+    remove_column :spree_assemblies_parts, :id
   end
 end

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

@@ -1,23 +1,36 @@
+# frozen_string_literal: true
+
 module SolidusProductAssembly
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      class_option :auto_run_migrations, :type => :boolean, :default => false
+      class_option :auto_run_migrations, type: :boolean, default: false
+      source_root File.expand_path('templates', __dir__)
 
-      def add_migrations
-        run 'rake railties:install:migrations FROM=solidus_product_assembly'
+      def copy_initializer
+        template 'initializer.rb', 'config/initializers/solidus_product_assembly.rb'
       end
 
       def add_javascripts
-        append_file "vendor/assets/javascripts/spree/backend/all.js", "//= require spree/backend/solidus_product_assembly\n"
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_product_assembly\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_product_assembly\n"
+      end
+
+      def add_stylesheets
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_product_assembly\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_product_assembly\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
+      end
+
+      def add_migrations
+        run 'bin/rails railties:install:migrations FROM=solidus_product_assembly'
       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]')) # rubocop:disable Layout/LineLength
         if run_migrations
-           run 'rake db:migrate'
-         else
-           puts "Skiping rake db:migrate, don't forget to run it!"
-         end
+          run 'bin/rails db:migrate'
+        else
+          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+        end
       end
     end
   end

data/lib/generators/solidus_product_assembly/install/templates/initializer.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+SolidusProductAssembly.configure do |config|
+  # TODO: Remember to change this with the actual preferences you have implemented!
+  # config.sample_preference = 'sample_value'
+end

data/lib/solidus_product_assembly/configuration.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module SolidusProductAssembly
+  class Configuration
+    # Define here the settings for this extension, e.g.:
+    #
+    # attr_accessor :my_setting
+  end
+
+  class << self
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    alias config configuration
+
+    def configure
+      yield configuration
+    end
+  end
+end

data/lib/solidus_product_assembly/engine.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
+require 'solidus_core'
+require 'solidus_support'
+
 module SolidusProductAssembly
   class Engine < Rails::Engine
-    engine_name 'solidus_product_assembly'
+    include SolidusSupport::EngineExtensions
 
-    config.autoload_paths += %W(#{config.root}/lib)
+    isolate_namespace ::Spree
 
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator.rb")) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
-    end
+    engine_name 'solidus_product_assembly'
 
-    config.to_prepare &method(:activate).to_proc
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
   end
 end

data/lib/solidus_product_assembly/testing_support/factories.rb

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

data/lib/solidus_product_assembly/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusProductAssembly
-  VERSION = '1.0.0'
+  VERSION = '1.2.0'
 end

data/lib/solidus_product_assembly.rb

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
 require 'solidus_core'
-require 'solidus_product_assembly/engine'
+require 'solidus_support'
+require 'deface'
+
 require 'solidus_product_assembly/version'
+require 'solidus_product_assembly/engine'
+require 'solidus_product_assembly/configuration'

data/lib/tasks/spree2_upgrade.rake

@@ -1,27 +1,27 @@
+# frozen_string_literal: true
+
 namespace :solidus_product_assembly do
   desc 'Link legacy inventory units to an order line item'
-  task :upgrade => :environment do
+  task upgrade: :environment do
     shipments = Spree::Shipment.includes(:inventory_units).where("spree_inventory_units.line_item_id IS NULL")
 
     shipments.each do |shipment|
       shipment.inventory_units.includes(:variant).group_by(&:variant).each do |variant, units|
-
         line_item = shipment.order.line_items.detect { |line_item| line_item.variant_id == variant.id }
 
-        unless line_item
+        next if line_item
 
-          begin
-            master = shipment.order.products.detect { |p| variant.assemblies.include? p }.master
-            supposed_line_item = shipment.order.line_items.detect { |line_item| line_item.variant_id == master.id }
+        begin
+          master = shipment.order.products.detect { |p| variant.assemblies.include? p }.master
+          supposed_line_item = shipment.order.line_items.detect { |line_item| line_item.variant_id == master.id }
 
-            if supposed_line_item
-              Spree::InventoryUnit.where(id: units.map(&:id)).update_all "line_item_id = #{supposed_line_item.id}"
-            else
-              puts "Couldn't find a matching line item for #{variant.name}"
-            end
-          rescue
+          if supposed_line_item
+            Spree::InventoryUnit.where(id: units.map(&:id)).update_all "line_item_id = #{supposed_line_item.id}"
+          else
             puts "Couldn't find a matching line item for #{variant.name}"
           end
+        rescue StandardError
+          puts "Couldn't find a matching line item for #{variant.name}"
         end
       end
     end

data/solidus_product_assembly.gemspec

@@ -1,35 +1,41 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
-require 'solidus_product_assembly/version'
+require_relative 'lib/solidus_product_assembly/version'
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
-  s.name        = 'solidus_product_assembly'
-  s.version     = SolidusProductAssembly::VERSION
-  s.summary     = 'Adds oportunity to make bundle of products to your Spree store'
+  s.name = 'solidus_product_assembly'
+  s.version = SolidusProductAssembly::VERSION
+  s.authors = ['Roman Smirnov']
+  s.email = 'roman@railsdog.com'
+
+  s.summary = 'Adds opportunity to make bundle of products to your Spree store'
   s.description = s.summary
-  s.required_ruby_version = '>= 1.9.3'
-
-  s.author            = 'Roman Smirnov'
-  s.email             = 'roman@railsdog.com'
-  s.homepage          = 'https://solidus.io'
-
-  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_backend', [">= 1.0", "< 3"]
-
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'factory_girl', '~> 4.4'
-  s.add_development_dependency 'capybara', '~> 2.7'
-  s.add_development_dependency 'poltergeist', '~> 1.9'
-  s.add_development_dependency 'database_cleaner', '~> 1.3'
-  s.add_development_dependency 'simplecov'
+  s.homepage = 'https://solidus.io'
+  s.license = 'BSD-3-Clause'
+
+  s.metadata['homepage_uri'] = s.homepage
+  s.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_product_assembly'
+  s.metadata['changelog_uri'] = 'https://github.com/SuperGoodSoft/solidus_product_assembly/blob/master/CHANGELOG.md'
+
+  s.required_ruby_version = '>= 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") }
+
+  s.files = files.grep_v(%r{^(test|spec|features)/})
+  s.test_files = files.grep(%r{^(test|spec|features)/})
+  s.bindir = "exe"
+  s.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
+  s.add_dependency 'solidus_support', '~> 0.8'
+  s.add_dependency 'deface'
+
+  s.add_development_dependency 'solidus_dev_support', '~> 2.5'
+  s.add_development_dependency 'github_changelog_generator'
+  s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'webdrivers'
 end