origami 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce1a44a58ce5b5e21a3279fda0f8195b10820eb7
-  data.tar.gz: d47ccde08ad05ece6b5008fcbbf19de9916709d9
+  metadata.gz: 5d1ff84fe2a78a359e39368afcefca18d5538136
+  data.tar.gz: 4b471c0175c77ec5189c2579496e552a3c416f30
 SHA512:
-  metadata.gz: 064c8a4052fb0a0b471bccb62351be31f00bd6362ed615affb31b0230c0d05b3c35819d7c69576b4c5ccfb203d3eab4187f4aad4b490003a88193c22f7ba377d
-  data.tar.gz: 8e6ee0137acfd94f3bb569f0dc6614c59e5aba05ef80a815f241a3b0309b5f8d200a7ffbe40955ac805ad4c7143c1f6709d4f014e3e8ad3afbd60fb6ab51526e
+  metadata.gz: 4f5d904ad0125e4f78efc68d0d0fd1115d19d9fd3221162c2d95e27084bebc88bd221167ffe10f9396cf7abf67cf66d1983e8be625bd089ba0d5b9093220dc44
+  data.tar.gz: 22a28b2c789e1614d757b8c1eb7fd39a10bb0f69ff3fba10aad1103dcbb25aebe2e5c1bab1b986e271e4041add4e653077a1801e2146623bf2488f1fba3c6275

data/README.md

@@ -45,6 +45,7 @@ Then import Origami with:
 
 ```ruby
 require 'origami'
+include Origami
 ```
 
 To process a PDF document, you can use the ``PDF.read`` method:

data/bin/gui/config.rb

@@ -46,8 +46,9 @@ module PDFWalker
 
             def initialize(configfile = DEFAULT_CONFIG_FILE)
                 begin
-                    @conf = YAML.load(File.open(configfile)) or DEFAULT_CONFIG
+                    @conf = YAML.load(File.open(configfile))
                 rescue
+                    @conf = DEFAULT_CONFIG
                 ensure
                     @filename = configfile
                     set_missing_values

data/bin/gui/file.rb

@@ -37,7 +37,7 @@ module PDFWalker
 
             # disable all menus.
             [
-                @file_menu_close, @file_menu_saveas, @file_menu_serialize, @file_menu_refresh,
+                @file_menu_close, @file_menu_saveas, @file_menu_refresh,
                 @document_menu_search,
                 @document_menu_gotocatalog, @document_menu_gotodocinfo, @document_menu_gotometadata,
                 @document_menu_gotopage, @document_menu_gotofield, @document_menu_gotorev, @document_menu_gotoobj,
@@ -78,174 +78,18 @@ module PDFWalker
             dialog.destroy
 
             begin
-                if @help_menu_profile.active?
-                    require 'ruby-prof'
-                    RubyProf.start
+                document = start_profiling do
+                    parse_file(filename)
                 end
 
-                target = parse_file(filename)
-
-                if @help_menu_profile.active?
-                    result = RubyProf.stop
-                    multiprinter = RubyProf::MultiPrinter.new(result)
-
-                    Dir.mkdir(@config.profile_output_dir) unless Dir.exists?(@config.profile_output_dir) 
-
-                    multiprinter.print(path: @config.profile_output_dir, profile: File.basename(filename))
-                end
-
-                if target
-                    close if @opened
-                    @opened = target
-                    @filename = filename
-
-                    @config.last_opened_file(filename)
-                    @config.save
-                    update_recent_menu
-
-                    @last_search_result = []
-                    @last_search =
-                    {
-                        :expr => "",
-                        :regexp => false,
-                        :type => :body
-                    }
-
-                    self.reload
-
-                    # Enable basic file menus.
-                    [
-                        @file_menu_close, @file_menu_refresh,
-                    ].each do |menu|
-                        menu.sensitive = true
-                    end
-
-                    @explorer_history.clear
-
-                    @statusbar.push(@main_context, "Viewing #{filename}")
-
-                    if @opened.is_a?(Origami::PDF)
-
-                        # Enable save and document menu.
-                        [
-                            @file_menu_saveas, @file_menu_serialize,
-                            @document_menu_search,
-                            @document_menu_gotocatalog, @document_menu_gotopage, @document_menu_gotorev, @document_menu_gotoobj,
-                            @document_menu_properties, @document_menu_sign, @document_menu_ur
-                        ].each do |menu|
-                            menu.sensitive = true
-                        end
-
-                        @document_menu_gotodocinfo.sensitive = true if @opened.document_info?
-                        @document_menu_gotometadata.sensitive = true if @opened.metadata?
-                        @document_menu_gotofield.sensitive = true if @opened.form?
-
-                        page_menu = Menu.new
-                        @document_menu_gotopage.remove_submenu
-                        @opened.each_page.with_index(1) do |page, index|
-                            page_menu.append(item = MenuItem.new(index.to_s).show)
-                            item.signal_connect("activate") do @treeview.goto(page) end
-                        end
-                        @document_menu_gotopage.set_submenu(page_menu)
-
-                        field_menu = Menu.new
-                        @document_menu_gotofield.remove_submenu
-                        @opened.each_field do |field|
-                            field_name = field.T || "<unnamed field>"
-                            field_menu.append(item = MenuItem.new(field_name).show)
-                            item.signal_connect("activate") do @treeview.goto(field) end
-                        end
-                        @document_menu_gotofield.set_submenu(field_menu)
-
-                        rev_menu = Menu.new
-                        @document_menu_gotorev.remove_submenu
-                        rev_index = 1
-                        @opened.revisions.each do |rev|
-                            rev_menu.append(item = MenuItem.new(rev_index.to_s).show)
-                            item.signal_connect("activate") do @treeview.goto(rev) end
-                            rev_index = rev_index + 1
-                        end
-                        @document_menu_gotorev.set_submenu(rev_menu)
-
-                        goto_catalog
-                    end
-                end
+                set_active_document(filename, document)
 
             rescue
                 error("Error while parsing file.\n#{$!} (#{$!.class})\n" + $!.backtrace.join("\n"))
+            ensure
+                close_progressbar
+                self.activate_focus
             end
-
-            close_progressbar
-            self.activate_focus
-        end
-
-        def deserialize
-            dialog = Gtk::FileChooserDialog.new("Open dump file",
-                        self,
-                        FileChooser::ACTION_OPEN,
-                        nil,
-                        [Stock::CANCEL, Dialog::RESPONSE_CANCEL],
-                        [Stock::OPEN, Dialog::RESPONSE_ACCEPT]
-            )
-
-            dialog.current_folder = File.join(Dir.pwd, "dumps")
-            dialog.filter = FileFilter.new.add_pattern("*.gz")
-
-            if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
-                close if @opened
-                filename = dialog.filename
-
-                begin
-                    @opened = Origami::PDF.deserialize(filename)
-                    self.reload
-
-                    [
-                        @file_menu_close, @file_menu_saveas, @file_menu_serialize, @file_menu_refresh,
-                        @document_menu_search,
-                        @document_menu_gotocatalog, @document_menu_gotopage, @document_menu_gotorev, @document_menu_gotoobj,
-                        @document_menu_properties, @document_menu_sign, @document_menu_ur
-                    ].each do |menu|
-                        menu.sensitive = true
-                    end
-
-                    @document_menu_gotodocinfo.sensitive = true if @opened.document_info?
-                    @document_menu_gotometadata.sensitive = true if @opened.metadata?
-                    @document_menu_gotofield.sensitive = true if @opened.form?
-
-                    @explorer_history.clear
-
-                    @statusbar.push(@main_context, "Viewing dump of #{filename}")
-                rescue
-                    error("This file cannot be loaded.\n#{$!} (#{$!.class})")
-                end
-            end
-
-            dialog.destroy
-        end
-
-        def serialize
-            dialog = Gtk::FileChooserDialog.new("Save dump file",
-                        self,
-                        Gtk::FileChooser::ACTION_SAVE,
-                        nil,
-                        [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-                        [Gtk::Stock::SAVE, Gtk::Dialog::RESPONSE_ACCEPT]
-            )
-
-            dialog.do_overwrite_confirmation = true
-            dialog.current_folder = File.join(Dir.pwd, "dumps")
-            dialog.current_name = "#{File.basename(@filename)}.dmp.gz"
-            dialog.filter = FileFilter.new.add_pattern("*.gz")
-
-            if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
-                begin
-                    @opened.serialize(dialog.filename)
-                rescue
-                    error("Error: #{$!.message}")
-                end
-            end
-
-            dialog.destroy
         end
 
         def save_data(caption, data, filename = "")
@@ -297,97 +141,95 @@ module PDFWalker
             dialog.destroy
         end
 
-        def save_dot
-            dialog = Gtk::FileChooserDialog.new("Save dot file",
-                        self,
-                        Gtk::FileChooser::ACTION_SAVE,
-                        nil,
-                        [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-                        [Gtk::Stock::SAVE, Gtk::Dialog::RESPONSE_ACCEPT]
-            )
+        private
 
-            dialog.filter = FileFilter.new.add_pattern("*.dot")
+        def set_active_document(filename, document)
+            close if @opened
+            @opened = document
+            @filename = filename
+
+            @config.last_opened_file(filename)
+            @config.save
+            update_recent_menu
+
+            @last_search_result = []
+            @last_search =
+            {
+                :expr => "",
+                :regexp => false,
+                :type => :body
+            }
 
-            folder = File.dirname(@filename)
-            dialog.set_current_folder(folder)
+            self.reload
 
-            if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
-                begin
-                    @opened.export_to_graph(dialog.filename)
-                rescue
-                    error("Error: #{$!.message}")
-                end
+            # Enable basic file menus.
+            [
+                @file_menu_close, @file_menu_refresh,
+            ].each do |menu|
+                menu.sensitive = true
             end
 
-            dialog.destroy
+            @explorer_history.clear
+
+            @statusbar.push(@main_context, "Viewing #{filename}")
+
+            setup_pdf_interface if @opened.is_a?(Origami::PDF)
         end
 
-        def save_graphml
-            dialog = Gtk::FileChooserDialog.new("Save GraphML file",
-                        self,
-                        Gtk::FileChooser::ACTION_SAVE,
-                        nil,
-                        [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-                        [Gtk::Stock::SAVE, Gtk::Dialog::RESPONSE_ACCEPT]
-            )
+        def setup_pdf_interface
+            # Enable save and document menu.
+            [
+                @file_menu_saveas,
+                @document_menu_search,
+                @document_menu_gotocatalog, @document_menu_gotopage, @document_menu_gotorev, @document_menu_gotoobj,
+                @document_menu_properties, @document_menu_sign, @document_menu_ur
+            ].each do |menu|
+                menu.sensitive = true
+            end
 
-            dialog.filter = FileFilter.new.add_pattern("*.graphml")
+            @document_menu_gotodocinfo.sensitive = true if @opened.document_info?
+            @document_menu_gotometadata.sensitive = true if @opened.metadata?
+            @document_menu_gotofield.sensitive = true if @opened.form?
 
-            folder = File.dirname(@filename)
-            dialog.set_current_folder(folder)
+            setup_page_menu
+            setup_field_menu
+            setup_revision_menu
 
-            if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
-                begin
-                    @opened.export_to_graphml(dialog.filename)
-                rescue
-                    error("Error: #{$!.message}")
-                end
+            goto_catalog
+        end
+
+        def setup_page_menu
+            page_menu = Menu.new
+            @document_menu_gotopage.remove_submenu
+            @opened.each_page.with_index(1) do |page, index|
+                page_menu.append(item = MenuItem.new(index.to_s).show)
+                item.signal_connect("activate") { @treeview.goto(page) }
             end
+            @document_menu_gotopage.set_submenu(page_menu)
+        end
 
-            dialog.destroy
+        def setup_field_menu
+            field_menu = Menu.new
+            @document_menu_gotofield.remove_submenu
+            @opened.each_field do |field|
+                field_name = field.T || "<unnamed field>"
+                field_menu.append(item = MenuItem.new(field_name).show)
+                item.signal_connect("activate") { @treeview.goto(field) }
+            end
+            @document_menu_gotofield.set_submenu(field_menu)
         end
 
-        private
+        def setup_revision_menu
+            rev_menu = Menu.new
+            @document_menu_gotorev.remove_submenu
+            @opened.revisions.each.with_index(1) do |rev, index|
+                rev_menu.append(item = MenuItem.new(index.to_s).show)
+                item.signal_connect("activate") { @treeview.goto(rev) }
+            end
+            @document_menu_gotorev.set_submenu(rev_menu)
+        end
 
         def parse_file(path)
-            update_bar = lambda { |obj|
-                @progressbar.pulse if @progressbar
-                Gtk.main_iteration while Gtk.events_pending?
-            }
-
-            prompt_passwd = lambda {
-                passwd = ""
-
-                dialog = Gtk::Dialog.new(
-                            "This document is encrypted",
-                            nil,
-                            Gtk::Dialog::MODAL,
-                            [ Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK ],
-                            [ Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL ]
-                )
-
-                dialog.set_default_response(Gtk::Dialog::RESPONSE_OK)
-
-                label = Gtk::Label.new("Please enter password:")
-                entry = Gtk::Entry.new
-                entry.signal_connect('activate') {
-                    dialog.response(Gtk::Dialog::RESPONSE_OK)
-                }
-
-                dialog.vbox.add(label)
-                dialog.vbox.add(entry)
-                dialog.show_all
-
-                dialog.run do |response|
-                    if response == Gtk::Dialog::RESPONSE_OK
-                        passwd = entry.text
-                    end
-                end
-
-                dialog.destroy
-                return passwd
-            }
-
             #
             # Try to detect the file type of the document.
             # Fallback to PDF if none is found.
@@ -403,12 +245,48 @@ module PDFWalker
             file_type.read(path,
                 verbosity: Origami::Parser::VERBOSE_TRACE,
                 ignore_errors: false,
-                callback: update_bar,
-                prompt_password: prompt_passwd,
+                callback: method(:update_progressbar),
+                prompt_password: method(:prompt_password),
                 force: force_mode
             )
         end
 
+        def update_progressbar(_obj)
+            @progressbar.pulse if @progressbar
+            Gtk.main_iteration while Gtk.events_pending?
+        end
+
+        def prompt_password
+            passwd = ""
+
+            dialog = Gtk::Dialog.new(
+                        "This document is encrypted",
+                        nil,
+                        Gtk::Dialog::MODAL,
+                        [ Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK ],
+                        [ Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL ]
+            )
+
+            dialog.set_default_response(Gtk::Dialog::RESPONSE_OK)
+
+            label = Gtk::Label.new("Please enter password:")
+            entry = Gtk::Entry.new
+            entry.signal_connect('activate') {
+                dialog.response(Gtk::Dialog::RESPONSE_OK)
+            }
+
+            dialog.vbox.add(label)
+            dialog.vbox.add(entry)
+            dialog.show_all
+
+            dialog.run do |response|
+                passwd = entry.text if response == Gtk::Dialog::RESPONSE_OK
+            end
+
+            dialog.destroy
+            passwd
+        end
+
         def detect_file_type(path)
             supported_types = [ Origami::PDF, Origami::FDF, Origami::PPKLite ]
 

data/bin/gui/gtkhex.rb

@@ -169,7 +169,7 @@ module Gtk
                 @xdisp_gc.set_exposures(true)
             end
 
-            @xdisp.signal_connect 'expose_event' do |xdisp, event|
+            @xdisp.signal_connect 'expose_event' do |_xdisp, event|
                 imin = (event.area.y / @char_height).to_i
                 imax = ((event.area.y + event.area.height) / @char_height).to_i
                 imax += 1 if (event.area.y + event.area.height).to_i % @char_height != 0
@@ -179,7 +179,7 @@ module Gtk
                 render_hex_lines(imin, imax)
             end
 
-            @xdisp.signal_connect 'scroll_event' do |xdisp, event|
+            @xdisp.signal_connect 'scroll_event' do |_xdisp, event|
                 @scrollbar.event(event)
             end
 
@@ -245,7 +245,7 @@ module Gtk
                 @adisp_gc.set_exposures(true)
             end
 
-            @adisp.signal_connect 'expose_event' do |adisp, event|
+            @adisp.signal_connect 'expose_event' do |_adisp, event|
                 imin = (event.area.y / @char_height).to_i
                 imax = ((event.area.y + event.area.height) / @char_height).to_i
                 imax += 1 if (event.area.y + event.area.height).to_i % @char_height != 0
@@ -254,7 +254,7 @@ module Gtk
                 render_ascii_lines(imin, imax)
             end
 
-            @adisp.signal_connect 'scroll_event' do |adisp, event|
+            @adisp.signal_connect 'scroll_event' do |_adisp, event|
                 @scrollbar.event(event)
             end
 
@@ -910,7 +910,7 @@ module Gtk
             @olayout = @offsets.create_pango_layout('')
 
             @offsets.events = Gdk::Event::EXPOSURE_MASK
-            @offsets.signal_connect 'expose_event' do |offsets, event|
+            @offsets.signal_connect 'expose_event' do |_offsets, event|
                 imin = (event.area.y / @char_height).to_i
                 imax = ((event.area.y + event.area.height) / @char_height).to_i
                 imax += 1 if (event.area.y + event.area.height).to_i % @char_height != 0