pssh_box 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a6bb262bbf2468e221e28e6039db1b1dbff43dd90768bf27ccd4d380740d4bd
-  data.tar.gz: 5dfd15b64af6e743eaa9432174cb690b3a80a204410c7727728263e8414e13ca
+  metadata.gz: a9b3e35812098db35aae931bb2b14e879625b56ceb7001323f504002eb7d538d
+  data.tar.gz: b708d02ed8554be4d665344b03b943f9ee992cba14354c05f9f4b6d01de36163
 SHA512:
-  metadata.gz: 42bd2ccacb5b4016c26337a7cbce3d2f9019628af63ec23a98b6e5d0caba1e6a553f368679ed71874d59b41214f2af45f211e0bb9296ffd341238c338c1e39ed
-  data.tar.gz: bc14228b095f93a9e0fb187ab9806e7b2959ea649ca4f29baccb58b199b6d9c35983706b4dfa853ca4bc5ed40355b5b5949953dcc23345b789a44dc604319904
+  metadata.gz: 886e0327377e89873769ccf15b6d8b7dded4b8e636576b426f8193ea12ff2b1197c6fb469d28931707686d743cc8ca37e271f9da677a28a62d0f75fdf2059785
+  data.tar.gz: 364f98a00418e93fcb02c4505490684309ffce452264fbb5ccf898ec0376d6c249dcf17be28ecded9e9566dc73c7248a038a3bf3b6c189fbf4e7305488864939

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pssh_box (0.0.1)
+    pssh_box (0.1.0)
       ruby-uuid (~> 0.0.1)
 
 GEM

data/lib/pssh_box/builder.rb

@@ -25,21 +25,39 @@ module PsshBox
 
     def self.build_pssh_bytes(key_ids, pssh_data, pssh_version, system_id)
       pssh_bytes = 'pssh'.bytes
-      pssh_bytes += int_to_four_bytes(pssh_version << 24).bytes
-      pssh_bytes += uuid_to_bytes(system_id).bytes
+      pssh_bytes += version_bytes(pssh_version)
+      pssh_bytes += system_id_bytes(system_id)
       if pssh_version == 1
-        pssh_bytes += int_to_four_bytes(key_ids.length).bytes
-        key_ids.each do |key_id|
-          pssh_bytes += uuid_to_bytes(key_id).bytes
-        end
+        pssh_bytes += key_id_bytes(key_ids)
       end
-      pssh_bytes += int_to_four_bytes(pssh_data.length).bytes
-      pssh_bytes += pssh_data
+      pssh_bytes += pssh_data_bytes(pssh_data)
 
-      length_including_prefix = 4 + pssh_bytes.length
-      length_prefix_bytes = int_to_four_bytes(length_including_prefix).bytes
+      length_prefix_bytes(pssh_bytes.length) + pssh_bytes
+    end
+
+    def self.version_bytes(pssh_version)
+      int_to_four_bytes(pssh_version << 24).bytes
+    end
+
+    def self.system_id_bytes(system_id)
+      uuid_to_bytes(system_id).bytes
+    end
+
+    def self.key_id_bytes(key_ids)
+      key_id_bytes = int_to_four_bytes(key_ids.length).bytes
+      key_ids.each do |key_id|
+        key_id_bytes += uuid_to_bytes(key_id).bytes
+      end
+      key_id_bytes
+    end
+
+    def self.pssh_data_bytes(pssh_data)
+      int_to_four_bytes(pssh_data.length).bytes + pssh_data
+    end
 
-      length_prefix_bytes + pssh_bytes
+    def self.length_prefix_bytes(length)
+      length_including_prefix = 4 + length
+      int_to_four_bytes(length_including_prefix).bytes
     end
 
     def self.base64_encode_bytes(pssh_bytes)

data/lib/pssh_box/version.rb

@@ -1,3 +1,3 @@
 module PsshBox
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/pssh_box.gemspec

@@ -1,32 +1,32 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pssh_box/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'pssh_box'
-  spec.version       = PsshBox::VERSION
-  spec.authors       = ['Catalin Ursachi']
-  spec.email         = ['catalin.ursachi@softwire.com']
-
-  spec.summary       = 'A builder for PSSH boxes used in content encryption, as per the specification at'\
-    ' https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html.'
-  spec.homepage      = 'https://github.com/catalin-ursachi/pssh_box'
-  spec.license       = 'MIT'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-
-  spec.add_dependency 'ruby-uuid', '~> 0.0.1'
-end
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'pssh_box/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'pssh_box'
+  spec.version       = PsshBox::VERSION
+  spec.authors       = ['Catalin Ursachi']
+  spec.email         = ['catalin.ursachi@softwire.com']
+
+  spec.summary       = 'A builder for PSSH boxes used in content encryption, as per the specification at'\
+    ' https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html.'
+  spec.homepage      = 'https://github.com/catalin-ursachi/pssh_box'
+  spec.license       = 'MIT'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+
+  spec.add_dependency 'ruby-uuid', '~> 0.0.1'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pssh_box
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Catalin Ursachi