ro-bundle 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ce96bc8a8dd23d9784601a0c4d5f18f8b94e895e
-  data.tar.gz: 0152f7394f9a3638c3b396e5b9fd02f32a6e07ce
+SHA256:
+  metadata.gz: 763804a43ec1bd90fa5c8be95c25808e8877a60d0a9b8ee29b312179585afc59
+  data.tar.gz: 8c11baba2952c2a11ec03258335dac5fc46c50826ec63d30fd584109e7f440b5
 SHA512:
-  metadata.gz: 5f6d7d8e6b4e2a547faccc52a2e51e6145db72c24b15185489d9d3f31082d8a667d3b9c621364dc1b044f0819d6a3bb6d78ca51dab026f1fb36e1f062d208694
-  data.tar.gz: 7ca9dba93b88c45218f2afef0eb3c618863be46bf34e9f2aac58682b98d14f604028c9cf378a7968833a5cb95aea6f3f343beca4b861ce6031d93cf423a53cad
+  metadata.gz: 4d08175914d093e89a94b582402d05d0a9af7bf53a79fc5fe7de44022d4b34895a002c5ef29b191d9883ac8fbf3bce18d38df4b8a7a3e5f7e8216b8bcbf16b03
+  data.tar.gz: 0b5dfd58c3b4a8351e7c05e22f9aed53c99334979db70ae927701e848979562609a379c56f706561153a6c8773be6d4ace0c18a013a0859f6ab829a3b4188fe2

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.1
+ruby-2.6.6

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.6
-  - 2.2.1
+  - 2.2.8
   - ruby-head
   - rbx-2
 

data/Changes.rdoc

@@ -1,5 +1,13 @@
 = Changes log for the RO Bundle Ruby Gem
 
+== Version 0.2.3
+
+* Re-added missing `manifest` reader to ROBundle::File.
+
+== Version 0.2.2
+
+* Update ucf dependency to fix rubyzip security vulnerability.
+
 == Version 0.1.0
 
 * Use the ZipContainer::ZipError in examples and tests.

data/Rakefile

@@ -15,7 +15,7 @@ task :default => [:test]
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/ts_ro_bundle.rb']
-  t.verbose = true
+  t.verbose = false
 end
 
 RDoc::Task.new do |r|

data/ReadMe.rdoc

@@ -1,6 +1,6 @@
 = Research Object Bundle Ruby Library
 
-Authors::     Robert Haines
+Authors::     Robert Haines, Stuart Owen, Finn Bacall
 Contact::     mailto:support@mygrid.org.uk
 Homepage::    http://mygrid.github.io/ruby-ro-bundle
 Source code:: https://github.com/myGrid/ruby-ro-bundle

data/lib/ro-bundle.rb

@@ -13,6 +13,7 @@ require "time"
 require "ucf"
 require "uri"
 require "uuid"
+require "addressable"
 
 require "ro-bundle/version"
 require "ro-bundle/util"

data/lib/ro-bundle/file.rb

@@ -18,12 +18,16 @@ module ROBundle
 
     extend Forwardable
     def_delegators :@manifest, :add_author, :aggregates, :annotations,
-      :authored_by, :authored_on, :authored_on=, :created_by, :created_by=,
-      :created_on, :created_on=, :history, :id, :id=, :remove_annotation,
-      :remove_author
+                   :authored_by, :authored_on, :authored_on=, :created_by,
+                   :created_by=, :created_on, :created_on=, :history, :id,
+                   :id=, :remove_annotation, :remove_author, :retrieved_by,
+                   :retrieved_by=, :retrieved_from, :retrieved_from=,
+                   :retrieved_on, :retrieved_on=
 
     private_class_method :new
 
+    attr_reader :manifest
+
     # :stopdoc:
     MIMETYPE = "application/vnd.wf4ever.robundle+zip"
 

data/lib/ro-bundle/ro/aggregate.rb

@@ -33,7 +33,7 @@ module ROBundle
         @structure[:uri] = if Util.is_absolute_uri?(object)
                              object.to_s
                            else
-                             URI.encode(object.start_with?("/") ? object : "/#{object}")
+                             Addressable::URI.encode(object.start_with?("/") ? object : "/#{object}")
                            end
         @structure[:mediatype] = mediatype
       end
@@ -52,7 +52,7 @@ module ROBundle
     #
     # The path of this aggregate in "rubyzip" format, i.e. no leading '/'.
     def file_entry
-      URI.decode(Util.strip_leading_slash(uri)) unless Util.is_absolute_uri?(uri)
+      Addressable::URI.unencode(Util.strip_leading_slash(uri)) unless Util.is_absolute_uri?(uri)
     end
 
     # :call-seq:

data/lib/ro-bundle/version.rb

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2014 The University of Manchester, UK.
+# Copyright (c) 2018 The University of Manchester, UK.
 #
 # BSD Licenced. See LICENCE.rdoc for details.
 #
@@ -9,5 +9,5 @@
 #
 module ROBundle
   # The version number of this library as a String.
-  VERSION = "0.2.0"
+  VERSION = "0.2.5"
 end

data/ro-bundle.gemspec

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2014, 2015 The University of Manchester, UK.
+# Copyright (c) 2014, 2015, 2018 The University of Manchester, UK.
 #
 # BSD Licenced. See LICENCE.rdoc for details.
 #
@@ -13,7 +13,7 @@ require 'ro-bundle/version'
 Gem::Specification.new do |spec|
   spec.name          = "ro-bundle"
   spec.version       = ROBundle::VERSION
-  spec.authors       = ["Robert Haines"]
+  spec.authors       = ["Robert Haines", "Stuart Owen", "Finn Bacall"]
   spec.email         = ["support@mygrid.org.uk"]
   spec.summary       = "This library provides an API for manipulating "\
     "Research Object (RO) bundles."
@@ -28,17 +28,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.has_rdoc         = true
   spec.extra_rdoc_files = [ "Changes.rdoc", "Licence.rdoc", "ReadMe.rdoc" ]
   spec.rdoc_options     = [ "-N", "--tab-width=2", "--main=ReadMe.rdoc" ]
 
   spec.required_ruby_version = ">= 1.9.3"
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake", "~> 10.1"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rdoc", "~> 4.1"
   spec.add_development_dependency "test-unit", "~> 3.0"
   spec.add_development_dependency "coveralls"
-  spec.add_runtime_dependency "ucf", "~> 2.0"
-  spec.add_runtime_dependency "json", "~> 1.8"
+  spec.add_runtime_dependency "ucf", "~> 2.0.2"
+  spec.add_runtime_dependency "json", ">= 2.3.0"
   spec.add_runtime_dependency "uuid", "~> 2.3"
+  spec.add_runtime_dependency "addressable", "~> 2.7.0"
 end

data/test/tc_create.rb

@@ -185,4 +185,18 @@ class TestCreation < Test::Unit::TestCase
     end
   end
 
+  def test_get_manifest
+    Dir.mktmpdir do |dir|
+      filename = File.join(dir, "test.bundle")
+
+      assert_nothing_raised do
+        ROBundle::File.create(filename) do |b|
+          assert_nothing_raised do
+            b.manifest
+          end
+        end
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ro-bundle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Robert Haines
+- Stuart Owen
+- Finn Bacall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +30,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +88,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +124,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 description: This library provides an API for manipulating Research Object (RO) bundles.
   The RO bundle specification can be found at https://w3id.org/bundle/.
 email:
@@ -208,8 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: This library provides an API for manipulating Research Object (RO) bundles.