expedia 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0bf61f60677e53b4b72d7f71dd317598d9f89af
-  data.tar.gz: 8e7e52d75105b1700525ad01bf60bbaa25f6bdc4
+  metadata.gz: ccf1ce4946c74fe5bf410bb1233ec0e4a2843ce6
+  data.tar.gz: ac8f8962e58013fe545abe46698736239db8b654
 SHA512:
-  metadata.gz: 73fe7866b28ecb559b2c9ad683418b52470948cf8b7480e80e3b21258fd1649daa1b89fa25b6602f4ba7852b9eff1b70e2a6283ac857b3e491dfd003b76c4708
-  data.tar.gz: 6431d464ea5522a20b15e05e3a691c9429f8087588fd0c50bd541368faac2aaddd34596a47985cb7165583ccdae95b2c26b5ebc38082b1d66ea1524cdb4aa37e
+  metadata.gz: b3670577a70da4abda79ff55c962f00ddf4ace1c822950cbfa4a1e1531650f182d5d4a5a66f56ee4d92ceadb36a26f7162fea8ae7a455ecdee23da85223bddf3
+  data.tar.gz: 42902849d59db49d22a0ff2a0d71b0dac8b65a8a441750320625f1404f34706682465efd84e04e0a769d5a4f0d152387d0eeb8fd02bdfeb70ba0b1049e9365dd

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1"
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx
+
+sudo: false

data/README.textile

@@ -1,4 +1,4 @@
-h1. Expedia !https://travis-ci.org/zaidakram/expedia.svg?branch=master(Expedia)!:https://travis-ci.org/zaidakram/expedia
+h1. Expedia !https://travis-ci.org/zaidakram/expedia.svg?branch=master(Expedia)!:https://travis-ci.org/zaidakram/expedia !https://badge.fury.io/rb/expedia.svg!:http://badge.fury.io/rb/expedia
 
 Expedia is a ruby wrapper for ["EAN - Expedia Affiliate Network":http://www.expediaaffiliate.com] APIs.
 
@@ -135,3 +135,10 @@ Expedia::Utils.logger = Rails.logger
 </pre>
 
 
+h3. Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/lib/expedia.rb

@@ -23,7 +23,7 @@ module Expedia
   class << self
 
     attr_accessor :cid, :api_key, :shared_secret, :format, :locale,
-      :currency_code, :minor_rev
+      :currency_code, :minor_rev, :timeout, :open_timeout
 
     # Default way to setup Expedia. Run generator to create
     # a fresh initializer with all configuration values.

data/lib/expedia/api.rb

@@ -6,11 +6,9 @@ module Expedia
     # @param args [Hash] All the params required for 'get_list' call
     # @return [Expedia::HTTPService::Response] on success. A response object representing the results from Expedia
     # @return [Expedia::APIError] on Error.
-    # @note A POST request is made instead of GET if 'numberOfResults' > 200
+    # @note A POST request is made instead of GET if 'hotelIdList' length > 200
     def get_list(args)
-      no_of_results = 'numberOfResults'
-      method = (args[no_of_results.to_sym].to_i > 200 || args[no_of_results].to_i > 200) ||
-        args[no_of_results.downcase.to_sym].to_i > 200 || args[no_of_results.downcase].to_i > 200 ? :post : :get
+      method = (args[:hotelIdList] || args["hotelIdList"] || []).length > 200 ? :post : :get
       services('/ean-services/rs/hotel/v3/list', args, method)
     end
 
@@ -43,7 +41,7 @@ module Expedia
     end
 
     def get_reservation(args)
-      HTTPService.make_request('/ean-services/rs/hotel/v3/res', args, :post, { :reservation_api => true, :use_ssl => true })
+      HTTPService.make_request('/ean-services/rs/hotel/v3/res', args, :post, { :reservation_api => true, :use_ssl => true, :ignore_timeout => true })
     end
 
     def get_payment_info(args)

data/lib/expedia/http_service.rb

@@ -27,6 +27,22 @@ module Expedia
         "#{options[:use_ssl] ? "https" : "http"}://#{server}"
       end
 
+
+      # Adding open and read timeouts
+      #
+      # open timeout - the amount of time you are willing to wait for 'opening a connection'
+      # (read) timeout - the amount of time you are willing to wait for some data to be received from the connected party.
+      # @param conn - Faraday connection object
+      #
+      # @return the connection obj with the timeouts set if they have been initialized
+      def add_timeouts(conn, options)
+        if !options[:ignore_timeout]
+          conn.options.timeout = Expedia.timeout.to_i if Expedia.timeout.present?
+          conn.options.open_timeout = Expedia.open_timeout.to_i if Expedia.open_timeout.present?
+        end
+        conn
+      end
+
       # Makes a request directly to Expedia.
       # @note You'll rarely need to call this method directly.
       #
@@ -47,6 +63,7 @@ module Expedia
         request_options = {:params => (verb == :get ? args : {})}
         # set up our Faraday connection
         conn = Faraday.new(server(options), request_options)
+        conn = add_timeouts(conn, options)
         response = conn.send(verb, path, (verb == :post ? args : {}))
 
         # Log URL and params information
@@ -61,36 +78,18 @@ module Expedia
         end
       end
 
-      # Encodes a given hash into a query string.
-      #
-      # @param params_hash a hash of values to CGI-encode and appropriately join
-      #
-      # @example
-      #   Expedia.http_service.encode_params({:a => 2, :b => "My String"})
-      #   => "a=2&b=My+String"
-      #
-      # @return the appropriately-encoded string
-      # Method currently not in use.
-      def encode_params(param_hash)
-        ((param_hash || {}).sort_by{|k, v| k.to_s}.collect do |key_and_value|
-           key_and_value[1] = MultiJson.dump(key_and_value[1]) unless key_and_value[1].is_a? String
-           "#{key_and_value[0].to_s}=#{CGI.escape key_and_value[1]}"
-        end).join("&")
-      end
-
-
       # Creates a Signature for Expedia using MD5 Checksum Auth.
       # Shared and Api keys are required for Signature along with the current utc time.
       def signature
         if Expedia.cid && Expedia.api_key && Expedia.shared_secret
-          Digest::MD5.hexdigest(Expedia.api_key+Expedia.shared_secret+Time.now.utc.to_i.to_s)
+          Digest::MD5.hexdigest(Expedia.api_key + Expedia.shared_secret + Time.now.utc.to_i.to_s)
         else
           raise Expedia::AuthCredentialsError, "cid, api_key and shared_secret are required for Expedia Authentication."
         end
       end
 
       # 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 }

data/lib/expedia/version.rb

@@ -1,3 +1,3 @@
 module Expedia
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/generators/templates/expedia.txt

@@ -4,5 +4,8 @@ Expedia.setup do |config|
 	config.shared_secret = 'your_shared_secret'
 	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 = 26 # between 4-26 as of July 2014. Default is 4. 26 being latest
+	config.minor_rev = 28 # between 4-28 as of Jan 2015. If not set, 4 is used by EAN.
+  # optional configurations...
+  config.timeout = 1 # read timeout in sec
+  config.open_timeout = 1 # connection timeout in sec
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expedia
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Zaid Akram
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.textile