spree_temando 0.1.3 → 0.1.4

data/Rakefile

@@ -4,9 +4,37 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'SpreeTemando'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
-require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new('spec')
 
-task :default => :spec
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task :default => :test

data/app/models/spree/calculator/temando_quote.rb

@@ -18,15 +18,25 @@ module Spree
 
     def cheapest(destination, line_items)
       quotes = find_quotes(destination, line_items)
+      return nil if quotes.nil?
       cheapest = quotes.sort_by { |q| q.total_price }.first
-      { :price => cheapest.total_price, :minimum_eta => cheapest.minimum_eta, :maximum_eta => cheapest.maximum_eta, :quote => cheapest }
+      if cheapest then
+        { :price => cheapest.total_price, :minimum_eta => cheapest.minimum_eta, :maximum_eta => cheapest.maximum_eta, :quote => cheapest }
+      else
+        nil
+      end
     end
 
     def fastest(destination, line_items)
       quotes = find_quotes(destination, line_items)
+      return nil if quotes.nil?
       fastest_eta = quotes.collect(&:maximum_eta).min
       cheapest = quotes.reject { |q| q.maximum_eta > fastest_eta }.sort_by { |q| q.total_price }.first
-      { :price => cheapest.total_price, :minimum_eta => cheapest.minimum_eta, :maximum_eta => cheapest.maximum_eta, :quote => cheapest }
+      if cheapest then
+        { :price => cheapest.total_price, :minimum_eta => cheapest.minimum_eta, :maximum_eta => cheapest.maximum_eta, :quote => cheapest }
+      else
+        nil
+      end
     end
 
     def temando_origin
@@ -57,6 +67,8 @@ module Spree
             data = cheapest(destination.to_temando_location, object.line_items)
           end
 
+          return if data.nil?
+
           quote = Spree::TemandoQuote.new_or_update_from_quote(self, object, data[:quote], destination)
 
           # Store the Quote data against the Order and these LineItems if they are persisted
@@ -77,12 +89,16 @@ private
     def find_quotes(destination, line_items)
       delivery = Temando::Delivery::DoorToDoor.new(self.temando_origin, destination)
 
-      request = Temando::Request.new
-      line_items.reject { |i| i.quantity < 1 }.each do |item|
-        request.items << item.to_temando_item
-      end
+      begin
+        request = Temando::Request.new
+        line_items.reject { |i| i.quantity < 1 }.each do |item|
+          request.items << item.to_temando_item
+        end
 
-      request.quotes_for(delivery)
+        request.quotes_for(delivery)
+      rescue Temando::Api::Exceptions::SoapError
+        return nil
+      end
     end
   end
 end

data/lib/spree_temando/engine.rb

@@ -1,6 +1,3 @@
-require 'spree_core'
-require 'temando'
-
 module SpreeTemando
   class Engine < ::Rails::Engine
     isolate_namespace SpreeTemando
@@ -12,7 +9,7 @@ module SpreeTemando
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
-      ::Temando::Api::Base.logger = Rails.logger
+      Temando::Api::Base.logger = Rails.logger
     end
 
     initializer "spree_temando.register.shipping_calculators" do |app|

data/lib/spree_temando/version.rb

@@ -1,3 +1,3 @@
 module SpreeTemando
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_temando
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,23 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -139,22 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Adds temando shipping support to Spree
 email:
 - jason@reinteractive.net