spree_fosdick_integration 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13986672e0deb67ca5905d5bb4ddd945baf4535
-  data.tar.gz: c8f580eb733f0bf062a9ed39154c7879eee2d110
+  metadata.gz: b7b5a27b8023463cb8ec11d776c7de7ddfc8b154
+  data.tar.gz: 66eb460f62c2b697690e944573d3d3b50fdd1df7
 SHA512:
-  metadata.gz: 97ee5e4468d6637dca27732d38eec742864ae783e7acb5872745fa8bdef388337a6bac43dbccd32fcc751cfc0f171cc9e715cef8135695f5f8cd9b970dd54f19
-  data.tar.gz: e0370185fa1dd7097b24be8b92705ebe2b3acca64c132462ef31c5235f742cdf773e70c7e36bc2c060e2de59dd46d32b3dbf1a75863b3927c520db428d2da58b
+  metadata.gz: f7ec466d7ef9d6d2521a1723c3e552328196efd2e54742115a116f0281ab91cfa2bc4a7fd3345b43f97a495f7764047a4f1f1cb8519d32f2457ca627ede71acb
+  data.tar.gz: b30401daedc7971b1db1dcfd49a48e29dc4a011f56678dcb1ac01c38e8ecaab5a93d194d238b11664877a51e362cb4673480083265ae652c3e9db4febc4a40d0

data/.gitlab-ci.yml

@@ -0,0 +1,15 @@
+image: ruby:2.4.2
+
+cache:
+  paths:
+    - cache
+
+before_script:
+  - apt-get update -q && apt-get install nodejs -yqq
+  - gem install bundler -v 1.15.4 --no-ri --no-rdoc
+  - bundle install -j $(nproc) --path cache
+
+test:
+  script:
+    - bundle exec rake test_app
+    - rspec spec

data/Gemfile

@@ -5,17 +5,15 @@ gem 'httparty'
 gem 'nokogiri'
 gem 'model_un'
 
-spree_version = '3-1-stable'
-
-gem 'spree',             github: 'spree/spree',             branch: spree_version
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: spree_version
+gem 'spree',             '~> 3.6'
+gem 'spree_auth_devise', '~> 3.3'
 
 gem 'haml'
 gem 'haml-rails'
-gem 'active_model_serializers', '~> 0.9.3'
+gem 'active_model_serializers', '~> 0.10.7'
 
 group :test do
-  gem 'shoulda-matchers', require: false
+  gem 'shoulda-matchers', git: 'https://github.com/thoughtbot/shoulda-matchers', require: false
   gem 'webmock'
 end
 gemspec

data/README.md

@@ -2,6 +2,11 @@
 
 Current gem provides easy integration for you Spree Commerce based apps with full service fulfillment services of Fosdick Fulfillment.
 
+Spree Commerce versions:
+- Spree Core - 3.6
+- Spree Auth Devise - 3.3
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/app/models/spree/shipment_decorator.rb

@@ -4,7 +4,12 @@ Spree::Shipment.class_eval do
   def self.perform_fosdick_shipments
     shipments = where(shipped_at: nil, state: 'ready', send_atempt: 0..2).where.not(fosdick_state: ['duplicate', 'success'])
 
-    JSON.parse(ActiveModel::ArraySerializer.new(shipments, each_serializer: ShipmentSerializer, root: false).to_json) if shipments.present?
+    JSON.parse(
+      ActiveModel::Serializer::CollectionSerializer.new(
+        shipments,
+        each_serializer: ShipmentSerializer,
+        root: false).to_json
+    ) if shipments.present?
   end
 
   def bill_to

data/app/overrides/add_fosdick_panel.rb

@@ -1,8 +1,11 @@
 Deface::Override.new(
   virtual_path: 'spree/admin/orders/index',
   name: 'admin_fosdick_index_button',
-  insert_before: "erb[silent]:contains('if can? :edit, Spree::Order.new ')",
-  text: "<li style='padding-right: 5px;'>
-           <%= button_link_to 'Fosdick panel', admin_fosdick_shipments_path, icon: '', id: 'admin_fosdick_index' %>
-         </li>"
-)
+  insert_before: "erb[loud]:contains('Spree.t(:new_order)')",
+) do
+  <<-CODE.chomp
+    <%= button_link_to 'Fosdick panel',
+      admin_fosdick_shipments_path, { style: 'margin-right:5px;',
+      class: 'btn-primary', icon: 'ok', id: 'admin_fosdick_index' }%>
+  CODE
+end

data/app/serializers/shipment_serializer.rb

@@ -5,8 +5,8 @@ class ShipmentSerializer < ActiveModel::Serializer
             :shipping_method, :tracking, :placed_on, :shipped_at, :totals,
             :updated_at, :channel, :items, :shipping_method_code
 
-  has_one :bill_to, serializer: AddressSerializer, root: 'billing_address'
-  has_one :ship_to, serializer: AddressSerializer, root: 'shipping_address'
+  has_one :bill_to, serializer: AddressSerializer, key: 'billing_address'
+  has_one :ship_to, serializer: AddressSerializer, key: 'shipping_address'
 
   def id
     object.number

data/db/migrate/20151013153126_create_spree_fosdick_shipment.rb

