yomu 0.1.3 → 0.1.4

data/lib/yomu.rb

@@ -12,7 +12,7 @@ class Yomu
   #   data = File.read 'sample.pages'
   #   text = Yomu.read :text, data
   #   metadata = Yomu.read :metadata, data
-  #
+
   def self.read(type, data)
     switch = case type
     when :text
@@ -21,7 +21,7 @@ class Yomu
       '-m'
     end
 
-    result = IO.popen "java -Djava.awt.headless=true -jar #{Yomu::JARPATH} #{switch}", 'r+' do |io|
+    result = IO.popen "#{java} -Djava.awt.headless=true -jar #{Yomu::JARPATH} #{switch}", 'r+' do |io|
       io.write data
       io.close_write
       io.read
@@ -43,7 +43,7 @@ class Yomu
   # From a stream or an object which responds to +read+
   #
   #   Yomu.new File.open('sample.pages')
-  #
+
   def initialize(input)
     if input.is_a? String
       if input =~ URI::regexp
@@ -64,7 +64,7 @@ class Yomu
   #
   #   yomu = Yomu.new 'sample.pages'
   #   yomu.text
-  #
+
   def text
     return @text if defined? @text
 
@@ -75,7 +75,7 @@ class Yomu
   #
   #   yomu = Yomu.new 'sample.pages'
   #   yomu.metadata['Content-Type']
-  #
+
   def metadata
     return @metadata if defined? @metadata
 
@@ -86,7 +86,7 @@ class Yomu
   #
   #   yomu = Yomu.new 'sample.pages'
   #   yomu.path? #=> true
-  #
+
   def path?
     defined? @path
   end
@@ -95,7 +95,7 @@ class Yomu
   #
   #   yomu = Yomu.new 'http://svn.apache.org/repos/asf/poi/trunk/test-data/document/sample.docx'
   #   yomu.uri? #=> true
-  #
+
   def uri?
     defined? @uri
   end
@@ -105,7 +105,7 @@ class Yomu
   #   file = File.open('sample.pages')
   #   yomu = Yomu.new file
   #   yomu.stream? #=> true
-  #
+
   def stream?
     defined? @stream
   end
@@ -114,7 +114,7 @@ class Yomu
   #
   #   yomu = Yomu.new 'sample.pages'
   #   yomu.data
-  #
+
   def data
     return @data if defined? @data
 
@@ -128,4 +128,9 @@ class Yomu
 
     @data
   end
+
+  def self.java
+    ENV['JAVA_HOME'] ? ENV['JAVA_HOME'] + '/bin/java' : 'java'
+  end
+  private_class_method :java
 end

data/lib/yomu/version.rb

@@ -1,3 +1,3 @@
 class Yomu
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/specs/yomu.rb

@@ -3,6 +3,10 @@ require_relative '../helper.rb'
 describe Yomu do
   let(:data) { File.read 'test/samples/sample.pages' }
 
+  before do
+    ENV['JAVA_HOME'] = nil
+  end
+
   describe '.read' do
     it 'reads text' do
       text = Yomu.read :text, data
@@ -25,55 +29,65 @@ describe Yomu do
     end
 
     it 'accepts a root path' do
+      yomu = nil
+
       assert_silent do
         yomu = Yomu.new 'test/samples/sample.pages'
-
-        assert_block { yomu.path? }
-        assert_block { !yomu.uri? }
-        assert_block { !yomu.stream? }
       end
+
+      assert yomu.path?
+      refute yomu.uri?
+      refute yomu.stream?
     end
 
     it 'accepts a relative path' do
+      yomu = nil
+
       assert_silent do
         yomu = Yomu.new 'test/samples/sample.pages'
-
-        assert_block { yomu.path? }
-        assert_block { !yomu.uri? }
-        assert_block { !yomu.stream? }
       end
+
+      assert yomu.path?
+      refute yomu.uri?
+      refute yomu.stream?
     end
 
     it 'accepts a path with spaces' do
+      yomu = nil
+
       assert_silent do
         yomu = Yomu.new 'test/samples/sample filename with spaces.pages'
