dwc-archive 0.5.9 → 0.5.10

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/lib/dwc-archive.rb

@@ -17,6 +17,7 @@ else
 end
 
 require 'logger'
+require 'dwc-archive/xml_reader'
 require 'dwc-archive/ingester'
 require 'dwc-archive/errors'
 require 'dwc-archive/expander'

data/lib/dwc-archive/archive.rb

@@ -8,8 +8,8 @@ class DarwinCore
       @expander = DarwinCore::Expander.new(@archive_path, @tmp_dir)
       @expander.unpack
       if valid?
-        @meta = Hash.from_xml(open(File.join(@expander.path, 'meta.xml')))
-        @eml = files.include?("eml.xml") ? Hash.from_xml(open(File.join(@expander.path, 'eml.xml'))) : nil
+        @meta = DarwinCore::XmlReader.from_xml(open(File.join(@expander.path, 'meta.xml')))
+        @eml = files.include?("eml.xml") ? DarwinCore::XmlReader.from_xml(open(File.join(@expander.path, 'eml.xml'))) : nil
       else
         clean
         raise InvalidArchiveError

data/lib/dwc-archive/xml_reader.rb

@@ -0,0 +1,64 @@
+# USAGE: Hash.from_xml:(YOUR_XML_STRING)
+require 'nokogiri'
+# modified from http://stackoverflow.com/questions/1230741/convert-a-nokogiri-document-to-a-ruby-hash/1231297#1231297
+class DarwinCore
+  module XmlReader
+    class << self
+      def from_xml(xml_io) 
+        begin
+          result = Nokogiri::XML(xml_io)
+          return { result.root.name.to_sym => xml_node_to_hash(result.root)} 
+        rescue Exception => e
+          raise e
+        end
+      end
+
+      private
+
+      def xml_node_to_hash(node) 
+        # If we are at the root of the document, start the hash 
+        if node.element?
+          result_hash = {}
+          if node.attributes != {}
+            result_hash[:attributes] = {}
+            node.attributes.keys.each do |key|
+              result_hash[:attributes][node.attributes[key].name.to_sym] = prepare(node.attributes[key].value)
+            end
+          end
+          if node.children.size > 0
+            node.children.each do |child| 
+              result = xml_node_to_hash(child) 
+
+              if child.name == "text"
+                unless child.next_sibling || child.previous_sibling
+                  return prepare(result)
+                end
+              elsif result_hash[child.name.to_sym]
+                if result_hash[child.name.to_sym].is_a?(Object::Array)
+                  result_hash[child.name.to_sym] << prepare(result)
+                else
+                  result_hash[child.name.to_sym] = [result_hash[child.name.to_sym]] << prepare(result)
+                end
+              else 
+                result_hash[child.name.to_sym] = prepare(result)
+              end
+            end
+
+            return result_hash 
+          else 
+            return result_hash
+          end 
+        else 
+          return prepare(node.content.to_s) 
+        end 
+      end          
+
+      def prepare(data)
+        return data if data.class != String
+        return true if data.strip == "true"
+        return false if data.strip == "false"
+        data.to_i.to_s == data ? data.to_i : data
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dwc-archive
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 5
-  - 9
-  version: 0.5.9
+  - 10
+  version: 0.5.10
 platform: ruby
 authors: 
 - Dmitry Mozzherin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 -05:00
+date: 2010-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,7 +75,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -99,7 +98,7 @@ files:
 - lib/dwc-archive/ingester.rb
 - lib/dwc-archive/metadata.rb
 - lib/dwc-archive/utf_regex_ruby18.rb
-- lib/ruby_extensions.rb
+- lib/dwc-archive/xml_reader.rb
 - spec/files/broken.tar.gz
 - spec/files/data.tar.gz
 - spec/files/data.zip
@@ -123,8 +122,8 @@ homepage: http://github.com/GlobalNamesArchitecture/dwc-archive
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-*.gemspec
-
-## PROJECT::SPECIFIC
-tags
-bin

data/lib/ruby_extensions.rb

@@ -1,67 +0,0 @@
-# USAGE: Hash.from_xml:(YOUR_XML_STRING)
-require 'nokogiri'
-# modified from http://stackoverflow.com/questions/1230741/convert-a-nokogiri-document-to-a-ruby-hash/1231297#1231297
-
-class Hash
-  class << self
-    def from_xml(xml_io) 
-      begin
-        result = Nokogiri::XML(xml_io)
-        return { result.root.name.to_sym => xml_node_to_hash(result.root)} 
-      rescue Exception => e
-        raise e
-      end
-    end 
-
-    def xml_node_to_hash(node) 
-      # If we are at the root of the document, start the hash 
-      if node.element?
-        result_hash = {}
-        if node.attributes != {}
-          result_hash[:attributes] = {}
-          node.attributes.keys.each do |key|
-            result_hash[:attributes][node.attributes[key].name.to_sym] = prepare(node.attributes[key].value)
-          end
-        end
-        if node.children.size > 0
-          node.children.each do |child| 
-            result = xml_node_to_hash(child) 
-
-            if child.name == "text"
-              unless child.next_sibling || child.previous_sibling
-                return prepare(result)
-              end
-            elsif result_hash[child.name.to_sym]
-              if result_hash[child.name.to_sym].is_a?(Object::Array)
-                result_hash[child.name.to_sym] << prepare(result)
-              else
-                result_hash[child.name.to_sym] = [result_hash[child.name.to_sym]] << prepare(result)
-              end
-            else 
-              result_hash[child.name.to_sym] = prepare(result)
-            end
-          end
-
-          return result_hash 
-        else 
-          return result_hash
-        end 
-      else 
-        return prepare(node.content.to_s) 
-      end 
-    end          
-
-    def prepare(data)
-      return data if data.class != String
-      return true if data.strip == "true"
-      return false if data.strip == "false"
-      data.to_i.to_s == data ? data.to_i : data
-    end
-  end
-  
-  def to_struct(struct_name)
-      Struct.new(struct_name,*keys).new(*values)
-  end
-end
-
-