corraios 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c811102c68dfc955dd2112501b5700813aa421
-  data.tar.gz: 3097c12695b024281744938f1f731a8562e31e92
+  metadata.gz: 6417ca32463b2238feac9aa24170c153021e633e
+  data.tar.gz: a4564955bfddf1646bbfc568b5f9c42bcd278577
 SHA512:
-  metadata.gz: 4df5316d9e47de63f9ca8df6f57386563d8457502e705c3e559961f2a766d9fdf5204d09a76f4d7021931ff012826e088f4811f9e3976dea24777febd134ba78
-  data.tar.gz: d7d972e07e2b2f0b9a524a7c4e94295331c567f02f6a247bc49ff839a9ec3d8e4195b25035a3b67b90333be68f4615d974802c333f511bba4188f9374f42b887
+  metadata.gz: 98fe66a88f401bdc96b3ea91ac978574d7ddcb36a9522b72022576918be42468d066d84816f4f72c8b258bf5427632c9e5d896abdb2d30455afbc80e473eedf1
+  data.tar.gz: a10caa1bd73859737e580d93e2fc200b3c086ce2a12dfa033ce07c4be084ae37565f4d7d3547ddec240bb4e01599734d920b111bca55dc21672cb682f71fb1fa

data/README.md

@@ -128,8 +128,6 @@ end
 ## TODO
 
 - Unificar requisições para diferentes serviços (Hoje a chamada `calculator.perform :pac, :sedex` realiza duas requisiçoes ao servidor do Correios. Pode ser feita em uma)
-- Unificar respostas quando mais de uma requisição é feita ao mesmo serviço (isso acontece quando o peso excede o limite de 30kg)
-- Utilizar webmock nos testes
 - adicionar opção mão própria
 - adicionar opção aviso recebimento
 - adicionar opção valor declarado

data/corraios.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "activesupport", "~> 4.2"
   spec.add_development_dependency 'minitest-reporters', '~> 1.0'
-
+  spec.add_development_dependency 'webmock', '~> 1.20'
 end

data/lib/corraios/calculator.rb

@@ -13,14 +13,30 @@ module Corraios
     end
 
     def perform(*services)
+      deliveries = calculate_services(*services)
+      unify_deliveries(services, deliveries)
+    end
+
+    private
+
+    def unify_deliveries(services, deliveries)
+      services.map do |service|
+        service_deliveries = deliveries.select { |delivery| delivery.name == service }
+
+        service_deliveries[1..-1].each do |service_delivery|
+          service_deliveries.first.merge!(service_delivery)
+        end if service_deliveries.size > 0
+
+        service_deliveries.first
+      end
+    end
+
+    def calculate_services(*services)
       services.map do |service|
         calculate_delivery(service)
       end.flatten
     end
 
-
-    private
-
     def calculate_delivery(service)
       @packer.containers.map do |container|
         query_string = "#{to_query_params(service)}&#{container.to_query_params}"

data/lib/corraios/delivery.rb

@@ -21,6 +21,15 @@ module Corraios
       !error?
     end
 
+    def merge!(other)
+      raise CorraiosError unless self == other
+      @value += other.value
+      @deadline = [@deadline, other.deadline].max
+    end
+
+    def ==(other)
+      @code == other.code
+    end
     private
     def parse_response(response)
       service = validate_response(response)

data/lib/corraios/version.rb

@@ -1,3 +1,3 @@
 module Corraios
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corraios
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Rodrigo Ra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
 description: ''
 email:
 - rodrigorcomp@gmail.com