kang 0.0.3 → 0.1.0alpha

data/COPYING

@@ -0,0 +1,19 @@
+Copyright (c) 2011 Tony Doan <tdoan@tdoan.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/History.txt

@@ -0,0 +1,12 @@
+== 0.0.1 2009-01-07
+
+* Initial release
+
+== 0.0.2 2011-06-21
+
+* Port from wx to gtk2
+
+== 0.0.3 2011-08-07
+
+* Fix bug where match highlighting would not start until the match text was edited for the first time.
+* Changed background color of highlighted text tog gray to make the cursor more visible.

data/bin/kang

@@ -3,8 +3,6 @@
 #  Created on 2009-1-7.
 #  Copyright (c) 2011. All rights reserved.
 
-require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/kang")
-require "kang/cli"
-
+require 'kang/cli'
 Kang::CLI.execute(STDOUT, ARGV)

data/lib/kang/controller.rb

@@ -0,0 +1,58 @@
+module Kang
+  class Controller
+    def initialize
+      reg_text = "RegEx here"
+      match_text = "Match Text Here"
+      @data = Data.new(reg_text,match_text)
+      @view = View.new(self,@data)
+      @view.start
+    end
+
+    def key_up_match(view,event,match_string)
+      #@view.update_status("")
+      @data.match_string = match_string
+      #key_up
+      @view.repaint
+    end
+
+    def key_up_reg(view,event,text)
+      #@view.update_status("")
+      @data.regex_string = text
+      #key_up
+      @view.repaint
+    end
+
+    def multiline_click(view,event)
+      @data.multiline=view.active?
+      #@view.toggle_multiline(view.active?)
+      @view.repaint
+    end
+
+    def spin_change(value)
+      @data.line_number = value
+      #@view.update_tag
+      @view.repaint
+    end
+
+    private
+    def key_up
+      unless @data.regex_valid?
+        @view.remove_tag
+        @view.update_status("Invalid Regex")
+      else
+        count = @data.match_group_count ? @data.match_group_count : "no"
+        message = "Matched with #{@data.match_group_count} grouping"
+        message += "s" if @data.match_group_count and @data.match_group_count > 1
+        @view.update_status(message)
+        if @data.match?
+          @view.update_tag(@data.match_begin,@data.match_end)
+        else
+          @view.remove_tag
+          @view.update_status("no match")
+        end
+      end
+      @view.update_match_groups(@data.matches)
+      @view.update_spin_count
+    end
+  end
+end

data/lib/kang/data.rb

@@ -0,0 +1,140 @@
+require 'kang/offset_data'
+
+module Kang
+  class Data
+    attr_accessor :line_number,:match_string,:regex_string
+
+    def initialize(reg_text="",match_text="")
+      self.match_string = match_text
+      self.regex_string = reg_text
+      @line_number=1
+      @multiline=false
+      update_match
+    end
+
+    def match_string=(match_string)
+      @match_string = match_string
+      update_match
+    end
+
+    def regex_string=(regex_string)
+      @regex_string = regex_string
+      begin
+        @re = Regexp.new(@regex_string)
+        update_match
+      rescue RegexpError
+        @re = nil
+      end
+    end
+
+    def multiline=(multiline)
+      if multiline
+        @multiline = true
+      else
+        @multiline = false
+      end
+      update_match
+    end
+
+    def multiline
+      @multiline
+    end
+
+    def match
+      @match
+    end
+
+    def line_number=(line_number)
+      if (self.num_lines) and (line_number > 0) and (line_number <= self.num_lines)
+        @line_number = line_number
+        update_match
+      end
+    end
+
+    def num_lines
+      #if (defined? @line_matches) and @multiline
+        #@line_matches.size - 1 #line_match is padded with a leading nil to deal with 0 offset
+      #else
+        #nil
+      #end
+      @match_string.scan(/^.*$/).size
+    end
+
+    def line(line_num)
+      @line_matches[line_num][0]
+    end
+
+    def regex_valid?
+      @re.nil? ? false : true
+    end
+
+    def match?
+      @match ? true : false
+    end
+
+    def match_begin
+      if @match
+        @match.begin(0)
+      else
+        nil
+      end
+    end
+
+    def match_end
+      if @match
+        @match.end(0)
+      else
+        nil
+      end
+    end
+
+    def match_group_count
+      if @match
+        @match.length
+      else
+        nil
+      end
+    end
+
+    def matches
+      if @match and (@match.length > 1)
+        if @match.names and @match.names.size>0
+          names = @match.names.unshift("0")
+        else
+          names = Range.new(0,@match.length-1).to_a.collect{|o| o.to_s}
+        end
+        return names.zip(@match.to_a)
+      else
+        []
+      end
+    end
+
+    private
+
+    def update_match
+      if @re
+        if @multiline
+          @line_matches = [nil]
+          @match_string.scan(/^.*$/) {|m| @line_matches << $~}
+          @line_number = 1 if @line_number > self.num_lines
+          line_match = @line_matches[@line_number]
+          @match = @re.match(@line_matches[@line_number][0])
+          @match = OffSetMatchData.new(line_match.begin(0), @match) if @match
+        else
+          @match = @re.match(@match_string)
+        end
+      else
+        @match = nil
+      end
+    end
+
+    def update_regexp(re_string)
+      begin
+        @re = Regexp.new(re_string)
+      rescue RegexpError
+        @re = nil
+      end
+      update_match
+    end
+  end
+end

