groonga-database-viewer-gtk 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fda9b07864087f8a3d2c871764520900aa608ba
-  data.tar.gz: 53596509c98d1ee9cca7a79feee50445a8f4f24d
+  metadata.gz: 9a123ff921e425f0c0c97ba55f8f92c05c04d45b
+  data.tar.gz: 7aafad21070d426840271ffb2621641f10e1d172
 SHA512:
-  metadata.gz: 3460cf8e7d0b9843f3d9bf2695b549011cba95dd08055fa43d37f4e0e7c2aa17ca6eeb1260ef7565164dbc081581df8f3046a7d1f57e253245d9251fb994fac0
-  data.tar.gz: f6c08d4c8d7f785c734b83e2823b558dfcd3cf81bf98e57101380701e9796c1dfd1882e6d6bfae84363d9caf3993068dade718b8b563c9a88aa53b4f55a3417a
+  metadata.gz: 305720b3522cc67da8a962388a9aafd0afe607b23abcaaeed99d0f3525c780bf4d3a4b7bcaeb5a7733e868692541fc009c9875a56bd25766c577abad6916b7a2
+  data.tar.gz: f3ca5901a8172848aa7e9f37e2cc4c01f57b055f33f4715e78ecc4038c393e35c290c1cdc92cbfb637eee559ad35e222d434aad0cffe24b48c4cd3a51bd6fcf5

data/NEWS.md

@@ -1,5 +1,14 @@
 # NEWS
 
+## 0.0.2: 2014-10-01
+
+### Changes
+
+  * Improvements
+    * Set a limit to "100" as default
+    * Support raw query search
+    * Set title to window
+
 ## 0.0.1: 2014-08-05
 
 Initial release!

data/lib/groonga/database-viewer-gtk.rb

@@ -14,5 +14,5 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "groonga/database_viewer_gtk/version"
-require "groonga/database_viewer_gtk/window"
+require "groonga/database-viewer-gtk/version"
+require "groonga/database-viewer-gtk/window"

data/lib/groonga/database-viewer-gtk/table.rb

@@ -0,0 +1,125 @@
+# Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "groonga"
+require "gtk2"
+
+module Groonga
+  module DatabaseViewerGtk
+    class Table < Gtk::TreeView
+      ID_COLUMN_INDEX = 0
+      KEY_COLUMN_INDEX = 1
+
+      attr_reader :updated
+      attr_reader :grn_table
+
+      def initialize(grn_table, db_path)
+        super()
+        @grn_table = grn_table
+        @db_path = db_path
+        @updated = false
+        @threads = []
+        signal_connect("destroy") do
+          @threads.each do |thread|
+            thread.kill
+          end
+        end
+        create_tree_view
+      end
+
+      def create_tree_view
+        self.rules_hint = true
+
+        create_column("_id", ID_COLUMN_INDEX)
+        create_column("_key", KEY_COLUMN_INDEX)
+
+        @grn_table.columns.each_with_index do |grn_column, i|
+          create_column(grn_column.local_name, i + 2)
+        end
+      end
+
+      def create_column(name, index)
+        gtk_column = Gtk::TreeViewColumn.new
+        gtk_column.title = name.gsub(/_/, "__")
+        gtk_column.resizable = true
+        gtk_column.set_sort_column_id(index)
+        append_column(gtk_column)
+
+        renderer = Gtk::CellRendererText.new
+        gtk_column.pack_start(renderer, :expand => false)
+        gtk_column.add_attribute(renderer, :text, index)
+      end
+
+      def update_model(limit, query=nil)
+        @threads.reject! do |thread|
+          thread.kill
+          true
+        end
+
+        column_types = @grn_table.columns.collect do |column|
+                         # TODO
+                         String
+                       end
+        column_types.unshift(String)   # _key
+        column_types.unshift(Integer)  # _id
+
+        model = Gtk::ListStore.new(*column_types)
+        self.model = model
+
+        thread = Thread.new do
+          each_records(limit, query).each do |grn_record|
+            load_record(model, grn_record)
+          end
+        end
+        @threads << thread
+
+        @updated = true
+      end
+
+      def load_record(model, grn_record)
+        iter = model.append
+        iter.set_value(ID_COLUMN_INDEX, grn_record._id)
+        iter.set_value(KEY_COLUMN_INDEX, grn_record._key) if grn_record.respond_to?(:_key)
+        @grn_table.columns.each_with_index do |grn_column, i|
+          value = grn_record[grn_column.local_name]
+          iter.set_value(i + 2, value.to_s)
+          if grn_column.index?
+            ids = grn_column.search(grn_record._id).records.collect {|record| record._id}
+            value = "#{ids.size}, #{ids.to_s}"
+          else
+            value = grn_record[grn_column.local_name].to_s
+          end
+          iter.set_value(2 + i, value)
+          GC.start if i % 100 == 0
+        end
+      end
+
+      def each_records(limit, query=nil)
+        grn_records = Groonga[@grn_table.name]
+        if query
+          grn_records = grn_records.select(query)
+        end
+        if block_given?
+          grn_records.take(limit).each do |grn_record|
+            yield(grn_record)
+          end
+        else
+          grn_records.take(limit)
+        end
+      end
+    end
+  end
+end

