mods_display 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d5c102f64b65d4313c4aad186328f17edf6475908f360762591ec4ded1f044
-  data.tar.gz: fefe5bd0aa2a29fe4cb60ad94e40840a3a1fe4a12b30ffccfc08b32361d04a5b
+  metadata.gz: b98625a861414ce3c06cd365c9850454a50ccd83719124820a49f4fcb7ff107d
+  data.tar.gz: e0c7ded47f3f3f38b821294f4bb9252e0fd7ffdb3fae837dc4da340bc225ab44
 SHA512:
-  metadata.gz: 5230f9bda246de22ebaaab5d01f3dc8a6d02f7a92f56a6caa1aa8e7d39039d8cb2d2fd8f39e8797d0757fb49dea269e680191ba9d495ae45ddf20cdfbfb3ae55
-  data.tar.gz: 5d5144f39760608dcb3a628022d1e8335e54b23a0c6e2b172c7705c68bd1a2fc12fa8b3155635c77bae9c74842bb3aeefc61639ea3c717f0495df7860faf6853
+  metadata.gz: efd399144bc193f4db0bfd4b3185346dce1e8cc523fad133af38f61a19d2f41b42e8d05a4fad6ea77dab744eeba2b7727b2dfe911f34c49844ca94fd433320fa
+  data.tar.gz: 121a7fa3ba9a0af4887fbc5fac992c95be7c19b888cb632fede718bb2796b1ceb783ce98f16e06de415e149b344584f6c4046dfa2f25c1bcc01823ade826ee46

data/.travis.yml

@@ -1,5 +1,4 @@
 notifications:
   email: false
 rvm:
-  - 2.4.1
-  - 2.3.4
+  - 2.5.3

data/lib/mods_display/fields/access_condition.rb

@@ -1,5 +1,53 @@
 module ModsDisplay
   class AccessCondition < Field
+    LICENSES = {
+      'cc-none' => { desc: '' },
+      'cc-by' => {
+        link: 'http://creativecommons.org/licenses/by/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution 3.0 Unported License'
+      },
+      'cc-by-sa' => {
+        link: 'http://creativecommons.org/licenses/by-sa/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License'
+      },
+      'cc-by-nd' => {
+        link: 'http://creativecommons.org/licenses/by-nd/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-No Derivative Works 3.0 Unported License'
+      },
+      'cc-by-nc' => {
+        link: 'http://creativecommons.org/licenses/by-nc/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-Noncommercial 3.0 Unported License'
+      },
+      'cc-by-nc-sa' => {
+        link: 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 Unported License'
+      },
+      'cc-by-nc-nd' => {
+        link: 'http://creativecommons.org/licenses/by-nc-nd/3.0/',
+        desc: 'This work is licensed under a Creative Commons Attribution-Noncommercial-No Derivative Works 3.0 Unported License'
+      },
+      'cc-pdm' => {
+        link: 'http://creativecommons.org/publicdomain/mark/1.0/',
+        desc: 'This work is in the public domain per Creative Commons Public Domain Mark 1.0'
+      },
+      'odc-odc-pddl' => {
+        link: 'http://opendatacommons.org/licenses/pddl/',
+        desc: 'This work is licensed under a Open Data Commons Public Domain Dedication and License (PDDL)'
+      },
+      'odc-pddl' => {
+        link: 'http://opendatacommons.org/licenses/pddl/',
+        desc: 'This work is licensed under a Open Data Commons Public Domain Dedication and License (PDDL)'
+      },
+      'odc-odc-by' => {
+        link: 'http://opendatacommons.org/licenses/by/',
+        desc: 'This work is licensed under a Open Data Commons Attribution License'
+      },
+      'odc-odc-odbl' => {
+        link: 'http://opendatacommons.org/licenses/odbl/',
+        desc: 'This work is licensed under a Open Data Commons Open Database License (ODbL)'
+      }
+    }.freeze
+
     def fields
       return_fields = @values.map do |value|
         ModsDisplay::Values.new(
@@ -28,26 +76,32 @@ module ModsDisplay
     end
 
     def license_statement(element)
-      element.text[/^(.*) (.*):(.*)$/]
-      output = "<div class='#{[Regexp.last_match(1), Regexp.last_match(2)].join('-').downcase}'>"
-      if license_link(Regexp.last_match(1), Regexp.last_match(2))
-        link = "<a href='#{license_link(Regexp.last_match(1), Regexp.last_match(2))}'>#{Regexp.last_match(3).strip}</a>"
-        output << link
-      else
-        output << Regexp.last_match(3).strip
-      end
+      matches = element.text.match(/^(?<code>.*) (?<type>.*):(?<description>.*)$/)
+      code = matches[:code].downcase
+      type = matches[:type].downcase
+      description = license_description(code, type) || matches[:description]
+      url = license_url(code, type)
+      output = "<div class='#{code}-#{type}'>"
+      output << if url
+                  "<a href='#{url}'>#{description}</a>"
+                else
+                  description
+                end
       output << '</div>'
     end
 
-    def license_code_urls
-      { 'cc'  => 'http://creativecommons.org/licenses/',
-        'odc' => 'http://opendatacommons.org/licenses/' }
+    def license_url(code, type)
+      key = "#{code}-#{type}"
+      return unless LICENSES.key?(key)
+
+      LICENSES[key][:link]
     end
 
-    def license_link(code, type)
-      code = code.downcase
-      return unless license_code_urls.key?(code)
-      "#{license_code_urls[code]}#{type.downcase}#{"/#{@config.cc_license_version}/" if code == 'cc'}"
+    def license_description(code, type)
+      key = "#{code}-#{type}"
+      return unless LICENSES.key?(key) && LICENSES[key][:desc]
+
+      LICENSES[key][:desc]
     end
 
     def access_label(element)

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/fields/access_condition_spec.rb

@@ -8,14 +8,6 @@ def mods_display_access_condition(mods_record)
   )
 end
 
-def mods_display_versioned_access_condition(mods_record, version)
-  ModsDisplay::AccessCondition.new(
-    mods_record,
-    ModsDisplay::Configuration::AccessCondition.new { cc_license_version version },
-    double('controller')
-  )
-end
-
 def mods_display_non_ignore_access_condition(mods_record)
   ModsDisplay::AccessCondition.new(
     mods_record,
@@ -68,31 +60,19 @@ describe ModsDisplay::AccessCondition do
         expect(fields.first.values.length).to eq(1)
         expect(fields.first.values.first).to include("<a href='http://creativecommons.org/licenses/by-sa/3.0/'>")
         expect(fields.first.values.first).to include(
-          'This work is licensed under a Creative Commons Attribution-Noncommercial 3.0 Unported License'
+          'This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License'
         )
       end
       it 'should itentify and link OpenDataCommons licenses properly' do
         fields = mods_display_access_condition(@odc_license_note).fields
         expect(fields.length).to eq(1)
         expect(fields.first.values.length).to eq(1)
-        expect(fields.first.values.first).to include("<a href='http://opendatacommons.org/licenses/pddl'>")
+        expect(fields.first.values.first).to include("<a href='http://opendatacommons.org/licenses/pddl/'>")
         expect(fields.first.values.first).to include(
           'This work is licensed under a Open Data Commons Public Domain Dedication and License (PDDL)'
         )
       end
-      it 'should have a configurable version for CC licenses' do
-        fields = mods_display_versioned_access_condition(@cc_license_note, '4.0').fields
-        expect(fields.length).to eq(1)
-        expect(fields.first.values.length).to eq(1)
-        expect(fields.first.values.first).to include('http://creativecommons.org/licenses/by-sa/4.0/')
-        expect(fields.first.values.first).not_to include('http://creativecommons.org/licenses/by-sa/3.0/')
-      end
-      it 'should not apply configured version to NON-CC licenses' do
-        fields = mods_display_versioned_access_condition(@odc_license_note, '4.0').fields
-        expect(fields.length).to eq(1)
-        expect(fields.first.values.length).to eq(1)
-        expect(fields.first.values.first).not_to include('/4.0/')
-      end
+
       it 'should not attempt unknown license types' do
         fields = mods_display_access_condition(@no_link_license_note).fields
         expect(fields.length).to eq(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jessie Keck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -226,8 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The MODS Display gem allows implementers to configure a customized display