rika 0.9.4-java → 0.9.5-java

data/lib/rika.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 raise "You need to run JRuby to use Rika" unless RUBY_PLATFORM =~ /java/
 
 require "rika/version"
@@ -13,30 +15,32 @@ end
 module Rika
   import org.apache.tika.metadata.Metadata
   import org.apache.tika.Tika
+  import java.io.FileInputStream
+  import java.net.URL
   
   class Parser
     
-    def initialize(uri, max_content_length = -1)
-      p = URI::Parser.new
-      @uri = uri
+    def initialize(file_location, max_content_length = -1)
+      @uri = file_location
       @tika = Tika.new
       @tika.set_max_string_length(max_content_length)
       @metadata = Metadata.new
+
+      @is_file = File.exists?(@uri)
+      is_http = URI(@uri).scheme == "http" && Net::HTTP.get_response(URI(@uri)).is_a?(Net::HTTPSuccess) if !@is_file
       
-      if File.exists?(@uri)
-        self.parse_file
-      elsif p.parse(@uri).scheme == 'http' || p.parse(@uri).scheme == 'https'
-        self.parse_url
-      else
+      if !@is_file && !is_http
         raise IOError, "File does not exist or can't be reached."
       end
     end
 
     def content
-      @content.to_s.strip
+      self.parse
+      @content 
     end
 
     def metadata
+      self.parse
       metadata_hash = {}
       
       @metadata.names.each do |name|
@@ -47,33 +51,31 @@ module Rika
     end
 
     def media_type
-      @media_type
+      @media_type ||= @tika.detect(input_stream) 
     end
 
     def available_metadata
+      self.parse
       @metadata.names.to_a
     end
 
     def metadata_exists?(name)
+      self.parse
       @metadata.get(name) != nil
     end
 
     protected
     
-    def parse_file
-      input_stream = java.io.FileInputStream.new(java.io.File.new(@uri))
-      @metadata.set("filename", File.basename(@uri))
-      @media_type = @tika.detect(java.io.FileInputStream.new(java.io.File.new(@uri)))
-      @content = @tika.parse_to_string(input_stream, @metadata) 
+    def parse
+      @content ||= @tika.parse_to_string(input_stream, @metadata).to_s.strip
     end
 
-    def parse_url
-      raise IOError, "File does not exist or can't be reached." if not Net::HTTP.get_response(URI(@uri)).is_a?(Net::HTTPSuccess)
-      url = java.net.URL.new(@uri)
-      input_stream = url.open_stream
-      @media_type = @tika.detect(url.open_stream)
-      @metadata.set("url", @uri)
-      @content = @tika.parse_to_string(input_stream, @metadata) 
+    def input_stream
+      if @is_file
+        FileInputStream.new(java.io.File.new(@uri))
+      else 
+        URL.new(@uri).open_stream
+      end
     end
   end
 end

data/lib/rika/version.rb

@@ -1,3 +1,3 @@
 module Rika
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/spec/rika_spec.rb

@@ -90,10 +90,6 @@ describe Rika::Parser do
       @txt_parser.metadata["nonsense"].should be_nil
     end
 
-    it "should return metadata from a text file" do
-      @txt_parser.metadata["filename"].should == "text_file.txt"
-    end
-
     it "should return metadata from a docx file" do
       @docx_parser.metadata["Page-Count"].should == "1"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rika
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec