json_pure 1.0.0 → 1.4.6

data/lib/json/editor.rb

@@ -5,6 +5,7 @@ require 'gtk2'
 require 'iconv'
 require 'json'
 require 'rbconfig'
+require 'open-uri'
 
 module JSON
   module Editor
@@ -25,6 +26,15 @@ module JSON
     # The Nodes necessary for the tree representation of a JSON document
     ALL_NODES = (ALL_TYPES + %w[Key]).sort
 
+    DEFAULT_DIALOG_KEY_PRESS_HANDLER = lambda do |dialog, event|
+      case event.keyval
+      when Gdk::Keyval::GDK_Return
+        dialog.response Dialog::RESPONSE_ACCEPT
+      when Gdk::Keyval::GDK_Escape
+        dialog.response Dialog::RESPONSE_REJECT
+      end
+    end
+
     # Returns the Gdk::Pixbuf of the icon named _name_ from the icon cache.
     def Editor.fetch_icon(name)
       @icon_cache ||= {}
@@ -41,11 +51,13 @@ module JSON
       dialog = MessageDialog.new(window, Dialog::MODAL, 
         MessageDialog::ERROR, 
         MessageDialog::BUTTONS_CLOSE, text)
+      dialog.show_all
       dialog.run
     rescue TypeError
       dialog = MessageDialog.new(Editor.window, Dialog::MODAL, 
         MessageDialog::ERROR, 
         MessageDialog::BUTTONS_CLOSE, text)
+      dialog.show_all
       dialog.run
     ensure
       dialog.destroy if dialog
@@ -58,6 +70,7 @@ module JSON
       dialog = MessageDialog.new(window, Dialog::MODAL, 
         MessageDialog::QUESTION, 
         MessageDialog::BUTTONS_YES_NO, text)
+      dialog.show_all
       dialog.run do |response|
         return Gtk::Dialog::RESPONSE_YES === response
       end
@@ -68,6 +81,7 @@ module JSON
     # Convert the tree model starting from Gtk::TreeIter _iter_ into a Ruby
     # data structure and return it.
     def Editor.model2data(iter)
+      return nil if iter.nil?
       case iter.type
       when 'Hash'
         hash = {}
@@ -214,9 +228,18 @@ module JSON
       # Adds a Gtk::MenuItem to this instance's #menu. _label_ is the label
       # string, _klass_ is the item type, and _callback_ is the procedure, that
       # is called if the _item_ is activated.
-      def add_item(label, klass = MenuItem, &callback)
+      def add_item(label, keyval = nil, klass = MenuItem, &callback)
+        label = "#{label} (C-#{keyval.chr})" if keyval
         item = klass.new(label)
         item.signal_connect(:activate, &callback)
+        if keyval
+          self.signal_connect(:'key-press-event') do |item, event|
+            if event.state & Gdk::Window::ModifierType::CONTROL_MASK != 0 and
+              event.keyval == keyval
+              callback.call item
+            end
+          end
+        end
         menu.append item
         item
       end
@@ -432,18 +455,18 @@ module JSON
 
       # Create the menu.
       def create
-        add_item("Change node", &method(:change_node))
+        add_item("Change node", ?n, &method(:change_node))
         add_separator