data/lib/kang/offset_data.rb

@@ -0,0 +1,32 @@
+module Kang
+  class OffSetMatchData
+    def initialize(offset,match_data)
+      @offset = offset
+      @match_data = match_data
+    end
+
+    def begin(i)
+      @match_data.begin(i) + @offset
+    end
+
+    def end(i)
+      @match_data.end(i) + @offset
+    end
+
+    def length
+      @match_data.length
+    end
+
+    def [](x)
+      @match_data[x]
+    end
+
+    def names
+      @match_data.names
+    end
+
+    def to_a
+      @match_data.to_a
+    end
+  end
+end

data/lib/kang/version.rb

@@ -1,3 +1,3 @@
 module Kang
-  VERSION = "0.0.3"
-end
+  VERSION = "0.1.0alpha"
+end

data/lib/kang/view.rb

@@ -0,0 +1,141 @@
+module Kang
+  class View
+    def initialize(controller,data)
+      reg_text=data.regex_string
+      match_text=data.match_string
+      @controller = controller
+      @data = data
+      @window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
+      @window.set_title  "Kang"
+      @window.border_width = 10
+      @window.set_size_request(600, 400)
+      @window.signal_connect('delete_event') { Gtk.main_quit }
+
+      wintop = Gtk::ScrolledWindow.new
+      wintop.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS)
+
+      winbottom = Gtk::ScrolledWindow.new
+      winbottom.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS)
+
+      winright = Gtk::ScrolledWindow.new
+      winright.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+
+      @statusbar = Gtk::Statusbar.new
+      @statusbar.push(0,"")
+
+      @regview = Gtk::TextView.new
+      @regview.buffer.text = reg_text
+
+      @matchview = Gtk::TextView.new
+      @matchview.buffer.text = match_text
+
+      @matchview.buffer.create_tag("colors",{ "foreground" => "green", "background" => "gray" })
+
+      wintop.add(@regview)
+      winbottom.add(@matchview)
+
+      @list_store = Gtk::ListStore.new(String, String)
+      treeview = Gtk::TreeView.new(@list_store)
+      column0 = Gtk::TreeViewColumn.new("Match",Gtk::CellRendererText.new, {:text => 0})
+      column1 = Gtk::TreeViewColumn.new("Match",Gtk::CellRendererText.new, {:text => 1})
+      treeview.append_column(column0)
+      treeview.append_column(column1)
+      treeview.selection.mode = Gtk::SELECTION_NONE
+      treeview.set_size_request(200,-1)
+      winright.add(treeview)
+      #winright.set_size_request(200,-1)
+
+      vpaned = Gtk::VPaned.new
+      vpaned.add1(wintop)
+      vpaned.add2(winbottom)
+      vpaned.set_size_request(400,400)
+      hpaned = Gtk::HPaned.new
+      hpaned.pack1(vpaned,true,false)
+      hpaned.pack2(winright,true,false)
+      hpaned.set_size_request(100,-1)
+      vbox = Gtk::VBox.new(false,0)
+      vbox.pack_start(hpaned,true,true,0)
+      @multiline = Gtk::CheckButton.new("multiline")
+      vbox.pack_start(@multiline,false,false,0)
+      @spinbutton = Gtk::SpinButton.new(1, 1, 1)
+      @spinbutton.sensitive=false
+      vbox.pack_start(@spinbutton,false,false,0)
+      vbox.pack_start(@statusbar,false,false,0)
+      @window.add(vbox)
+
+      @regview.signal_connect("key-release-event") {|view,event| @controller.key_up_reg(view,event,view.buffer.text)}
+      @matchview.signal_connect("key-release-event") {|view,event| @controller.key_up_match(view,event,view.buffer.text)}
+      @multiline.signal_connect("clicked") {|view,event| @controller.multiline_click(view,event)}
+      @spinbutton.signal_connect("value-changed") {|button| @controller.spin_change(button.value.to_i)}
+    end
+
+    def start
+      @window.show_all
+      begin
+        Gtk.main
+      rescue SystemExit, Interrupt
+        exit(0)
+      end
+    end
+
+    def repaint
+      update_status
+      update_spin_count
+      update_match_groups
+      update_tag if @data.match
+    end
+
+    private
+    def update_tag
+      remove_tag
+      tag_begin = @data.match_begin
+      tag_end   = @data.match_end
+      b = @matchview.buffer.get_iter_at_offset(tag_begin)
+      e = @matchview.buffer.get_iter_at_offset(tag_end)
+      @matchview.buffer.apply_tag("colors",b,e)
+    end
+
+    def update_status
+      unless @data.regex_valid?
+        remove_tag
+        message = "Invalid Regex"
+      else
+        count = @data.match_group_count ? @data.match_group_count : "no"
+        message = "Matched with #{@data.match_group_count} grouping"
+        message += "s" if @data.match_group_count and @data.match_group_count > 1
+        if @data.match?
+          update_tag #(@data.match_begin,@data.match_end)
+        else
+          remove_tag
+          message = "no match"
+        end
+      end
+      @statusbar.pop(0)
+      @statusbar.push(0,message)
+    end
+
+    def update_match_groups
+      @list_store.clear
+      @data.matches.each{|m| iter = @list_store.append; iter[0]=m[0];iter[1]=m[1]}
+    end
+
+    def remove_tag
+      buffer = @matchview.buffer
+      bstart = buffer.get_iter_at_offset(0)
+      bend = buffer.get_iter_at_offset(buffer.text.size)
+      @matchview.buffer.remove_tag("colors",bstart,bend)
+    end
+
+    def update_spin_count
+      @spinbutton.sensitive = @data.multiline
+      if @data.multiline
+        @spinbutton.set_range(1, @data.num_lines)
+      end
+    end
+
+    def toggle_multiline(active)
+      update_spin_count
+      @spinbutton.sensitive = active
+    end
+  end
+end

data/lib/kang.rb

@@ -15,210 +15,13 @@
 #
 $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
+require "kang/controller"
+require "kang/view"
+require "kang/data"
+require "rubygems"
 begin
   require 'gtk2'
 rescue LoadError => ex
   $stderr.puts("This is a GUI application that requires the gtk2 gem be installed, which in turn requires that GTK2 be installed.")
   exit(-1)
 end
-
-module Kang
-  class Data
-    def initialize(reg_text="",match_text="")
-      update_regexp(reg_text)
-      update_match_string(match_text)
-    end
-
-    def update_match_string(match_string)
-      @match_string = match_string
-      update_match
-    end
-
-    def update_match
-      if @re
-        @match = @re.match(@match_string)
-      else
-        @match = nil
-      end
-    end
-
-    def match_group_count
-      if @match
-        @match.length
-      else
-        nil
-      end
-    end
-
-    def update_regexp(re_string)
-      begin
-        @re = Regexp.new(re_string)
-      rescue RegexpError
-        @re = nil
-      end
-      update_match
-    end
-
-    def regexp_valid?
-      @re.nil? ? false : true
-    end
-
-    def match?
-      @match ? true : false
-    end
-
-    def match_begin
-      if @match
-        @match.begin(0)
-      else
-        nil
-      end
-    end
-
-    def match_end
-      if @match
-        @match.end(0)
-      else
-        nil
-      end
-    end
-
-    def matches
-      if @match and (@match.length > 1)
-        @match.to_a
-      else
-        []
-      end
-    end
-  end
-
-  class Controller
-    def initialize
-      reg_text = "RegExp here"
-      match_text = "Match Text Here"
-      @view = View.new(self,reg_text,match_text)
-      @data = Data.new(reg_text,match_text)
-      @view.start
-    end
-
-    def key_up_match(view,event,match_string)
-      @view.update_status("")
-      @data.update_match_string(match_string)
-      key_up
-    end
-
-    def key_up_reg(view,event,text)
-      @view.update_status("")
-      @data.update_regexp(text)
-      key_up
-    end
-
-    private
-    def key_up
-      unless @data.regexp_valid?
-        @view.remove_tag
-        @view.update_status("Invalid Regexp")
-      else
-        count = @data.match_group_count ? @data.match_group_count : "no"
-        message = "Matched with #{@data.match_group_count} grouping"
-        message += "s" if @data.match_group_count and @data.match_group_count > 1
-        @view.update_status(message)
-        if @data.match?
-          @view.update_tag(@data.match_begin,@data.match_end)
-        else
-          @view.remove_tag
-          @view.update_status("no match")
-        end
-      end
-      @view.update_match_groups(@data.matches)
-    end
-  end
-
-  class View
-    def initialize(controller,reg_text="",match_text="")
-      @controller = controller
-      @window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
-      @window.set_title  "Kang"
-      @window.border_width = 10
-      @window.set_size_request(600, 400)
-      @window.signal_connect('delete_event') { Gtk.main_quit }
-
-      wintop = Gtk::ScrolledWindow.new
-      wintop.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS)
-
-      winbottom = Gtk::ScrolledWindow.new
-      winbottom.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS)
-
-      @statusbar = Gtk::Statusbar.new
-      @statusbar.push(0,"")
-
-      @regview = Gtk::TextView.new
-      @regview.buffer.text = reg_text
-
-      @matchview = Gtk::TextView.new
-      @matchview.buffer.text = match_text
-
-      @matchview.buffer.create_tag("colors",{ "foreground" => "green", "background" => "gray" })
-
-      wintop.add(@regview)
-      winbottom.add(@matchview)
-
-      @list_store = Gtk::ListStore.new(Integer, String)
-      treeview = Gtk::TreeView.new(@list_store)
-      column0 = Gtk::TreeViewColumn.new("#",Gtk::CellRendererText.new, {:text => 0})
-      column1 = Gtk::TreeViewColumn.new("Match",Gtk::CellRendererText.new, {:text => 1})
-      treeview.append_column(column0)
-      treeview.append_column(column1)
-      treeview.selection.mode = Gtk::SELECTION_NONE
-
-      vpaned = Gtk::VPaned.new
-      vpaned.add1(wintop)
-      vpaned.add2(winbottom)
-      vpaned.set_size_request(400,400)
-      hpaned = Gtk::HPaned.new
-      hpaned.add1(vpaned)
-      hpaned.add2(treeview)
-      vbox = Gtk::VBox.new(false,0)
-      vbox.pack_start(hpaned,true,true,0)
-      vbox.pack_start(@statusbar,false,false,0)
-      @window.add(vbox)
-
-      @regview.signal_connect("key-release-event") {|view,event| @controller.key_up_reg(view,event,view.buffer.text)}
-      @matchview.signal_connect("key-release-event") {|view,event| @controller.key_up_match(view,event,view.buffer.text)}
-    end
-
-    def start
-      @window.show_all
-      begin
-        Gtk.main
-      rescue SystemExit, Interrupt
-        exit(0)
-      end
-    end
-
-    def update_tag(tag_begin,tag_end)
-      remove_tag
-      b = @matchview.buffer.get_iter_at_offset(tag_begin)
-      e = @matchview.buffer.get_iter_at_offset(tag_end)
-      @matchview.buffer.apply_tag("colors",b,e)
-    end
-
-    def update_status(message)
-      @statusbar.pop(0)
-      @statusbar.push(0,message)
-    end
-
-    def update_match_groups(groups)
-      @list_store.clear
-      groups.each_with_index{|item,i| iter = @list_store.append; iter[0]=i;iter[1]=item}
-    end
-
-    def remove_tag
-      buffer = @matchview.buffer
-      bstart = buffer.get_iter_at_offset(0)
-      bend = buffer.get_iter_at_offset(buffer.text.size)
-      @matchview.buffer.remove_tag("colors",bstart,bend)
-    end
-  end
-end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: kang
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0alpha
+  prerelease: 5
 platform: ruby
 authors:
 - Tony Doan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-07 00:00:00.000000000Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
-  requirement: &70347311322200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70347311322200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The Ruby Regex Debugger. Put your regex in the top pane, and your match
   text in the bottom pane. Kang will highlight the match text that matches and show
   you any match groups you have created down the right hand side.
@@ -33,7 +38,13 @@ extra_rdoc_files: []
 files:
 - lib/kang.rb
 - lib/kang/cli.rb
+- lib/kang/controller.rb
+- lib/kang/data.rb
+- lib/kang/offset_data.rb
 - lib/kang/version.rb
+- lib/kang/view.rb
+- COPYING
+- History.txt
 - bin/kang
 homepage: http://github.com/tdoan/kang
 licenses: []
@@ -50,13 +61,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A visual regex debugger
 test_files: []
+has_rdoc: false