-
-        assert_block { yomu.path? }
-        assert_block { !yomu.uri? }
-        assert_block { !yomu.stream? }
       end
+
+      assert yomu.path?
+      refute yomu.uri?
+      refute yomu.stream?
     end
 
     it 'accepts a URI' do
+      yomu = nil
+
       assert_silent do
         yomu = Yomu.new 'http://svn.apache.org/repos/asf/poi/trunk/test-data/document/sample.docx'
-
-        assert_block { yomu.uri? }
-        assert_block { !yomu.path? }
-        assert_block { !yomu.stream? }
       end
+
+      assert yomu.uri?
+      refute yomu.path?
+      refute yomu.stream?
     end
 
     it 'accepts a stream or object that can be read' do
+      yomu = nil
+
       assert_silent do
         File.open 'test/samples/sample.pages', 'r' do |file|
           yomu = Yomu.new file
-
-        assert_block { yomu.stream? }
-        assert_block { !yomu.path? }
-        assert_block { !yomu.uri? }
         end
       end
+
+      assert yomu.stream?
+      refute yomu.path?
+      refute yomu.uri?
     end
 
     it 'does not accept a path to a missing file' do
@@ -91,51 +105,51 @@ describe Yomu do
     end
   end
 
+  describe '.java' do
+    specify 'with no specified JAVA_HOME' do
+      assert_equal 'java', Yomu.send(:java)
+    end
+
+    specify 'with a specified JAVA_HOME' do
+      ENV['JAVA_HOME'] = '/path/to/java/home'
+
+      assert_equal '/path/to/java/home/bin/java', Yomu.send(:java)
+    end
+  end
+
   describe 'initialized with a given path' do
     let(:yomu) { Yomu.new 'test/samples/sample.pages' }
 
-    describe '#text' do
-      it 'reads text' do
-        assert_includes yomu.text, 'The quick brown fox jumped over the lazy cat.'
-      end
+    specify '#text reads text' do
+      assert_includes yomu.text, 'The quick brown fox jumped over the lazy cat.'
     end
 
-    describe '#metadata' do
-      it 'reads metadata' do
-        assert_equal 'application/vnd.apple.pages', yomu.metadata['Content-Type']
-      end
+    specify '#metada reads metadata' do
+      assert_equal 'application/vnd.apple.pages', yomu.metadata['Content-Type']
     end
   end
 
   describe 'initialized with a given URI' do
     let(:yomu) { Yomu.new 'http://svn.apache.org/repos/asf/poi/trunk/test-data/document/sample.docx' }
 
-    describe '#text' do
-      it 'reads text' do
-        assert_includes yomu.text, 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit.'
-      end
+    specify '#text reads text' do
+      assert_includes yomu.text, 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit.'
     end
 
-    describe '#metadata' do
-      it 'reads metadata' do
-        assert_equal 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', yomu.metadata['Content-Type']
-      end
+    specify '#metadata reads metadata' do
+      assert_equal 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', yomu.metadata['Content-Type']
     end
   end
 
   describe 'initialized with a given stream' do
     let(:yomu) { Yomu.new File.open('test/samples/sample.pages', 'rb') }
 
-    describe '#text' do
-      it 'reads text' do
-        assert_includes yomu.text, 'The quick brown fox jumped over the lazy cat.'
-      end
+    specify '#text reads text' do
+      assert_includes yomu.text, 'The quick brown fox jumped over the lazy cat.'
     end
 
-    describe '#metadata' do
-      it 'reads metadata' do
-        assert_equal 'application/vnd.apple.pages', yomu.metadata['Content-Type']
-      end
+    specify '#metadata reads metadata' do
+      assert_equal 'application/vnd.apple.pages', yomu.metadata['Content-Type']
     end
   end
 end

data/yomu.gemspec

@@ -14,4 +14,6 @@ Gem::Specification.new do |gem|
   gem.name          = "yomu"
   gem.require_paths = ["lib"]
   gem.version       = Yomu::VERSION
+
+  gem.add_development_dependency 'minitest'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yomu
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
-dependencies: []
+date: 2012-10-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Read text and metadata from files and documents (.doc, .docx, .pages,
   .odt, .rtf, .pdf)
 email: