yomu 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23b6ed327cc94e45aea195294d84bb8dd669f1a6
-  data.tar.gz: c5ef3d9857242820b04f7c76f2f90834a7235a62
+  metadata.gz: ef1ce415813b44ff2a36e29a49b59768dd72f7f3
+  data.tar.gz: 17c69e97c25e156d101e6cef2c5b3f1fb149190d
 SHA512:
-  metadata.gz: 195f73de69ed781c97f10fffac2971a258a2f23ede81e6ebbc1ce34400c38de4fccac93b765df37c0ca3ab105a95a682977fcc6c71a3d86f810a674e2226ed0e
-  data.tar.gz: a5f562f9de92eedf29a2cf889f1083f03d19928f10998998131c06f3457613e40e06a7fd2f116a88bb74058e1bceb7fe62402aa6204e0fe1a81adcc71cf1c422
+  metadata.gz: 3ad3d4a04d785d0a31028f91d196d797d98e93f9289693d53987f9f72086c6e1c2a86057bc54055e2eb5db87324d370229cb92e8d2bc1ccccf8ecc09a8764f44
+  data.tar.gz: f1e70048c8c42b9750e14bb0b85250114e0674599663da6418cdc4d893947220247be46e16e002f909170b8f86526bd96c4610a515f1ee0c14728e2a77705a55

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/README.md

@@ -1,4 +1,5 @@
-![Google Analytics](https://ga-beacon.appspot.com/UA-31066891-2/yomu/code)
+[![Build Status](https://travis-ci.org/Erol/yomu.png?branch=master)](https://travis-ci.org/Erol/yomu)
+[![Code Climate](https://codeclimate.com/github/Erol/yomu.png)](https://codeclimate.com/github/Erol/yomu)
 
 # Yomu 読む
 

data/lib/yomu.rb

@@ -2,7 +2,7 @@ require 'yomu/version'
 
 require 'net/http'
 require 'mime/types'
-require 'yaml'
+require 'json'
 
 class Yomu
   GEMPATH = File.dirname(File.dirname(__FILE__))
@@ -21,11 +21,11 @@ class Yomu
     when :html
       '-h'
     when :metadata
-      '-m'
+      '-m -j'
     when :mimetype
-      '-m'
+      '-m -j'
     end
-
+    
     result = IO.popen "#{java} -Djava.awt.headless=true -jar #{Yomu::JARPATH} #{switch}", 'r+' do |io|
       io.write data
       io.close_write
@@ -38,9 +38,9 @@ class Yomu
     when :html
       result
     when :metadata
-      YAML.load quote(result)
+      JSON.parse(result)
     when :mimetype
-      MIME::Types[YAML.load(quote(result))['Content-Type']].first
+      MIME::Types[JSON.parse(result)['Content-Type']].first
     end
   end
 
@@ -60,10 +60,10 @@ class Yomu
 
   def initialize(input)
     if input.is_a? String
-      if input =~ URI::regexp
-        @uri = URI.parse input
-      elsif File.exists? input
+      if File.exists? input
         @path = input
+      elsif input =~ URI::regexp
+        @uri = URI.parse input
       else
         raise Errno::ENOENT.new "missing file or invalid URI - #{input}"
       end
@@ -91,9 +91,9 @@ class Yomu
   #   yomu.html
 
   def html
-    return @text if defined? @text
+    return @html if defined? @html
 
-    @text = Yomu.read :html, data
+    @html = Yomu.read :html, data
   end
 
   # Returns the metadata hash of the Yomu document.
@@ -116,7 +116,9 @@ class Yomu
   def mimetype
     return @mimetype if defined? @mimetype
 
-    @mimetype = MIME::Types[metadata['Content-Type']].first
+    type = metadata["Content-Type"].is_a?(Array) ? metadata["Content-Type"].first : metadata["Content-Type"]
+    
+    @mimetype = MIME::Types[type].first
   end
 
   # Returns +true+ if the Yomu document was specified using a file path.
@@ -124,6 +126,18 @@ class Yomu
   #   yomu = Yomu.new 'sample.pages'
   #   yomu.path? #=> true
 
+
+  def creation_date
+    return @creation_date if defined? @creation_date
+ 
+    if metadata['Creation-Date']
+      @creation_date = Time.parse(metadata['Creation-Date'])
+    else
+      nil
+    end
+  end
+
+
   def path?
     defined? @path
   end
@@ -166,11 +180,6 @@ class Yomu
     @data
   end
 
-  def self.quote(metadata)
-    metadata.gsub(/: (.*: .*)$/, ': "\1"')
-  end
-  private_class_method :quote
-
   def self.java
     ENV['JAVA_HOME'] ? ENV['JAVA_HOME'] + '/bin/java' : 'java'
   end

data/lib/yomu/version.rb

@@ -1,3 +1,3 @@
 class Yomu
-  VERSION = "0.1.10"
+  VERSION = '0.2.0'
 end

data/spec/yomu_spec.rb

@@ -28,12 +28,6 @@ describe Yomu do
       expect( metadata['dc:title'] ).to eql 'problem: test'
     end
 
-    it 'reads metadata time values as time values' do
-      metadata = Yomu.read :metadata, data
-
-      expect( metadata['Creation-Date'] ).to be_a Time
-    end
-
     it 'reads mimetype' do
       mimetype = Yomu.read :mimetype, data
 
@@ -100,6 +94,14 @@ describe Yomu do
     end
   end
 
+
+  describe '.creation_date' do
+    let(:yomu) { Yomu.new 'spec/samples/sample.pages' }
+    it 'should retur Time' do 
+      expect( yomu.creation_date ).to be_a Time
+    end
+  end
+
   describe '.java' do
     specify 'with no specified JAVA_HOME' do
       expect( Yomu.send(:java) ).to eql 'java'
@@ -120,7 +122,7 @@ describe Yomu do
     end
 
     specify '#metadata reads metadata' do
-      expect( yomu.metadata['Content-Type'] ).to eql 'application/vnd.apple.pages'
+      expect( yomu.metadata['Content-Type'] ).to eql ["application/vnd.apple.pages", "application/vnd.apple.pages"]
     end
   end
 
@@ -144,7 +146,7 @@ describe Yomu do
     end
 
     specify '#metadata reads metadata' do
-      expect( yomu.metadata['Content-Type'] ).to eql 'application/vnd.apple.pages'
+      expect( yomu.metadata['Content-Type'] ).to eql ["application/vnd.apple.pages", "application/vnd.apple.pages"]
     end
   end
 end

data/yomu.gemspec

@@ -4,23 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'yomu/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "yomu"
+  spec.name          = 'yomu'
   spec.version       = Yomu::VERSION
-  spec.authors       = ["Erol Fornoles"]
-  spec.email         = ["erol.fornoles@gmail.com"]
+  spec.authors       = ['Erol Fornoles']
+  spec.email         = ['erol.fornoles@gmail.com']
   spec.description   = %q{Read text and metadata from files and documents (.doc, .docx, .pages, .odt, .rtf, .pdf)}
   spec.summary       = %q{Read text and metadata from files and documents (.doc, .docx, .pages, .odt, .rtf, .pdf)}
-  spec.homepage      = "http://erol.github.com/yomu"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://erol.github.com/yomu'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'mime-types', '~> 1.23'
+  spec.add_runtime_dependency 'json', '~> 1.8'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 2.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yomu
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - Erol Fornoles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - NOTICE.txt
@@ -111,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Read text and metadata from files and documents (.doc, .docx, .pages, .odt,