kronk 1.5.2 → 1.5.3

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 1.5.3 / 2011-08-31
+
+* Bugfixes:
+
+  * Fix for multiple path transaction delete bug.
+
+  * Fix for non applied uri options from config.
+
 === 1.5.2 / 2011-08-15
 
 * Enhancements:

data/lib/kronk.rb

@@ -14,7 +14,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 
   require 'kronk/constants'
   require 'kronk/player'
@@ -285,7 +285,7 @@ class Kronk
   # Returns a Response instance from a url, file, or IO as a String.
 
   def retrieve uri
-    options = Kronk.config[:no_uri_options] ? options_for_uri(uri) : @options
+    options = Kronk.config[:no_uri_options] ? @options : options_for_uri(uri)
 
     if IO === uri || StringIO === uri
       Cmd.verbose "Reading IO #{uri}"
@@ -340,7 +340,6 @@ class Kronk
           next
         end
 
-
         case key
 
         # Hash or uri query String

data/lib/kronk/constants.rb

@@ -47,30 +47,31 @@ class Kronk
       Hash === v1 && Hash === v2 ? v1.merge(v2,&DEEP_MERGE) : v2
     end
 
+  # The default Kronk user agent.
+  DEFAULT_USER_AGENT =
+    "Kronk/#{VERSION} (http://github.com/yaksnrainbows/kronk)"
 
   # Aliases for various user-agents. Thanks Mechanize! :)
   USER_AGENTS = {
-    'kronk'         =>
-    "Kronk/#{VERSION} (http://github.com/yaksnrainbows/kronk)",
-    'iphone'        =>
+    'iphone'          =>
     "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3",
-    'linux_firefox' =>
+    'linux_firefox'   =>
     "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.1) Gecko/20100122 firefox/3.6.1",
-    'linux_mozilla' =>
+    'linux_mozilla'   =>
     "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624",
-    'mac_mozilla'   =>
+    'mac_mozilla'     =>
     "Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.4a) Gecko/20030401",
     'linux_konqueror' =>
     "Mozilla/5.0 (compatible; Konqueror/3; Linux)",
-    'mac_firefox'   =>
+    'mac_firefox'     =>
     "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6",
-    'mac_safari'    =>
+    'mac_safari'      =>
     "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; de-at) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10",
-    'win_ie6'       =>
+    'win_ie6'         =>
     "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
-    'win_ie7'       =>
+    'win_ie7'         =>
     "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)",
-    'win_mozilla'   =>
+    'win_mozilla'     =>
     "Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4b) Gecko/20030516 Mozilla Firebird/0.6"
   }
 

data/lib/kronk/path/transaction.rb

@@ -150,7 +150,8 @@ class Kronk::Path::Transaction
             new_curr_data.delete key
 
           else
-            new_curr_data[key] = curr_data[key].dup
+            new_curr_data[key] = new_curr_data[key].dup if
+              new_curr_data[key] == curr_data[key]
 
             if Array === new_curr_data[key]
               new_curr_data[key] = ary_to_hash new_curr_data[key]

data/lib/kronk/request.rb

@@ -323,7 +323,7 @@ class Kronk
     def user_agent= new_ua
       @headers['User-Agent'] =
         new_ua && Kronk.config[:user_agents][new_ua.to_s] ||
-        new_ua || Kronk.config[:user_agents]['kronk']
+        new_ua || Kronk::DEFAULT_USER_AGENT
     end
 
 

data/test/test_helper.rb

@@ -133,7 +133,11 @@ end
 
 
 def with_config config={}
-  old_conf = Kronk.config
+  old_conf = Kronk.config.dup
+  old_conf.each do |k,v|
+    old_conf[k] = v.dup if Array === old_conf[k] || Hash === old_conf[k]
+  end
+
   Kronk.instance_variable_set "@config", Kronk.config.merge(config)
   yield
 
@@ -159,7 +163,7 @@ def expect_request req_method, url, options={}
   data &&= Hash === data ? Kronk::Request.build_query(data) : data.to_s
 
   headers = options[:headers] || Hash.new
-  headers['User-Agent'] ||= Kronk.config[:user_agents]['kronk']
+  headers['User-Agent'] ||= Kronk::DEFAULT_USER_AGENT
 
   req.expects(:start).yields(http).returns res
 

data/test/test_kronk.rb

@@ -28,59 +28,61 @@ class TestKronk < Test::Unit::TestCase
 
 
   def test_load_config
