dwc-archive 0.7.6 → 0.7.7

data/Gemfile

@@ -9,10 +9,10 @@ source "http://rubygems.org"
 gem "parsley-store", "~> 0.3.0"
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "nokogiri"
-  gem "cucumber", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "rspec", "~> 2.7.0"
+  gem "nokogiri", "~> 1.5.0"
+  gem "cucumber", "~> 1.1.3"
+  gem "bundler", "~> 1.0"
   gem "jeweler", "~> 1.6.4"
-  gem "ruby-debug19"
+  gem "ruby-debug19", "~> 0.11.6"
 end

data/Gemfile.lock

@@ -2,42 +2,46 @@ GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    biodiversity19 (1.0.5)
+    biodiversity19 (1.0.9)
+      parallel
+      parallel
+      treetop
       treetop
     builder (3.0.0)
-    columnize (0.3.4)
-    cucumber (1.1.0)
+    columnize (0.3.5)
+    cucumber (1.1.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.5.0)
+      gherkin (~> 2.6.7)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    gherkin (2.5.4)
+    gherkin (2.6.8)
       json (>= 1.4.6)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
+    json (1.6.3)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     nokogiri (1.5.0)
+    parallel (0.5.9)
     parsley-store (0.3.0)
       biodiversity19
       redis
     polyglot (0.3.3)
-    rake (0.9.2)
+    rake (0.9.2.2)
     redis (2.2.2)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.7.0)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -57,10 +61,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler
   cucumber
-  jeweler (~> 1.6.4)
+  jeweler
   nokogiri
   parsley-store (~> 0.3.0)
-  rspec (~> 2.3.0)
+  rspec
   ruby-debug19

data/Rakefile

@@ -46,12 +46,12 @@ end
 
 task :default => :spec
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "dwc-archive #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+# require 'rdoc/task'
+# Rake::RDocTask.new do |rdoc|
+#   version = File.exist?('VERSION') ? File.read('VERSION') : ""
+# 
+#   rdoc.rdoc_dir = 'rdoc'
+#   rdoc.title = "dwc-archive #{version}"
+#   rdoc.rdoc_files.include('README*')
+#   rdoc.rdoc_files.include('lib/**/*.rb')
+# end

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.7.7

data/lib/dwc-archive.rb

@@ -2,20 +2,10 @@
 $:.unshift(File.dirname(__FILE__)) unless
    $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 R19 = RUBY_VERSION.split('.')[0..1].join('').to_i > 18
+raise "IMPORTANT: dwc-archive gem  requires ruby >= 1.9.1" unless R19
 require 'fileutils'
 require 'ostruct'
-
-if R19
-  require 'csv'
-else
-  raise "IMPORTANT: dwc-archive gem  requires ruby >= 1.9.1"
-  require 'fastercsv'
-  CSV = FasterCSV
-  if (defined?(Rails) && Rails::VERSION::MAJOR >= 3 && Rails.env.test?)
-    $" << 'csv.rb'
-  end
-end
-
+require 'csv'
 require 'logger'
 require 'dwc-archive/xml_reader'
 require 'dwc-archive/ingester'

data/lib/dwc-archive/classification_normalizer.rb

@@ -67,7 +67,6 @@ class DarwinCore
   private
 
     def get_canonical_name(a_scientific_name)
-      a_scientific_name.force_encoding('utf-8')
       if @with_canonical_names
         canonical_name = @parser.parse(a_scientific_name, :canonical_only => true)
         canonical_name.to_s.empty? ? a_scientific_name : canonical_name
@@ -102,10 +101,10 @@ class DarwinCore
     def set_scientific_name(row, fields)
       row[fields[:scientificname]] = 'N/A' unless row[fields[:scientificname]]
       canonical_name = nil
-      scientific_name = row[fields[:scientificname]].strip.force_encoding('utf-8')
+      scientific_name = row[fields[:scientificname]].strip
       if separate_canonical_and_authorship?(row, fields)
