cudan 0.0.4 → 0.0.5

data/CHANGES

@@ -1,3 +1,15 @@
+= 0.0.5
+ * 2011/01/13
+ * change some options.
+
+= 0.0.4
+ * 2011/01/12
+ * fix bug in xpath query.
+
+= 0.0.3
+ * 2011/01/12
+ * update document.
+
 = 0.0.2
  * 2011/01/12
  * add dependancy on Nokogiri

data/lib/cudan.rb

@@ -4,5 +4,5 @@ module Cudan
     require 'cudan/regexp_cudan'
     require 'cudan/xpath_cudan'
     require 'cudan/main'
-    VERSION="0.0.4"
+    VERSION="0.0.5"
 end

data/lib/cudan/base_cudan.rb

@@ -37,6 +37,7 @@ module Cudan
             end
         end
         def execute query, expect, url, method=GET, body=nil
+            @query = query
             fetch(url, method, body)
             @query_result = do_query(query)
             r = do_expect(expect)
@@ -48,6 +49,7 @@ module Cudan
         end
         def do_message
             Logger.log 'failure:'
+            Logger.log "query: #{@query}"
             Logger.log @query_result.gsub(/^(.*)$/){|r| "\t" + r}
         end
         def do_query query

data/lib/cudan/main.rb

@@ -8,6 +8,9 @@ class Cudan::Main
             exit
         end
         opts.on('-q QUERY', '--query QUERY', 'query') do |q|
+            if q==''
+                q = '/.*'
+            end
             @query = q
         end
         opts.on('-e EXPECT_STRING', '--expects EXPECT_STRING', 'expect string') do |ex|
@@ -19,6 +22,18 @@ class Cudan::Main
         opts.on('--show-body', 'show body') do |b|
             @showbody = b
         end
+        @mode = :css
+        opts.on('-m MODE', '--mode MODE', 'query mode. [regexp|xpath|css].', [:regexp, :xpath, :css]) do |m|
+            @mode = m
+        end
+        opts.on('-x QUERY', 'alias for "-q query --mode=xpath"') do |q|
+            @mode = :xpath
+            @query = q
+        end
+        opts.on('-r QUERY', 'alias for "-q query --mode=regexp"') do |q|
+            @mode = :regexp
+            @query = q
+        end
         opts.version = Cudan::VERSION
         opts.parse!(ARGV)
         @url = ARGV[0]
@@ -26,13 +41,19 @@ class Cudan::Main
             puts opts.to_s
             exit
         end
-        if /^\/(.*)\/$/ =~ @query
-            klass = Cudan::RegexpCudan
+        if /^\/(.+)\/$/ =~ @query
+            @mode = :regexp
             @query = $~[1]
-        else
-            klass = Cudan::XpathCudan
         end
-        instance = klass::new
+        case @mode
+        when :regexp
+            @klass = Cudan::RegexpCudan
+        when :css
+            @klass = Cudan::XpathCudan
+        when :xpath
+            @klass = Cudan::XpathCudan
+        end
+        instance = @klass::new
         instance.set_header('UserAgent', @ua) if @ua
         instance.showbody = @showbody
         instance.execute(@query, @expects, @url)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - takada-at