booker_ruby 2.0.1 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87db655244e8a3abee83ad556cb641aff2818d0b
-  data.tar.gz: f0c48b980e92c9bd07a0d3cb38b7d384b64cf6ed
+  metadata.gz: 041d3e240d6256924589eb8f528409e6f9f96231
+  data.tar.gz: bc4db79ffab85ef87d604e925bb76299c7b9f1b9
 SHA512:
-  metadata.gz: 4ba399916add74a931efdd44d0dc63a8a36ed701c756ff20311c6fee05814705379d9f2791850b78927f03665ecaa332208902980aaab4b1074fd7d6d1af76ff
-  data.tar.gz: 2d8a1cdf8ddae105c626ed74ce401833c5030251ee88d84d91da62892f380573c2b90c425cb2e5a54c2a2a4d720801ed0cdf0640dadf19e1c3a3aeb385b0655b
+  metadata.gz: 26541378dc2c8760039e63781589b6f10da16f72a975cfbc1077ba08a487df0147fc71041de142ced765aac5e5c7b050778c75b58ea9b2d57d9b7fa1ba5c573b
+  data.tar.gz: b6d81407d710bba52fbe5b7cc5a435f9da93767ea4e32f09a6fe2585f790096a29592711b8b0c7316c8c24e43a5929b3e0c9246cf8cd712277f43a70b21e32d8

data/lib/booker/client.rb

@@ -212,7 +212,8 @@ module Booker
           'Content-Type' => CREATE_TOKEN_CONTENT_TYPE,
           'Ocp-Apim-Subscription-Key' => self.api_subscription_key
         },
-        body: body.to_query
+        body: body.to_query,
+        timeout: 30
       }
 
       url = "#{self.auth_base_url}#{CREATE_TOKEN_PATH}"
@@ -237,7 +238,7 @@ module Booker
         query: {
           locationId: location_id
         },
-        open_timeout: 120
+        timeout: 30
       }
       url = "#{self.auth_base_url}#{UPDATE_TOKEN_CONTEXT_PATH}"
 
@@ -262,7 +263,8 @@ module Booker
             'Authorization' => "Bearer #{access_token}",
             'Ocp-Apim-Subscription-Key' => self.api_subscription_key
           },
-          open_timeout: 120
+          open_timeout: 120,
+          read_timeout: 300
         }
 
         options[:body] = body if body.present?

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

@@ -7,14 +7,14 @@ module Booker
         class_availability: '/v4.1/availability/availability/class'.freeze
       }.freeze
 
-      def class_availability(location_id:, from_start_date_time:, to_start_date_time:, options: {})
+      def class_availability(location_id:, from_start_date_time:, to_start_date_time:, params: {})
         post API_METHODS[:class_availability], build_params({
           FromStartDateTime: from_start_date_time,
           LocationID: location_id,
           OnlyIfAvailable: true,
           ToStartDateTime: to_start_date_time,
           ExcludeClosedDates: true
-        }, options), Booker::V4::Models::ClassInstance
+        }, params), Booker::V4::Models::ClassInstance
       end
     end
   end

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

@@ -3,43 +3,54 @@ module Booker
     class Booking < Booker::Client
       include Booker::V4::RequestHelper
 
+      V41_PREFIX = '/v4.1/booking'
+      V41_APPOINTMENTS_PREFIX = "#{V41_PREFIX}/appointment"
       API_METHODS = {
-        appointment: '/v4.1/booking/appointment'.freeze,
-        cancel_appointment: '/v4.1/booking/appointment/cancel'.freeze,
-        create_appointment: '/v4.1/booking/appointment/create'.freeze,
-        appointment_hold: '/v4.1/booking/appointment/hold'.freeze,
-        employees: '/v4.1/booking/employees'.freeze,
-        services: '/v4.1/booking/services'.freeze,
-        location: '/v4.1/booking/location'.freeze,
-        locations: '/v4.1/booking/locations'.freeze
+        appointment: "#{V41_APPOINTMENTS_PREFIX}".freeze,
+        cancel_appointment: "#{V41_APPOINTMENTS_PREFIX}/cancel".freeze,
+        create_appointment: "#{V41_APPOINTMENTS_PREFIX}/create".freeze,
+        create_class_appointment: "#{V41_PREFIX}/class_appointment/create".freeze,
+        appointment_hold: "#{V41_APPOINTMENTS_PREFIX}/hold".freeze,
+        employees: "#{V41_PREFIX}/employees".freeze,
+        services: "#{V41_PREFIX}/services".freeze,
+        location: "#{V41_PREFIX}/location".freeze,
+        locations: "#{V41_PREFIX}/locations".freeze
       }.freeze
 
       def appointment(id:)
         get "#{API_METHODS[:appointment]}/#{id}", build_params, Booker::V4::Models::Appointment
       end
 
-      def cancel_appointment(id:, options:{})
-        put API_METHODS[:cancel_appointment], build_params({ID: id}, options), Booker::V4::Models::Appointment
+      def cancel_appointment(id:, params: {})
+        put API_METHODS[:cancel_appointment], build_params({ID: id}, params), Booker::V4::Models::Appointment
       end
 
-      def create_appointment(location_id:, available_time:, customer:, options: {})
+      def create_class_appointment(location_id:, class_instance_id:, customer:, params: {})
+        post API_METHODS[:create_class_appointment], build_params({
+                                                         LocationID: location_id,
+                                                         ClassInstanceID: class_instance_id,
+                                                         Customer: customer
+                                                       }, params), Booker::V4::Models::Appointment
+      end
+
+      def create_appointment(location_id:, available_time:, customer:, params: {})
         post API_METHODS[:create_appointment], build_params({
           LocationID: location_id,
           ItineraryTimeSlotList: [
             TreatmentTimeSlots: [available_time]
           ],
           Customer: customer
-        }, options), Booker::V4::Models::Appointment
+        }, params), Booker::V4::Models::Appointment
       end
 
-      def create_appointment_hold(location_id:, available_time:, customer:, options: {})
+      def create_appointment_hold(location_id:, available_time:, customer:, params: {})
         post API_METHODS[:appointment_hold], build_params({
           LocationID: location_id,
           ItineraryTimeSlot: {
             TreatmentTimeSlots: [available_time]
           },
           Customer: customer
-        }, options)
+        }, params)
       end
 
       def delete_appointment_hold(location_id:, incomplete_appointment_id:)
@@ -49,11 +60,11 @@ module Booker
         })
       end
 
-      def employees(location_id:, fetch_all: true, options: {})
+      def employees(location_id:, fetch_all: true, params: {})
         paginated_request(
           method: :post,
           path: API_METHODS[:employees],
-          params: build_params({LocationID: location_id}, options, true),
+          params: build_params({LocationID: location_id}, params, true),
           model: Booker::V4::Models::Employee,
           fetch_all: fetch_all
         )
@@ -64,11 +75,11 @@ module Booker
         Booker::V4::Models::Location.from_hash(response)
       end
 
-      def locations(options: {})
+      def locations(params: {})
         paginated_request(
           method: :post,
           path: API_METHODS[:locations],
-          params: build_params({}, options, true),
+          params: build_params({}, params, true),
           model: Booker::V4::Models::Location
         )
       end

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

@@ -3,13 +3,91 @@ module Booker
     class Merchant < Booker::Client
       include Booker::V4::RequestHelper
 
+      V41_PREFIX = '/v4.1/merchant'
+      V41_LOCATION_PREFIX = "#{V41_PREFIX}/location"
+      V41_APPOINTMENTS_PREFIX = "#{V41_PREFIX}/appointments"
       API_METHODS = {
-        appointments: '/v4.1/merchant/appointments'.freeze,
-        customers: '/v4.1/merchant/customers'.freeze,
-        create_special: '/v4.1/merchant/special'.freeze
+        appointments: "#{V41_APPOINTMENTS_PREFIX}".freeze,
+        appointments_partial: "#{V41_APPOINTMENTS_PREFIX}/partial".freeze,
+        appointment_confirm: "#{V41_PREFIX}/appointment/confirm".freeze,
+        customers: "#{V41_PREFIX}/customers".freeze,
+        create_special: "#{V41_PREFIX}/special".freeze,
+        employees: "#{V41_PREFIX}/employees".freeze,
+        treatments: "#{V41_PREFIX}/treatments".freeze,
       }.freeze
 
