stash-wrapper 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c68496253c2cb379be6134a3d5eeeac63a5a7069
-  data.tar.gz: 5403fbe01b456bea4544e7c0d9713116d62d5f17
+  metadata.gz: b47fcabaef7739a10f5bfd3bfb6739ef6f5bf2c0
+  data.tar.gz: 505ea0b2ae8634662e3c4804370436c81b57563c
 SHA512:
-  metadata.gz: e32da7b4c27e48c9e6924f0c54dec31de9e98b6212b3e5f1a3e3d80c55eb98a46319ef0fcdc222f0873b048d642c451b546c5d7448a62909268307b3f58e6fd4
-  data.tar.gz: 658d96609a26073218fd05344a683dd5ea6879446eaa46f9875406238ceceb04443edfba9a49914a6ea971c232e80c207ff073637b501bb61f3f9ae03cc4c8b9
+  metadata.gz: 16dbdc7400afcb229bdd7f530227a9f8e705295550fd2a0952122f9fff46bc3b17d22cc5861e934b1de8d30b2917576a9c92f3c8cbc0c3028f5ef9bb7e76fb19
+  data.tar.gz: fbb69e10abfeb28e68d1425fd0ad5829cd24cd74ee16b13f02d6f5bbf58dd619de0b5013b77d2a1e975f3a1b84fb07edf7118f8511f4dc36a7cb7b4aa7a593c4

data/CHANGES.md

@@ -1,6 +1,12 @@
+# 0.1.6 (2 May 2016)
+
+- Update to XML::MappingExtensions 0.3.6 and remove now-unnecessary namespace hacks
+- Update to TypesafeEnum 0.1.7 for improved debug output
+
 # 0.1.5 (28 April 2016)
 
-- Update to XML::MappingExtensions 0.3.5
+- Update to XML::MappingExtensions 0.3.5 to fix issues with `Date.xmlschema` misbehaving
+  in a Rails / ActiveSupport environment
 
 # 0.1.4 (25 April 2016)
 

data/lib/stash/wrapper/module_info.rb

@@ -5,7 +5,7 @@ module Stash
     NAME = 'stash-wrapper'
 
     # The version of this gem
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'

data/lib/stash/wrapper/stash_wrapper.rb

@@ -10,11 +10,11 @@ module Stash
     class StashWrapper
       include ::XML::Mapping
 
-      # The `stash_wrapper` namespace
-      NAMESPACE = 'http://dash.cdlib.org/stash_wrapper/'
-
-      # The `st` prefix for the `stash_wrapper` namespace
-      NAMESPACE_PREFIX = 'st'
+      NAMESPACE = ::XML::MappingExtensions::Namespace.new(
+        prefix: 'st',
+        uri: 'http://dash.cdlib.org/stash_wrapper/',
+        schema_location: 'http://dash.cdlib.org/stash_wrapper/ http://dash.cdlib.org/stash_wrapper/stash_wrapper.xsd'
+      )
 
       root_element_name 'stash_wrapper'
 
@@ -44,6 +44,7 @@ module Stash
           inventory: inventory
         )
         self.stash_descriptive = descriptive_elements
+        self.namespace = NAMESPACE
       end
 
       def id_value
@@ -95,39 +96,34 @@ module Stash
         inv ? inv.files.map(&:pathname) : []
       end
 
