captive 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 507732c8b1ccb140a3ad934f6c8fd4e8f05e49703ce9e48b5e07c4cb815ad6b0
4
- data.tar.gz: f1c314eea9df3e4482e44db07a3ec664da05f7032712a883c7826a23096c8dbf
3
+ metadata.gz: 0efb1ac420047333556fffa1f812da51c934d04ec1c4663abdd16dff37119bae
4
+ data.tar.gz: a82f64acf3da2b74cf5d72714939ee0559121b8ec43fbc2f92a5597c1f179a78
5
5
  SHA512:
6
- metadata.gz: 1845a4d5314701d636400b753ff609638466151ba24b27edf77a6e670380cbb258388529c788e93d5e3e440c9ab84bd3d9a373d4d7d461343968ba7739834b00
7
- data.tar.gz: 36f0ba341f0878eb7a2d5cb11fc36feea8182b55754762d308f7073be715ad5af208e89a22562cecad34fc66a183fd4e747e8a6879ea1b7cecf46ae3aa960739
6
+ metadata.gz: a8a2c9496fcfe350776c912599e03495d3df9f907cfb4dbe85b9a531740c2a1b843e84fbf5eba9e1c27a0717b23a6b438a8e833ac0c6c45d653c67841b50f5ba
7
+ data.tar.gz: 8a369222333aaefdcb4cf5798536a2174baf344a46aab0f7e59bb687235865e9c5f29c7bd7322383b28c61736f3d2074f135cbcbb8d642dc8bc569fd2c558539
@@ -86,12 +86,13 @@ module Captive
86
86
 
87
87
  def as_json(**args)
88
88
  options = args.delete(:options) || {}
89
- format = options['format'] || {}
89
+ format = options['format'] || options[:format] || {}
90
+ mapping = (options['mapping'] || options[:mapping] || {}).map { |k, v| [k.to_s, v.to_s] }.to_h
90
91
  obj = {
91
- 'start_time' => format[:time] == :timecode ? milliseconds_to_timecode(start_time) : start_time,
92
- 'end_time' => format[:time] == :timecode ? milliseconds_to_timecode(end_time) : end_time,
93
- 'text' => text,
94
- 'properties' => properties,
92
+ mapping['start_time'] || 'start_time' => format[:time] == :timecode ? milliseconds_to_timecode(start_time) : start_time,
93
+ mapping['end_time'] || 'end_time' => format[:time] == :timecode ? milliseconds_to_timecode(end_time) : end_time,
94
+ mapping['text'] || 'text' => text,
95
+ mapping['properties'] || 'properties' => properties,
95
96
  }
96
97
  obj.respond_to?(:as_json) ? obj.as_json(**args) : obj
97
98
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Captive
4
- VERSION = '1.1.1'
4
+ VERSION = '1.1.2'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: captive
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - mserran2
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-07-22 00:00:00.000000000 Z
11
+ date: 2020-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler