ddr-extraction 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d86fadee99408637cfc774cdd62efdaff04e7d
-  data.tar.gz: 03b9386486aa83632f5d96fcc65f209b7ad32952
+  metadata.gz: 1e6c32f2c82cc25e4a8c7b65b98becae648925ad
+  data.tar.gz: 9f8f4da7e5e4c7db8fc66dcddda8bff671642572
 SHA512:
-  metadata.gz: afd68b70ea7ee45bed52c1debfabd88c4ebef23d40d997232c4452061f19ac64d0d2791fc90990807d456e468c660ed553538aaaddf59de731643126e3ab89bb
-  data.tar.gz: df8032a81665c2a4592df5a3ff96d3ff8f490dc1c8f16e4f1de482895fe119f48a5dc796e51d0b98aefea78080e1418d2c685a08ba73e94d7df2752322d07098
+  metadata.gz: 8411bd09f0cb81d7cb16827fd3098f474c21fcf407da1ec38e2936fc3fc9982e892de08cf6ed747901fce92b6aef3d8cfa22c4a6f4bb2a4269fbb659adca539c
+  data.tar.gz: 30967c3ecb2bd79fa5895e7198cb15d29b45be5eceb876ce2a60dd94371b4387296daac635b1fea7a0f38270dd59e62fdc11ed0da2a9be087a4067a2b64cffb9

data/.gitignore

@@ -1,5 +1,5 @@
 Gemfile.lock
 bin/tika-*
-bin/fits-*
+bin/fits
 pkg
 tmp

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.1
+before_script: "bundle exec rake tika:download fits:download"
+cache: 
+  - bundler
+notifications:
+  email:
+    - lib-drs@duke.edu

data/README.md

@@ -1,6 +1,6 @@
-# Ddr::Extractor
+# Ddr::Extraction
 
-Generic file text and metadata extraction service.
+Pluggable file text and metadata extraction service.
 
 ## Installation
 

data/Rakefile

@@ -1,3 +1,9 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
-load "tasks/ddr_extraction.rake"
+load "tasks/ddr_extraction.rake"
+
+desc "Run all specs in spec directory"
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/ddr/extraction.rb

@@ -1,6 +1,6 @@
-require "ddr/extraction/version"
-require "ddr/extraction/configuration"
-require "ddr/extraction/extractor"
+require_relative "extraction/version"
+require_relative "extraction/configuration"
+require_relative "extraction/extractor"
 
 module Ddr
   #
@@ -10,14 +10,15 @@ module Ddr
 
     class << self
 
-      attr_reader :config
+      def config
+        @config ||= Configuration.new
+      end
 
       # Yields a configuration object for the service
       def configure
-        @config ||= Configuration.new
-        yield @config
+        yield config
       end
-
+      
     end
 
   end

data/lib/ddr/extraction/adapters.rb

@@ -2,11 +2,23 @@ module Ddr
   module Extraction
     module Adapters
 
-      def self.get_adapter(adapter_name)
-        require_relative "adapters/#{adapter_name}_adapter"
-        class_name = "#{adapter_name.to_s.capitalize}Adapter"
-        const_get(class_name.to_sym, false)
-      end      
+      KNOWN_ADAPTERS = [:fits, :tika]
+
+      class << self
+
+        def get_adapter(adapter_name)
+          require_relative "adapters/#{adapter_name}_adapter"
+          class_name = "#{adapter_name.to_s.capitalize}Adapter"
+          const_get(class_name.to_sym, false)
+        end
+
+        KNOWN_ADAPTERS.each do |adapter|
+          define_method(adapter) do
+            get_adapter(adapter)
+          end
+        end
+
+      end
 
     end
   end

data/lib/ddr/extraction/adapters/fits_adapter.rb

@@ -12,14 +12,8 @@ module Ddr
         end
 
         class << self
-          # FITS version
-          attr_accessor :version
-
           # Path to FITS executable (fits.sh or fits.bat)
           attr_accessor :path
-
-          # URL to download distribution
-          attr_accessor :download_url
         end
 
       end

data/lib/ddr/extraction/adapters/tika_adapter.rb

@@ -12,27 +12,9 @@ module Ddr
         end
 
         class << self
-          # Tika version
-          attr_accessor :version
-
           # Path to tika-app.jar
           attr_accessor :path
 
-          # Base command
-          attr_accessor :command
-
-          # URL to download distribution
-          attr_accessor :download_url
-
-          # Verify checksum?
-          attr_accessor :verify_checksum
-
-          # Tika distribution checksum
-          attr_accessor :checksum_value
-
-          # Tika distribution checksum type
-          attr_accessor :checksum_type
-
           # Tika server port (optional, required for server)
           attr_accessor :port
         end          

data/lib/ddr/extraction/configuration.rb

@@ -5,8 +5,8 @@ module Ddr
   module Extraction
     class Configuration
 
-      def adapters(name)
-        config = Adapters.get_adapter(name)
+      def adapters
+        config = Adapters
         yield config if block_given?
         config
       end

