kronk 1.6.2 → 1.7.0

data/test/test_diff.rb

@@ -39,306 +39,8 @@ class TestDiff < Test::Unit::TestCase
 
     diff = Kronk::Diff.new_from_data mock_data, other_data
 
-    assert_equal Kronk::Diff.ordered_data_string(mock_data), diff.str1
-    assert_equal Kronk::Diff.ordered_data_string(other_data), diff.str2
-  end
-
-
-  def test_ordered_data_string_json
-    expected = <<STR
-{
- "acks": [
-  [
-   56,
-   78
-  ],
-  [
-   "12",
-   "34"
-  ]
- ],
- "root": [
-  [
-   "B1",
-   "B2"
-  ],
-  [
-   "A1",
-   "A2"
-  ],
-  [
-   "C1",
-   "C2",
-   [
-    "C3a",
-    "C3b"
-   ]
-  ],
-  {
-   ":tests": [
-    "D3a",
-    "D3b"
-   ],
-   "test": [
-    [
-     "D1a\\nContent goes here",
-     "D1b"
-    ],
-    "D2"
-   ]
-  }
- ],
- "subs": [
-  "a",
-  "b"
- ],
- "tests": {
-  ":foo": ":bar",
-  "test": [
-   [
-    1,
-    2
-   ],
-   2.123
-  ]
- }
-}
-STR
-
-    assert_equal expected.strip, Kronk::Diff.ordered_data_string(mock_data)
-  end
-
-
-  def test_ordered_data_string_struct_json
-    expected = <<STR
-{
- "acks": [
-  [
-   "Fixnum",
-   "Fixnum"
-  ],
-  [
-   "String",
-   "String"
-  ]
- ],
- "root": [
-  [
-   "String",
-   "String"
-  ],
-  [
-   "String",
-   "String"
-  ],
-  [
-   "String",
-   "String",
-   [
-    "String",
-    "String"
-   ]
-  ],
-  {
-   ":tests": [
-    "String",
-    "String"
-   ],
-   "test": [
-    [
-     "String",
-     "String"
-    ],
-    "String"
-   ]
-  }
- ],
- "subs": [
-  "String",
-  "String"
- ],
- "tests": {
-  ":foo": "Symbol",
-  "test": [
-   [
-    "Fixnum",
-    "Fixnum"
-   ],
-   "Float"
-  ]
- }
-}
-STR
-
-    assert_equal expected.strip,
-                  Kronk::Diff.ordered_data_string(mock_data, true)
-  end
-
-  def test_ordered_data_string_json
-    expected = <<STR
-{
- "acks": [
-  [
-   56,
-   78
-  ],
-  [
-   "12",
-   "34"
-  ]
- ],
- "root": [
-  [
-   "B1",
-   "B2"
-  ],
-  [
-   "A1",
-   "A2"
-  ],
-  [
-   "C1",
-   "C2",
-   [
-    "C3a",
-    "C3b"
-   ]
-  ],
-  {
-   ":tests": [
-    "D3a",
-    "D3b"
-   ],
-   "test": [
-    [
-     "D1a\\nContent goes here",
-     "D1b"
-    ],
-    "D2"
-   ]
-  }
- ],
- "subs": [
-  "a",
-  "b"
- ],
- "tests": {
-  ":foo": ":bar",
-  "test": [
-   [
-    1,
-    2
-   ],
-   2.123
-  ]
- }
-}
-STR
-
-    assert_equal expected.strip, Kronk::Diff.ordered_data_string(mock_data)
-  end
-
-
-  def test_ordered_data_string_ruby_paths
-    with_config :render_lang => 'ruby', :render_paths => true do
-      expected = <<STR
-{
- "/acks/0/0" => 56,
- "/acks/0/1" => 78,
- "/acks/1/0" => "12",
- "/acks/1/1" => "34",
- "/root/0/0" => "B1",
- "/root/0/1" => "B2",
- "/root/1/0" => "A1",
- "/root/1/1" => "A2",
- "/root/2/0" => "C1",
- "/root/2/1" => "C2",
- "/root/2/2/0" => "C3a",
- "/root/2/2/1" => "C3b",
- "/root/3/test/0/0" => "D1a\\nContent goes here",
- "/root/3/test/0/1" => "D1b",
- "/root/3/test/1" => "D2",
- "/root/3/tests/0" => "D3a",
- "/root/3/tests/1" => "D3b",
- "/subs/0" => "a",
- "/subs/1" => "b",
- "/tests/foo" => :bar,
- "/tests/test/0/0" => 1,
- "/tests/test/0/1" => 2,
- "/tests/test/1" => 2.123
-}
-STR
-
-      assert_equal expected.strip, Kronk::Diff.ordered_data_string(mock_data)
-    end
-  end
-
-
-  def test_ordered_data_string_struct_ruby
-    with_config :render_lang => 'ruby' do
-      expected = <<STR
-{
- "acks" => [
-  [
-   Fixnum,
-   Fixnum
-  ],
-  [
-   String,
-   String
-  ]
- ],
- "root" => [
-  [
-   String,
-   String
-  ],
-  [
-   String,
-   String
-  ],
-  [
-   String,
-   String,
-   [
-    String,
-    String
-   ]
-  ],
-  {
-   :tests => [
-    String,
-    String
-   ],
-   "test" => [
-    [
-     String,
-     String
-    ],
-    String
-   ]
-  }
- ],
- "subs" => [
-  String,
-  String
- ],
- "tests" => {
-  :foo => Symbol,
-  "test" => [
-   [
-    Fixnum,
-    Fixnum
-   ],
-   Float
-  ]
- }
-}
-STR
-
-      assert_equal expected.strip,
-                    Kronk::Diff.ordered_data_string(mock_data, true)
-    end
+    assert_equal Kronk::DataString.new(mock_data), diff.str1
+    assert_equal Kronk::DataString.new(other_data), diff.str2
   end
 
 