-        add_item("Cut node", &method(:cut_node))
-        add_item("Copy node", &method(:copy_node))
-        add_item("Paste node (appending)", &method(:paste_node_appending))
-        add_item("Paste node (inserting before)",
+        add_item("Cut node", ?X, &method(:cut_node))
+        add_item("Copy node", ?C, &method(:copy_node))
+        add_item("Paste node (appending)", ?A, &method(:paste_node_appending))
+        add_item("Paste node (inserting before)", ?I,
           &method(:paste_node_inserting_before))
         add_separator
-        add_item("Append new node", &method(:append_new_node))
-        add_item("Insert new node before", &method(:insert_new_node))
+        add_item("Append new node", ?a, &method(:append_new_node))
+        add_item("Insert new node before", ?i, &method(:insert_new_node))
         add_separator 
-        add_item("Collapse/Expand node (recursively)",
+        add_item("Collapse/Expand node (recursively)", ?e,
           &method(:collapse_expand))
 
         menu.show_all
@@ -474,6 +497,10 @@ module JSON
         window.file_open
       end
 
+      def open_location(item)
+        window.location_open
+      end
+
       # Revert the current JSON document in the editor to the saved version.
       def revert(item)
         window.instance_eval do
@@ -501,13 +528,14 @@ module JSON
         title = MenuItem.new('File')
         title.submenu = menu
         add_item('New', &method(:new))
-        add_item('Open', &method(:open))
+        add_item('Open', ?o, &method(:open))
+        add_item('Open location', ?l, &method(:open_location))
         add_item('Revert', &method(:revert))
         add_separator
-        add_item('Save', &method(:save))
-        add_item('Save As', &method(:save_as))
+        add_item('Save', ?s, &method(:save))
+        add_item('Save As', ?S, &method(:save_as))
         add_separator
-        add_item('Quit', &method(:quit))
+        add_item('Quit', ?q, &method(:quit))
         title
       end
     end
@@ -516,17 +544,32 @@ module JSON
     class EditMenu
       include MenuExtension
 
+      # Copy data from model into primary clipboard.
+      def copy(item)
+        data = Editor.model2data(model.iter_first)
+        json = JSON.pretty_generate(data, :max_nesting => false)
+        c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
+        c.text = json
+      end
+
+      # Copy json text from primary clipboard into model.
+      def paste(item)
+        c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
+        if json = c.wait_for_text
+          window.ask_save if @changed
+          begin
+            window.edit json
+          rescue JSON::ParserError
+            window.clear
+          end
+        end
+      end
+
       # Find a string in all nodes' contents and select the found node in the
       # treeview.
       def find(item)
-        search = ask_for_find_term or return
-        begin
-          @search = Regexp.new(search)
-        rescue => e
-          Editor.error_dialog(self, "Evaluation of regex /#{search}/ failed: #{e}!")
-          return
-        end
-        iter = model.get_iter('0')
+        @search = ask_for_find_term(@search) or return
+        iter = model.get_iter('0') or return
         iter.recursive_each do |i|
           if @iter
             if @iter != i
@@ -602,10 +645,13 @@ module JSON
       def create
         title = MenuItem.new('Edit')
         title.submenu = menu
-        add_item('Find', &method(:find))
-        add_item('Find Again', &method(:find_again))
+        add_item('Copy', ?c, &method(:copy))
+        add_item('Paste', ?v, &method(:paste))
         add_separator
-        add_item('Sort', &method(:sort))
+        add_item('Find', ?f, &method(:find))
+        add_item('Find Again', ?g, &method(:find_again))
+        add_separator
+        add_item('Sort', ?S, &method(:sort))
         title
       end
     end
@@ -636,8 +682,8 @@ module JSON
       def create
         title = MenuItem.new('Options')
         title.submenu = menu
-        add_item('Collapsed nodes', CheckMenuItem, &method(:collapsed_nodes))
-        @pretty_item = add_item('Pretty saving', CheckMenuItem,
+        add_item('Collapsed nodes', nil, CheckMenuItem, &method(:collapsed_nodes))
+        @pretty_item = add_item('Pretty saving', nil, CheckMenuItem,
           &method(:pretty_saving))
         @pretty_item.active = true
         window.unchange
@@ -723,7 +769,12 @@ module JSON
             iter.type, iter.content = 'FalseClass', 'false'
           end
         when 'Numeric'
-          iter.content = (Integer(value) rescue Float(value) rescue 0).to_s
+          iter.content =
+            if value == 'Infinity'
+              value
+            else
+              (Integer(value) rescue Float(value) rescue 0).to_s
+            end
         when 'String'
           iter.content = value
         when 'Hash', 'Array'
@@ -784,12 +835,13 @@ module JSON
           [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
           [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
         )
+        dialog.width_request = 640
 
         hbox = HBox.new(false, 5)
-        hbox.pack_start(Label.new("Key:"))
+        hbox.pack_start(Label.new("Key:"), false)
         hbox.pack_start(key_input = Entry.new)
         key_input.text = @key || ''
-        dialog.vbox.add(hbox)
+        dialog.vbox.pack_start(hbox, false)
         key_input.signal_connect(:activate) do
           if parent.any? { |c| c.content == key_input.text }
             toplevel.display_status('Key already exists in Hash!')
@@ -800,11 +852,11 @@ module JSON
         end
 
         hbox = HBox.new(false, 5)
-        hbox.add(Label.new("Type:"))
+        hbox.pack_start(Label.new("Type:"), false)
         hbox.pack_start(type_input = ComboBox.new(true))
         ALL_TYPES.each { |t| type_input.append_text(t) }
         type_input.active = @type || 0
-        dialog.vbox.add(hbox)
+        dialog.vbox.pack_start(hbox, false)
 
         type_input.signal_connect(:changed) do
           value_input.editable = false
@@ -824,12 +876,15 @@ module JSON
         end
 
         hbox = HBox.new(false, 5)
-        hbox.add(Label.new("Value:"))
+        hbox.pack_start(Label.new("Value:"), false)
         hbox.pack_start(value_input = Entry.new)
+        value_input.width_chars = 60
         value_input.text = @value || ''
-        dialog.vbox.add(hbox)
+        dialog.vbox.pack_start(hbox, false)
 
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
         dialog.show_all
+        self.focus = dialog
         dialog.run do |response| 
           if response == Dialog::RESPONSE_ACCEPT
             @key = key_input.text
@@ -854,7 +909,7 @@ module JSON
           [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
         )
         hbox = HBox.new(false, 5)
-        hbox.add(Label.new("Type:"))
+        hbox.pack_start(Label.new("Type:"), false)
         hbox.pack_start(type_input = ComboBox.new(true))
         default_active = 0
         types = parent ? ALL_TYPES : CONTAINER_TYPES
@@ -865,26 +920,33 @@ module JSON
           end
         end
         type_input.active = default_active
-        dialog.vbox.add(hbox)
+        dialog.vbox.pack_start(hbox, false)
         type_input.signal_connect(:changed) do
           configure_value(value_input, types[type_input.active])
         end
 
         hbox = HBox.new(false, 5)
-        hbox.add(Label.new("Value:"))
+        hbox.pack_start(Label.new("Value:"), false)
         hbox.pack_start(value_input = Entry.new)
+        value_input.width_chars = 60
         value_input.text = value_text if value_text
         configure_value(value_input, types[type_input.active])
 
-        dialog.vbox.add(hbox)
+        dialog.vbox.pack_start(hbox, false)
 
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
         dialog.show_all
+        self.focus = dialog
         dialog.run do |response| 
           if response == Dialog::RESPONSE_ACCEPT
             type = types[type_input.active]
             @content = case type
             when 'Numeric'
-              Integer(value_input.text) rescue Float(value_input.text) rescue 0
+              if (t = value_input.text) == 'Infinity'
+                1 / 0.0
+              else
+                Integer(t) rescue Float(t) rescue 0
+              end
             else
               value_input.text
             end.to_s
@@ -908,15 +970,18 @@ module JSON
         )
         hbox = HBox.new(false, 5)
 
-        hbox.add(Label.new("Order:"))
+        hbox.pack_start(Label.new("Order:"), false)
         hbox.pack_start(order_input = Entry.new)
         order_input.text = @order || 'x'
+        order_input.width_chars = 60
 
-        hbox.pack_start(reverse_checkbox = CheckButton.new('Reverse'))
+        hbox.pack_start(reverse_checkbox = CheckButton.new('Reverse'), false)
 
-        dialog.vbox.add(hbox)
+        dialog.vbox.pack_start(hbox, false)
 
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
         dialog.show_all
+        self.focus = dialog
         dialog.run do |response| 
           if response == Dialog::RESPONSE_ACCEPT
             return @order = order_input.text, reverse_checkbox.active?
@@ -929,7 +994,7 @@ module JSON
 
       # Ask for a find term to search for in the tree. Returns the term as a
       # string.
-      def ask_for_find_term
+      def ask_for_find_term(search = nil)
         dialog = Dialog.new(
           "Find a node matching regex in tree.",
           nil, nil,
@@ -938,16 +1003,28 @@ module JSON
         )
         hbox = HBox.new(false, 5)
 
-        hbox.add(Label.new("Regex:"))
+        hbox.pack_start(Label.new("Regex:"), false)
         hbox.pack_start(regex_input = Entry.new)
-        regex_input.text = @regex || ''
+        hbox.pack_start(icase_checkbox = CheckButton.new('Icase'), false)
+        regex_input.width_chars = 60
+        if search
+          regex_input.text = search.source
+          icase_checkbox.active = search.casefold?
+        end
 
-        dialog.vbox.add(hbox)
+        dialog.vbox.pack_start(hbox, false)
 
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
         dialog.show_all
+        self.focus = dialog
         dialog.run do |response| 
           if response == Dialog::RESPONSE_ACCEPT
-            return @regex = regex_input.text
+            begin
+              return Regexp.new(regex_input.text, icase_checkbox.active? ? Regexp::IGNORECASE : 0)
+            rescue => e
+              Editor.error_dialog(self, "Evaluation of regex /#{regex_input.text}/ failed: #{e}!")
+              return
+            end
           end
         end
         return
@@ -1004,6 +1081,18 @@ module JSON
           data = read_data(@filename)
           view_new_model Editor.data2model(data)
         end
+
+        signal_connect(:button_release_event) do |_,event|
+          if event.button == 2
+            c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
+            if url = c.wait_for_text
+              location_open url
+            end
+            false
+          else
+            true
+          end
+        end
       end
 
       # Creates the menu bar with the pulldown menus and returns it.
@@ -1063,9 +1152,11 @@ module JSON
       # Quit this editor, that is, leave this editor's main loop.
       def quit
         ask_save if @changed
-        destroy
-        Gtk.main_quit
-        true
+        if Gtk.main_level > 0
+          destroy
+          Gtk.main_quit
+        end
+        nil
       end
 
       # Display the new title according to the editor's current state.
@@ -1083,6 +1174,22 @@ module JSON
         self.view_new_model nil
       end
 
+      def check_pretty_printed(json)
+        pretty = !!((nl_index = json.index("\n")) && nl_index != json.size - 1)
+        @options_menu.pretty_item.active = pretty
+      end
+      private :check_pretty_printed
+
+      # Open the data at the location _uri_, if given. Otherwise open a dialog
+      # to ask for the _uri_.
+      def location_open(uri = nil)
+        uri = ask_for_location unless uri
+        uri or return
+        ask_save if @changed
+        data = load_location(uri) or return
+        view_new_model Editor.data2model(data)
+      end
+
       # Open the file _filename_ or call the #select_file method to ask for a
       # filename.
       def file_open(filename = nil)
@@ -1091,6 +1198,15 @@ module JSON
         view_new_model Editor.data2model(data)
       end
 
+      # Edit the string _json_ in the editor.
+      def edit(json)
+        if json.respond_to? :read
+          json = json.read
+        end
+        data = parse_json json
+        view_new_model Editor.data2model(data)
+      end
+
       # Save the current file.
       def file_save
         if @filename
@@ -1111,10 +1227,11 @@ module JSON
         if path
           data = Editor.model2data(@treeview.model.iter_first)
           File.open(path + '.tmp', 'wb') do |output|
+            data or break
             if @options_menu.pretty_item.active?
-              output.puts JSON.pretty_generate(data)
+              output.puts JSON.pretty_generate(data, :max_nesting => false)
             else
-              output.write JSON.unparse(data)
+              output.write JSON.generate(data, :max_nesting => false)
             end
           end
           File.rename path + '.tmp', path
@@ -1131,49 +1248,62 @@ module JSON
         if filename
           if File.directory?(filename)
             Editor.error_dialog(self, "Try to select a JSON file!")
-            return
+            nil
           else
-            data = read_data(filename)
             @filename = filename
-            toplevel.display_status("Loaded data from '#@filename'.")
+            if data = read_data(filename)
+              toplevel.display_status("Loaded data from '#@filename'.")
+            end
             display_title
-            return data
+            data
           end
         end
       end
 
-      def check_pretty_printed(json)
-        pretty = !!((nl_index = json.index("\n")) && nl_index != json.size - 1)
-        @options_menu.pretty_item.active = pretty
+      # Load the data at location _uri_ into the editor as a JSON document.
+      def load_location(uri)
+        data = read_data(uri) or return
+        @filename = nil
+        toplevel.display_status("Loaded data from '#{uri}'.")
+        display_title
+        data
       end
-      private :check_pretty_printed
 
-      # Read a JSON document from the file named _filename_, parse it into a
-      # ruby data structure, and return the data.
-      def read_data(filename)
-        json = File.read(filename)
+      def parse_json(json)
         check_pretty_printed(json)
         if @encoding && !/^utf8$/i.match(@encoding)
           iconverter = Iconv.new('utf8', @encoding)
           json = iconverter.iconv(json)
         end
-        JSON::parse(json)
-      rescue JSON::JSONError => e
+        JSON::parse(json, :max_nesting => false, :create_additions => false)
+      end
+      private :parse_json
+
+      # Read a JSON document from the file named _filename_, parse it into a
+      # ruby data structure, and return the data.
+      def read_data(filename)
+        open(filename) do |f|
+          json = f.read
+          return parse_json(json)
+        end
+      rescue => e
         Editor.error_dialog(self, "Failed to parse JSON file: #{e}!")
         return
-      rescue SystemCallError => e
-        quit
       end
 
       # Open a file selecton dialog, displaying _message_, and return the
       # selected filename or nil, if no file was selected.
       def select_file(message)
         filename = nil
-        fs = FileSelection.new(message).set_modal(true).
-          set_filename(Dir.pwd + "/").set_transient_for(self)
+        fs = FileSelection.new(message)
+        fs.set_modal(true)
+        @default_dir = File.join(Dir.pwd, '') unless @default_dir
+        fs.set_filename(@default_dir)
+        fs.set_transient_for(self)
         fs.signal_connect(:destroy) { Gtk.main_quit }
         fs.ok_button.signal_connect(:clicked) do
           filename = fs.filename
+          @default_dir = File.join(File.dirname(filename), '')
           fs.destroy
           Gtk.main_quit
         end
@@ -1185,13 +1315,41 @@ module JSON
         Gtk.main
         filename
       end
+
+      # Ask for location URI a to load data from. Returns the URI as a string.
+      def ask_for_location
+        dialog = Dialog.new(
+          "Load data from location...",
+          nil, nil,
+          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
+          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
+        )
+        hbox = HBox.new(false, 5)
+
+        hbox.pack_start(Label.new("Location:"), false)
+        hbox.pack_start(location_input = Entry.new)
+        location_input.width_chars = 60
+        location_input.text = @location || ''
+
+        dialog.vbox.pack_start(hbox, false)
+
+        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
+        dialog.show_all
+        dialog.run do |response| 
+          if response == Dialog::RESPONSE_ACCEPT
+            return @location = location_input.text
+          end
+        end
+        return
+      ensure
+        dialog.destroy if dialog
+      end
     end
 
     class << self
       # Starts a JSON Editor. If a block was given, it yields
       # to the JSON::Editor::MainWindow instance.
-      def start(encoding = nil) # :yield: window
-        encoding ||= 'utf8'
+      def start(encoding = 'utf8') # :yield: window
         Gtk.init
         @window = Editor::MainWindow.new(encoding)
         @window.icon_list = [ Editor.fetch_icon('json') ]
@@ -1200,8 +1358,14 @@ module JSON
         Gtk.main
       end
 
+      # Edit the string _json_ with encoding _encoding_ in the editor.
+      def edit(json, encoding = 'utf8')
+        start(encoding) do |window|
+          window.edit json
+        end
+      end
+
       attr_reader :window
     end
   end
 end
-  # vim: set et sw=2 ts=2:

data/lib/json/ext.rb

@@ -10,4 +10,6 @@ module JSON
     JSON.parser = Parser
     JSON.generator = Generator
   end
+
+  JSON_LOADED = true
 end