kronk 1.7.3 → 1.7.4

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 1.7.3 / 2011-10-26
+
+* Bugfixes:
+
+  * Support converting root transaction hash to array.
+
+  * Fix for single item selection in Path::Match.
+
+  * Fix for overly-eager Path::Matcher regexp.
+
 === 1.7.3 / 2011-10-25
 
 * Bugfixes:

data/lib/kronk.rb

@@ -14,7 +14,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.7.3'
+  VERSION = '1.7.4'
 
   require 'kronk/constants'
   require 'kronk/queue_runner'
@@ -354,8 +354,8 @@ class Kronk
 
     resp
 
-  rescue SocketError, SystemCallError
-    raise NotFoundError, "#{uri} could not be found"
+  rescue SocketError, SystemCallError => e
+    raise NotFoundError, "#{uri} could not be found (#{e.class})"
 
   rescue Timeout::Error
     raise TimeoutError, "#{uri} took too long to respond"

data/lib/kronk/cmd.rb

@@ -5,6 +5,11 @@ class Kronk
 
   class Cmd
 
+    RESCUABLE = [
+      Kronk::Exception, Timeout::Error,
+      SocketError, SystemCallError, URI::InvalidURIError
+    ]
+
     ##
     # Saves the raw http response to a cache file.
 
@@ -537,8 +542,8 @@ Parse and run diffs against data from live and cached http responses.
 
       exit 1 unless success
 
-    rescue Kronk::Exception, SystemCallError => e
-      error e.message, e.backtrace
+    rescue *RESCUABLE => e
+      error e
       exit 2
     end
 
@@ -647,11 +652,18 @@ Parse and run diffs against data from live and cached http responses.
 
 
     ##
-    # Print an error string
+    # Print an error from a String or Exception instance
+
+    def self.error err, more=nil
+      msg = ::Exception === err ?
+              "#{err.class}: #{err.message}" : "Error: #{err}"
 
-    def self.error str, more=nil
-      $stderr.puts "\nError: #{str}"
-      $stderr.puts more if Kronk.config[:verbose] && more
+      $stderr.puts "\n#{msg}"
+
+      if Kronk.config[:verbose]
+        more ||= err.backtrace.join("\n") if ::Exception === err
+        $stderr.puts "#{more}" if more
+      end
     end
 
 

data/lib/kronk/path/match.rb

@@ -12,10 +12,14 @@ class Kronk::Path::Match < Array
   end
 
 
-  def [] *args
+  def [] selector
     path_match = super
-    path_match.matches = @matches.dup
-    path_match.splat   = @splat.map{|key, sp| [key, sp.dup]}
+
+    if self.class === path_match
+      path_match.matches = @matches.dup
+      path_match.splat   = @splat.map{|key, sp| [key, sp.dup]}
+    end
+
     path_match
   end
 

data/lib/kronk/path/matcher.rb