@@ -579,7 +281,7 @@ STR
     (<<-STR
 \e[1;33m--- test/mocks/200_response_diff.json
 +++ test/mocks/200_response.json\e[0m
-\e[1;35m@@ -6,7 +6,7 @@\e[0m business/description
+\e[1;35m@@ -6,7 +6,7 @@\e[0m /business/description
      "additional_urls": [
       {
        "destination": "http://example.com",
@@ -588,7 +290,7 @@ STR
       }
      ],
      "general_info": "<p>A Paint Your Own Pottery Studios..</p>",
-\e[1;35m@@ -15,11 +15,12 @@\e[0m business/description
+\e[1;35m@@ -15,11 +15,12 @@\e[0m /business/description
      "slogan": "<p>Pottery YOU dress up</p>"
     },
     "distance": 0.0,
@@ -603,7 +305,7 @@ STR
     "improvable": true,
     "latitude": 42.882561,
     "listing_id": "1234",
-\e[1;35m@@ -34,12 +35,12 @@\e[0m business
+\e[1;35m@@ -34,12 +35,12 @@\e[0m /business
     "rating_count": 0,
     "red_listing": false,
     "state": "MI",
@@ -667,6 +369,7 @@ STR
     str = <<STR
 --- left
 +++ right
+@@ -1,17 +1,16 @@ 
 - HTTP/1.1 302 Found
 - Location: http://igoogle.com/
 + HTTP/1.1 301 Moved Permanently
@@ -698,6 +401,7 @@ STR
     str = <<STR
 --- left
 +++ right
+@@ -1,17 +1,16 @@ 
  1|   - HTTP/1.1 302 Found
  2|   - Location: http://igoogle.com/
   | 1 + HTTP/1.1 301 Moved Permanently
@@ -730,6 +434,7 @@ STR
     str = <<STR
 \e[1;33m--- left
 +++ right\033[0m
+\e[1;35m@@ -1,17 +1,16 @@\e[0m 
 \033[1;31m- HTTP/1.1 302 Found\033[0m
 \033[1;31m- Location: http://igoogle.com/\033[0m
 \033[1;32m+ HTTP/1.1 301 Moved Permanently\033[0m

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 require "test/unit"
-require "kronk"
+require "kronk/async"
 require "mocha"
 
 Kronk.config[:context] = nil

data/test/test_kronk.rb

@@ -4,6 +4,7 @@ class TestKronk < Test::Unit::TestCase
 
   def test_default_config
     expected = {
+      :async         => 'auto',
       :content_types => {
         'js'      => 'JSON',
         'json'    => 'JSON',
@@ -31,6 +32,7 @@ class TestKronk < Test::Unit::TestCase
   def test_load_config
     with_config do
       mock_config = {
+        :async         => false,
         :content_types => {
           'soap' => "SOAPParser",
           'js'   => "JsEngine"
@@ -60,6 +62,7 @@ class TestKronk < Test::Unit::TestCase
       Kronk.load_config "foobar"
 
       expected = {
+        :async         => false,
         :content_types => {
           'soap'  => "SOAPParser",
           'js'    => "JsEngine",
@@ -80,7 +83,7 @@ class TestKronk < Test::Unit::TestCase
         :ignore_headers => ["Content-Type"],
         :uri_options => {'example.com' => {:parser => 'JSON'}},
         :user_agents =>
-          Kronk::USER_AGENTS.merge(:win_ie6 => 'piece of crap browser'),
+          Kronk::USER_AGENTS.merge('win_ie6' => 'piece of crap browser'),
         :foo => :bar
       }
 
@@ -365,11 +368,11 @@ class TestKronk < Test::Unit::TestCase
                          :show_headers => true,
                          :raw => true
 
-    resp1 = Kronk.retrieve "test/mocks/200_response.json",
+    resp1 = Kronk.request "test/mocks/200_response.json",
                              :show_headers => true,
                              :raw => true
 
-    resp2 = Kronk.retrieve "test/mocks/200_response.xml",
+    resp2 = Kronk.request "test/mocks/200_response.xml",
                              :show_headers => true,
                              :raw => true
 
@@ -446,10 +449,10 @@ class TestKronk < Test::Unit::TestCase
                          "test/mocks/200_response.xml",
                          :show_headers => true
 
-    resp1 = Kronk.retrieve "test/mocks/200_response.json",
+    resp1 = Kronk.request "test/mocks/200_response.json",
                              :show_headers => true
 
-    resp2 = Kronk.retrieve "test/mocks/200_response.xml",
+    resp2 = Kronk.request "test/mocks/200_response.xml",
                              :show_headers => true
 
     exp_diff = Kronk::Diff.new_from_data \
@@ -469,13 +472,15 @@ class TestKronk < Test::Unit::TestCase
     req = Kronk::Request.new "http://www.google.com/"
     req.stubs(:retrieve).returns res
 
-    Kronk::Request.stubs(:new).with("http://www.google.com/",{}).returns req
+    Kronk::Request.stubs(:new).
+      with("http://www.google.com/",{:follow_redirects => true}).returns req
+
     Kronk::Request.expects(:new).
       with("http://www.google.com/", :follow_redirects => true).returns req
 
     assert_raises Timeout::Error do
       timeout(2) do
-        Kronk.retrieve "http://www.google.com/", :follow_redirects => true
+        Kronk.request "http://www.google.com/", :follow_redirects => true
       end
     end
   end
@@ -487,38 +492,39 @@ class TestKronk < Test::Unit::TestCase
     req.stubs(:retrieve).returns res
 
     Kronk::Request.expects(:new).
-      with("http://www.google.com/",{}).returns(req).times(3)
+      with("http://www.google.com/",{:follow_redirects => 3}).returns(req).
+      times(3)
 
     Kronk::Request.expects(:new).
       with("http://www.google.com/", :follow_redirects => 3).returns req
 
-    Kronk.retrieve "http://www.google.com/", :follow_redirects => 3
+    Kronk.request "http://www.google.com/", :follow_redirects => 3
   end
 
 
   def test_follow_redirect_no_redirect
     res = Kronk::Response.new mock_200_response
     req = Kronk::Request.new "http://www.google.com/"
-    req.stubs(:retrieve).returns res
+    req.stubs(:request).returns res
 
     Kronk::Request.expects(:new).with("http://www.google.com/",{}).never
     Kronk::Request.expects(:new).
       with("http://www.google.com/", :follow_redirects => true).returns req
 
-    Kronk.retrieve "http://www.google.com/", :follow_redirects => true
+    Kronk.request "http://www.google.com/", :follow_redirects => true
   end
 
 
   def test_do_not_follow_redirect
     res = Kronk::Response.new mock_302_response
     req = Kronk::Request.new "http://www.google.com/"
-    req.stubs(:retrieve).returns res
+    req.stubs(:request).returns res
 
     Kronk::Request.expects(:new).with("http://www.google.com/",{}).never
     Kronk::Request.expects(:new).
       with("http://www.google.com/", :follow_redirects => false).returns req
 
-    Kronk.retrieve "http://www.google.com/", :follow_redirects => false
+    Kronk.request "http://www.google.com/", :follow_redirects => false
   end
 
 
@@ -536,8 +542,8 @@ class TestKronk < Test::Unit::TestCase
     assert_equal 2,             kronk.responses.length
     assert_equal diff,          kronk.diff
 
-    resp1 = kronk.retrieve "test/mocks/200_response.xml"
-    resp2 = kronk.retrieve "test/mocks/200_response.json"
+    resp1 = kronk.request "test/mocks/200_response.xml"
+    resp2 = kronk.request "test/mocks/200_response.json"
 
     assert_equal json_resp.raw, kronk.response.raw
     assert_equal json_resp.raw, kronk.responses.last.raw
@@ -557,19 +563,6 @@ class TestKronk < Test::Unit::TestCase
   end
 
 
-  def test_parse_data_path_args
-    options = {}
-    argv = %w{this is --argv -- one -two -- -three four}
-
-    options = Kronk::Cmd.parse_data_path_args options, argv
-
-    assert_equal %w{one four}, options[:only_data]
-    assert_equal %w{two - three}, options[:ignore_data]
-
-    assert_equal %w{this is --argv}, argv
-  end
-
-
   private
 
   def mock_uri_options

data/test/test_path.rb

@@ -63,6 +63,35 @@ class TestPath < Test::Unit::TestCase
     assert data_points.include?(@data['findme'].last)
 
     assert_equal expected_paths, (expected_paths | paths)
+
+    splat_path = paths.find{|pa| pa[0] == :key1}
+    assert_equal [:key1, :key1a, 3], splat_path.splat[0][1]
+  end
+
+
+  def test_find_recursive_many_splat
+    path_match = nil
+
+    Kronk::Path.find "**/key1a/**=thing", @data do |data, key, path|
+      path_match = path
+    end
+
+    assert path_match
+    assert_equal [:key1], path_match.splat[0][1]
+    assert_equal [3], path_match.splat[1][1]
+  end
+
+
+  def test_find_recursive_many_splat_end_match
+    path_match = nil
+
+    Kronk::Path.find "**/key1a/**/*=thing", @data do |data, key, path|
+      path_match = path
+    end
+
+    assert path_match
+    assert_equal [:key1], path_match.splat[0][1]
+    assert_equal [3], path_match.splat[1][1]
   end
 
 

data/test/test_path_match.rb

@@ -5,6 +5,12 @@ class TestPathMatch < Test::Unit::TestCase
   def setup
     @pmatch = Kronk::Path::PathMatch.new %w{path to resource}
     @pmatch.matches = %w{this is 4 foo}
+
+    @splat = @pmatch.dup
+    @splat.append_splat "first", "path"
+    @splat.append_splat "first", "to"
+    @splat.append_splat "second", "resource"
+    @splat.append_splat "second", "bar"
   end
 
 
@@ -29,9 +35,24 @@ class TestPathMatch < Test::Unit::TestCase
   end
 
 
-  def test_make_path_bad_token
+  def test_make_path_consecutive
+    path = @pmatch.make_path "/%3%4/2/path/%1"
+    assert_equal %w{4foo 2 path this}, path
+  end
+
+
+  def test_make_path_no_splat
     path = @pmatch.make_path "/%%3/2/path/%4_%1"
-    assert_equal %w{4 2 path foo_this}, path
+    assert_equal %w{3 2 path foo_this}, path
+  end
+
+
+  def test_make_path_consecutive_no_splat
+    path = @pmatch.make_path "/%%%4/2/path/%1"
+    assert_equal %w{foo 2 path this}, path
+
+    path = @pmatch.make_path "/%4%%/2/path/%1"
+    assert_equal %w{foo 2 path this}, path
   end
 
 
@@ -57,4 +78,28 @@ class TestPathMatch < Test::Unit::TestCase
     path = @pmatch.make_path "/%31/2/path/%4_%1"
     assert_equal ["", "2", "path", "foo_this"], path
   end
+
+
+  def test_make_path_splat
+    path = @splat.make_path "/%4%%/2/thing"
+    assert_equal ["foopath", "to", "2", "thing"], path
+
+    path = @splat.make_path "/%4/%%/2/thing"
+    assert_equal ["foo", "path", "to", "2", "thing"], path
+
+    path = @splat.make_path "/%4/bah%%2/thing"
+    assert_equal ["foo", "bahpath", "to2", "thing"], path
+  end
+
+
+  def test_make_path_splat_multiple
+    path = @splat.make_path "/%4%%%%/2/thing"
+    assert_equal ["foopath", "toresource", "bar", "2", "thing"], path
+
+    path = @splat.make_path "/%4/%%/2/thing/%%"
+    assert_equal ["foo", "path", "to", "2", "thing", "resource", "bar"], path
+
+    path = @splat.make_path "%%/%4/bah%%2/thing/%%"
+    assert_equal %w{path to foo bahresource bar2 thing}, path
+  end
 end

data/test/test_path_matcher.rb

@@ -107,11 +107,12 @@ class TestPathMatcher < Test::Unit::TestCase
     matcher = Kronk::Path::Matcher.new :key       => :findme,
                                        :recursive => true
 
-    matcher.find_in @data do |data, key|
+    path_matches = matcher.find_in @data do |data, key|
       keys << key.to_s
       data_points << data
     end
 
+    assert path_matches.find{|pm| pm.splat == [[matcher, [:key1, :key1a, 3]]]}
     assert_equal 3, keys.length
     assert_equal 1, keys.uniq.length
     assert_equal "findme", keys.first
@@ -204,6 +205,11 @@ class TestPathMatcher < Test::Unit::TestCase
       [:key3]
     ]
 
+    paths.each do |path|
+      assert path.splat.empty?,
+        "Expected empty splat for #{path.inspect} but got #{path.splat.inspect}"
+    end
+
     assert_equal expected_paths, (expected_paths | paths)
     assert_equal Kronk::Path::PathMatch, paths.first.class
     assert_equal expected_paths, (expected_paths | paths.map{|p| p.matches})
@@ -269,6 +275,41 @@ class TestPathMatcher < Test::Unit::TestCase
   end
 
 
+  def test_find_in_match_splat
+    matcher = Kronk::Path::Matcher.new :key       => "findme",
+                                       :recursive => true
+
+    matches = matcher.find_in @data
+
+    splat_i = matches.index [:key1, :key1a, 3, :findme]
+    assert_equal [:key1, :key1a, 3], matches[splat_i].splat[0][1]
+
+    splat_i = matches.index ["findme"]
+    assert_equal [], matches[splat_i].splat[0][1]
+
+    splat_i = matches.index ["findme", 2, :findme]
+    assert_equal ["findme", 2], matches[splat_i].splat[0][1]
+  end
+
+
+  def test_find_in_match_splat_value
+    matcher = Kronk::Path::Matcher.new :value     => "foobar",
+                                       :recursive => true
+
+    matches = matcher.find_in @data
+
+    assert(matches.any?{|m|
+      m == [:key1, :key1a, 2] && assert_equal([:key1, :key1a, 2], m.splat[0][1])
+      true
+    })
+
+    assert(matches.any?{|m|
+      m == [:key2] && assert_equal([:key2], m.splat[0][1])
+      true
+    })
+  end
+
+
   def test_parse_node_range
     assert_equal 1..4,   @matcher.parse_node("1..4")
     assert_equal 1...4,  @matcher.parse_node("1...4")