netzke-core 0.4.5.1 → 0.4.5.2

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+= v0.4.5.2 - 2009-11-09
+* Fix: Hash#convert_keys and Array#convert_keys in core extensions are now renamed into deep_convert_keys, and now always plainly do what they're expected to do: recursively convert keys according to given block.
+
 = v0.4.5.1 - 2009-11-09
 * Regression: fixing inheritance and caching.
 * FeedbackGhost is too simple to be a Netzke widget (having no server part), so, moved to static JavaScript.

data/Rakefile

@@ -1,7 +1,7 @@
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.version = "0.4.5.1"
+    gemspec.version = "0.4.5.2"
     gemspec.name = "netzke-core"
     gemspec.summary = "Build ExtJS/Rails widgets with minimum effort"
     gemspec.description = "Allows building ExtJS/Rails reusable code in a DRY way"
@@ -11,10 +11,6 @@ begin
     gemspec.authors = ["Sergei Kozlov"]
   end
   Jeweler::GemcutterTasks.new
-  # Jeweler::RubyforgeTasks.new do |rubyforge|
-  #   rubyforge.doc_task = "rdoc"
-  # end
-    
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/javascripts/core.js

@@ -527,7 +527,6 @@ Ext.override(Ext.Container, {
     });
     // Caching the class
     Netzke.cache[n] = true;
-    // console.info(Netzke.cache);
     return klass;
   },
 

data/lib/netzke/base.rb

@@ -232,7 +232,7 @@ module Netzke
     
     def update_persistent_ext_config(hsh)
       current_config = persistent_config[:ext_config] || {}
-      current_config.deep_merge!(hsh.convert_keys{ |k| k.to_s }) # first, recursively stringify the keys
+      current_config.deep_merge!(hsh.deep_convert_keys{ |k| k.to_s }) # first, recursively stringify the keys
       persistent_config[:ext_config] = current_config
     end
     
@@ -299,7 +299,7 @@ module Netzke
         # So we need to recursively merge it into the final result
         res.deep_merge!(hsh_levels.first => anchor)
       end
-      res.convert_keys{ |k| k.to_sym } # recursively symbolize the keys
+      res.deep_convert_keys{ |k| k.to_sym } # recursively symbolize the keys
     end
     memoize :persistent_config_hash
     

data/lib/netzke/core_ext.rb

@@ -1,11 +1,11 @@
 class Hash
 
   # Recursively convert the keys. Example:
-  # irb> {:bla_bla => 1, "wow_now" => {:look_ma => true}}.convert_keys{|k| k.camelize} 
-  # irb> => {:BlaBla => 1, "WowNow" => {:LookMa => true}}
-  def convert_keys(&block)
+  # {:bla_bla => 1, "wow_now" => {:look_ma => true}}.deep_convert_keys{|k| k.to_s.camelize.to_sym} 
+  #   => {:BlaBla => 1, "WowNow" => {:LookMa => true}}
+  def deep_convert_keys(&block)
     block_given? ? self.inject({}) do |h,(k,v)|
-      h[k.is_a?(Symbol) ? yield(k.to_s).to_sym : yield(k.to_s)] = v.respond_to?('convert_keys') ? v.convert_keys(&block) : v
+      h[yield(k)] = v.respond_to?('deep_convert_keys') ? v.deep_convert_keys(&block) : v
       h
     end : self
   end
@@ -83,10 +83,10 @@ class Array
     self.recursive_delete_if_nil.jsonify.to_json
   end
   
-  # Applies convert_keys to each element which responds to convert_keys
-  def convert_keys(&block)
+  # Applies deep_convert_keys to each element which responds to deep_convert_keys
+  def deep_convert_keys(&block)
     block_given? ? self.map do |i|
-      i.respond_to?('convert_keys') ? i.convert_keys(&block) : i
+      i.respond_to?('deep_convert_keys') ? i.deep_convert_keys(&block) : i
     end : self
   end
   

data/test/unit/core_ext_test.rb

@@ -19,9 +19,12 @@ class CoreExtTest < ActiveSupport::TestCase
   end
   
   test "convert keys" do
+    assert_equal({:a => 1, :b => {:bb => 2}}, {"a" => 1, "b" => {"bb" => 2}}.deep_convert_keys{ |k| k.to_sym })
+    assert_equal([{"a" => 1}, {"b" => {"bb" => 2}}], [{:a => 1}, {:b => {:bb => 2}}].deep_convert_keys{ |k| k.to_s })
+
     assert_equal([
       {:aB => 1, :cDD => [{:lookMa => true},{:wowNow => true}]}
-    ],[:a_b => 1, :c_d_d => [{:look_ma => true},{:wow_now => true}]].convert_keys{|k| k.camelize(:lower)})
+    ],[:a_b => 1, :c_d_d => [{:look_ma => true},{:wow_now => true}]].deep_convert_keys{|k| k.to_s.camelize(:lower).to_sym})
   end
   
   test "javascript-like access to hash data" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-core
 version: !ruby/object:Gem::Version 
-  version: 0.4.5.1
+  version: 0.4.5.2
 platform: ruby
 authors: 
 - Sergei Kozlov