cff 0.3.0 → 0.4.0

data/lib/cff/util.rb

@@ -12,40 +12,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
+##
 module CFF
 
-  # :stopdoc:
-  # Utility methods useful throughout the rest of the CFF library.
-  # This module is not in the public API.
+  # Util provides utility methods useful throughout the rest of the CFF library.
+  #
+  # Util does not provide any methods or fields for the public API.
   module Util
-
-    def delete_from_hash(hash, *keys)
-      h = hash.dup
-      keys.each { |key| h.delete(key) }
-      h
-    end
+    # :stopdoc:
 
     def method_to_field(name)
-      name.gsub('_', '-')
+      name.tr('_', '-')
     end
 
-    def build_actor_collection(field, source)
-      source.each do |s|
-        field << (s.has_key?('given-names') ? Person.new(s) : Entity.new(s))
+    def build_actor_collection!(source)
+      source.map! do |s|
+        s.has_key?('given-names') ? Person.new(s) : Entity.new(s)
       end
     end
 
-    def expand_field(field)
-      field.fields if field.respond_to?(:fields)
+    def normalize_modelpart_array!(array)
+      array.select! { |i| i.respond_to?(:fields) }
     end
 
-    def expand_array_field(field)
-      field.reject do |f|
-        !f.respond_to?(:fields)
-      end.map { |f| f.fields }
+    def fields_to_hash(fields)
+      hash = {}
+
+      fields.each do |field, value|
+        if value.respond_to?(:map)
+          unless value.empty?
+            hash[field] = value.map do |v|
+              v.respond_to?(:fields) ? v.fields : v.to_s
+            end
+          end
+        else
+          hash[field] = value.respond_to?(:fields) ? value.fields : value
+        end
+      end
+
+      hash
     end
 
+    # :startdoc:
   end
-  # :startdoc:
 end

data/lib/cff/version.rb

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
+##
 module CFF
   # :nodoc:
-  VERSION = "0.3.0"
-  DEFAULT_SPEC_VERSION = "1.0.3"
+  VERSION = '0.4.0'.freeze
+  DEFAULT_SPEC_VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Haines
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_list
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -81,47 +81,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: test_construct
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0.54'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0.54'
+- !ruby/object:Gem::Dependency
+  name: test_construct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: See https://citation-file-format.github.io/ for more info.
 email:
 - robert.haines@manchester.ac.uk
@@ -129,11 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
 - CHANGES.md
+- CITATION.cff
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENCE
@@ -145,8 +156,8 @@ files:
 - lib/cff.rb
 - lib/cff/entity.rb
 - lib/cff/file.rb
-- lib/cff/model-part.rb
 - lib/cff/model.rb
+- lib/cff/model_part.rb
 - lib/cff/person.rb
 - lib/cff/reference.rb
 - lib/cff/util.rb
@@ -171,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Ruby library for manipulating CITATION.cff files.

data/.gitignore

@@ -1,30 +0,0 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-/html/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-Gemfile.lock
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc

data/.ruby-gemset

@@ -1 +0,0 @@
-cff

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.4.3

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-
-sudo: false
-
-cache: bundler
-
-rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-  - rbx-3
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: rbx-3
-    - rvm: ruby-head
-
-before_install: gem install bundler -v 1.16.1