pdfinfo 1.3.2 → 1.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjFkYmExNjAxODg3ODMyM2VhNWU1ZDE1MTYyN2ZkNDYwODg1MTdlMA==
+    OWE5OGUxYjJmMWRjYjZhM2FjZjdlN2RiNDU0YWI0MGMyYzhhZGM2OQ==
   data.tar.gz: !binary |-
-    MWE5NWIzMDZhZDE3YWQzYzRlMDYwMmQ4OTE4YjRlZjQwYzc3YjI4YQ==
+    NThkMTcwNjNiNDkxZGY1NTIwMWZiNDlhZjMyMTZkNWNhY2Y3Njg5Zg==
 SHA512:
   metadata.gz: !binary |-
-    MTM2MDMzYThjYjlkY2MzZWYyNjYwNGY5M2YyN2MyM2VjYmQxMTVhYWE5Y2U0
-    MjQ0ZTY3YjZmZGUxNjJjMDc2NWYzYjFiYTVmMjAyODA2YWI3Y2RlZmM3YjNk
-    YTJlMjQ1YTMxYTQ3Y2I0MWYzMzFmMTI4MWJmZDcxYzBmZmVkNmU=
+    N2JmMGQ2MjcwNzA4NjU2YTdiODIwNTg5YjI0NDY0YzI3NDkzYjU1ZmVjMThh
+    NGFiNmY5YjliYzlhZGEwNGQ3MjgyNjhjZTY1ZmVmYTAyODVhN2Q0MWRlMjg0
+    NTA0YTg2ZjZjZDg0MTVlYWU2ZmU2Njk1NGE5M2ZiNjA1MWMzMDg=
   data.tar.gz: !binary |-
-    NzAxZjU2MTUwMjg1ODQwZGE1ZDFiZDUwZGM5MTNkYWFiM2Y4NWVhNGZlMjk2
-    YzkwMDIxYzY5NjdjNTlmOTExM2RkY2QzMzlmZGVlNDRhNTlhYjA3YWUwMjRl
-    OWU1ZTg1YzA5ZjcyYTI2N2QwZDIzZmQ2YWNhYzk2ZGQyZmUzYmU=
+    YzNiYTUzMDc0NmRkNTY4ZTI4MTY0ZjgwMWEwNWJhOWRhMTBhMWZkODdhZWEz
+    ZTU0MDlhOWZiODJjZjc4ODI5MTE5ODVlM2EwMGFmZDYwMDNjMzM1MGI1MDIw
+    NGQxOGMzMmM4NzhhYWY4MmFhOTI5MTgyOWFiMjAzMWFkN2I2Y2I=

data/lib/pdfinfo.rb

@@ -2,11 +2,10 @@ require 'open3'
 require 'shellwords'
 require 'date'
 require 'time'
-%w(object_to_hash errors page).each {|f| require File.expand_path("../pdfinfo/#{f}", __FILE__)}
+Dir[File.expand_path("../pdfinfo/*", __FILE__)].each {|f| require f }
 
 class Pdfinfo
-  include ObjectToHash
-
+  include ToHash
   attr_reader :pages, :title, :subject, :keywords, :author, :creator,
     :creation_date, :modified_date, :usage_rights, :producer,
     :form, :page_count, :width, :height, :file_size, :pdf_version
@@ -29,10 +28,10 @@ class Pdfinfo
   end
 
   def initialize(source_path, opts = {})
-    @pages = []
 
     info_hash = parse_shell_response(exec(source_path, opts))
 
+    @pages = []
     info_hash.delete_if do |key, value|
       @pages << Page.from_string(value) if key.match(/Page\s+\d+\ssize/)
     end
@@ -45,12 +44,12 @@ class Pdfinfo
     @creator        = presence(info_hash.delete('Creator'))
     @producer       = presence(info_hash.delete('Producer'))
     @tagged         = !!(info_hash.delete('Tagged') =~ /yes/)
+    @optimized      = !!(info_hash.delete('Optimized') =~ /yes/)
     @encrypted      = !!(encrypted_val =~ /yes/)
     @page_count     = info_hash.delete('Pages').to_i
     @file_size      = info_hash.delete('File size').to_i
     @form           = info_hash.delete('Form')
     @pdf_version    = info_hash.delete('PDF version')
-    @optimized      = !!(info_hash.delete('Optimized') =~ /yes/)
     @keywords       = (info_hash.delete('Keywords') || '').split(/\s/)
     @creation_date  = parse_time(info_hash.delete('CreationDate'))
     @modified_date  = parse_time(info_hash.delete('ModDate'))
