zumata 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d78ff8033bb65e030d681e5fa615bddac28c5eb3
-  data.tar.gz: afaf5d0ad9ca769b3f895c23d4c74a2bda98a5c6
+  metadata.gz: fae9db9329572abb06c48e7e61ae5731ba87983a
+  data.tar.gz: 56cf1d78d47d19c41ab232af68ee75e12b6193ad
 SHA512:
-  metadata.gz: f0474a4eb7dda8af7f083e17b6f63b108d3f8e560e3347560b407c288ff534aca2c43c9cf8cb6a20125789373c7857551ad1103e5f687a5dc50a2d5e226d4dcc
-  data.tar.gz: 9d17d7d5822d84c5ea2c7f3b0de0cd8de0ad18cb6a82b6156787537463c0f2547bd80e5e82f6f17dfd2c1e15df3e1ecd8ce3c248b8b12875843113bfbff951f3
+  metadata.gz: 1a4e2243b8d2ec44e4ca8eec597127566ecbae9314624c29a7c05a3686f066da7d845a9686f3a0a6a20578ccc218362b493efb00abb3bb9581f087cd31e8446c
+  data.tar.gz: b70e448b490ec57c7db72f243e4d39dcb1d188c5af7d2ef4fb39ef4ee5b6179eca7d86977d632cba555e38c1d6f88550a9a5e6627431e88bbf37a94ab537df4a

data/lib/zumata/client.rb

@@ -9,19 +9,21 @@ module Zumata
   class Client
   	include HTTParty
 
-    raise Zumata::ClientConfigError unless ENV["ZUMATA_API_URL"]
-    base_uri ENV["ZUMATA_API_URL"]
-
-    def initialize api_key
-      @api_key = api_key
+    def initialize opts={}
+      raise Zumata::ClientConfigError.new("No API URL configured") if Zumata.configuration.nil? || Zumata.configuration.api_url == ''
+      @api_url = Zumata.configuration.api_url
+      @api_key = opts[:api_key] unless opts[:api_key].nil?
       @timeout = 600
     end
 
+    def get_api_key
+      @api_key || Zumata.configuration.api_key
+    end
 
     # GET /search
   	def search_by_destination destination, opts={}
 
