spree_channable 0.0.18.alpha → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc45055d9e1bef626d21f196471a45402d5c220cc05d0db9f7488630addc54a6
-  data.tar.gz: 0ef0d52b27cce58f5fe3edbc8fac265163b517ae4354c671513689d0dbe8ee3b
+  metadata.gz: 3840e7c43e722ecebd2511cc599d62b8ac8b4a6b944e243251724aa027fccca9
+  data.tar.gz: 3dfa6b96115649bb7212c0c611b9bf8f8269e6d69489f3cd622d5306f321e35a
 SHA512:
-  metadata.gz: c83193ff3364edc06054c6ecea2fe661c6d30de3af8f01aa4f95998b72d99dbcab4a633bce31c6736104519992a8443bd67696f7f38fce81f3e044b7913f717f
-  data.tar.gz: 43dac314d47fb2fdd16374b6a6ace86df645655accb6e63d9e20c1241b36b9fca52fac39fda740276a7ad3abd81d3437ed69ecd6b77f040e70069d8ebc09c2a6
+  metadata.gz: b6c1d138fd02cecd83357430f6b47d67e7629309b736b37186a5fcd7e7c5da6f7fbdf19fa2f53b52f40b7bb3fb58ea577dd2f15e91c5356c5632e180e3fc22e6
+  data.tar.gz: b3699c0f10843efa9da4fe986634cc9e1beb553dc3e0fdabde82168815455a2723dd42a030b9dd21e00958b86d9f7889f4f5077affec9134e7a2fa63face838a

data/.gitignore

