traject_horizon 0.11.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2f8ac4a546bb69032c0da921fa9a749ef83a6d96
+  data.tar.gz: 530cc90de2a1eb2ffb52eda7601bbc5076be3bf7
+SHA512:
+  metadata.gz: d5e490f9706b94fa747b21c689255320b9cd96dfe6cd1b93c63d32952496e293a90f550d5a8449d87d4a05c39a8a59cd049399e004bd75f031a9a55048ffb718
+  data.tar.gz: a766c0d3a2418017d0dcfe562737b4b647bb28e8e9d05dad9fc55be617e6de69c53dcbdd415bb153e4e56de1ea8bdd3cb0599728ef5dc729f16c23049a00764b

data/README.md

@@ -54,6 +54,9 @@ settings do
   # or "sqlserver:", including username on the end but not password:
   provide "horizon.jdbc_url", "jdbc:jtds:sybase://horizonserver.university.edu:2025/horizon_db;user=esys"
 
+  # Instead of horizon.jdbc_url, you can also use individual
+  # horizon.host, horizon.port, horizon.database, horizon.user
+
   # DB password in seperate setting
   provide "horizon.jdbc_password", "drilg53"
 

data/lib/traject/horizon_reader.rb

@@ -18,7 +18,17 @@ module Traject
   #                     it from logging. Eg: "jdbc:jtds:sybase://horizon.lib.univ.edu:2025/dbname;user=dbuser"
   #                     * In command line, you'll have to use quotes: -s 'horizon.jdbc_url=jdbc:jtds:sybase://horizon.lib.univ.edu:2025/dbname;user=dbuser'
   #
-  # [horizon.jdbc_password] Password to use for JDBC connection. We'll try to suppress it from being logged.
+  #
+  # [horizon.password] Password to use for JDBC connection. We'll try to suppress it from being logged.
+  #
+  # Instead of jdbc_url, you can provide all the other elements individually:
+  #
+  # [horizon.host]
+  # [horizon.port] (default 2025)
+  # [horizon.user]
+  # [horizon.database] (default 'horizon')
+  # [horizon.jtds_type] default 'sybase', or 'sqlserver'
+  #
   #
   # == What to export
   #
@@ -129,7 +139,7 @@ module Traject
 
       require_jars!
 
-      logger.info("   #{self.class.name} reading records from #{settings["horizon.jdbc_url"]}")
+      logger.info("   #{self.class.name} reading records from #{jdbc_url(false)}")
     end
 
     # Requires marc4j and jtds, and java_import's some classes.
@@ -244,8 +254,8 @@ module Traject
 
       # Turn Horizon's weird escaping into UTF8: <U+nnnn> where nnnn is a hex unicode
       # codepoint, turn it UTF8 for that codepoint
-      if false && settings["horizon.codepoint_translate"].to_s == "true" && settings["horizon.destination_encoding"] == "UTF8"
-        text.gsub!(/\<U\+([0-9A-F]{4})\>/) do
+      if settings["horizon.codepoint_translate"].to_s == "true" && settings["horizon.destination_encoding"] == "UTF8"
+        text.gsub!(/\<U\+([0-9A-Fa-f]{4})\>/) do
           [$1.hex].pack("U")
         end
       end
@@ -355,8 +365,7 @@ module Traject
       record_batch.clear
 
     rescue Exception => e
-      logger.fatal "HorizonReader, unexpected exception at bib id:#{current_bib_id}: #{Traject::Util.exception_to_log_message(e)}"
-      logger.fatal e.backtrace.join("/n")
+      logger.fatal "HorizonReader, unexpected exception at bib id:#{current_bib_id}: #{e}"    
       raise e
     ensure
       logger.info("HorizonReader: Closing all JDBC objects...")
@@ -623,16 +632,36 @@ module Traject
       settings['horizon.source_encoding'] == "MARC8" && settings['horizon.destination_encoding'] == "UTF8"
     end
 
+    # Looks up JDBC url from settings, either 'horizon.jdbc_url' if present,
+    # or individual settings. Will include password from `horizon.password` 
+    # only if given a `true` arg -- leave false for output to logs, to keep
+    # password out of logs. 
+    def jdbc_url(include_password=false)
+      url = if settings.has_key? "horizon.jdbc_url"
+        settings["horizon.jdbc_url"]
+      else
+        jtds_type = settings['horizon.jtds_type'] || 'sybase'
+        database  = settings['horizon.database']  || 'horizon'
+        host      = settings['horizon.host']      or raise ArgumentError.new("Need horizon.host setting, or horizon.jdbc_url")
+        port      = settings['horizon.port']      || '2025'
+        user      = settings['horizon.user']      or raise ArgumentError.new("Need horizon.user setting, or horizon.jdbc_url")
 
-    def open_connection!
-      logger.debug("HorizonReader: Opening JDBC Connection at #{settings["horizon.jdbc_url"]} ...")
+        "jdbc:jtds:#{jtds_type}://#{host}:#{port}/#{database};user=#{user}"
+      end
 
-      url = settings["horizon.jdbc_url"]
-      if settings["horizon.jdbc_password"]
-        url += ";password=#{settings['horizon.jdbc_password']}"
+      if include_password
+        password  = settings['horizon.password'] or raise ArgumentError.new("Need horizon.password setting")
+        url += ";password=#{password}"
       end
 
-      conn =  java.sql.DriverManager.getConnection( url )
+      return url
+    end
+
+
+    def open_connection!
+      logger.debug("HorizonReader: Opening JDBC Connection at #{jdbc_url(false)} ...")
+
+      conn =  java.sql.DriverManager.getConnection( jdbc_url(true) )
       # If autocommit on, fetchSize later has no effect, and JDBC slurps
       # the whole result set into memory, which we can not handle.
       conn.setAutoCommit false

data/lib/traject_horizon/version.rb

@@ -1,3 +1,3 @@
 module TrajectHorizon
-  VERSION = "0.11.2"
+  VERSION = "1.0.0"
 end

data/test/horizon_unicode_escape_test.rb

@@ -0,0 +1,21 @@
+# Encoding: UTF-8
+
+require 'test_helper'
+
+require 'traject'
+require 'traject/horizon_reader'
+
+describe "turning weird Horizon escape sequences into unicode" do
+  describe "convert_text" do
+    before do
+      @reader = Traject::HorizonReader.new(nil, {"horizon.host" => "example.com", "horizon.user" => "dummy"})
+    end
+
+    it "converts" do
+      converted = @reader.convert_text!("A hangul character: <U+1112>, okay<!>", org.marc4j.ErrorHandler.new)
+      assert_equal "A hangul character: ᄒ, okay<!>", converted
+    end
+
+  end
+
+end

metadata

@@ -1,97 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: traject_horizon
 version: !ruby/object:Gem::Version
-  version: 0.11.2
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Jonathan Rochkind
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: traject
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: marc-marc4j
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+  prerelease: false
+  type: :development
+description:
 email:
 - jonathan@dnil.net
 executables: []
@@ -108,6 +97,7 @@ files:
 - lib/traject_horizon.rb
 - lib/traject_horizon/version.rb
 - test/horizon_bib_auth_merge_test.rb
+- test/horizon_unicode_escape_test.rb
 - test/test_helper.rb
 - traject_horizon.gemspec
 - vendor/jtds/.DS_Store
@@ -115,28 +105,28 @@ files:
 homepage: http://github.com/jrochkind/traject_horizon
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.1.5
+signing_key:
+specification_version: 4
 summary: Horizon ILS MARC Exporter, a plugin for the traject tool
 test_files:
 - test/horizon_bib_auth_merge_test.rb
+- test/horizon_unicode_escape_test.rb
 - test/test_helper.rb