kronk 1.3.1 → 1.4.0

data/test/test_request.rb

@@ -82,16 +82,6 @@ class TestRequest < Test::Unit::TestCase
   end
 
 
-  def test_retrieve_file_cache
-    File.expects(:open).with(Kronk::DEFAULT_CACHE_FILE, "rb").
-      yields StringIO.new(mock_200_response)
-
-    resp = Kronk::Request.retrieve_file :cache
-    assert_equal mock_200_response, resp.raw
-    assert_equal "200", resp.code
-  end
-
-
   def test_retrieve_file_redirect
     resp2 = Kronk::Request.retrieve_file "test/mocks/200_response.txt"
     Kronk::Request.expects(:follow_redirect).returns resp2

data/test/test_transaction.rb

@@ -0,0 +1,330 @@
+require 'test/test_helper'
+
+class TestTransaction < Test::Unit::TestCase
+
+  def setup
+    @data = {
+      :key1 => {
+        :key1a => [
+          "foo",
+          "bar",
+          "foobar",
+          {:findme => "thing"}
+        ],
+        'key1b' => "findme"
+      },
+      'findme' => [
+        123,
+        456,
+        {:findme => 123456}
+      ],
+      :key2 => "foobar",
+      :key3 => {
+        :key3a => ["val1", "val2", "val3"]
+      }
+    }
+
+    @trans = Kronk::Path::Transaction.new @data
+  end
+
+
+  def test_class_run
+    block = lambda do |t|
+      t.delete "key3/key*/2", "**=thing"
+      t.select "**=foo*", "**/findme"
+    end
+
+    assert_equal @trans.run(&block),
+      Kronk::Path::Transaction.run(@data, &block)
+
+    assert_equal @trans.run(:keep_indicies => true, &block),
+      Kronk::Path::Transaction.run(@data, :keep_indicies => true, &block)
+  end
+
+
+  def test_run
+    expected = {
+      :key1=>{:key1a=>["foo", "foobar", {}]},
+      :key2=>"foobar",
+      "findme"=>[123, 456, {:findme=>123456}]
+    }
+
+    result = @trans.run do |t|
+      t.delete "key3/key*/2", "**=thing"
+      t.select "**=foo*", "**/findme"
+    end
+
+    assert_equal expected, result
+    assert_equal @data, @trans.run
+
+    result2 = @trans.run do |t|
+      t.delete "key3/key*/2", "**=thing"
+      t.select "**=foo*", "**/findme"
+    end
+
+    assert_equal expected, result2
+  end
+
+
+  def test_results
+    @trans.clear
+    @trans.delete "key3/key*/2", "**=thing"
+    @trans.select "**=foo*", "**/findme"
+    result = @trans.results
+
+    expected = {
+      :key1=>{:key1a=>["foo", "foobar", {}]},
+      :key2=>"foobar",
+      "findme"=>[123, 456, {:findme=>123456}]
+    }
+
+    assert_equal expected, result
+  end
+
+
+  def test_results_keep_indicies
+    @trans.clear
+    @trans.delete "key3/key*/2", "**=thing"
+    @trans.select "**=foo*", "**/findme"
+    result = @trans.results :keep_indicies => true
+
+    expected = {
+      :key1=>{:key1a=>{2=>"foobar", 0=>"foo", 3=>{}}},
+      :key2=>"foobar",
+      "findme"=>[123, 456, {:findme=>123456}]
+    }
+
+    assert_equal expected, result
+  end
+
+
+  def test_remake_arrays_select
+    result = @trans.transaction_select @data, "**=foo", "key3/key*/2"
+    result = @trans.remake_arrays result
+
+    expected = {:key1=>{:key1a=>["foo"]}, :key3=>{:key3a=>["val3"]}}
+
+    assert_equal expected, result
+  end
+
+
+  def test_remake_arrays_select_except_modified
+    result = @trans.transaction_select @data, "**=foo", "key3/key*/2"
+    result = @trans.remake_arrays result, true
+
+    expected = {:key1=>{:key1a=>{0=>"foo"}}, :key3=>{:key3a=>{2=>"val3"}}}
+
+    assert_equal expected, result
+  end
+
+
+  def test_remake_arrays_select_root
+    data_arr = @data.keys.sort{|x,y| x.to_s <=> y.to_s}.map{|k| @data[k]}
+
+    @trans = Kronk::Path::Transaction.new data_arr
+    result = @trans.transaction_select data_arr, "**=foo", "3/key*/2"
+    result = @trans.remake_arrays result
+
+    expected = [{:key1a=>["foo"]}, {:key3a=>["val3"]}]
+
+    assert_equal expected, result
+  end
+
+
+  def test_remake_arrays_select_root_except_modified
+    data_arr = @data.keys.sort{|x,y| x.to_s <=> y.to_s}.map{|k| @data[k]}
+
+    @trans = Kronk::Path::Transaction.new data_arr
+    result = @trans.transaction_select data_arr, "**=foo", "3/key*"
+    result = @trans.remake_arrays result, true
+
+    expected = {1=>{:key1a=>{0=>"foo"}}, 3=>{:key3a=>["val1", "val2", "val3"]}}
+
+    assert_equal expected, result
+  end
+
+
+  def test_remake_arrays_delete
+    result = @trans.transaction_delete @data, "**=foo", "key3/key*/2"
+    result = @trans.remake_arrays result
+
+    expected = {
+      :key1 => {
+        :key1a => ["bar", "foobar", {:findme => "thing"}],
+        'key1b' => "findme"
+      },
+      'findme' => [123, 456, {:findme => 123456}],
+      :key2 => "foobar",
+      :key3 => {
+        :key3a => ["val1", "val2"]
+      }
+    }
+
+    assert_equal expected, result
+  end
+
+
+  def test_remake_arrays_delete_except_modified
+    result = @trans.transaction_delete @data, "**=foo", "key3/key*/2"
+    result = @trans.remake_arrays result, true
+
+    expected = {
+      :key1 => {
+        :key1a => {1=>"bar", 2=>"foobar", 3=>{:findme=>"thing"}},
+        'key1b' => "findme"
+      },
+      'findme' => [123, 456, {:findme => 123456}],
+      :key2 => "foobar",
+      :key3 => {
+        :key3a => {0=>"val1", 1=>"val2"}
+      }
+    }
+
+    assert_equal expected, result
+  end
+
+
+  def test_remake_arrays_delete_root
+    data_arr = @data.keys.sort{|x,y| x.to_s <=> y.to_s}.map{|k| @data[k]}
+
+    @trans = Kronk::Path::Transaction.new data_arr
+    result = @trans.transaction_delete data_arr, "**=foo", "3/key*/2"
+    result = @trans.remake_arrays result
+
+    expected = [
+      [123, 456, {:findme=>123456}],
+      {:key1a=>["bar", "foobar", {:findme=>"thing"}], "key1b"=>"findme"},
+      "foobar",
+      {:key3a=>["val1", "val2"]}
+    ]
+
+    assert_equal expected, result
+  end
+
+
+  def test_remake_arrays_delete_root_except_modified
+    data_arr = @data.keys.sort{|x,y| x.to_s <=> y.to_s}.map{|k| @data[k]}
+
+    @trans = Kronk::Path::Transaction.new data_arr
+    result = @trans.transaction_delete data_arr, "**=foo", "3/key*/2"
+    result = @trans.remake_arrays result, true
+
+    expected = [
+      [123, 456, {:findme=>123456}],
+      {:key1a=>{1=>"bar", 2=>"foobar", 3=>{:findme=>"thing"}},
+      "key1b"=>"findme"},
+      "foobar",
+      {:key3a=>{0=>"val1", 1=>"val2"}}
+    ]
+
+    assert_equal expected, result
+  end
+
+
+  def test_transaction_select
+    result = @trans.transaction_select @data, "**=foo", "key3/key*/2"
+    expected = {:key1=>{:key1a=>{0=>"foo"}}, :key3=>{:key3a=>{2=>"val3"}}}
+
+    assert_equal expected, result
+  end
+
+
+  def test_transaction_select_array
+    data_arr = @data.keys.sort{|x,y| x.to_s <=> y.to_s}.map{|k| @data[k]}
+
+    result = @trans.transaction_select data_arr, "**=foo", "3/key*/2"
+    expected = {1=>{:key1a=>{0=>"foo"}}, 3=>{:key3a=>{2=>"val3"}}}
+
+    assert_equal expected, result
+  end
+
+
+  def test_transaction_select_empty
+    assert_equal @data, @trans.transaction_select(@data)
+  end
+
+
+  def test_transaction_delete
+    result = @trans.transaction_delete @data, "**=foo", "key3/key*/2"
+    expected = {
+      :key1 => {
+        :key1a => {1 => "bar", 2 => "foobar", 3 => {:findme => "thing"}},
+        'key1b' => "findme"
+      },
+      'findme' => [123, 456, {:findme => 123456}],
+      :key2 => "foobar",
+      :key3 => {
+        :key3a => {0 => "val1", 1 => "val2"}
+      }
+    }
+
+    assert_equal expected, result
+  end
+
+
+  def test_transaction_delete_array
+    data_arr = @data.keys.sort{|x,y| x.to_s <=> y.to_s}.map{|k| @data[k]}
+
+    result = @trans.transaction_delete data_arr, "**=foo", "3/key*/2"
+    expected = {
+      0 => [123, 456, {:findme => 123456}],
+      1 => {
+        :key1a => {1 => "bar", 2 => "foobar", 3 => {:findme => "thing"}},
+        'key1b' => "findme"
+      },
+      2 => "foobar",
+      3 => {:key3a => {0 => "val1", 1 => "val2"}}
+    }
+
+    assert_equal expected, result
+  end
+
+
+  def test_transaction_delete_empty
+    assert_equal @data, @trans.transaction_delete(@data)
+  end
+
+
+  def test_ary_to_hash
+    expected = {1 => :a, 0 => :foo, 2 => :b}
+    assert_equal expected, @trans.ary_to_hash([:foo, :a, :b])
+  end
+
+
+  def test_hash_to_ary
+    assert_equal [:foo, :a, :b], @trans.hash_to_ary(1 => :a, 0 => :foo, 2 => :b)
+  end
+
+
+  def test_clear
+    @trans.instance_variable_get(:@actions)[:foo] = :bar
+    @trans.instance_variable_get(:@make_array) << :foobar
+
+    @trans.clear
+
+    assert @trans.instance_variable_get(:@actions).empty?
+    assert @trans.instance_variable_get(:@make_array).empty?
+  end
+
+
+  def test_select
+    @trans.select "path1", "path2", "path3"
+    assert_equal ["path1", "path2", "path3"],
+                 @trans.instance_variable_get(:@actions)[:select]
+
+    @trans.select "path4", "path5"
+    assert_equal ["path1", "path2", "path3", "path4", "path5"],
+                 @trans.instance_variable_get(:@actions)[:select]
+  end
+
+
+  def test_delete
+    @trans.delete "path1", "path2", "path3"
+    assert_equal ["path1", "path2", "path3"],
+                 @trans.instance_variable_get(:@actions)[:delete]
+
+    @trans.delete "path4", "path5"
+    assert_equal ["path1", "path2", "path3", "path4", "path5"],
+                 @trans.instance_variable_get(:@actions)[:delete]
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: kronk
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 Z
+date: 2011-07-04 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plist
@@ -25,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 3
         - 1
@@ -41,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 1
         - 5
@@ -56,7 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -64,99 +61,65 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: cookiejar
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 0
-        - 5
-        version: "0.5"
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rubyforge
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
-  type: :runtime
+        - 4
+        version: 2.0.4
+  type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: cookiejar
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  type: :runtime
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
         segments: 
         - 0
         - 9
         - 10
         version: 0.9.10
   type: :development
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 2
-        - 9
-        - 4
-        version: 2.9.4
+        - 7
+        - 0
+        version: 2.7.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id007
 description: |-
   Kronk runs diffs against data from live and cached http responses.
   Kronk was made possible by the sponsoring of AT&T Interactive.
@@ -185,6 +148,8 @@ files:
 - lib/kronk/diff.rb
 - lib/kronk/diff/ascii_format.rb
 - lib/kronk/diff/color_format.rb
+- lib/kronk/path.rb
+- lib/kronk/path/transaction.rb
 - lib/kronk/plist_parser.rb
 - lib/kronk/request.rb
 - lib/kronk/response.rb
@@ -210,10 +175,12 @@ files:
 - test/test_diff.rb
 - test/test_helper.rb
 - test/test_kronk.rb
+- test/test_path.rb
 - test/test_request.rb
 - test/test_response.rb
+- test/test_transaction.rb
 - test/test_xml_parser.rb
-- .gemtest
+has_rdoc: true
 homepage: https://github.com/yaksnrainbows/kronk
 licenses: []
 
@@ -228,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 855220484149539505
       segments: 
       - 0
       version: "0"
@@ -237,14 +204,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: kronk
-rubygems_version: 1.8.4
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Kronk runs diffs against data from live and cached http responses
@@ -256,6 +222,8 @@ test_files:
 - test/test_helper.rb
 - test/test_helper_methods.rb
 - test/test_kronk.rb
+- test/test_path.rb
 - test/test_request.rb
 - test/test_response.rb
+- test/test_transaction.rb
 - test/test_xml_parser.rb