jpdfer 0.4.0-java → 0.5.0-java

data/lib/jpdfer/page_range_utilities.rb

@@ -0,0 +1,35 @@
+module Jpdfer
+  module PageRangeUtilities
+    module_function
+
+    def normalize_page_range page_range
+      pages = expand_page_range page_range
+      split_list pages
+    end
+
+    def expand_page_range page_range
+      page_range.split(',').reduce([]) do |result, sub_range|
+        if sub_range.include? '-'
+          raise "Invalid Range: #{sub_range}" unless sub_range =~ /^\d+-\d+$/
+          first, last = sub_range.split '-'
+          result.concat (first.to_i..last.to_i).to_a
+        else
+          raise "Invalid Range: #{sub_range}" unless sub_range.to_i.to_s == sub_range
+          result << sub_range.to_i
+        end
+      end
+    end
+
+    def split_list list
+      list.reduce([[]]) do |result, number|
+        current = result.last
+        if current.include? number
+          result << [number]
+        else
+          current << number
+          result
+        end
+      end
+    end
+  end
+end

data/lib/jpdfer/pdf.rb

@@ -1,4 +1,5 @@
 require 'jpdfer/page_sizes'
+require 'jpdfer/page_range_utilities'
 # High-level/convenience wrapper class for a PDF document.
 
 module Jpdfer
@@ -45,8 +46,16 @@ module Jpdfer
       flatten = options.delete(:flatten)
       concatenator = PdfCopyFields.new output_buffer.to_outputstream
 
-      pdfs.each do |pdf|
-        concatenator.addDocument pdf.reader
+      pdfs.each do |pdf, page_range|
+        if page_range
+          PageRangeUtilities::normalize_page_range(page_range).each do |pages|
+            # We need to help jruby convert Fixnum to java.lang.Integer. It defaults to java.lang.Long
+            pages = pages.map {|page| Java::JavaLang::Integer.new page}
+            concatenator.addDocument pdf.reader, pages
+          end
+        else
+          concatenator.addDocument pdf.reader
+        end
       end
       concatenator.close
 

data/lib/jpdfer/version.rb

@@ -1,3 +1,3 @@
 module Jpdfer
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/page_range_utilites_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+module Jpdfer
+  describe PageRangeUtilities do
+    describe '.normalize_page_range' do
+      it "should convert '' to []" do
+        Jpdfer::PageRangeUtilities.normalize_page_range('').should == [[]]
+      end
+
+      it "should convert '1' to [1]" do
+        Jpdfer::PageRangeUtilities.normalize_page_range('1').should == [[1]]
+      end
+
+      it "should convert '1-2' to [1,2]" do
+        Jpdfer::PageRangeUtilities.normalize_page_range('1-2').should == [[1,2]]
+      end
+
+      it "should convert '1-2,3-4,5-6,7' to [1,2,3,4,5,6,7]" do
+        Jpdfer::PageRangeUtilities.normalize_page_range('1-2,3-4,5-6,7').should == [[1,2,3,4,5,6,7]]
+      end
+
+      it "should convert '1-2,3,4,6' to [1,2,3,4,6]" do
+        Jpdfer::PageRangeUtilities.normalize_page_range('1-2,3,4,6').should == [[1,2,3,4,6]]
+      end
+
+      it "should convert '1-2,3,2,4-5,6' to [[1,2,3],[2,4,6]]" do
+        Jpdfer::PageRangeUtilities.normalize_page_range('1-2,3,2,4-5,6').should == [[1,2,3],[2,4,5,6]]
+      end
+
+      it "should convert '1-2,3,2,4-5,6' to [[1,2,3],[2,4,5,6]]" do
+        Jpdfer::PageRangeUtilities.normalize_page_range('1-2,3,2,4-5,6').should == [[1,2,3],[2,4,5,6]]
+      end
+
+      it "should convert '1,1,1,2,3,4,5,2,3,5,6' to [[1],[1],[1,2,3,4,5],[2,3,5,6]]" do
+        Jpdfer::PageRangeUtilities.normalize_page_range('1,1,1,2,3,4,5,2,3,5,6').should == [[1],[1],[1,2,3,4,5],[2,3,5,6]]
+      end
+    end
+  end
+end
+

data/spec/pdf_spec.rb

@@ -151,6 +151,11 @@ describe Pdf do
       new_pdf = Pdf.new(@save_path)
       new_pdf.number_of_pages.should == @pdf_1.number_of_pages + @pdf_2.number_of_pages
     end
+
+    it 'should allow the specification of a page range for a pdf' do
+      pdf = Pdf.concatenate([[@pdf_1, '1,1,1'], @pdf_2], @save_path)
+      pdf.number_of_pages.should == 3 + @pdf_2.number_of_pages
+    end
   end
 
   describe 'forwards any potential messages to the reader if it will respond' do

metadata

@@ -2,7 +2,7 @@
 name: jpdfer
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.4.0
+  version: 0.5.0
 platform: java
 authors:
 - Scott Nielsen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000Z
+date: 2013-01-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -58,14 +58,17 @@ files:
 - jars/itextpdf-5.1.1.jar
 - lib/jpdfer.rb
 - lib/jpdfer/key_store.rb
+- lib/jpdfer/page_range_utilities.rb
 - lib/jpdfer/page_sizes.rb
 - lib/jpdfer/pdf.rb
 - lib/jpdfer/version.rb
+- spec/page_range_utilites_spec.rb
 - spec/pdf_spec.rb
 - spec/spec_helper.rb
 - spec/data/keystore.ks
 - spec/data/flattened.pdf
 - spec/data/simple_form.pdf
+- spec/data/simple_form_2.pdf
 - spec/data/simple_form_flattened.pdf
 - spec/data/simple_form_flattened_signed.pdf
 - spec/data/simple_form_signed_by_someone_else.pdf
@@ -96,11 +99,13 @@ signing_key:
 specification_version: 3
 summary: Read and write PDF forms in JRuby
 test_files:
+- spec/page_range_utilites_spec.rb
 - spec/pdf_spec.rb
 - spec/spec_helper.rb
 - spec/data/keystore.ks
 - spec/data/flattened.pdf
 - spec/data/simple_form.pdf
+- spec/data/simple_form_2.pdf
 - spec/data/simple_form_flattened.pdf
 - spec/data/simple_form_flattened_signed.pdf
 - spec/data/simple_form_signed_by_someone_else.pdf