@@ -64,39 +63,32 @@ class Pdfinfo
       ur[:change]    = booleanize_usage_right.call('change')
       ur[:add_notes] = booleanize_usage_right.call('addNotes')
     end
-
-    # temporarily continue setting #width and #height on Pdfinfo object
-    # to maintain legacy behavior
-    @width  = @pages[0].width
-    @height = @pages[0].height
   end
 
-  # @return [Boolean]
-  def tagged?
-    @tagged
+  %w(width height).each do |attr|
+    define_method(attr) { @pages[0].send(attr) }
   end
 
-  # @return [Boolean]
-  def encrypted?
-    @encrypted
-  end
-
-  # @return [Boolean]
-  def optimized?
-    @optimized
+  # Feature checks
+  %w(tagged encrypted optimized).each do |flag|
+    define_method("#{flag}?") { instance_variable_get("@#{flag}")}
   end
 
+  # Usage rights checks
   %w(print copy change).each do |ur|
-    # @return [Boolean]
     define_method("#{ur}able?") { @usage_rights[ur.to_sym] }
   end
   alias modifiable? changeable?
 
-  # @return [Boolean]
   def annotatable?
     @usage_rights[:add_notes]
   end
 
+  def to_hash
+    super.tap {|h| h[:pages].map!(&:to_hash) }
+  end
+  alias_method :to_h, :to_hash
+
   private
   # executes pdfinfo command with supplied options
   # @param [String,Pathname] file_path
@@ -145,8 +137,9 @@ class Pdfinfo
     str.encode!(Encoding::UTF_8)
   end
 
+  # @return [NilClass,String] returns nil if string is empty
   def presence(val)
-    (val.nil? || val.empty? ) ? nil : val
+    (val.nil? || val.empty?) ? nil : val
   end
 
   def parse_shell_response(response_str)

data/lib/pdfinfo/page.rb

@@ -1,6 +1,8 @@
+require File.expand_path("../to_hash", __FILE__)
+
 class Pdfinfo
   class Page
-    include ObjectToHash
+    include Pdfinfo::ToHash
     MATCHER = /(?<=\s)?(\d+(?:\.\d+)?)(?=\s)/
 
     attr_reader :width, :height, :rotation
@@ -18,5 +20,9 @@ class Pdfinfo
     def rotated?
       0 != @rotation
     end
+
+    # def to_hash
+    #   {width: width, height: height, rotation: rotation}
+    # end
   end
 end

data/lib/pdfinfo/to_hash.rb

@@ -0,0 +1,7 @@
+class Pdfinfo
+  module ToHash
+    def to_hash
+      instance_variables.inject({}) { |h, var| h[var[1..-1].to_sym] = instance_variable_get(var); h }
+    end
+  end
+end

data/lib/pdfinfo/version.rb

@@ -1,3 +1,3 @@
 class Pdfinfo
-  VERSION = '1.3.2'
+  VERSION = '1.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdfinfo
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Ryan Venegas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Simple ruby wrapper around the pdfinfo executable
+description: Object oriented ruby wrapper around the pdfinfo
 email: rvenegas2@gmail.com
 executables: []
 extensions: []
@@ -60,8 +60,8 @@ extra_rdoc_files: []
 files:
 - lib/pdfinfo.rb
 - lib/pdfinfo/errors.rb
-- lib/pdfinfo/object_to_hash.rb
 - lib/pdfinfo/page.rb
+- lib/pdfinfo/to_hash.rb
 - lib/pdfinfo/version.rb
 homepage: https://github.com/RyanV/pdfinfo
 licenses:
@@ -86,5 +86,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Simple ruby wrapper around the pdfinfo executable
+summary: Simple ruby wrapper around the pdfinfo command line utility
 test_files: []

data/lib/pdfinfo/object_to_hash.rb

@@ -1,19 +0,0 @@
-class Pdfinfo
-  module ObjectToHash
-    def as_json
-      instance_variables.inject({}) do |hash, var|
-        val = instance_variable_get(var)
-        hash[var[1..-1].to_sym] = (val.respond_to?(:as_json) ? val.as_json : val)
-        hash
-      end
-    end
-    alias to_hash as_json
-    alias to_h as_json
-  end
-end
-
-class Array
-  def as_json
-    map {|v| v.respond_to?(:as_json) ? v.as_json : v }
-  end unless method_defined?(:as_json)
-end