captive 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a61ff5fe032e4d9f9156fd45c625320d7434e6ec7adb43e60995a4e1fda59a35
-  data.tar.gz: d3406fa0e28b7fecc1f697d642673b4b90c78061d9a6dfbb1ab5b29501069210
+  metadata.gz: 59d644077d8ed9449fb1311c4464d2b4e9d58e6ab38a24096631afdf2c7f6485
+  data.tar.gz: 85703935869c631ab93cb3be3986d6cdc771f79d9bd0d79c824ac2254b8bc4b4
 SHA512:
-  metadata.gz: b33a91a5041a56796ea020e37123519354ddc372da113a4abd8bc22f9bde4a6d70b7bb2235785893415c4e60ba2d2b679a0aa35fc4b809731c35fd83d72df179
-  data.tar.gz: 88ba730af80b36292739548ac4bff35b1f19c27f0cba66749c53affe6b63c2b3f8cbe78c06f6fdc16c0949551e75462e9e9d90d1de44af2342815a4e89934e44
+  metadata.gz: 640399ae1288cbe55f0e33fb15b922d70e43e69d699a93c024651a5226e1c59a844305cd2cee4a113e6f9e31a80c13e7e6a224ce0e94e9b631617fd82f246d7a
+  data.tar.gz: 757b8f2ff8d7412cad21edc82b0b699a2ff33a398748b5164daad11eceabbdc0fd34f14d3eafc713451ea48d540258112fb38d0a474f48cbcf480247881207a2

data/lib/captive/base.rb

@@ -14,6 +14,14 @@ module Captive
       def from_blob(blob:)
         new(cue_list: parse(blob: blob))
       end
+
+      def from_json(json:)
+        json = JSON.parse(json) if json.is_a?(String)
+        raise InvalidJsonInput unless json.key?('cues') && json['cues'].is_a?(Array)
+
+        cues = json['cues'].map { |cue_json| Cue.from_json(json: cue_json) }
+        new(cue_list: cues)
+      end
     end
 
     def self.included(base)

data/lib/captive/cue.rb

@@ -24,6 +24,25 @@ module Captive
       self.properties = properties || {}
     end
 
+    def self.from_json(json:)
+      schema = {
+        text!: :text,
+        start_time!: :start_time,
+        end_time!: :end_time,
+        number!: :cue_number,
+        properties: :properties,
+      }
+      data = {}
+      schema.each do |mask, value|
+        key = mask[-1] == '!' ? mask.to_s[0...-1] : mask.to_s
+        raise InvalidJsonInput, "Cue missing field: #{key}" if key.to_s != mask.to_s && !json.key?(key)
+
+        data[value] = json[key]
+      end
+
+      new(**data)
+    end
+
     def start_time=(time)
       set_time(:start_time, time)
     end

data/lib/captive/error.rb

@@ -16,4 +16,7 @@ module Captive
   # Error denoting incorrect input to a method.
   class InvalidInput < CaptiveError
   end
+
+  class InvalidJsonInput < CaptiveError
+  end
 end

data/lib/captive/formats/vtt.rb

@@ -86,7 +86,8 @@ module Captive
 
     # VTT Header tag matcher
     def self.validate_header(line)
-      !!line.strip.match(/^#{VTT_HEADER}/)
+      # Make sure BOM does not interfere with header detection
+      !!line.force_encoding('UTF-8').delete("\xEF\xBB\xBF").strip.match(/^#{VTT_HEADER}/)
     end
 
     # VTT Metadata tag matcher

data/lib/captive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Captive
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: captive
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - mserran2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="