booker_ruby 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbfd30226af31b9499a607d386cd7c311cb57148
-  data.tar.gz: 48a5cb542aa8b66dc4c5f459ff7f4c9c7ba37795
+  metadata.gz: c32d18a501108616082cfd6f1c4d9a9bb77c4acf
+  data.tar.gz: 1b518f4e5395d7a9221d34e36cb23c2cdcf42db5
 SHA512:
-  metadata.gz: 7a1a633bbc694abbd188920579c2916da443a68a36d17cb9f54084c21029e10803d99e69b4265925da6fba4054026707796ed73d95ba67ffd59727d96508eff3
-  data.tar.gz: d369adaa852672298b240f520bc5edd8df180a5e8f428e098a01dc1cff59934cd8fad282084be9f5da8d090df9dff460c507508088b0d55a4453662a63a394a5
+  metadata.gz: 5c8fe78924f6479548746e2b428b97beed68012a8f4baebd628c382dc1738d31a1294cfc63ad46a881967ca8487cdf52e38aa8b0e48ce4ff1fa8a356e8b11860
+  data.tar.gz: c3882ef8de57340214414ccdc1dd19605ea73c94ec1ba6e666fde98f4f910f1b1e9115e50c00a2bede580d692ff26c0ab6c9b6cfd66217e4d5ced3adbbf9c9be

data/lib/booker/business_rest.rb

@@ -15,6 +15,16 @@ module Booker
       Booker::Models::Location.from_hash(response)
     end
 