-      def appointments(location_id:, start_date:, end_date:, fetch_all: true, options: {})
+      def online_booking_settings(location_id:)
+        path = "#{V41_LOCATION_PREFIX}/#{location_id}/online_booking_settings"
+        response = get path, build_params
+        Booker::V4::Models::OnlineBookingSettings.from_hash(response['OnlineBookingSettings'])
+      end
+
+      def location_feature_settings(location_id:)
+        response = get "#{V41_LOCATION_PREFIX}/#{location_id}/feature_settings", build_params
+        Booker::V4::Models::FeatureSettings.from_hash response['FeatureSettings']
+      end
+
+      def location_day_schedules(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::V4::Models::Model.time_to_booker_datetime(Time.now)
+
+        additional_params = {getDefaultDaySchedule: true, fromDate: random_datetime, toDate: random_datetime}
+        response = get("#{V41_LOCATION_PREFIX}/#{location_id}/schedule", build_params(additional_params, params))
+        response['LocationDaySchedules'].map { |sched| Booker::V4::Models::LocationDaySchedule.from_hash(sched) }
+      end
+
+      def update_location_notification_settings(location_id:, send_appointment_reminders:)
+        params = build_params({NotificationSettings: { SendAppointmentReminders: send_appointment_reminders } })
+        put "#{V41_LOCATION_PREFIX}/#{location_id}/notification_settings", params
+      end
+
+      def confirm_appointment(appointment_id:)
+        put API_METHODS[:appointment_confirm], build_params(ID: appointment_id), Booker::V4::Models::Appointment
+      end
+
+      def appointments_partial(location_id:, start_date:, end_date:, fetch_all: true, params: {})
+        additional_params = {
+          LocationID: location_id,
+          FromStartDate: start_date.to_date,
+          ToStartDate: end_date.to_date
+        }
+
+        paginated_request(
+          method: :post,
+          path: API_METHODS[:appointments_partial],
+          params: build_params(additional_params, params, true),
+          model: Booker::V4::Models::Appointment,
+          fetch_all: fetch_all
+        )
+      end
+
+      def employees(location_id:, fetch_all: true, params: {})
+        paginated_request(
+          method: :post,
+          path: API_METHODS[:employees],
+          params: build_params({LocationID: location_id}, params, true),
+          model: Booker::V4::Models::Employee,
+          fetch_all: fetch_all
+        )
+      end
+
+      def treatments(location_id:, fetch_all: true, params: {})
+        paginated_request(
+          method: :post,
+          path: API_METHODS[:treatments],
+          params: build_params({ LocationID: location_id }, params, true),
+          model: Booker::V4::Models::Treatment,
+          fetch_all: fetch_all
+        )
+      end
+
+      def location(id:)
+        response = get("#{V41_LOCATION_PREFIX}/#{id}", build_params)
+        Booker::V4::Models::Location.from_hash(response)
+      end
+
+      def appointments(location_id:, start_date:, end_date:, fetch_all: true, params: {})
         additional_params = {
           LocationID: location_id,
           FromStartDate: start_date.to_date,
@@ -19,13 +97,13 @@ module Booker
         paginated_request(
           method: :post,
           path: API_METHODS[:appointments],
-          params: build_params(additional_params, options, true),
+          params: build_params(additional_params, params, true),
           model: Booker::V4::Models::Appointment,
           fetch_all: fetch_all
         )
       end
 
-      def customers(location_id:, fetch_all: true, options: {})
+      def customers(location_id:, fetch_all: true, params: {})
         additional_params = {
           FilterByExactLocationID: true,
           LocationID: location_id,
@@ -35,20 +113,20 @@ module Booker
         paginated_request(
           method: :post,
           path: API_METHODS[:customers],
-          params: build_params(additional_params, options, true),
+          params: build_params(additional_params, params, true),
           model: Booker::V4::Models::Customer,
           fetch_all: fetch_all
         )
       end
 
-      def create_special(location_id:, start_date:, end_date:, coupon_code:, name:, options: {})
+      def create_special(location_id:, start_date:, end_date:, coupon_code:, name:, params: {})
         post(API_METHODS[:create_special], build_params({
           LocationID: location_id,
           ApplicableStartDate: start_date.in_time_zone,
           ApplicableEndDate: end_date.in_time_zone,
           CouponCode: coupon_code,
           Name: name
-        }, options))
+        }, params))
       end
     end
   end

data/lib/booker/v4/common_rest.rb

@@ -9,7 +9,7 @@ module Booker
       end
 
       def confirm_appointment(appointment_id:)
-        put '/appointment/confirm', build_params(:ID => appointment_id), Booker::V4::Models::Appointment
+        put '/appointment/confirm', build_params(ID: appointment_id), Booker::V4::Models::Appointment
       end
 
       def get_location(booker_location_id:)

data/lib/booker/v5/availability.rb

@@ -8,7 +8,7 @@ module Booker
         thirty_day_availability: '/v5/availability/30day'.freeze
       }.freeze
 
-      def availability(location_ids:, from_date_time:, to_date_time:, include_employees: true)
+      def search(location_ids:, from_date_time:, to_date_time:, include_employees: true)
         get API_METHODS[:availability], {
           locationIds: location_ids,
           fromDateTime: from_date_time,
@@ -17,7 +17,7 @@ module Booker
         }, Booker::V5::Models::AvailabilityResult
       end
 
-      def one_day_availability(location_id:, from_date_time:, include_employees: true)
+      def one_day(location_id:, from_date_time:, include_employees: true)
         get API_METHODS[:one_day_availability], {
           locationId: location_id,
           fromDateTime: from_date_time,
@@ -25,7 +25,7 @@ module Booker
         }, Booker::V5::Models::AvailabilityResult
       end
 
-      def two_day_availability(location_id:, from_date_time:, include_employees: true)
+      def two_day(location_id:, from_date_time:, include_employees: true)
         get API_METHODS[:two_day_availability], {
           locationId: location_id,
           fromDateTime: from_date_time,
@@ -33,7 +33,7 @@ module Booker
         }, Booker::V5::Models::AvailabilityResult
       end
 
-      def thirty_day_availability(location_id:, from_date_time:, include_employees: true)
+      def thirty_day(location_id:, from_date_time:, include_employees: true)
         get API_METHODS[:thirty_day_availability], {
           locationId: location_id,
           fromDateTime: from_date_time,

data/lib/booker/version.rb

@@ -1,3 +1,3 @@
 module Booker
-  VERSION = '2.0.1'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booker_ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.1
 platform: ruby
 authors:
 - Frederick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty