merritt-manifest 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7adb8f2c7f2796960082706d5bad61ff5f31698e
-  data.tar.gz: e56637f452b35cd1556a0e67a2d1806293ef314d
+  metadata.gz: 9cb3e93897e66af0758ee2ad42e5b9b8c0a6bd2c
+  data.tar.gz: 7a1e0afce2443cc78ad558e1a93882257c7502c5
 SHA512:
-  metadata.gz: 6a414f7f46daf7849113ae9d460a57020c026194a170155f80d558fd5ffa61c6651d13322cf9ff90ba9ae0d6950570f7fcf28a179164f95267d56f7929e204ea
-  data.tar.gz: b92a32eb1bd631f8d19b2c8c0f45aaae7b526a55751e779cc91b0995f720e7417eebf3b48cd25df0e093457ddbb18c3b30d2bc01934d40f29fba68242d2a2619
+  metadata.gz: 63c2e6d1f168a4f7f046762d72c94b4d7b095ee3ef29d554d245079ddd9fdb6ccc4473fd5adaf174698ddf195e3721c5eea2bbe7130a1a5d956d0b08857c8719
+  data.tar.gz: 44baf91994e97c54ce4e399cb13be54c7a2556b1f2076ca2fb696e23ae84ebbc7f7937ec3b03bf5e3eb54f712e8a145a220680b82e1d8a435aa7c1645080e6e5

data/CHANGES.md

@@ -0,0 +1,11 @@
+# 0.1.1 (18 April 2017)
+
+- `Merritt::Manifest::Fields::Object::MIME_TYPE` now correctly parses strings as
+  `MIME::Type` objects.
+- **BREAKING CHANGE:** `Merritt::Manifest::DataONE` now uses the standard `file_name`
+  and `mime_type` fields rather than `name` and `type`.
+
+
+# 0.1.0 (18 April 2017)
+
+- Initial release.

data/lib/merritt/manifest/data_one.rb

@@ -1,3 +1,5 @@
+require 'merritt/manifest/fields'
+
 module Merritt
   class Manifest
     # A specialization of {Manifest} for DataONE.
@@ -6,7 +8,7 @@ module Merritt
       # Creates a new {Manifest::DataONE}
       # @param files [Array<Manifest::File>] an array of data files to be converted to entries.
       #   (Note that these not be actual {Manifest::File} objects so long as they respond to
-      #   `#name` and `#type`)
+      #   `#file_name` and `#mime_type`)
       def initialize(files:)
         super(
           conformance: 'dataonem_0.1',
@@ -38,8 +40,8 @@ module Merritt
           {
             METADATA_FILE => md_name,
             METADATA_FORMAT => md_url,
-            DATA_FILE => file.name,
-            MIME_TYPE => file.type
+            DATA_FILE => file.file_name,
+            MIME_TYPE => Merritt::Manifest::Fields::Object::MIME_TYPE.value_from(file)
           }
         end
       end

data/lib/merritt/manifest/fields.rb

@@ -1,4 +1,5 @@
 require 'typesafe_enum'
+require 'mime-types'
 require 'uri'
 
 module Merritt
@@ -112,7 +113,13 @@ module Merritt
         end
 
         # field for `mrt:mimeType`
-        new :MIME_TYPE, 'mrt:mimeType'
+        new :MIME_TYPE, 'mrt:mimeType' do
+          def value_from(obj)
+            value = super(obj)
+            return value if value.nil? || value.is_a?(::MIME::Type)
+            ::MIME::Types[value.to_s].first
+          end
+        end
       end
     end
   end

data/lib/merritt/manifest/module_info.rb

@@ -4,7 +4,7 @@ module Merritt
     NAME = 'merritt-manifest'.freeze
 
     # The version of this gem
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2017 The Regents of the University of California'.freeze

data/merritt-manifest.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['David Moles']
   spec.email         = ['david.moles@ucop.edu']
   spec.summary       = 'Merritt manifest generation library'
-  spec.description   = 'Merritt manifest generation library'
+  spec.description   = 'A library for creating Merritt text-based manifests (a specialization of the Checkm text-based manifest format).'
   spec.license       = 'MIT'
 
   origin = `git config --get remote.origin.url`.chomp
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'mime-types', '~> 3.1'
   spec.add_dependency 'typesafe_enum', '~> 0.1.7'
 
   spec.add_development_dependency 'bundler', '~> 1.14'

data/merritt-manifest.iml

@@ -12,6 +12,8 @@
     <orderEntry type="library" scope="PROVIDED" name="docile (v1.1.5, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="hirb (v0.7.3, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="json (v2.0.4, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0521, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parser (v2.4.0.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rainbow (v2.2.1, ruby-2.2.5-p319) [gem]" level="application" />

data/spec/unit/merritt/manifest/data_one_spec.rb

@@ -21,7 +21,7 @@ module Merritt
         'survey/Q33-37/networking.R' => 'text/plain',
         'survey/Q38-42/publications.R' => 'text/plain',
         'survey_data_prep.R' => 'text/plain'
-      }.map { |name, type| OpenStruct.new(name: name, type: type) }
+      }.map { |name, type| OpenStruct.new(file_name: name, mime_type: type) }
       @manifest = Manifest::DataONE.new(files: files)
     end
 
@@ -75,8 +75,8 @@ module Merritt
           expect(oai_entry['dom:scienceMetadataFormat']).to eq('http://dublincore.org/schemas/xmls/qdc/2008/02/11/qualifieddc.xsd')
 
           [dcs_entry, oai_entry].each do |entry|
-            expect(entry['dom:scienceDataFile']).to eq(file.name)
-            expect(entry['mrt:mimeType']).to eq(file.type)
+            expect(entry['dom:scienceDataFile']).to eq(file.file_name)
+            expect(entry['mrt:mimeType']).to eq(file.mime_type)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merritt-manifest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Moles
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +136,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: Merritt manifest generation library
+description: A library for creating Merritt text-based manifests (a specialization
+  of the Checkm text-based manifest format).
 email:
 - david.moles@ucop.edu
 executables: []
@@ -140,6 +155,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
+- CHANGES.md
 - Gemfile
 - LICENSE.md
 - README.md