booker_ruby 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe34d270528f43c6e9f7042e52acacd647ed41c03f128cb4ab006886bc48517e
-  data.tar.gz: f24db743158b86adf93196b95477046afc6fe8d3e91bf16ebe2428dfb4d8660c
+  metadata.gz: 2c591cf33e4fcc339c3c5669f087b08f201af8ed51c5fa6720904a8e333306a7
+  data.tar.gz: 792f3c94f166f069a13738552171faf32e1227ed5e48a0da7d59e6f3b9d3f652
 SHA512:
-  metadata.gz: f55fe8d9cc783ae561add8bf19c75dffb6f1d8401bef31e530c81f9dd8299f036281fc27256bc15c48620434512b17470ebf2667ab606a470663b83a5161fe31
-  data.tar.gz: addafb0b13725dc1876f58b4233dca0095883e42d1b22c1bb816aa5e9208cf03fac70e49f0f10506056fb83f6597d32970924358e68ca54ea6fa89c152f652ea
+  metadata.gz: 7d02cde048331d194864cecbe0b04a3eb0231fc9a13b688727322e8db17e26d96dfa7bf6068fb2968b5affb7bec4112d2145665e089ca8b5eff746b3f810a967
+  data.tar.gz: 96973ce4f0f119092bf48dd1f19831f41538e41c4f6e28459f1c26ad034d3f6605b2de7627f825430fab59532031d9192e0c0a90435f8119492a24b3691b22a4

data/lib/booker/client.rb

@@ -1,5 +1,7 @@
 module Booker
   class Client
+    include Booker::RequestHelper
+
     attr_accessor :base_url, :auth_base_url, :client_id, :client_secret, :temp_access_token,
                   :temp_access_token_expires_at, :token_store, :token_store_callback_method, :api_subscription_key,
                   :access_token_scope, :refresh_token, :location_id, :auth_with_client_credentials
@@ -70,6 +72,12 @@ module Booker
       build_resources(booker_resources, booker_model)
     end
 
+    def patch(path, data, booker_model=nil)
+      booker_resources = get_booker_resources(:patch, path, nil, data.to_json, booker_model)
+
+      build_resources(booker_resources, booker_model)
+    end
+
     def delete(path, params=nil, body=nil, booker_model=nil)
       booker_resources = get_booker_resources(:delete, path, params, body.to_json, booker_model)
 

data/lib/booker/concerns/date_time_concern.rb

@@ -0,0 +1,74 @@
+module Booker
+  module Concerns
+    module DateTimeConcern
+      # Booker's API hands you back all time as if the business is in server time.
+      # First load the time in server time, then return the same hours and minutes in current time zone.
+      def time_from_booker_datetime(booker_datetime)
+        timestamp = booker_datetime[/\/Date\((.\d+)[\-\+]/, 1].to_i / 1000.to_f
+
+        original_tz = Time.zone
+        begin
+          # Booker's server is always EST
+          Time.zone = Booker::Client::BOOKER_SERVER_TIMEZONE
+
+          booker_time = Time.zone.at(timestamp)
+        ensure
+          Time.zone = original_tz
+        end
+
+        # Convert it back to location time without changing hours and minutes
+        Time.zone.parse(booker_time.strftime('%Y-%m-%d %H:%M:%S'))
+      end
+
+      # Booker's API requires times to be sent in as if the business is in Eastern Time!
+      def time_to_booker_datetime(time)
+        original_tz = Time.zone
+
+        begin
+          # Booker's server is always EST
+          Time.zone = Booker::Client::BOOKER_SERVER_TIMEZONE
+          timestamp = (Time.zone.parse(time.strftime("%Y-%m-%dT%H:%M:%S")).to_f * 1000).to_i
+        ensure
+          Time.zone = original_tz
+        end
+
+        "/Date(#{timestamp})/"
+      end
+
+      def 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 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 to_wday(booker_wday); Date.parse(booker_wday).wday; end
+    end
+  end
+end

data/lib/booker/request_helper.rb

@@ -0,0 +1,29 @@
+module Booker
+  module RequestHelper
+    DEFAULT_PAGINATION_PARAMS = {
+        UsePaging: true,
+        PageSize: Integer(ENV['BOOKER_DEFAULT_PAGE_SIZE'] || 10),
+        PageNumber: 1
+    }
+
+    def build_params(default_params={}, overrides={}, paginated=false)
+      default_params.symbolize_keys!
+      overrides.symbolize_keys!
+      merged = {access_token: access_token}.merge(default_params.merge(overrides))
+
+      merged.each do |k, v|
+        if v.is_a?(Time) || v.is_a?(DateTime)
+          merged[k] = Booker::V4::Models::Model.time_to_booker_datetime(v)
+        elsif v.is_a?(Date)
+          merged[k] = Booker::V4::Models::Model.time_to_booker_datetime(v.in_time_zone)
+        end
+      end
+
+      if paginated
+        DEFAULT_PAGINATION_PARAMS.merge(merged)
+      else
+        merged
+      end
+    end
+  end
+end

data/lib/booker/v4.1/customer.rb

@@ -1,7 +1,7 @@
 module Booker
   module V41
     class Customer < Booker::Client
-      include Booker::V4::RequestHelper
+      include ::Booker::RequestHelper
 
       V41_PREFIX = '/v4.1/customer'
       V41_APPOINTMENTS_PREFIX = "#{V41_PREFIX}/appointment"

data/lib/booker/v4.1/merchant.rb

@@ -1,7 +1,7 @@
 module Booker
   module V41
     class Merchant < Booker::Client
-      include Booker::V4::RequestHelper
+      include ::Booker::RequestHelper
 
       V41_PREFIX = '/v4.1/merchant'
       V41_LOCATION_PREFIX = "#{V41_PREFIX}/location"

data/lib/booker/v4/business_rest.rb

@@ -2,6 +2,7 @@ module Booker
   module V4
     module BusinessREST
       include Booker::V4::CommonREST
+      include ::Booker::RequestHelper
 
       def get_logged_in_user
         response = get('/user', build_params)

data/lib/booker/v4/common_rest.rb

@@ -1,7 +1,7 @@
 module Booker
   module V4
     module CommonREST
-      include Booker::V4::RequestHelper
+      include ::Booker::RequestHelper
 
       def get_online_booking_settings(booker_location_id:)
         response = get("/location/#{booker_location_id}/online_booking_settings", build_params)

data/lib/booker/v4/models/model.rb

@@ -2,76 +2,10 @@ module Booker
   module V4
     module Models
       class Model < Booker::Model
-        CONSTANTIZE_MODULE = Booker::V4::Models
-
-        # Booker's API hands you back all time as if the business is in server time.
-        # First load the time in server time, then return the same hours and minutes in current time zone.
-        def self.time_from_booker_datetime(booker_datetime)
-          timestamp = booker_datetime[/\/Date\((.\d+)[\-\+]/, 1].to_i / 1000.to_f
-
-          original_tz = Time.zone
-          begin
-            # Booker's server is always EST
-            Time.zone = Booker::Client::BOOKER_SERVER_TIMEZONE
-
-            booker_time = Time.zone.at(timestamp)
-          ensure
-            Time.zone = original_tz
-          end
-
-          # Convert it back to location time without changing hours and minutes
-          Time.zone.parse(booker_time.strftime('%Y-%m-%d %H:%M:%S'))
-        end
-
-        # Booker's API requires times to be sent in as if the business is in Eastern Time!
-        def self.time_to_booker_datetime(time)
-          original_tz = Time.zone
-
-          begin
-            # Booker's server is always EST
-            Time.zone = Booker::Client::BOOKER_SERVER_TIMEZONE
-            timestamp = (Time.zone.parse(time.strftime("%Y-%m-%dT%H:%M:%S")).to_f * 1000).to_i
-          ensure
-            Time.zone = original_tz
-          end
-
-          "/Date(#{timestamp})/"
-        end
+        extend ::Booker::Concerns::DateTimeConcern
 
-        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
+        CONSTANTIZE_MODULE = Booker::V4::Models
 
-        def self.to_wday(booker_wday); Date.parse(booker_wday).wday; end
       end
     end
   end

data/lib/booker/v4/request_helper.rb

@@ -1,33 +1,7 @@
 module Booker
   module V4
     module RequestHelper
-      DEFAULT_PAGINATION_PARAMS = {
-        UsePaging: true,
-        PageSize: Integer(ENV['BOOKER_DEFAULT_PAGE_SIZE'] || 10),
-        PageNumber: 1
-      }
-
-      private
-
-      def build_params(default_params={}, overrides={}, paginated=false)
-        default_params.symbolize_keys!
-        overrides.symbolize_keys!
-        merged = {access_token: access_token}.merge(default_params.merge(overrides))
-
-        merged.each do |k, v|
-          if v.is_a?(Time) || v.is_a?(DateTime)
-            merged[k] = Booker::V4::Models::Model.time_to_booker_datetime(v)
-          elsif v.is_a?(Date)
-            merged[k] = Booker::V4::Models::Model.time_to_booker_datetime(v.in_time_zone)
-          end
-        end
-
-        if paginated
-          DEFAULT_PAGINATION_PARAMS.merge(merged)
-        else
-          merged
-        end
-      end
+      
     end
   end
 end

data/lib/booker/v5/availability.rb

@@ -1,6 +1,8 @@
 module Booker
   module V5
     class Availability < Booker::Client
+      include ::Booker::RequestHelper
+
       API_METHODS = {
         availability: '/v5/availability/availability'.freeze,
         two_day_availability: '/v5/availability/2day'.freeze,

data/lib/booker/version.rb

@@ -1,3 +1,3 @@
 module Booker
-  VERSION = '3.3.5'
+  VERSION = '3.3.6'
 end

data/lib/booker_ruby.rb

@@ -16,6 +16,10 @@ require 'booker/booker'
 # Errors
 require 'booker/errors'
 
+# Concerns
+require 'booker/concerns/date_time_concern'
+require 'booker/request_helper'
+
 # Models
 require 'booker/model'
 
@@ -23,6 +27,7 @@ require 'booker/model'
 require 'booker/v4/models/model'
 
 # Types
+require 'booker/v4/request_helper'
 require 'booker/v4/models/type'
 require 'booker/v4/models/country'
 require 'booker/v4/models/status'
@@ -95,7 +100,6 @@ require 'booker/v5/models/availability_result'
 require 'booker/client'
 
 # V4 Rest
-require 'booker/v4/request_helper'
 require 'booker/v4/common_rest'
 require 'booker/v4/business_rest'
 require 'booker/v4/customer_rest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booker_ruby
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - Frederick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -145,12 +145,14 @@ extra_rdoc_files: []
 files:
 - lib/booker/booker.rb
 - lib/booker/client.rb
+- lib/booker/concerns/date_time_concern.rb
 - lib/booker/config/booker_country_ids_to_iso_codes.yml
 - 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/model.rb
+- lib/booker/request_helper.rb
 - lib/booker/v4.1/customer.rb
 - lib/booker/v4.1/merchant.rb
 - lib/booker/v4/business_client.rb