cronofy 0.31.1 → 0.31.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b29b7a7d74bfeb8effadc79dc1b7db32c55666189bf3cd6a752ee472cf2fef
-  data.tar.gz: 944c20303ab4e950dd6a9fc69e087dff461f50be68a68a2ca97556821529113f
+  metadata.gz: 2ac0a6d45f99b6fc43669a1c8bfae0ae9c040d05ca200c9638cf535fcff3ee71
+  data.tar.gz: 44ce008bc883118eda39dc75a486834083e71bfb37ff2716629db2d9019578ed
 SHA512:
-  metadata.gz: bd2f6482085df5c981a1a31ba9a816ec8cf36a7273c93eb27616a2613f16b9fd00b3803368d6aa9e8373b38eff1686429ce7274f5d30ebc306610f0a9d6ddfee
-  data.tar.gz: 452f25bfe0a6009428fd0ff7f52bd9191391349db2baee1ac325b9fbc76368619ad5f4c944d0cd20ceae7b7c4349441d6b04a67ecfb61a398a0be5a26afedf45
+  metadata.gz: e9e8ff68fbfa8a4fe9582a259dd885f3d8cd155ec455fccbdab736acc3fdfae655ce2ec17eeb81a954774a6c311172c28d0be24721179ef408b08bb060b3fe9d
+  data.tar.gz: 3f0632f1a75377bcbcca43fbe03557c91dff7492ed1122688bd160e7c5227c0620c0b8765f46cbac54fe53aafb8fd6d2b224fbb07beee41d7d67d3358e7a3b73

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.31.2]
+
+ * Support parsing new Availability response formats [#73]
+
 ## [0.31.1]
 
  * No Authorization header for Real-Time Scheduling and Real-Time Sequencing [#72]
@@ -137,6 +141,7 @@
 [0.30.0]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.30.0
 [0.31.0]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.31.0
 [0.31.1]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.31.1
+[0.31.2]: https://github.com/cronofy/cronofy-ruby/releases/tag/v0.31.2
 
 [#13]: https://github.com/cronofy/cronofy-ruby/pull/13
 [#16]: https://github.com/cronofy/cronofy-ruby/pull/16
@@ -171,3 +176,4 @@
 [#62]: https://github.com/cronofy/cronofy-ruby/pull/62
 [#69]: https://github.com/cronofy/cronofy-ruby/pull/69
 [#72]: https://github.com/cronofy/cronofy-ruby/pull/72
+[#73]: https://github.com/cronofy/cronofy-ruby/pull/73

data/lib/cronofy/client.rb

@@ -826,7 +826,12 @@ module Cronofy
       translate_available_periods(options[:available_periods])
 
       response = post("/v1/availability", options)
-      parse_collection(AvailablePeriod, "available_periods", response)
+
+      parse_collections(
+        response,
+        available_periods: AvailablePeriod,
+        available_slots: AvailableSlot,
+      )
     end
 
     # Public: Performs an sequenced availability query.
@@ -1553,6 +1558,10 @@ module Cronofy
       ResponseParser.new(response).parse_collection(type, attr)
     end
 
+    def parse_collections(response, mappings)
+      ResponseParser.new(response).parse_collections(mappings)
+    end
+
     def parse_json(type, attr = nil, response)
       ResponseParser.new(response).parse_json(type, attr)
     end

data/lib/cronofy/response_parser.rb

@@ -7,6 +7,14 @@ module Cronofy
       @response = response
     end
 
+    def parse_collections(attribute_collection_types)
+      attribute_collection_types.each do |attribute, type|
+        return parse_collection(type, attribute.to_s) if json_hash[attribute.to_s]
+      end
+
+      raise "No mapped attributes for response - #{json_hash.keys}"
+    end
+
     def parse_collection(type, attribute = nil)
       target = parsing_target(attribute)
       target.map { |item| type.new(item) }

data/lib/cronofy/types.rb

@@ -378,6 +378,13 @@ module Cronofy
     coerce_key :participants, ParticipantEnumerable
   end
 
+  class AvailableSlot < CronofyMash
+    coerce_key :start, EventTime
+    coerce_key :end, EventTime
+
+    coerce_key :participants, ParticipantEnumerable
+  end
+
   class ElementToken < CronofyMash
   end
 end

data/lib/cronofy/version.rb

@@ -1,3 +1,3 @@
 module Cronofy
-  VERSION = "0.31.1".freeze
+  VERSION = "0.31.2".freeze
 end

data/spec/lib/cronofy/client_spec.rb

@@ -1281,10 +1281,13 @@ describe Cronofy::Client do
         }
       end
 
+      let(:availability_response_attribute) { "available_periods" }
+      let(:availability_response_class) { Cronofy::AvailablePeriod }
+
       let(:correct_response_code) { 200 }
       let(:correct_response_body) do
         {
-          "available_periods" => [
+          availability_response_attribute => [
             {
               "start" => "2017-01-03T09:00:00Z",
               "end" => "2017-01-03T11:00:00Z",
@@ -1314,11 +1317,85 @@ describe Cronofy::Client do
       end
 
       let(:correct_mapped_result) do
-        correct_response_body['available_periods'].map { |ap| Cronofy::AvailablePeriod.new(ap) }
+        correct_response_body[availability_response_attribute].map { |ap| availability_response_class.new(ap) }
       end
 
       subject { client.availability(participants: participants, required_duration: required_duration, available_periods: available_periods) }
 
+      context "response_format" do
+        %i{
+          slots
+          overlapping_slots
+        }.each do |slot_format|
+          context slot_format do
+            let(:response_format) { slot_format.to_s }
+            let(:availability_response_attribute) { "available_slots" }
+            let(:availability_response_class) { Cronofy::AvailableSlot }
+
+            let(:required_duration) do
+              { minutes: 60 }
+            end
+
+            let(:available_periods) do
+              [
+                { start: Time.parse("2017-01-03T09:00:00Z"), end: Time.parse("2017-01-03T18:00:00Z") },
+                { start: Time.parse("2017-01-04T09:00:00Z"), end: Time.parse("2017-01-04T18:00:00Z") },
+              ]
+            end
+
+            let(:participants) do
+              [
+                {
+                  members: [
+                    { sub: "acc_567236000909002" },
+                    { sub: "acc_678347111010113" },
+                  ],
+                  required: :all,
+                }
+              ]
+            end
+
+            let(:request_body) do
+              {
+                "participants" => [
+                  {
+                    "members" => [
+                      { "sub" => "acc_567236000909002" },
+                      { "sub" => "acc_678347111010113" }
+                    ],
+                    "required" => "all"
+                  }
+                ],
+                "required_duration" => { "minutes" => 60 },
+                "available_periods" => [
+                  {
+                    "start" => "2017-01-03T09:00:00Z",
+                    "end" => "2017-01-03T18:00:00Z"
+                  },
+                  {
+                    "start" => "2017-01-04T09:00:00Z",
+                    "end" => "2017-01-04T18:00:00Z"
+                  }
+                ],
+                "response_format" => response_format,
+              }
+            end
+
+            subject do
+              client.availability(
+                participants: participants,
+                required_duration: required_duration,
+                available_periods: available_periods,
+                response_format: slot_format,
+              )
+            end
+
+            it_behaves_like 'a Cronofy request'
+            it_behaves_like 'a Cronofy request with mapped return value'
+          end
+        end
+      end
+
       context "fully specified" do
         let(:participants) do
           [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cronofy
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.31.2
 platform: ruby
 authors:
 - Sergii Paryzhskyi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2