-      # Overrides `XML::Mapping#pre_save` to set the XML namespace and schema location.
-      def pre_save(options = { mapping: :_default })
-        xml = super(options)
-        xml.add_namespace(NAMESPACE)
-        xml.add_namespace('xsi', 'http://www.w3.org/2001/XMLSchema-instance')
-        xml.add_attribute('xsi:schemaLocation', 'http://dash.cdlib.org/stash_wrapper/ http://dash.cdlib.org/stash_wrapper/stash_wrapper.xsd')
-        xml
-      end
-
-      # Overrides `XML::Mapping#save_to_xml` to set the XML namespace prefix on all
-      # `stash_wrapper` elements. (The elements in `descriptive_elements` should retain
-      # their existing namespaces and prefixes, if any.)
-      def save_to_xml(options = { mapping: :_default })
-        elem = super(options)
-        set_prefix(prefix: NAMESPACE_PREFIX, elem: elem)
-        elem.add_namespace(nil) # clear the no-prefix namespace
-        elem.add_namespace(NAMESPACE_PREFIX, NAMESPACE)
-        elem
-      end
-
-      def self.parse_xml(xml_str)
-        xml = REXML::Document.new(xml_str).root
-        load_from_xml(xml)
-      end
-
-      private
-
-      def set_prefix(prefix:, elem:)
-        return unless elem.namespace == NAMESPACE
-        # name= with a prefixed name sets namespace by side effect and is the only way to actually output the prefix
-        elem.name = "#{prefix}:#{elem.name}"
-        elem.each_element { |e| set_prefix(prefix: prefix, elem: e) }
-      end
+      # # Overrides `XML::Mapping#pre_save` to set the XML namespace and schema location.
+      # def pre_save(options = { mapping: :_default })
+      #   xml = super(options)
+      #   xml.add_namespace(NAMESPACE)
+      #   xml.add_namespace('xsi', 'http://www.w3.org/2001/XMLSchema-instance')
+      #   xml.add_attribute('xsi:schemaLocation', 'http://dash.cdlib.org/stash_wrapper/ http://dash.cdlib.org/stash_wrapper/stash_wrapper.xsd')
+      #   xml
+      # end
+      #
+      # # Overrides `XML::Mapping#save_to_xml` to set the XML namespace prefix on all
+      # # `stash_wrapper` elements. (The elements in `descriptive_elements` should retain
+      # # their existing namespaces and prefixes, if any.)
+      # def save_to_xml(options = { mapping: :_default })
+      #   xml = super(options)
+      #   set_prefix(prefix: NAMESPACE_PREFIX, elem: xml)
+      #   xml.add_namespace(nil) # clear the no-prefix namespace
+      #   xml.add_namespace(NAMESPACE_PREFIX, NAMESPACE)
+      #   xml
+      # end
+      #
+      # private
+      #
+      # def set_prefix(prefix:, elem:)
+      #   return unless elem.namespace == NAMESPACE
+      #   # name= with a prefixed name sets namespace by side effect and is the only way to actually output the prefix
+      #   elem.name = "#{prefix}:#{elem.name}"
+      #   elem.each_element { |e| set_prefix(prefix: prefix, elem: e) }
+      # end
 
     end
 

data/spec/unit/stash/wrapper/stash_wrapper_spec.rb

@@ -207,7 +207,7 @@ module Stash
           it 'sets the correct namespace' do
             assert_st = lambda do |elem|
               actual = elem.namespace
-              expected = StashWrapper::NAMESPACE
+              expected = 'http://dash.cdlib.org/stash_wrapper/'
               expect(actual).to eq(expected), "expected '#{expected}', got '#{actual}': #{elem}"
               elem.each_element { |e| assert_st.call(e) }
             end
@@ -217,7 +217,7 @@ module Stash
           it 'sets the correct namespace prefix' do
             assert_st = lambda do |elem|
               actual = elem.prefix
-              expected = StashWrapper::NAMESPACE_PREFIX
+              expected = 'st'
               expect(actual).to eq(expected), "expected '#{expected}', got '#{actual}': #{elem}"
               elem.each_element { |e| assert_st.call(e) }
             end
@@ -226,8 +226,8 @@ module Stash
 
           it 'maps the namespace to the prefix' do
             assert_st = lambda do |elem|
-              actual = elem.namespace(StashWrapper::NAMESPACE_PREFIX)
-              expected = StashWrapper::NAMESPACE
+              actual = elem.namespace('st')
+              expected = 'http://dash.cdlib.org/stash_wrapper/'
               expect(actual).to eq(expected), "expected '#{expected}', got '#{actual}': #{elem}"
               elem.each_element { |e| assert_st.call(e) }
             end
@@ -236,7 +236,7 @@ module Stash
 
           it 'includes the prefix in the name' do
             assert_st = lambda do |elem|
-              expect(elem.to_s).to start_with("<#{StashWrapper::NAMESPACE_PREFIX}:")
+              expect(elem.to_s).to start_with('<st:')
               elem.each_element { |e| assert_st.call(e) }
             end
             assert_st.call(@wrapper_xml.root)

data/stash-wrapper.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.5'
-  spec.add_dependency 'xml-mapping_extensions', '~> 0.3', '>= 0.3.5'
+  spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.7'
+  spec.add_dependency 'xml-mapping_extensions', '~> 0.3', '>= 0.3.6'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stash-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -19,7 +19,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: xml-mapping_extensions
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement