expedia 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 808b4e362862ea498efd345aa0de09fca5d433f7
-  data.tar.gz: b7140ca89302622158d297b31b01e71b3a385a49
+  metadata.gz: 113ead84b4c3eba315055d26c60640074400a858
+  data.tar.gz: 2adbf22fca33615e8940f166a5bfcc4f258f1da9
 SHA512:
-  metadata.gz: 3d72d6aee658b3c86626e01f3b747298c1630a3dca056fc924530702ab8ac24f36c138d961749642e79a705b0adfd659f488c98039c8ecb1e206d22f9c878cb9
-  data.tar.gz: 405a7f7888047a4e5cdee382b19730d226153db37d6d2f3840f7fcfc037a598fa3b0d9477aa94d4054f08a7156e2f696ecb1701702fff3047de37bf8cb6c0419
+  metadata.gz: b93034f2efb452af346cf72d580f3fc26fd8a987a3632ee6df414ec98e95aac63791d2bde2070ef8e51600010f2546689db540c6220d440bc487d3609fc1a700
+  data.tar.gz: 7ee9c54af892c26e8f99215b9418659b50a029bc5899a9e5488d687efc5b322c40b99139e8f5ad7f7fea11980e9f94f96ddd47374fd857470317163952721a27

data/README.textile

@@ -37,6 +37,7 @@ Expedia.shared_secret = 'your_shared_secret'
 Expedia.locale = 'en_US'
 Expedia.currency_code = 'USD'
 Expedia.minor_rev = 13
+Expedia.use_signature = true # must be false if using ip whitelisting instead of signature
 # Optional configuration...
 Expedia.timeout = 1 # read timeout in sec
 Expedia.open_timeout = 1 # connection timeout in sec

data/lib/expedia.rb

@@ -23,11 +23,12 @@ module Expedia
   class << self
 
     attr_accessor :cid, :api_key, :shared_secret, :format, :locale,
-      :currency_code, :minor_rev, :timeout, :open_timeout
+      :currency_code, :minor_rev, :timeout, :open_timeout, :use_signature
 
     # Default way to setup Expedia. Run generator to create
     # a fresh initializer with all configuration values.
     def setup
+      Expedia.use_signature = true #default
       yield self
     end
 

data/lib/expedia/http_service.rb

@@ -5,7 +5,7 @@ module Expedia
   module HTTPService
 
     API_SERVER = 'api.eancdn.com'
-    # The development api server is not reliable. Ofthen gives 400...
+    # The development api server is not reliable. Often gives 400...
     # DEVELOPMENT_API_SERVER = 'dev.api.ean.com'
     DEVELOPMENT_API_SERVER = 'api.ean.com'
     RESERVATION_SERVER = 'book.api.ean.com'
@@ -93,8 +93,9 @@ module Expedia
       # Common Parameters required for every Call to Expedia Server.
       # @return [Hash] of all common parameters.
       def common_parameters
-        { :cid => Expedia.cid, :sig => signature, :apiKey => Expedia.api_key, :minorRev => Expedia.minor_rev,
-          :_type => 'json', :locale => Expedia.locale, :currencyCode => Expedia.currency_code }
+        params = { :cid => Expedia.cid, :apiKey => Expedia.api_key, :minorRev => Expedia.minor_rev, :_type => 'json', :locale => Expedia.locale, :currencyCode => Expedia.currency_code }
+        params.merge!(:sig => signature) if Expedia.use_signature
+        return params
       end
 
     end

data/lib/expedia/version.rb

@@ -1,3 +1,3 @@
 module Expedia
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/generators/templates/expedia.txt

@@ -5,6 +5,7 @@ Expedia.setup do |config|
   config.locale = 'en_US' # For Example 'de_DE'. Default is 'en_US'
   config.currency_code = 'USD' # For Example 'EUR'. Default is 'USD'
   config.minor_rev = 28 # between 4-28 as of Jan 2015. If not set, 4 is used by EAN.
+  config.use_signature = true # An encoded signature is not required if ip whitelisting is used
   # optional configurations...
   config.timeout = 1 # read timeout in sec
   config.open_timeout = 1 # connection timeout in sec

data/spec/http_service_spec.rb

@@ -48,6 +48,7 @@ describe "Expedia::HTTPService" do
       Expedia.cid = ''
       Expedia.api_key =''
       Expedia.shared_secret = ''
+      Expedia.use_signature = true
 
     end
 
@@ -63,6 +64,11 @@ describe "Expedia::HTTPService" do
       Expedia::HTTPService.common_parameters.keys.should include(:sig)
       Expedia::HTTPService.common_parameters.keys.should include(:_type)
     end
+    
+    it "checks to see if sig is removed from parameters" do
+      Expedia.use_signature = false
+      Expedia::HTTPService.common_parameters.keys.should_not include(:sig)
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expedia
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Zaid Akram
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json