data/lib/groonga/database-viewer-gtk/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   module DatabaseViewerGtk
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/groonga/database-viewer-gtk/window.rb

@@ -17,11 +17,16 @@
 require "groonga"
 require "gtk2"
 
+require "groonga/database-viewer-gtk/table"
+
 module Groonga
   module DatabaseViewerGtk
     class Window < Gtk::Window
+      RAW_QUERY_MODE = "--query"
+
       def initialize(db_path)
         super()
+        self.title = db_path
         set_default_size(640, 480)
         @grn_database = Database.open(db_path)
         signal_connect("destroy") do
@@ -44,6 +49,7 @@ module Groonga
         Gtk.main
       end
 
+      private
       def init_view(page_num)
         target = get_tree_view(page_num)
         return unless target
@@ -55,6 +61,8 @@ module Groonga
       def select(column, word)
         if word.empty?
           query = nil
+        elsif column == RAW_QUERY_MODE
+          query = word
         elsif column == "_id"
           query = "#{column}:#{word}"
         else
@@ -70,7 +78,7 @@ module Groonga
         page_widget = @notebook.children[page_num]
         if page_widget.is_a?(Gtk::ScrolledWindow)
           page_widget.each do |child|
-            if child.is_a?(TreeView)
+            if child.is_a?(Table)
               return child
             end
           end
@@ -78,7 +86,6 @@ module Groonga
         return nil
       end
 
-      private
       def create_search_hbox
         hbox = Gtk::HBox.new
 
@@ -103,7 +110,7 @@ module Groonga
           @limit_combo.append_text(text)
         end
         @limit_combo.append_text("268,435,455")
-        @limit_combo.active = 0
+        @limit_combo.active = 2
         hbox.pack_end(@limit_combo, false, false, 4)
 
         label = Gtk::Label.new("Limit:")
@@ -124,6 +131,7 @@ module Groonga
           target.grn_table.columns.each do |column|
             @combo_box.append_text(column.local_name)
           end
+          @combo_box.append_text(RAW_QUERY_MODE)
           @combo_box.active = 1
         end
       end
@@ -138,8 +146,8 @@ module Groonga
           scrolled_window = Gtk::ScrolledWindow.new
           scrolled_window.set_policy(:automatic, :automatic)
 
-          tree_view = TreeView.new(grn_table, @grn_database.path)
-          scrolled_window.add(tree_view)
+          table = Table.new(grn_table, @grn_database.path)
+          scrolled_window.add(table)
 
           label = Gtk::Label.new(grn_table.name)
           notebook.append_page(scrolled_window, label)
@@ -153,108 +161,5 @@ module Groonga
         notebook
       end
     end
-
-    class TreeView < Gtk::TreeView
-      ID_COLUMN_INDEX = 0
-      KEY_COLUMN_INDEX = 1
-
-      attr_reader :updated
-      attr_reader :grn_table
-
-      def initialize(grn_table, db_path)
-        super()
-        @grn_table = grn_table
-        @db_path = db_path
-        @updated = false
-        @threads = []
-        signal_connect("destroy") do
-          @threads.each do |thread|
-            thread.kill
-          end
-        end
-        create_tree_view
-      end
-
-      def create_tree_view
-        self.rules_hint = true
-
-        create_column("_id", ID_COLUMN_INDEX)
-        create_column("_key", KEY_COLUMN_INDEX)
-
-        @grn_table.columns.each_with_index do |grn_column, i|
-          create_column(grn_column.local_name, i + 2)
-        end
-      end
-
-      def create_column(name, index)
-        gtk_column = Gtk::TreeViewColumn.new
-        gtk_column.title = name.gsub(/_/, "__")
-        gtk_column.resizable = true
-        gtk_column.set_sort_column_id(index)
-        append_column(gtk_column)
-
-        renderer = Gtk::CellRendererText.new
-        gtk_column.pack_start(renderer, :expand => false)
-        gtk_column.add_attribute(renderer, :text, index)
-      end
-
-      def update_model(limit, query=nil)
-        @threads.reject! do |thread|
-          thread.kill
-          true
-        end
-
-        column_types = @grn_table.columns.collect do |column|
-                         # TODO
-                         String
-                       end
-        column_types.unshift(String)   # _key
-        column_types.unshift(Integer)  # _id
-
-        model = Gtk::ListStore.new(*column_types)
-        self.model = model
-
-        thread = Thread.new do
-          each_records(limit, query).each do |grn_record|
-            load_record(model, grn_record)
-          end
-        end
-        @threads << thread
-
-        @updated = true
-      end
-
-      def load_record(model, grn_record)
-        iter = model.append
-        iter.set_value(ID_COLUMN_INDEX, grn_record._id)
-        iter.set_value(KEY_COLUMN_INDEX, grn_record._key) if grn_record.respond_to?(:_key)
-        @grn_table.columns.each_with_index do |grn_column, i|
-          value = grn_record[grn_column.local_name]
-          iter.set_value(i + 2, value.to_s)
-          if grn_column.index?
-            ids = grn_column.search(grn_record._id).records.collect {|record| record._id}
-            value = "#{ids.size}, #{ids.to_s}"
-          else
-            value = grn_record[grn_column.local_name].to_s
-          end
-          iter.set_value(2 + i, value)
-          GC.start if i % 100 == 0
-        end
-      end
-
-      def each_records(limit, query=nil)
-        grn_records = Groonga[@grn_table.name]
-        if query
-          grn_records = grn_records.select(query)
-        end
-        if block_given?
-          grn_records.take(limit).each do |grn_record|
-            yield(grn_record)
-          end
-        else
-          grn_records.take(limit)
-        end
-      end
-    end
   end
 end

data/test/test-window.rb

@@ -26,6 +26,11 @@ class WindowTest < Test::Unit::TestCase
       FileUtils.mkdir_p(@tmpdir)
       @db_path = File.join(@tmpdir, "test.db")
       Groonga::Database.create(:path => @db_path)
+      Groonga::Schema.define do |schema|
+        schema.create_table("Texts", :type => :hash) do |table|
+          table.text("text")
+        end
+      end
     end
 
     def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-database-viewer-gtk
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -109,6 +109,7 @@ files:
 - bin/groonga-database-viewer-gtk
 - groonga-database-viewer-gtk.gemspec
 - lib/groonga/database-viewer-gtk.rb
+- lib/groonga/database-viewer-gtk/table.rb
 - lib/groonga/database-viewer-gtk/version.rb
 - lib/groonga/database-viewer-gtk/window.rb
 - test/run-test.rb