@@ -21,3 +21,4 @@ public/spree
 .ruby-gemset
 gemfiles/*.gemfile.lock
 *.gem
+.byebug_history

data/.travis.yml

@@ -1,35 +1,35 @@
 sudo: required
 dist: trusty
-
 language: ruby
-
 env:
-  - DB=postgres
-  - DB=mysql
-
+- DB=mysql
 gemfile:
-  - gemfiles/spree_3_2.gemfile
-  - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_7.gemfile
-  - gemfiles/spree_master.gemfile
-
+- gemfiles/spree_3_2.gemfile
+- gemfiles/spree_3_5.gemfile
+- gemfiles/spree_3_7.gemfile
+- gemfiles/spree_master.gemfile
 script:
-  - bundle exec rake test_app
-  - bundle exec rake spec
-
+- bundle exec rake test_app
+- bundle exec rake spec
 rvm:
-  - 2.5.1
-  - 2.4.2
-
+- 2.5.1
+- 2.4.2
 matrix:
   allow_failures:
-    - gemfile: gemfiles/spree_master.gemfile
-
+  - gemfile: gemfiles/spree_master.gemfile
 before_install:
-  - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
-  - wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
-  - unzip ~/chromedriver_linux64.zip -d ~/
-  - rm ~/chromedriver_linux64.zip
-  - sudo mv -f ~/chromedriver /usr/local/share/
-  - sudo chmod +x /usr/local/share/chromedriver
-  - sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+- mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
+- wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip
+  -P ~/
+- unzip ~/chromedriver_linux64.zip -d ~/
+- rm ~/chromedriver_linux64.zip
+- sudo mv -f ~/chromedriver /usr/local/share/
+- sudo chmod +x /usr/local/share/chromedriver
+- sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+deploy:
+  provider: rubygems
+  api_key: GoR3CYhCOd/Pw+wwBR36qeEo+6cl+ZetrWInSaoz0mVNe8vGe4NHli4t/jdZXbPn8Yp56tCajiiGIPddj5s6oT8AZ7B0sbfC9RNwL49Z99FiwR81J911qG1YHVlyBeWymBk3CliPNpCpYFmDwcAXX07u9NVza4SyevIB29vjNZD1NhYd/ObOB0QUynGxQ91Q5WmY9MNXrtMrWtImc3UZwfjA6Eo9Po7e/sG2RTvnv06nHLPraZ7jdTj42UQu+FLn7TYdQSBSAmxvXdjYjhdmj9bQt0qJTs89ESB6fK7S7LfgsfZexeNL3OZQC9jDbVqKFBV7YW4tCnLKFcmNdVQbXMmiLFa+3oimHp43+6zuaRFMB4tWOgnSrWhh+N8OE9bKcPb4cZ5tj+P1fcs5eclUGZX+QT2CMPl2bRoBe3nol3HggOGlvDdA/VhEwWFznZr3Qpo3kniZtYFQwLQgR3fTD8LvaGH3ScGno7iRWLsy+Gw2iuzjM3lQ5KjH2Rz76RbMzQGfj/b7zR2wN+WnWADjRODEAt5RPhh9VJthFrpHLVwvpwo7Mt+22+AK87YylznDgnzwhrUMcyw34MN0UismRoz7QEP8tNds7JwwP2UEyOJoqrumPxGFm4pcTrZWvnVVZsGjYfHKaqs7ZzOumRSkcGdMWWHyKQEPeY3VBYYRDzM=
+  gem: spree_channable
+  on:
+    tags: true
+    repo: Oldharlem/spree_channable

data/README.md

@@ -1,4 +1,7 @@
-# SpreeChannable
+<h1 align="center">Channable integration for Spree Commerce</h1>
+
+[![Build Status](https://travis-ci.com/Oldharlem/spree_channable.svg?branch=master)](https://travis-ci.com/Oldharlem/spree_channable)
+[![Gem Version](https://badge.fury.io/rb/spree_channable.svg)](https://badge.fury.io/rb/spree_channable)
 
 Channable offers many ways to transform a product feed to many marketplace formats. On top channable offers an order connection to accept incoming orders from connected marketplaces. This gem connects your spree store to the channable platform. The feeds are configurable and can be directly loaded into channable. 
 The order connection can be enabled by channable on request and can be easily configured through the spree admin panel. 
@@ -7,7 +10,7 @@ The order connection can be enabled by channable on request and can be easily co
 
 1. Add this extension to your Gemfile with this line:
   ```ruby
-  gem 'spree_channable', github: 'Oldharlem/spree_channable'
+  gem 'spree_channable'
   ```
 
 2. Install the gem using Bundler:

data/app/models/spree/product_decorator.rb

@@ -13,12 +13,15 @@ module Spree
                 xml.link(rel: 'self', href: ::SpreeChannable.configuration.host)
                 xml.updated DateTime.now.strftime('%Y-%m-%dT%H:%M:%S%z')
 
-                Parallel.map(products) {|product| product.to_channable_variant_xml}.each do |products_xml|
-                  products_xml.each do |variant_xml|
-                    xml.parent << Nokogiri::XML(variant_xml).at('product')
+                xml.variants do
+                  products.map {|product| product.to_channable_variant_xml}.each do |variants_xml|
+                    variants_xml.each do |variant_xml|
+                      xml.parent << Nokogiri::XML(variant_xml).at('variant')
+                    end
                   end
                 end
 
+
               end
             end
 
@@ -33,7 +36,7 @@ module Spree
                 xml.updated DateTime.now.strftime('%Y-%m-%dT%H:%M:%S%z')
 
                 xml.products do
-                  Parallel.map(products) {|product| product.to_channable_product_xml}.each do |product_xml|
+                  products.map {|product| product.to_channable_product_xml}.each do |product_xml|
                     xml.parent << Nokogiri::XML(product_xml).at('product')
                   end
                 end
@@ -59,10 +62,16 @@ module Spree
             xml.id id
             xml.title "#{name}"
             xml.description ActionController::Base.helpers.strip_tags(normalized_description)
-            xml.link URI.join(::SpreeChannable.configuration.host, "/#{::SpreeChannable.configuration.url_prefix}/" + slug).to_s
+            xml.link URI.join(::SpreeChannable.configuration.host, "/#{::SpreeChannable.configuration.url_prefix}/" + "#{slug}").to_s
             (xml.image_link URI.join(::SpreeChannable.configuration.image_host, images.first.attachment.url(:large)).to_s) if images.any?
             xml.condition property('product_condition') || ::SpreeChannable.configuration.product_condition
 
+            xml.images do
+              images.each do |image|
+                xml.image URI.join(::SpreeChannable.configuration.image_host, image.attachment.url(:large)).to_s
+              end
+            end
+
             xml.price price
 
             xml.brand property('brand') || ::SpreeChannable.configuration.brand
@@ -111,6 +120,14 @@ module Spree
         end.to_xml
       end
 
+      def normalized_description
+        if description.blank? || description.length < 3
+          name
+        else
+          description
+        end
+      end
+
     end
   end
 end

data/app/models/spree/variant_decorator.rb

@@ -10,7 +10,7 @@ module Spree
         return nil if price.blank?
 
         Nokogiri::XML::Builder.new do |xml|
-          xml.product {
+          xml.variant {
             xml.id id
             xml.product_id product.id
             xml.title "#{product.name}"
@@ -19,6 +19,12 @@ module Spree
             (xml.image_link URI.join(::SpreeChannable.configuration.image_host, get_images.first.attachment.url(:large)).to_s) unless get_images.empty?
             xml.condition product.property('product_condition') || ::SpreeChannable.configuration.product_condition
 
+            xml.images do
+              get_images.each do |image|
+                xml.image URI.join(::SpreeChannable.configuration.image_host, image.attachment.url(:large)).to_s
+              end
+            end
+
             xml.availability can_supply?
             xml.stock total_on_hand
             xml.price price

data/lib/spree_channable/version.rb

@@ -10,9 +10,8 @@ module SpreeChannable
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 18
-    PRE   = 'alpha'.freeze
+    TINY  = 20
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end
 end

data/spree_channable.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'httparty'
   s.add_dependency 'whenever'
 
+
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'capybara'
@@ -47,4 +48,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3', '~> 1.3.6'
   s.add_development_dependency 'webdrivers', '~> 3.8.0'
+  s.add_development_dependency 'byebug'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_channable
 version: !ruby/object:Gem::Version
-  version: 0.0.18.alpha
+  version: 0.0.20
 platform: ruby
 authors:
 - Fabian Oudhaarlem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -358,6 +358,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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'
 description: Connect your spree store to channable. Receive orders, generate product
   feeds and send shipment updates.
 email: fabian@oldharlem.nl
@@ -439,9 +453,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.0.2