+    def get_location_day_schedules(booker_location_id:, params: {})
+      # Booker requires fromDate and toDate for JSON API, but does not use them when getDefaultDaySchedule is true
+      # So datetime used for these fields does not matter
+      random_datetime = Booker::Models::Model.time_to_booker_datetime(Time.now)
+
+      additional_params = {'getDefaultDaySchedule' => true, 'fromDate' => random_datetime, 'toDate' => random_datetime}
+      response = get("/location/#{booker_location_id}/schedule", build_params(additional_params, params))
+      response['LocationDaySchedules'].map { |sched| Booker::Models::LocationDaySchedule.from_hash(sched) }
+    end
+
     def find_locations(params: {})
       paginated_request(
           method: :post,

data/lib/booker/client.rb

@@ -65,12 +65,6 @@ module Booker
       end
     end
 
-    def log_issue(message, extra_info = {})
-      if (log_message_block = Booker.config[:log_message])
-        log_message_block.call(message, extra_info)
-      end
-    end
-
     def get_booker_resources(http_method, path, params=nil, body=nil, booker_model=nil)
       http_options = request_options(params, body)
       puts "BOOKER REQUEST: #{http_method} #{path} #{http_options}" if ENV['BOOKER_API_DEBUG'] == 'true'

data/lib/booker/helpers/active_support_helper.rb

@@ -0,0 +1,102 @@
+module Booker
+  module Helpers
+    module ActiveSupport
+      BOOKER_TO_ACTIVE_SUPPORT_TIMEZONE = {
+          '(GMT-12:00) International Date Line West' => 'International Date Line West',
+          '(GMT-11:00) Midway Island, Samoa' => 'Samoa',
+          '(GMT-10:00) Hawaii' => 'Hawaii',
+          '(GMT-09:00) Alaska' => 'Alaska',
+          '(GMT-08:00) Tijuana, Baja California' => 'Tijuana',
+          '(GMT-08:00) Pacific Time (US & Canada)' => 'Pacific Time (US & Canada)',
+          '(GMT-07:00) Chihuahua, La Paz, Mazatlan - New' => 'Chihuahua',
+          '(GMT-07:00) Arizona' => 'Arizona',
+          '(GMT-07:00) Mountain Time (US & Canada)' => 'Mountain Time (US & Canada)',
+          '(GMT-07:00) Chihuahua, La Paz, Mazatlan - Old' => 'Chihuahua',
+          '(GMT-06:00) Guadalajara, Mexico City, Monterrey - New' => 'Guadalajara',
+          '(GMT-06:00) Central Time (US & Canada)' => 'Central Time (US & Canada)',
+          '(GMT-06:00) Central America' => 'Central America',
+          '(GMT-06:00) Guadalajara, Mexico City, Monterrey - Old' => 'Guadalajara',
+          '(GMT-06:00) Saskatchewan' => 'Saskatchewan',
+          '(GMT-05:00) Bogota, Lima, Quito, Rio Branco' => 'Bogota',
+          '(GMT-05:00) Indiana (East)' => 'Indiana (East)',
+          '(GMT-05:00) Eastern Time (US & Canada)' => 'Eastern Time (US & Canada)',
+          '(GMT-04:00) Santiago' => 'Santiago',
+          '(GMT-04:00) Caracas, La Paz' => 'Caracas',
+          '(GMT-04:00) Atlantic Time (Canada)' => 'Atlantic Time (Canada)',
+          '(GMT-04:00) Manaus' => 'Atlantic Time (Canada)',
+          '(GMT-03:30) Newfoundland' => 'Newfoundland',
+          '(GMT-03:00) Brasilia' => 'Brasilia',
+          '(GMT-03:00) Greenland' => 'Greenland',
+          '(GMT-03:00) Montevideo' => 'Montevideo',
+          '(GMT-03:00) Buenos Aires, Georgetown' => 'Buenos Aires',
+          '(GMT-02:00) Mid-Atlantic' => 'Mid-Atlantic',
+          '(GMT-01:00) Cape Verde Is.' => 'Cape Verde Is.',
+          '(GMT-01:00) Azores' => 'Azores',
+          '(GMT) Casablanca, Monrovia, Reykjavik' => 'Casablanca',
+          '(GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London' => 'Dublin',
+          '(GMT+01:00) West Central Africa' => 'West Central Africa',
+          '(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb' => 'Sarajevo',
+          '(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna' => 'Amsterdam',
+          '(GMT+01:00) Brussels, Copenhagen, Madrid, Paris' => 'Brussels',
+          '(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague' => 'Belgrade',
+          '(GMT+02:00) Windhoek' => 'Harare',
+          '(GMT+02:00) Jerusalem' => 'Jerusalem',
+          '(GMT+02:00) Amman' => 'Jerusalem',
+          '(GMT+02:00) Beirut' => 'Jerusalem',
+          '(GMT+02:00) Harare, Pretoria' => 'Harare',
+          '(GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius' => 'Helsinki',
+          '(GMT+02:00) Cairo' => 'Cairo',
+          '(GMT+02:00) Minsk' => 'Minsk',
+          '(GMT+02:00) Athens, Bucharest, Istanbul' => 'Athens',
+          '(GMT+03:00) Moscow, St. Petersburg, Volgograd' => 'Moscow',
+          '(GMT+03:00) Nairobi' => 'Nairobi',
+          '(GMT+03:00) Kuwait, Riyadh' => 'Kuwait',
+          '(GMT+03:00) Tbilisi' => 'Tbilisi',
+          '(GMT+03:00) Baghdad' => 'Baghdad',
+          '(GMT+03:30) Tehran' => 'Tehran',
+          '(GMT+04:00) Caucasus Standard Time' => 'Yerevan',
+          '(GMT+04:00) Yerevan' => 'Yerevan',
+          '(GMT+04:00) Abu Dhabi, Muscat' => 'Abu Dhabi',
+          '(GMT+04:00) Baku' => 'Baku',
+          '(GMT+04:30) Kabul' => 'Kabul',
+          '(GMT+05:00) Ekaterinburg' => 'Ekaterinburg',
+          '(GMT+05:00) Islamabad, Karachi, Tashkent' => 'Islamabad',
+          '(GMT+05:30) Sri Jayawardenepura' => 'Sri Jayawardenepura',
+          '(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi' => 'Chennai',
+          '(GMT+05:45) Kathmandu' => 'Kathmandu',
+          '(GMT+06:00) Almaty, Novosibirsk' => 'Almaty',
+          '(GMT+06:00) Astana, Dhaka' => 'Astana',
+          '(GMT+06:30) Yangon (Rangoon)' => 'Rangoon',
+          '(GMT+07:00) Bangkok, Hanoi, Jakarta' => 'Bangkok',
+          '(GMT+07:00) Krasnoyarsk' => 'Krasnoyarsk',
+          '(GMT+08:00) Taipei' => 'Taipei',
+          '(GMT+08:00) Kuala Lumpur, Singapore' => 'Kuala',
+          '(GMT+08:00) Irkutsk, Ulaan Bataar' => 'Irkutsk',
+          '(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi' => 'Beijing',
+          '(GMT+08:00) Perth' => 'Perth',
+          '(GMT+09:00) Osaka, Sapporo, Tokyo' => 'Osaka',
+          '(GMT+09:00) Seoul' => 'Seoul',
+          '(GMT+09:00) Yakutsk' => 'Yakutsk',
+          '(GMT+09:30) Darwin' => 'Darwin',
+          '(GMT+09:30) Adelaide' => 'Adelaide',
+          '(GMT+10:00) Hobart' => 'Hobart',
+          '(GMT+10:00) Brisbane' => 'Brisbane',
+          '(GMT+10:00) Vladivostok' => 'Vladivostok',
+          '(GMT+10:00) Guam, Port Moresby' => 'Guam',
+          '(GMT+10:00) Canberra, Melbourne, Sydney' => 'Canberra',
+          '(GMT+11:00) Magadan, Solomon Is., New Caledonia' => 'Magadan',
+          '(GMT+12:00) Fiji, Kamchatka, Marshall Is.' => 'Fiji',
+          '(GMT+12:00) Auckland, Wellington' => 'Auckland',
+          "(GMT+13:00) Nuku'alofa" => "Nuku'alofa"
+      }.freeze
+
+      def self.to_active_support(booker_timezone_name)
+        BOOKER_TO_ACTIVE_SUPPORT_TIMEZONE[booker_timezone_name]
+      end
+
+      def self.booker_timezone_names
+        BOOKER_TO_ACTIVE_SUPPORT_TIMEZONE.keys
+      end
+    end
+  end
+end

data/lib/booker/helpers/logging_helper.rb

@@ -0,0 +1,11 @@
+module Booker
+  module Helpers
+    module LoggingHelper
+      def self.log_issue(message, extra_info = {})
+        if (log_message_block = Booker.config[:log_message])
+          log_message_block.call(message, extra_info)
+        end
+      end
+    end
+  end
+end

data/lib/booker/models/location_day_schedule.rb

@@ -0,0 +1,18 @@
+module Booker
+  module Models
+    class LocationDaySchedule < Model
+      attr_accessor 'Weekday',
+                    'StartTime',
+                    'EndTime'
+
+      def self.from_hash(hash)
+        model = super
+        model.Weekday = to_wday(model.Weekday)
+        strftime_format = '%T'
+        model.StartTime = model.StartTime.try(:strftime, strftime_format)
+        model.EndTime = model.EndTime.try(:strftime, strftime_format)
+        model
+      end
+    end
+  end
+end

data/lib/booker/models/model.rb

@@ -1,11 +1,8 @@
 module Booker
   module Models
     class Model
-
       def initialize(options = {})
-        options.each do |key, value|
-          send(:"#{key}=", value)
-        end
+        options.each { |key, value| send(:"#{key}=", value) }
       end
 
       def to_hash
@@ -29,9 +26,7 @@ module Booker
         hash
       end
 
-      def to_json
-        Oj.dump(to_hash, mode: :compat)
-      end
+      def to_json; Oj.dump(to_hash, mode: :compat); end
 
       def self.from_hash(hash)
         model = self.new
@@ -58,9 +53,7 @@ module Booker
         model
       end
 
-      def self.from_list(array)
-        array.map{|item| self.from_hash(item)}
-      end
+      def self.from_list(array); array.map { |item| self.from_hash(item) }; end
 
       def self.constantize(key)
         begin
@@ -105,8 +98,42 @@ module Booker
         "/Date(#{timestamp})/"
       end
 
-      private
+      def self.timezone_from_booker_timezone(booker_timezone_name)
+        normalized_booker_timezone_name = Booker::Helpers::ActiveSupport.to_active_support(booker_timezone_name)
+        return normalized_booker_timezone_name if normalized_booker_timezone_name.present?
+
+        begin
+          Booker::Helpers::LoggingHelper.log_issue(
+              'Unable to find time zone name using Booker::Helpers::ActiveSupport.to_active_support',
+              booker_timezone_name: booker_timezone_name
+          )
+        rescue
+        end
+
+        timezone_from_booker_offset!(booker_timezone_name)
+      end
+
+      def self.timezone_from_booker_offset!(booker_timezone_name)
+        booker_offset_match = booker_timezone_name.scan(/(\A)(.*)(?=\))/).first
 
+        if booker_offset_match.present?
+          booker_offset = booker_offset_match.delete_if { |match| match.blank? }.first
+
+          if booker_offset
+            booker_timezone_map_key = Booker::Helpers::ActiveSupport.booker_timezone_names.find do |key|
+              key.start_with?(booker_offset)
+            end
+
+            return Booker::Helpers::ActiveSupport.to_active_support(booker_timezone_map_key) if booker_timezone_map_key
+          end
+        end
+
+        raise Booker::Error
+      end
+
+      def self.to_wday(booker_wday); Date.parse(booker_wday).wday; end
+
+      private
         def hash_list(array)
           array.map do |item|
             if item.is_a? Array

data/lib/booker/version.rb

@@ -1,3 +1,3 @@
 module Booker
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/lib/booker_ruby.rb

@@ -69,6 +69,7 @@ require 'booker/models/available_time'
 require 'booker/models/class_instance'
 require 'booker/models/online_booking_settings'
 require 'booker/models/user'
+require 'booker/models/location_day_schedule'
 
 # Base Client
 require 'booker/client'
@@ -84,3 +85,7 @@ require 'booker/generic_token_store'
 # Client Subclasses
 require 'booker/business_client'
 require 'booker/customer_client'
+
+# Helpers
+require 'booker/helpers/logging_helper'
+require 'booker/helpers/active_support_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booker_ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Frederick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -124,6 +124,8 @@ files:
 - lib/booker/customer_rest.rb
 - lib/booker/errors.rb
 - lib/booker/generic_token_store.rb
+- lib/booker/helpers/active_support_helper.rb
+- lib/booker/helpers/logging_helper.rb
 - lib/booker/models/address.rb
 - lib/booker/models/appointment.rb
 - lib/booker/models/appointment_treatment.rb
@@ -142,6 +144,7 @@ files:
 - lib/booker/models/final_total.rb
 - lib/booker/models/gender.rb
 - lib/booker/models/location.rb
+- lib/booker/models/location_day_schedule.rb
 - lib/booker/models/model.rb
 - lib/booker/models/online_booking_settings.rb
 - lib/booker/models/original_price.rb