@@ -1,4 +1,4 @@
-class CreateSpreeFosdickShipment < ActiveRecord::Migration
+class CreateSpreeFosdickShipment < ActiveRecord::Migration[5.0]
   def change
     create_table :spree_fosdick_shipments do |t|
       t.belongs_to :spree_shipment
@@ -11,7 +11,5 @@ class CreateSpreeFosdickShipment < ActiveRecord::Migration
       t.datetime   :ship_date
       t.timestamps
     end
-
-    add_index :spree_fosdick_shipments, :spree_shipment_id
   end
 end

data/db/migrate/20151015122038_create_fosdick_exceptions.rb

@@ -1,4 +1,4 @@
-class CreateFosdickExceptions < ActiveRecord::Migration
+class CreateFosdickExceptions < ActiveRecord::Migration[5.0]
   def change
     create_table :spree_fosdick_exceptions do |t|
       t.belongs_to :spree_fosdick_shipment
@@ -9,7 +9,5 @@ class CreateFosdickExceptions < ActiveRecord::Migration
       t.datetime   :happened_at
       t.timestamps
     end
-
-    add_index :spree_fosdick_exceptions, :spree_fosdick_shipment_id
   end
 end

data/db/migrate/20151028105216_add_fosdick_atempt_and_state_spree_shipments.rb

@@ -1,4 +1,4 @@
-class AddFosdickAtemptAndStateSpreeShipments < ActiveRecord::Migration
+class AddFosdickAtemptAndStateSpreeShipments < ActiveRecord::Migration[5.0]
   def change
     add_column :spree_shipments, :send_atempt,   :integer, default: 0,       null: false
     add_column :spree_shipments, :fosdick_state, :string,  default: 'ready', null: false

data/lib/fosdick/processor.rb

@@ -52,7 +52,7 @@ module Fosdick
           shipment.order.update(shipment_state: 'shipped') if ship_date.present?
 
           if fosdick_shipment.confirmation_sent == false && trackings.present?
-            Spree::FosdickShipmentMailer.order_shipped(shipment).deliver
+            Spree::FosdickShipmentMailer.order_shipped(shipment).deliver_now
             fosdick_shipment.update(confirmation_sent: true)
           end
         end

data/lib/spree_fosdick_integration/factories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   # Example adding this to your spec_helper will load these Factories for use:
   # require 'spree_fosdick_integration/factories'
 

data/lib/spree_fosdick_integration/version.rb

@@ -1,3 +1,3 @@
 module SpreeFosdickIntegration
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

data/spec/controllers/admin/fosdick_shipments_controller_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
 RSpec.describe Spree::Admin::FosdickShipmentsController, type: :controller do
+  routes { Spree::Core::Engine.routes }
+
   describe '#index' do
     let!(:fosdick_shipment) { create :fosdick_shipment }
     let!(:admin)            { create :admin_user }
     before { sign_in(admin) }
 
     it 'should have 200 response' do
-      get :index, { use_route: SpreeFosdickIntegration }
+      get :index
 
       expect(response.status).to eq(200)
       expect(assigns[:fosdick_shipments]).to eq [fosdick_shipment]
     end
   end
-end
+end

data/spec/models/spree/shipment_spec.rb

@@ -41,7 +41,7 @@ RSpec.describe Spree::Shipment, type: :model do
             'phone'=>'555-555-0199'},
         'shipping_address'=>nil}.to_json) }
 
-    before { allow(ActiveModel::ArraySerializer).to receive(:new).and_return([result]) }
+    before { allow(ActiveModel::Serializer::CollectionSerializer).to receive(:new).and_return([result]) }
 
     it 'should perform shipments to fosdick' do
       expect(Spree::Shipment.perform_fosdick_shipments).to eq [result]

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ require 'rspec/rails'
 require 'database_cleaner'
 require 'ffaker'
 require 'shoulda/matchers'
+require 'rails-controller-testing'
 
 Shoulda::Matchers.configure do |config|
   config.integrate do |with|
@@ -47,7 +48,7 @@ require 'spree_fosdick_integration/factories'
 require 'webmock/rspec'
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 
   config.include Devise::TestHelpers, type: :controller
   # == URL Helpers
@@ -96,4 +97,6 @@ RSpec.configure do |config|
   end
 
   config.fail_fast = ENV['FAIL_FAST'] || false
+
+  Rails::Controller::Testing.install
 end

data/spree_fosdick_integration.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'spree_core', '~> 3.1.0'
+  spec.add_dependency 'spree_core', '~> 3.6.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -28,7 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'capybara', '~> 2.4'
   spec.add_development_dependency 'coffee-rails'
   spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'factory_girl', '~> 4.2'
+  spec.add_development_dependency 'factory_bot_rails', '~> 4.10.0'
+  spec.add_development_dependency 'rails-controller-testing'
   spec.add_development_dependency 'ffaker', '~> 2.2.0'
   spec.add_development_dependency 'sass-rails'
   spec.add_development_dependency 'selenium-webdriver'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_fosdick_integration
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - anatolii-volodko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.10.0
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  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: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +214,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -269,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Integration Spree Commerce with Fosdick API
@@ -283,4 +298,3 @@ test_files:
 - spec/services/fosdick/receiver_spec.rb
 - spec/services/fosdick/sender_spec.rb
 - spec/spec_helper.rb
-has_rdoc: