kang 0.0.2 → 0.0.3

data/lib/kang.rb

@@ -25,9 +25,9 @@ end
 
 module Kang
   class Data
-    def initialize
-      @re = nil
-      @match = nil
+    def initialize(reg_text="",match_text="")
+      update_regexp(reg_text)
+      update_match_string(match_text)
     end
 
     def update_match_string(match_string)
@@ -45,7 +45,7 @@ module Kang
 
     def match_group_count
       if @match
-        @match.to_a.size-1
+        @match.length
       else
         nil
       end
@@ -86,7 +86,7 @@ module Kang
 
     def matches
       if @match and (@match.length > 1)
-        @match[1..-1]
+        @match.to_a
       else
         []
       end
@@ -95,8 +95,10 @@ module Kang
 
   class Controller
     def initialize
-      @view = View.new(self)
-      @data = Data.new
+      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
 
@@ -119,7 +121,9 @@ module Kang
         @view.update_status("Invalid Regexp")
       else
         count = @data.match_group_count ? @data.match_group_count : "no"
-        @view.update_status("Matched with #{@data.match_group_count} grouping(s)")
+        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
@@ -132,7 +136,7 @@ module Kang
   end
 
   class View
-    def initialize(controller)
+    def initialize(controller,reg_text="",match_text="")
       @controller = controller
       @window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
       @window.set_title  "Kang"
@@ -150,12 +154,12 @@ module Kang
       @statusbar.push(0,"")
 
       @regview = Gtk::TextView.new
-      @regview.buffer.text = "RegExp here"
+      @regview.buffer.text = reg_text
 
       @matchview = Gtk::TextView.new
-      @matchview.buffer.text = "Match Text Here"
+      @matchview.buffer.text = match_text
 
-      @matchview.buffer.create_tag("colors",{ "foreground" => "green", "background" => "#000000" })
+      @matchview.buffer.create_tag("colors",{ "foreground" => "green", "background" => "gray" })
 
       wintop.add(@regview)
       winbottom.add(@matchview)

data/lib/kang/version.rb

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

metadata

@@ -1,67 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kang
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Tony Doan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gtk2
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70347311322200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-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.
+  prerelease: false
+  version_requirements: *70347311322200
+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.
 email: tdoan@tdoan.com
-executables: 
+executables:
 - kang
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/kang.rb
 - lib/kang/cli.rb
 - lib/kang/version.rb
 - bin/kang
 homepage: http://github.com/tdoan/kang
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: A visual regex debugger
 test_files: []
-