sy18nc 0.1.0 → 0.2.1

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/michaldarda/sy18nc.png?branch=master)](https://travis-ci.org/michaldarda/sy18nc)
+[![Gem Version](https://badge.fury.io/rb/sy18nc.png)](http://badge.fury.io/rb/sy18nc)
 
 # Sy18nc
 
@@ -9,7 +10,7 @@ Simple tool to synchronize Rails .ymls with locales.
 Add this line to your application's Gemfile:
 
     group :development do
-      gem 'sy18nc', '~> 0.1.0'
+      gem 'sy18nc', '~> 0.2.1'
     end
 
 And then execute:
@@ -108,6 +109,10 @@ Please post any issues via Github Issues. If you want to contribute, see [Contri
 
 # Changelog
 
+## 0.2.1
+- Synchronized already synchronized locales already marked as fixme (when key in base locale is changing)
+- Fixed bug with creating translations from scratch
+
 ## 0.1.0
 - Creating translations from scratch
 - Deleting keys which are not present in base

data/ext/hash.rb

@@ -7,7 +7,7 @@ class Hash
       self_value = self[other_key]
       self[other_key] = if self_value.is_a?(Hash) && other_value.is_a?(Hash)
         self_value.sy18nc_deep_merge!(other_value)
-      elsif self_value.nil?
+      elsif self_value.nil? || self_value.sy18nc_marked_as_fixme?
           other_value.sy18nc_mark_fixme!
       else
         self_value
@@ -16,6 +16,16 @@ class Hash
     self
   end
 
+  def sy18nc_deep_delete_unused!(other_hash)
+    each_pair do |k, v|
+      if other_hash[k].nil?
+        delete(k)
+      elsif self[k].is_a?(Hash)
+        self[k].sy18nc_deep_delete_unused!(other_hash[k])
+      end
+    end
+  end
+
   # Appends the val to the every string in nested hash
   def sy18nc_append!(val)
     self.each_pair do |key, value|

data/ext/string.rb

@@ -1,7 +1,11 @@
 class String
+  def sy18nc_marked_as_fixme?
+    self =~ /g FIXME/
+  end
+
   def sy18nc_mark_fixme!
     # skip if it is already marked or its an alias
-    if self =~ /g FIXME/ || self =~ /\*([a-z]*(\_)?)*/
+    if sy18nc_marked_as_fixme? || self =~ /\*([a-z]*(\_)?)*/
       return self
     end
 

data/lib/sy18nc/locale.rb

@@ -4,6 +4,13 @@ module Sy18nc
   class Locale
     attr_reader :name, :hash
 
+    # a little helper, move to separate module
+    def nested_hash(keys)
+      head, *tail = keys
+      return {} if head.nil?
+      { head => nested_hash(tail) }
+    end
+
     def initialize(file)
       # locale does not exists
       unless File.exists?(File.expand_path(file))
@@ -13,10 +20,7 @@ module Sy18nc
         f = File.new(file, "w+")
 
         # uses fetched keys before to create a skeleton of locale
-        locale_skeleton = tname.inject({}) do |result, k|
-          result[k] = {}
-          result
-        end
+        locale_skeleton = nested_hash(tname.reverse)
 
         f.write(YAML.dump(locale_skeleton))
         f.close
@@ -49,6 +53,7 @@ module Sy18nc
 
     def synchronize(other)
       body.sy18nc_deep_merge!(other.body)
+      body.sy18nc_deep_delete_unused!(other.body)
     end
 
     def to_yaml

data/lib/sy18nc/version.rb

@@ -1,3 +1,3 @@
 module Sy18nc
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/spec/ext_spec.rb

@@ -134,7 +134,23 @@ describe Hash do
     other_hash.sy18nc_deep_merge!(@hash).should eql(result)
   end
 
-  it "deep merges hashes with nested arrays" do
+  it "deep deletes unused" do
+    hash1 = {
+      :key1 => {
+        :key3 => {}
+      }
+    }
+
+    hash2 = {
+      :key1 => {
+        :key2 => 1,
+        :key3 => {
+          :key4 => 1
+        }
+      }
+    }
+
+    hash2.sy18nc_deep_delete_unused!(hash1).should eql(hash1)
   end
 
   describe String do

data/spec/fixtures/devise.en.yml

@@ -55,7 +55,6 @@ en:
         many: "%{count} Websites"
         other: "%{count} Websites"
     omniauth_callbacks:
-      empty_key:
       success: "Successfully authorized from %{kind} account"
       user:
         failure: "Unexpected Authorization failure, please try again."

data/spec/fixtures/en.yml

@@ -3,3 +3,4 @@ en:
   promo:
     link1: Hello
     link2: Hello
+    link3: Hello

data/spec/fixtures/results/devise.tr.yml

@@ -28,7 +28,6 @@ tr:
         other: "%{count} Websites" # FIXME
     omniauth_callbacks:
       success: "Successfully authorized from %{kind} account"
-      empty_key: 
       user:
         failure: "Unexpected Authorization failure, please try again." # FIXME
         range:

data/spec/fixtures/ru.yml

@@ -2,3 +2,4 @@
 ru:
   promo:
     link1: Birbevoon
+    link3: Whatevervalue # FIXME

data/spec/locale_spec.rb

@@ -57,6 +57,7 @@ en:
   promo:
     link1: "Hello"
     link2: "Hello"
+    link3: "Hello"
 ])
   end
 
@@ -67,6 +68,7 @@ en:
 ru:
   promo:
     link1: "Birbevoon"
+    link3: "Hello" # FIXME
     link2: "Hello" # FIXME
 ])
     @locale.to_yaml.lines.count.should eql(russian_locale.to_yaml.lines.count)
@@ -80,6 +82,13 @@ ru:
     devise_tr.to_yaml.should eql(File.read(File.expand_path("spec/fixtures/results/devise.tr.yml")))
   end
 
+  it "deletes unused keys" do
+    locale1 = Sy18nc::Locale.new("spec/fixtures/devise.en.yml")
+    locale2 = Sy18nc::Locale.new("spec/fixtures/devise.tr.yml")
+
+    locale1.synchronize(locale2)
+  end
+
   def cleanup
     %x[rm en.yml]
     %x[rm en.yml.bak]

data/spec/sychronizer_spec.rb

@@ -35,6 +35,7 @@ describe Sy18nc::Synchronizer do
 ru:
   promo:
     link1: "Birbevoon"
+    link3: "Hello" # FIXME
     link2: "Hello" # FIXME
 ]
     end
@@ -54,6 +55,7 @@ ru:
 ru:
   promo:
     link1: "Birbevoon"
+    link3: "Hello" # FIXME
     link2: "Hello" # FIXME
 ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sy18nc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych