fastshop_catalog 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30d3f10c0b09c6cd91d0d70a9581bc08a0f32b0f
-  data.tar.gz: b5ad556c0c926ee60f379374338ceb1489f5933b
+  metadata.gz: d68f0540ed875634364fe3981b000ccbfe1399df
+  data.tar.gz: 934adc99a896278af769a3912d69d4adaf4f1fe6
 SHA512:
-  metadata.gz: 23861e9bf14e1683d5047f892671fd43c648fce4945778454bc2dcc511b362fc1d9697803d96bdfa91914c303cbb0c37967a03cfbd498a40102ea3d2d01b21ab
-  data.tar.gz: b9561a2116aca37af5c65778f2436716316e4d09c8f2b5ea37613c2392f36d18aa840ea72381be51931bfc890b5e782338253dd8a6435895b80c9d82ba60d9e5
+  metadata.gz: 84293e29c8ed9450566cdf92a624b82b650ac3861ffc8c634003a84fe8db31915fe8c822ac9e913fcffd37616a3dfad72d9f1a9707a0e516090f1c9ca7075b1d
+  data.tar.gz: cc0d60e81043a39d5965edbd4bd0d1b579c00c2f99246eadc5ce35d0b813b058aa2786e0fc0537d480e298591f48cecd66c94ca880cb0ae7867ef1dc455c7aa3

data/lib/fastshop_catalog.rb

@@ -17,4 +17,5 @@ require_relative "fastshop_catalog/check_availability_service"
 require_relative "fastshop_catalog/order_status_service"
 require_relative "fastshop_catalog/participant_service"
 require_relative "fastshop_catalog/service_exception"
+require_relative "fastshop_catalog/service_urls"
 HTTPI.log_level = :info

data/lib/fastshop_catalog/base_service.rb

@@ -4,8 +4,6 @@ module FastshopCatalog
     AUX_LOG = Logger.new(STDOUT)
     AUX_LOG.level = Logger::WARN
 
-    DEFAULT_BASE_URL = 'http://www.fastincentivos.com.br'
-
     class << self
       attr_accessor :log_level
       attr_accessor :base_url
@@ -13,7 +11,11 @@ module FastshopCatalog
     end
 
     def service_url
-      @service_url ||= "#{FastshopCatalog::BaseService.base_url || DEFAULT_BASE_URL}/#{@service}"
+      env = "development"
+
+      env = Rails.env if defined?(Rails)
+      url_service = FastshopCatalog::ServiceUrls.new(env)
+      @service_url ||= url_service.url_for(@service)
     end
 
     def action
@@ -23,7 +25,7 @@ module FastshopCatalog
     def self.camelize(val)
       val.to_s.split('_').map {|w| w.capitalize}.join
     end
-    
+
     def encrypt(payload)
       require_relative 'crypto'
       Crypto.new.encrypt(payload.to_s)
@@ -31,9 +33,9 @@ module FastshopCatalog
 
     def initialize(params={})
       @@log_level ||= :info
-      default_params = {:wsdl => "#{service_url}?wsdl", :soap_version => 2, :namespaces => 
-        {"xmlns:x" => "http://www.w3.org/2005/08/addressing"}, :soap_header => 
-        {"x:To" => service_url, "x:Action" => "http://tempuri.org/#{action}"}, :log_level => 
+      default_params = {:wsdl => "#{service_url}?wsdl", :soap_version => 2, :namespaces =>
+        {"xmlns:x" => "http://www.w3.org/2005/08/addressing"}, :soap_header =>
+        {"x:To" => service_url, "x:Action" => "http://tempuri.org/#{action}"}, :log_level =>
         @log_level}
       @client = Savon.client(recursive_merge(default_params, params))
       HTTPI.log = false
@@ -50,7 +52,7 @@ module FastshopCatalog
       end
       result[@return_key]
     end
-    
+
     def service_invoker_with_encryption(encrypted_payload_key, parameters={})
       encrypted_payload = encrypt(parameters[encrypted_payload_key])
       FastshopCatalog::BaseService::AUX_LOG.debug('Encrypted payload: ' + encrypted_payload)

data/lib/fastshop_catalog/catalog_service.rb

@@ -2,7 +2,7 @@ module FastshopCatalog
   class CatalogService < FastshopCatalog::BaseService
 
     def initialize
-      @service = 'FastServices.WsCatalogo/Catalogo.svc/service'
+      @service = :catalogo
       @interface = 'ICatalogo'
       @soap_method = :busca_catalogo
       @return_key = 'Lista'

data/lib/fastshop_catalog/check_availability_service.rb

@@ -2,7 +2,7 @@ module FastshopCatalog
   class CheckAvailabilityService < FastshopCatalog::BaseService
 
     def initialize
-      @service = 'FastServices.WsConsultaDisponibilidade/ConsultaDisponibilidade.svc/service'
+      @service = :consulta_disponibilidade
       @interface = 'IConsultaDisponibilidade'
       @soap_method = :retorna_dados
       @return_key = 'Disponibilidade'

data/lib/fastshop_catalog/external_dne_service.rb

@@ -2,7 +2,7 @@ module FastshopCatalog
   class ExternalDneService < FastshopCatalog::BaseService
 
     def initialize
-      @service = 'FastServices.WsConsultaDneExterno/ConsultaDneExterno.svc/service'
+      @service = :consulta_dne_externo
       @interface = 'IConsultaDneExterno'
       @soap_method = :consultar
       @return_key = 'Dne'

data/lib/fastshop_catalog/order_placement_service.rb

@@ -2,7 +2,7 @@ module FastshopCatalog
   class OrderPlacementService < FastshopCatalog::BaseService
 
     def initialize
-      @service = 'FastServices.WsColocacaoPedido/ColocacaoPedido.svc/service'
+      @service = :colocacao_pedido
       @interface = 'IColocacaoPedido'
       @soap_method = :incluir_pedido
       @return_key = 'NumeroPedidoFast'

data/lib/fastshop_catalog/order_status_service.rb

@@ -2,7 +2,7 @@ module FastshopCatalog
   class OrderStatusService < FastshopCatalog::BaseService
 
     def initialize
-      @service = 'FastServices.WsConsultaStatusPedido/ConsultaStatusPedido.svc/service'
+      @service = :consulta_status
       @interface = 'IConsultaStatusPedido'
       @soap_method = :retorna_dados
       @return_key = 'Lista'

data/lib/fastshop_catalog/participant_service.rb

@@ -2,7 +2,7 @@ module FastshopCatalog
   class ParticipantService < FastshopCatalog::BaseService
 
     def initialize
-      @service = 'FastServices.WsParticipante/Participante.svc/service'
+      @service = :participante
       @interface = 'IParticipante'
       @soap_method = :cadastrar_participante
       @return_key = 'Token'
@@ -12,7 +12,7 @@ module FastshopCatalog
     def insert(participant)
       payload = participant.to_json.to_s
       AUX_LOG.debug('Participant as json: ' + payload)
-      service_invoker_with_encryption('entrada', 'contrato' => participant.contract_code, 
+      service_invoker_with_encryption('entrada', 'contrato' => participant.contract_code,
       'entrada' => payload)
     end
 

data/lib/fastshop_catalog/product_service.rb

@@ -2,7 +2,7 @@ module FastshopCatalog
   class ProductService < FastshopCatalog::BaseService
 
     def initialize
-      @service = 'FastServices.WsConsultaProduto/ConsultaProduto.svc/service'
+      @service = :consulta_produto
       @interface = 'IConsultaProduto'
       @soap_method = :busca_produto
       @return_key = 'ProdutoDados'

data/lib/fastshop_catalog/service_urls.rb

@@ -0,0 +1,41 @@
+module FastshopCatalog
+  class ServiceUrls
+    DEFAULT_BASE_URL = 'http://www.fastincentivos.com.br'
+
+    PRODUCTION_URLS = {
+      catalogo: "http://www.fastincentivos.com.br:8081/Catalogo.svc/service",
+      consulta_disponibilidade: "http://www.fastincentivos.com.br:8084/ConsultaDisponibilidade.svc/service",
+      consulta_dne_externo: "http://www.fastincentivos.com.br:8086/ConsultaDneExterno.svc/service",
+      colocacao_pedido: "http://www.fastincentivos.com.br:8082/ColocacaoPedido.svc/service",
+      consulta_status: "http://www.fastincentivos.com.br:8090/ConsultaStatusPedido.svc/service",
+      participante: "http://www.fastincentivos.com.br:8093/Participante.svc/service",
+      consulta_produto: "#{DEFAULT_BASE_URL}/FastServices.WsConsultaProduto/ConsultaProduto.svc/service"
+    }
+
+    HOMOLOG_URLS = {
+      catalogo: "#{DEFAULT_BASE_URL}/FastServices.WsCatalogo/Catalogo.svc/service",
+      consulta_disponibilidade: "#{DEFAULT_BASE_URL}/FastServices.WsConsultaDisponibilidade/ConsultaDisponibilidade.svc/service",
+      consulta_dne_externo: "#{DEFAULT_BASE_URL}/FastServices.WsConsultaDneExterno/ConsultaDneExterno.svc/service",
+      colocacao_pedido: "#{DEFAULT_BASE_URL}/FastServices.WsColocacaoPedido/ColocacaoPedido.svc/service",
+      consulta_status: "#{DEFAULT_BASE_URL}/FastServices.WsConsultaStatusPedido/ConsultaStatusPedido.svc/service",
+      participante: "#{DEFAULT_BASE_URL}/FastServices.WsParticipante/Participante.svc/service",
+      consulta_produto: "#{DEFAULT_BASE_URL}/FastServices.WsConsultaProduto/ConsultaProduto.svc/service"
+    }
+    attr_reader :env
+
+    def initialize(env)
+      @env = env
+    end
+
+    def url_for(serv)
+      url = ""
+      if env == "production"
+        url = PRODUCTION_URLS.fetch(serv)
+      else
+        url = HOMOLOG_URLS.fetch(serv)
+      end
+
+      url
+    end
+  end
+end

data/lib/fastshop_catalog/version.rb

@@ -1,3 +1,3 @@
 module FastshopCatalog
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/fastshop_catalog/base_service_spec.rb

@@ -9,13 +9,13 @@ describe FastshopCatalog::BaseService do
     end
 
   end
-  
+
   describe "initialization" do
-    
+
     let(:service) do
       class TempService < FastshopCatalog::BaseService
         def initialize
-          @service = 'SomePath/some_service'
+          @service = :catalogo
           @interface = 'ISomeInterface'
           @soap_method = :some_method
           @return_key = 'SomeName'
@@ -25,16 +25,6 @@ describe FastshopCatalog::BaseService do
       TempService.new
     end
 
-    it 'should return the correct service_url' do
-      expect(service.service_url).to eq('http://www.fastincentivos.com.br/SomePath/some_service')
-    end
-    
-    it 'should return the correct service_url if base_url changed' do
-      FastshopCatalog::BaseService.base_url = 'http://yourserverhere.com'
-      expect(service.service_url).to eq('http://yourserverhere.com/SomePath/some_service')
-      FastshopCatalog::BaseService.base_url = FastshopCatalog::BaseService::DEFAULT_BASE_URL
-    end
-
     it 'should return the correct action' do
       expect(service.action).to eq('ISomeInterface/SomeMethod')
     end

data/spec/fastshop_catalog/service_urls_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe FastshopCatalog::ServiceUrls do
+  it "should return homolog url" do
+    subject = FastshopCatalog::ServiceUrls.new("development")
+
+    url = subject.url_for(:catalogo)
+
+    expect(url).to eql("http://www.fastincentivos.com.br/FastServices.WsCatalogo/Catalogo.svc/service")
+  end
+
+  it "should return production url" do
+    subject = FastshopCatalog::ServiceUrls.new("production")
+
+    url = subject.url_for(:catalogo)
+
+    expect(url).to eql("http://www.fastincentivos.com.br:8081/Catalogo.svc/service")
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastshop_catalog
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Thiago Ganzarolli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - lib/fastshop_catalog/participant_service.rb
 - lib/fastshop_catalog/product_service.rb
 - lib/fastshop_catalog/service_exception.rb
+- lib/fastshop_catalog/service_urls.rb
 - lib/fastshop_catalog/time.rb
 - lib/fastshop_catalog/version.rb
 - password_util.rb
@@ -132,6 +133,7 @@ files:
 - spec/fastshop_catalog/participant_factory.rb
 - spec/fastshop_catalog/participant_service_spec.rb
 - spec/fastshop_catalog/product_service_spec.rb
+- spec/fastshop_catalog/service_urls_spec.rb
 - spec/fixtures/catalog_service_successful_response.xml
 - spec/fixtures/catalog_service_wrong_contract_response.xml
 - spec/fixtures/check_availability_successful_response.xml
@@ -195,6 +197,7 @@ test_files:
 - spec/fastshop_catalog/participant_factory.rb
 - spec/fastshop_catalog/participant_service_spec.rb
 - spec/fastshop_catalog/product_service_spec.rb
+- spec/fastshop_catalog/service_urls_spec.rb
 - spec/fixtures/catalog_service_successful_response.xml
 - spec/fixtures/catalog_service_wrong_contract_response.xml
 - spec/fixtures/check_availability_successful_response.xml