-      q = { api_key: opts[:api_key] || @api_key,
+      q = { api_key: opts[:api_key] || get_api_key,
             destination: destination,
             rooms: opts[:rooms] || 1,
             adults: opts[:adults] || 2,
@@ -36,7 +38,7 @@ module Zumata
       q[:lang]     = opts[:lang] if opts[:lang]
       q[:timeout]  = opts[:timeout] if opts[:timeout]
       
-      res = self.class.get("/search", query: q).response
+      res = self.class.get("#{@api_url}/search", query: q).response
 
       # todo - handle errors from search
       Zumata::GenericResponse.new(context: q, code: res.code.to_i, body: res.body)
@@ -50,12 +52,12 @@ module Zumata
       # raise InvalidRequestError unless valid_guest_params?(guest)
       # raise InvalidRequestError unless valid_payment_params?(payment)
       
-      body_params = { api_key: opts[:api_key] || @api_key,
+      body_params = { api_key: opts[:api_key] || get_api_key,
                       booking_key: booking_key,
                       guest: guest,
                       payment: payment }
       
-      res = self.class.post("/book", body: body_params.to_json, headers: { 'Content-Type' => 'application/json' }, timeout: @timeout)
+      res = self.class.post("#{@api_url}/book", body: body_params.to_json, headers: { 'Content-Type' => 'application/json' }, timeout: @timeout)
 
       status_code = res.code.to_i
       raise Zumata::GeneralError, res.body unless VALID_STATUS_CODES.include?(status_code)

data/lib/zumata/config.rb

@@ -0,0 +1,20 @@
+module Zumata
+  class << self
+    attr_accessor :configuration
+  end
+ 
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration)
+  end
+ 
+  class Configuration
+    attr_accessor :api_url, :api_key
+ 
+    def initialize
+      @api_url = ''
+      @api_key = nil
+    end
+  end
+end
+

data/lib/zumata/version.rb

@@ -1,3 +1,3 @@
 module Zumata
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/zumata.rb

@@ -1,4 +1,5 @@
 require "zumata/version"
+require "zumata/config"
 require "zumata/responses"
 require "zumata/errors"
 require "zumata/client"

data/spec/zumata_spec.rb

@@ -4,11 +4,19 @@ require './lib/zumata'
 
 describe "Zumata::Client" do
 
+  vcr_recorded_checkin = '11/15/2014'
+  vcr_recorded_checkout = '11/16/2014'
+
   raise Zumata::TestConfigError unless ENV["ZUMATA_API_KEY"]
-  sample_api_key = ENV["ZUMATA_API_KEY"]
 
   before(:each) do
-    @client = Zumata::Client.new(sample_api_key)
+
+    Zumata.configure do |config|
+      config.api_url = ENV["ZUMATA_API_URL"]
+      config.api_key = ENV["ZUMATA_API_KEY"]
+    end
+
+    @client = Zumata::Client.new
   end
 
   describe "search_by_destination" do
@@ -17,7 +25,7 @@ describe "Zumata::Client" do
     	
       # note - when recording the cassette this requires a cached search w/ results to exist
       destination_id = "f75a8cff-c26e-4603-7b45-1b0f8a5aa100" # Singapore
-      results = @client.search_by_destination destination_id
+      results = @client.search_by_destination destination_id, {checkin: vcr_recorded_checkin, checkout: vcr_recorded_checkout}
     	data = JSON.parse(results.body)
       expect(data["searchCompleted"]).to_not be(nil)
       expect(data["content"]["hotels"].length).to be > 0
@@ -89,7 +97,7 @@ describe "Zumata::Client" do
       
       destination_id = "53d32e78-c548-42af-5236-fb89e0977722" # Barcelona
       results = VCR.use_cassette('search_by_destination_done_2', :record => :new_episodes) do
-        @client.search_by_destination destination_id
+        @client.search_by_destination destination_id, {checkin: vcr_recorded_checkin, checkout: vcr_recorded_checkout}
       end
       
       data = JSON.parse(results.body)
@@ -112,7 +120,7 @@ describe "Zumata::Client" do
 
       destination_id = "f75a8cff-c26e-4603-7b45-1b0f8a5aa100" # Singapore
       results = VCR.use_cassette('search_by_destination_done', :record => :new_episodes) do
-        @client.search_by_destination(destination_id)
+        @client.search_by_destination(destination_id, {checkin: vcr_recorded_checkin, checkout: vcr_recorded_checkout})
       end
       
       data = JSON.parse(results.body)
@@ -134,7 +142,7 @@ describe "Zumata::Client" do
       
       destination_id = "f75a8cff-c26e-4603-7b45-1b0f8a5aa100" # Singapore
       results = VCR.use_cassette('search_by_destination_done', :record => :new_episodes) do
-        @client.search_by_destination destination_id
+        @client.search_by_destination destination_id, {checkin: vcr_recorded_checkin, checkout: vcr_recorded_checkout}
       end
       
       data = JSON.parse(results.body)
@@ -154,7 +162,7 @@ describe "Zumata::Client" do
       
       destination_id = "53d32e78-c548-42af-5236-fb89e0977722" # Barcelona
       results = VCR.use_cassette('search_by_destination_done_2', :record => :new_episodes) do
-        @client.search_by_destination destination_id
+        @client.search_by_destination destination_id, {checkin: vcr_recorded_checkin, checkout: vcr_recorded_checkout}
       end
       
       data = JSON.parse(results.body)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zumata
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jonathan Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - Rakefile
 - lib/zumata.rb
 - lib/zumata/client.rb
+- lib/zumata/config.rb
 - lib/zumata/errors.rb
 - lib/zumata/responses.rb
 - lib/zumata/version.rb