-        canonical_name = row[fields[:scientificname]].strip.force_encoding('utf-8') if @with_canonical_names
-        scientific_name += " #{row[fields[:scientificnameauthorship]].strip.force_encoding('utf-8')}"
+        canonical_name = row[fields[:scientificname]].strip if @with_canonical_names
+        scientific_name += " #{row[fields[:scientificnameauthorship]].strip}"
       else
         canonical_name = get_canonical_name(row[fields[:scientificname]]) if @with_canonical_names
       end

data/lib/dwc-archive/generator.rb

@@ -9,7 +9,7 @@ class DarwinCore
       FileUtils.mkdir(@path)
       @meta_xml_data = {:extensions => []}
       @eml_xml_data = {:id => nil, :title => nil, :authors => [], :abstract => nil, :citation => nil, :url => nil}
-      @write = R19 ? 'w:utf-8' : 'w'
+      @write = 'w:utf-8'
     end
     
     #TODO refactor!

data/lib/dwc-archive/generator_eml_xml.rb

@@ -4,7 +4,7 @@ class DarwinCore
       def initialize(data, path)
         @data = data
         @path = path
-        @write = R19 ? 'w:utf-8' : 'w'
+        @write = 'w:utf-8'
       end
       def create
         builder = Nokogiri::XML::Builder.new do |xml|

data/lib/dwc-archive/generator_meta_xml.rb

@@ -4,7 +4,7 @@ class DarwinCore
       def initialize(data, path)
         @data = data
         @path = path
-        @write = R19 ? 'w:utf-8' : 'w'
+        @write = 'w:utf-8'
       end
 
       def create

data/lib/dwc-archive/ingester.rb

@@ -40,13 +40,8 @@ class DarwinCore
 
     def process_csv_row(result, errors, row)
       str = row.join('')
-      if R19
-        str = str.force_encoding('utf-8')
-        str.encoding.name == "UTF-8" && str.valid_encoding? ? result << row : errors << row
-      else
-        require File.join(File.dirname(__FILE__), 'utf_regex_ruby18')
-        UTF8RGX === str ? result << row : errors << row
-      end
+      str = str.force_encoding('utf-8')
+      str.encoding.name == "UTF-8" && str.valid_encoding? ? result << row.map { |f| f.nil? ? nil : f.force_encoding('utf-8') } : errors << row
     end
 
     def get_attributes(exception)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwc-archive
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000Z
+date: 2011-12-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parsley-store
-  requirement: &70313285716740 !ruby/object:Gem::Requirement
+  requirement: &70157662627320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,54 +21,54 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70313285716740
+  version_requirements: *70157662627320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70313285716120 !ruby/object:Gem::Requirement
+  requirement: &70157662625740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70313285716120
+  version_requirements: *70157662625740
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70313285714900 !ruby/object:Gem::Requirement
+  requirement: &70157662614720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *70313285714900
+  version_requirements: *70157662614720
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70313285714160 !ruby/object:Gem::Requirement
+  requirement: &70157662612960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70313285714160
+  version_requirements: *70157662612960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70313285713460 !ruby/object:Gem::Requirement
+  requirement: &70157662610660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70313285713460
+  version_requirements: *70157662610660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70313285712720 !ruby/object:Gem::Requirement
+  requirement: &70157662608200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,21 +76,21 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70313285712720
+  version_requirements: *70157662608200
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70313285712020 !ruby/object:Gem::Requirement
+  requirement: &70157662604880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.6
   type: :development
   prerelease: false
-  version_requirements: *70313285712020
+  version_requirements: *70157662604880
 - !ruby/object:Gem::Dependency
   name: parsley-store
-  requirement: &70313285711280 !ruby/object:Gem::Requirement
+  requirement: &70157662602720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70313285711280
+  version_requirements: *70157662602720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70313285710580 !ruby/object:Gem::Requirement
+  requirement: &70157662577620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70313285710580
+  version_requirements: *70157662577620
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70313285709840 !ruby/object:Gem::Requirement
+  requirement: &70157662576480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70313285709840
+  version_requirements: *70157662576480
 description: Darwin Core Archive is the current standard exchange format for GLobal
   Names Architecture modules. This gem makes it easy to incorporate files in Darwin
   Core Archive format into a ruby project.