rabelyoda 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/rabelyoda/hash.rb

@@ -4,8 +4,8 @@ class Hash
   def locale_diff(b)
     a = self
     (a.keys | b.keys).inject({}) do |diff, k|
-      if a[k].respond_to?(:deep_diff) && b[k].respond_to?(:deep_diff)
-        deeper_diff = a[k].deep_diff(b[k])
+      if a[k].respond_to?(:locale_diff) && b[k].respond_to?(:locale_diff)
+        deeper_diff = a[k].locale_diff(b[k])
         diff[k] = deeper_diff if deeper_diff != {}
       else
         if !a.keys.include?(k)
@@ -13,6 +13,10 @@ class Hash
           # diff[k] = 'extra'
         elsif !b.keys.include?(k)
           diff[k] = '[pls translate]' + a[k]
+        elsif b.keys.include?(k) && b[k] == a[k]
+          diff[k] = '[pls translate]' + a[k]
+        elsif b.keys.include?(k)
+          # do nothing
         else
           # keep translated strings
           diff[k] = b[k]

data/test/rabelyoda/hash_test.rb

@@ -0,0 +1,42 @@
+root = File.expand_path(File.dirname(__FILE__))
+require File.join root, '../../lib/rabelyoda/hash'
+require 'test/unit'
+
+module RabelYoda
+  class HashTest < Test::Unit::TestCase
+    def setup
+      @en = {'user' => "User",
+        'company' => 'Company',
+        'position' => 'Position',
+        'department' => 'Department', 
+        'activerecord' => {
+          'validations' => {
+            'email' => 'Should be like email',
+            'name' => 'Should contain only letters'} 
+          } 
+        }
+      @ru = {'user' => "Пользователь", 
+        'company' => 'Компания',
+        'position' => 'Position',
+        'activerecord' => {
+        'validations' => {
+            'email' => 'Should be like email'}, 
+            'age' => 'Должен быть числом' 
+          } 
+        }
+    end
+
+    def test_locale_diff
+      assert_equal @en.locale_diff(@ru), {
+        'department' => '[pls translate]Department',
+        'position' => '[pls translate]Position',
+        'activerecord' => {
+            'validations' => {
+              'name' => '[pls translate]Should contain only letters',
+              'email' => '[pls translate]Should be like email'
+            }
+          }
+        }
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Andrey Subbotin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -04:00
+date: 2010-08-24 00:00:00 -04:00
 default_executable: 
 - rabelyoda
 dependencies: 
@@ -100,5 +100,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails project localization made easy
-test_files: []
-
+test_files: 
+- test/rabelyoda/hash_test.rb