@@ -180,7 +180,7 @@ class Kronk::Path::Matcher
         str.gsub! %r{(^|[^#{Kronk::Path::RECH}])([#{SUFF_CHARS}])},   '\1(.\2)'
         str.gsub! %r{(^|[^\.#{Kronk::Path::RECH}])([#{SUFF_CHARS}])}, '\1(.\2)'
 
-        Regexp.new "\\A#{str}\\Z", @regex_opts
+        Regexp.new "\\A(?:#{str})\\Z", @regex_opts
 
       else
         str.gsub %r{#{Kronk::Path::RECH}([^#{Kronk::Path::RECH}]|$)}, '\1'

data/lib/kronk/path/transaction.rb

@@ -101,7 +101,7 @@ class Kronk::Path::Transaction
     end
 
     new_data = hash_to_ary new_data if
-      Array === @data && Hash === new_data &&
+      (remake_paths.last == [] || Array === @data && Hash === new_data) &&
       (!except_modified || @data.length == new_data.length)
 
     new_data
@@ -159,7 +159,7 @@ class Kronk::Path::Transaction
       remap_make_arrays(tpath, path)
     end
 
-    force_assign_paths data.class.new, path_val_hash
+    force_assign_paths [], path_val_hash
   end
 
 
@@ -242,7 +242,7 @@ class Kronk::Path::Transaction
 
         new_curr_data[key] = value and break if last
 
-        if ary_or_hash?(curr_data) && ary_or_hash?(curr_data[key])
+        if ary_or_hash?(curr_data) && child_ary_or_hash?(curr_data, key)
           new_curr_data[key] ||= curr_data[key]
 
         elsif !ary_or_hash?(new_curr_data[key])
@@ -254,7 +254,7 @@ class Kronk::Path::Transaction
         prev_key      = key
         prev_data     = new_curr_data
         new_curr_data = new_curr_data[key]
-        curr_data     = ary_or_hash?(curr_data) ? curr_data[key] : nil
+        curr_data     = curr_data[key] if ary_or_hash?(curr_data) rescue nil
       end
     end
 
@@ -272,6 +272,11 @@ class Kronk::Path::Transaction
   end
 
 
+  def child_ary_or_hash? obj, key
+    ary_or_hash?(obj[key]) rescue false
+  end
+
+
   def ary_to_hash ary # :nodoc:
     hash = {}
     ary.each_with_index{|val, i| hash[i] = val}

data/lib/kronk/player.rb

@@ -8,8 +8,6 @@ class Kronk
 
   class Player < QueueRunner
 
-    RESCUABLE = [Kronk::Exception, SystemCallError, URI::InvalidURIError]
-
     attr_accessor :input, :output
 
     ##
@@ -126,7 +124,7 @@ class Kronk
 
       begin
         kronk.send(*args)
-      rescue *RESCUABLE => e
+      rescue *Kronk::Cmd::RESCUABLE => e
         err = e
       end
 
@@ -149,7 +147,7 @@ class Kronk
       method = args.shift.to_s + '_async'
 
       kronk.send(method, *args) do |obj, err|
-        raise err if err && !RESCUABLE.find{|eclass| eclass === err}
+        raise err if err && !Kronk::Cmd::RESCUABLE.find{|eclass| eclass === err}
         trigger_result kronk, err, &block
       end
     end

data/test/test_cmd.rb

@@ -497,7 +497,7 @@ class TestCmd < Test::Unit::TestCase
 
     errs.each do |err, msg|
       Kronk.expects(:load_config)
-      expect_error_output msg
+      expect_error_output msg, err
       Kronk::Cmd.expects(:request).raises(err)
 
       assert_exit 2 do

data/test/test_helper.rb

@@ -113,8 +113,8 @@ def expect_request_output str, opts={}
 end
 
 
-def expect_error_output str
-  $stderr.expects(:puts).with "\nError: #{str}"
+def expect_error_output str, name="Error"
+  $stderr.expects(:puts).with "\n#{name}: #{str}"
 end
 
 

data/test/test_path.rb

@@ -237,10 +237,10 @@ class TestPath < Test::Unit::TestCase
 
     assert_path %w{path/to item/ i}, "path\\/to/item\\//i"
 
-    assert_path [/\Apath\/\.to\Z/i, /\Aitem\Z/i],
+    assert_path [/\A(?:path\/\.to)\Z/i, /\A(?:item)\Z/i],
        "path\\/.to/item", Regexp::IGNORECASE
 
-    assert_path ['path', /\Ato|for\Z/, 'item'], "path/to|for/item"
+    assert_path ['path', /\A(?:to|for)\Z/, 'item'], "path/to|for/item"
   end
 
 
@@ -249,10 +249,11 @@ class TestPath < Test::Unit::TestCase
     assert_path ['path', ["*", 'foo'], 'item'],  "path/*=foo/item"
     assert_path ['path', [nil, 'foo'], 'item'],  "path/=foo/item"
 
-    assert_path ['path', ['to', /\Afoo|bar\Z/], 'item'],
+    assert_path ['path', ['to', /\A(?:foo|bar)\Z/], 'item'],
       "path/to=foo|bar/item"
 
-    assert_path [/\Apath\Z/i, [/\Ato\Z/i, /\Afoo\Z/i], /\Aitem\Z/i],
+    assert_path \
+      [/\A(?:path)\Z/i, [/\A(?:to)\Z/i, /\A(?:foo)\Z/i], /\A(?:item)\Z/i],
       "path/to=foo/item", Regexp::IGNORECASE
   end
 

data/test/test_path_matcher.rb

@@ -28,8 +28,8 @@ class TestPathMatcher < Test::Unit::TestCase
 
 
   def test_new
-    assert_equal %r{\Afoo(.*)\Z},     @matcher.key
-    assert_equal %r{\A(.*)bar(.*)\Z}, @matcher.value
+    assert_equal %r{\A(?:foo(.*))\Z},     @matcher.key
+    assert_equal %r{\A(?:(.*)bar(.*))\Z}, @matcher.value
     assert !@matcher.recursive
   end
 
@@ -339,17 +339,18 @@ class TestPathMatcher < Test::Unit::TestCase
 
 
   def test_parse_node_regex
-    assert_equal(/\Atest(.*)\Z/,       @matcher.parse_node("test*"))
-    assert_equal(/\A(.?)test(.*)\Z/,   @matcher.parse_node("?test*"))
-    assert_equal(/\A\?test(.*)\Z/,     @matcher.parse_node("\\?test*"))
-    assert_equal(/\A(.?)test\*(.*)\Z/, @matcher.parse_node("?test\\**"))
-    assert_equal(/\A(.?)test(.*)\Z/,   @matcher.parse_node("?test*?**??"))
-    assert_equal(/\A(.?)test(.?)(.?)(.*)\Z/, @matcher.parse_node("?test??**??"))
-    assert_equal(/\Aa|b\Z/,            @matcher.parse_node("a|b"))
-    assert_equal(/\Aa|b(c|d)\Z/,       @matcher.parse_node("a|b(c|d)"))
+    assert_equal(/\A(?:test(.*))\Z/,       @matcher.parse_node("test*"))
+    assert_equal(/\A(?:(.?)test(.*))\Z/,   @matcher.parse_node("?test*"))
+    assert_equal(/\A(?:\?test(.*))\Z/,     @matcher.parse_node("\\?test*"))
+    assert_equal(/\A(?:(.?)test\*(.*))\Z/, @matcher.parse_node("?test\\**"))
+    assert_equal(/\A(?:(.?)test(.*))\Z/,   @matcher.parse_node("?test*?**??"))
+    assert_equal(/\A(?:(.?)test(.?)(.?)(.*))\Z/,
+      @matcher.parse_node("?test??**??"))
+    assert_equal(/\A(?:a|b)\Z/,            @matcher.parse_node("a|b"))
+    assert_equal(/\A(?:a|b(c|d))\Z/,       @matcher.parse_node("a|b(c|d)"))
 
     matcher = Kronk::Path::Matcher.new :regex_opts => Regexp::IGNORECASE
-    assert_equal(/\Aa|b(c|d)\Z/i, matcher.parse_node("a|b(c|d)"))
+    assert_equal(/\A(?:a|b(c|d))\Z/i, matcher.parse_node("a|b(c|d)"))
   end
 
 

data/test/test_transaction.rb

@@ -459,6 +459,8 @@ class TestTransaction < Test::Unit::TestCase
     assert_equal expected, new_data
 
     expected[3]['other'] = ['val4', 'val3', ['val5']]
+    expected = @trans.hash_to_ary expected
+
     new_data = @trans.remake_arrays new_data
     assert_equal expected, new_data
   end

metadata

@@ -2,7 +2,7 @@
 name: kronk
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 Z
+date: 2011-10-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json