-    mock_config = {
-      :content_types => {
-        'soap' => "SOAPParser",
-        'js'   => "JsEngine"
-      },
-      :ignore_headers => ["Content-Type"],
-      :cache_file  => Kronk::DEFAULT_CACHE_FILE,
-      :cookies_file => Kronk::DEFAULT_COOKIES_FILE,
-      :history_file => Kronk::DEFAULT_HISTORY_FILE,
-      :indentation => 1,
-      :show_lines  => false,
-      :use_cookies => true,
-      :requires    => [],
-      :uri_options => {'example.com' => {:parser => 'JSON'}},
-      :user_agents => {:win_ie6 => 'piece of crap browser'},
-      :foo => :bar
-    }
+    with_config do
+      mock_config = {
+        :content_types => {
+          'soap' => "SOAPParser",
+          'js'   => "JsEngine"
+        },
+        :ignore_headers => ["Content-Type"],
+        :cache_file  => Kronk::DEFAULT_CACHE_FILE,
+        :cookies_file => Kronk::DEFAULT_COOKIES_FILE,
+        :history_file => Kronk::DEFAULT_HISTORY_FILE,
+        :indentation => 1,
+        :show_lines  => false,
+        :use_cookies => true,
+        :requires    => [],
+        :uri_options => {'example.com' => {:parser => 'JSON'}},
+        :user_agents => {:win_ie6 => 'piece of crap browser'},
+        :foo => :bar
+      }
 
-    YAML.expects(:load_file).with(Kronk::DEFAULT_CONFIG_FILE).
-      returns mock_config
+      YAML.expects(:load_file).with(Kronk::DEFAULT_CONFIG_FILE).
+        returns mock_config
 
-    Kronk.load_config
+      Kronk.load_config
 
-    YAML.expects(:load_file).with("foobar").
-      returns mock_config
+      YAML.expects(:load_file).with("foobar").
+        returns mock_config
 
-    Kronk.load_config "foobar"
+      Kronk.load_config "foobar"
 
-    expected = {
-      :content_types => {
-        'soap'  => "SOAPParser",
-        'js'    => "JsEngine",
-        'json'  => "JSON",
-        'plist' => "PlistParser",
-        'xml'   => "XMLParser"
-      },
-      :default_host => "http://localhost:3000",
-      :diff_format => :ascii_diff,
-      :cache_file  => Kronk::DEFAULT_CACHE_FILE,
-      :cookies_file => Kronk::DEFAULT_COOKIES_FILE,
-      :history_file => Kronk::DEFAULT_HISTORY_FILE,
-      :indentation => 1,
-      :requires    => [],
-      :show_lines  => false,
-      :use_cookies => true,
-      :ignore_headers => ["Content-Type"],
-      :uri_options => {'example.com' => {:parser => 'JSON'}},
-      :user_agents =>
-        Kronk::USER_AGENTS.merge(:win_ie6 => 'piece of crap browser'),
-      :foo => :bar
-    }
+      expected = {
+        :content_types => {
+          'soap'  => "SOAPParser",
+          'js'    => "JsEngine",
+          'json'  => "JSON",
+          'plist' => "PlistParser",
+          'xml'   => "XMLParser"
+        },
+        :default_host => "http://localhost:3000",
+        :diff_format => :ascii_diff,
+        :cache_file  => Kronk::DEFAULT_CACHE_FILE,
+        :cookies_file => Kronk::DEFAULT_COOKIES_FILE,
+        :history_file => Kronk::DEFAULT_HISTORY_FILE,
+        :indentation => 1,
+        :requires    => [],
+        :show_lines  => false,
+        :use_cookies => true,
+        :ignore_headers => ["Content-Type"],
+        :uri_options => {'example.com' => {:parser => 'JSON'}},
+        :user_agents =>
+          Kronk::USER_AGENTS.merge(:win_ie6 => 'piece of crap browser'),
+        :foo => :bar
+      }
 
-    assert_equal expected, Kronk.config
+      assert_equal expected, Kronk.config
+    end
   end
 
 

data/test/test_transaction.rb

@@ -280,6 +280,17 @@ class TestTransaction < Test::Unit::TestCase
   end
 
 
+  def test_transaction_delete_many_from_embedded_data
+    result = @trans.transaction_delete @data, "key1/key1a/1", "key1/key1a/0"
+    expected = {
+      :key1a => {2 => "foobar", 3 => {:findme => "thing"}},
+      'key1b' => "findme"
+      }
+
+    assert_equal expected, result[:key1]
+  end
+
+
   def test_transaction_delete_empty
     assert_equal @data, @trans.transaction_delete(@data)
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kronk
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
-  version: 1.5.2
+  segments: 
+  - 1
+  - 5
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 Z
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -20,6 +25,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
         version: "1.5"
   type: :runtime
   version_requirements: *id001
@@ -31,6 +40,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
   type: :runtime
   version_requirements: *id002
@@ -42,6 +56,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :development
   version_requirements: *id003
@@ -53,6 +72,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
         version: "1.4"
   type: :development
   version_requirements: *id004
@@ -64,6 +87,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 0
+        - 9
+        - 12
         version: 0.9.12
   type: :development
   version_requirements: *id005
@@ -75,7 +103,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.9.1
+        hash: 35
+        segments: 
+        - 2
+        - 9
+        - 4
+        version: 2.9.4
   type: :development
   version_requirements: *id006
 description: |-
@@ -161,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1250647076143869812
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -170,11 +203,14 @@ 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.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Kronk runs diffs against data from live and cached http responses