data/lib/ddr/extraction/defaults.rb

@@ -1,26 +1,11 @@
 require "ddr-extraction"
 
-BIN_DIR = File.expand_path("../../../../bin", __FILE__)
-TIKA_VERSION = "1.6"
-FITS_VERSION = "0.8.3"
+bin_dir = File.expand_path("../../../../bin", __FILE__)
 
 Ddr::Extraction.configure do |config|
   config.adapter.text = :tika
   config.adapter.metadata = :fits
-
-  config.adapters(:tika) do |tika|
-    tika.version = TIKA_VERSION
-    tika.path = File.join(BIN_DIR, "tika-app.jar")
-    tika.download_url = "http://archive.apache.org/dist/tika/tika-app-#{TIKA_VERSION}.jar"
-    tika.verify_checksum = true
-    tika.checksum_value = "99df0d8c3f6a2be498d275053e611fb5afdf0a9d"
-    tika.checksum_type = :SHA1
-  end
-
-  config.adapters(:fits) do |fits|
-    fits.version = "0.8.3"
-    fits.path = File.join(BIN_DIR, "fits-#{FITS_VERSION}", "fits.sh")
-    fits.download_url = "http://projects.iq.harvard.edu/files/fits/files/fits-#{FITS_VERSION}.zip"
-  end
+  config.adapters.tika.path = File.join(bin_dir, "tika-app.jar")
+  config.adapters.fits.path = File.join(bin_dir, "fits", "fits.sh")
 end
 

data/lib/ddr/extraction/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Extraction
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/tasks/ddr_extraction.rake

@@ -1,26 +1,40 @@
 require "ddr/extraction/defaults"
 require "openssl"
+require "net/http"
 
 DOWNLOAD_DIR = File.absolute_path("tmp")
+BIN_DIR = File.absolute_path("bin")
+TIKA_VERSION = "1.6"
+FITS_VERSION = "0.8.3"
+
+tika_version = ENV["TIKA_VERSION"] || TIKA_VERSION
+tika_path = Ddr::Extraction.config.adapters.tika.path
+tika_app = File.basename(tika_path)
+tika_download_url = "http://archive.apache.org/dist/tika/tika-app-#{tika_version}.jar"
+tika_checksum_url = "#{tika_download_url}.sha"
+tika_checksum_type = :SHA1
+
+fits_version = ENV["FITS_VERSION"] || FITS_VERSION
+fits_path = Ddr::Extraction.config.adapters.fits.path
+fits_download_url = "http://projects.iq.harvard.edu/files/fits/files/fits-#{fits_version}.zip"
 
 namespace :tika do
   desc "Download Tika app"
-  task :download => :download_dir do
-    tika_app = File.join(DOWNLOAD_DIR, "tika-app.jar")
-    tika_config = Ddr::Extraction.config.adapters(:tika)
-    puts "Downloading Tika app ... "
-    system "curl -L #{tika_config.download_url} -o #{tika_app}"
-    if tika_config.verify_checksum
+  task :download => [:download_dir] do
+    FileUtils.cd(DOWNLOAD_DIR) do
+      puts "Downloading Tika app ... "
+      system "curl -L #{tika_download_url} -o #{tika_app}"
+      checksum = Net::HTTP.get(URI(tika_checksum_url)).chomp
       puts "Verifiying checksum ... "
-      digest = OpenSSL::Digest.const_get(tika_config.checksum_type).new
-      digest << File.read(tika_config.path)
-      if digest.to_s != tika_config.checksum_value
+      digest = OpenSSL::Digest.const_get(tika_checksum_type).new
+      digest << File.read(tika_app)
+      if digest.to_s != checksum
         puts "Checksums do not match -- aborting!"
         FileUtils.remove_entry_secure(tika_app)
         abort
       end
+      FileUtils.mv(tika_app, tika_path)
     end
-    FileUtils.mv(tika_app, tika_config.path)
   end
 
   # namespace :server do
@@ -33,13 +47,13 @@ end
 namespace :fits do
   desc "Download FITS tool"
   task :download => :download_dir do
-    fits_tool = File.join(DOWNLOAD_DIR, "fits.zip")
-    fits_config = Ddr::Extraction.config.adapters(:fits)
-    puts "Downloading FITS tool ... "
-    system "curl -L #{fits_config.download_url} -o #{fits_tool}"
-    # Unzip options: convert text files, force overwrite, extra quiet
-    system "unzip -a -o -qq -d bin #{fits_tool}"
-    FileUtils.chmod(0755, fits_config.path)
+    FileUtils.cd(DOWNLOAD_DIR) do
+      puts "Downloading FITS tool ... "
+      system "curl -L #{fits_download_url} -o fits.zip"
+      system "unzip -a -o -q fits.zip"
+      FileUtils.mv("fits-#{fits_version}", File.dirname(fits_path))
+    end
+    FileUtils.chmod(0755, fits_path)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddr-extraction
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md