i18n_redis 0.0.2 → 0.0.3

data/README.markdown

@@ -66,6 +66,10 @@ Find Key
  Clone data for all locale It will load master data to all present locale
 
     I18nRedis.clone_data_for_all_locale(i18n_key,master_locale="en")
+    
+ Update Missing key from master data      
+ 
+    I18nRedis.create_missing_keys_for_locale(src_locale="en",dest_locale, key_value)    
 
  Search and Replace I18n Value 
 

data/i18n_redis.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency(%q<redis>, ["~> 2.2.0"])
+  s.add_runtime_dependency(%q<redis>, ["~> 3.0.0"])
 end

data/lib/i18n_redis.rb

@@ -1,26 +1,26 @@
 require 'rubygems'
 require 'redis'
-require 'ruby-debug'
-require "i18n_redis/version"
+require_relative "i18n_redis/version"
 
 
 module I18nRedis
 
- 
 # Connect To Redis
  def self.connect(args={})
    $i18n_redis = Redis.new(args)
  end
 
   # YAML TO REDIS
-  # yaml to redis for i18n 
+  # yaml to redis for i18n
   # file name is "/abc/en.yml"
   def self.yaml_to_redis(file_name)
-    
-    if File.exist?(file_name) 
+
+    if File.exist?(file_name)
       yaml_hash = YAML::load(File.open(file_name))
       yaml_hash.each do |k,v|
-      # if yaml data  contain further nested then create nestedkey or add key to redis 
+        #have to force key to_string because of some funny keys (eg. true/false)
+        k = k.to_s
+      # if yaml data  contain further nested then create nestedkey or add key to redis
         self.add_value_to_redis(yaml_hash[k],k)
       end
     end
@@ -30,28 +30,37 @@ module I18nRedis
   #  errors:
   #    template:
   #      header: "%{count} errors prohibited this %{model} from being saved"
-  # This method generates folloeing key and set its respective value
+  # This method generates following key and set its respective value
   # en.errors.template.header="%{count} errors prohibited this %{model} from being saved"
   def self.add_value_to_redis(yaml_hash,yaml_key)
     if yaml_hash.is_a?(Hash)
       yaml_hash.each do |key,value|
+        key = key.to_s
+        value = value.to_s
+        if value == ""
+          value = "MISSING_TRANSLATION"
+        end
        if yaml_hash[key].is_a?(Hash)
          add_value_to_redis(yaml_hash[key],yaml_key+"."+key)
        else
-         create(yaml_key+"."+key,value)    
+         create(yaml_key+"."+key,value)
        end
-      end 
+      end
     else
-     create(yaml_key,yaml_hash) 
+      yaml_hash = yaml_hash.to_s
+      if yaml_hash == ""
+        yaml_hash = "MISSING_TRANSLATION"
+      end
+      create(yaml_key,yaml_hash)
     end
   end
 
- 
-  # Add to en(master) it will add to all company 
-  # locale is a redis hash which contain default key and value as locale name 
+
+  # Add to en(master) it will add to all company
+  # locale is a redis hash which contain default key and value as locale name
   # or it can be user id company id etc
-  # any data is added to master it will find all the respective company and add data 
-  # key can be en.label_text 
+  # any data is added to master it will find all the respective company and add data
+  # key can be en.label_text
 
   def self.add_to_all_locale(key,val)
     locale_array = $i18n_redis.hgetall("locale")
@@ -69,7 +78,7 @@ module I18nRedis
     end
   end
 
- 
+
 
   #This contain name = "user name or id",value en_20
   def self.add_locale(name,value)
@@ -89,7 +98,7 @@ module I18nRedis
      value = $i18n_redis.get(i18n_key)
      value.gsub!(/\b#{search_value}\b/,replace_value)
      create(i18n_key,value)
-    end   
+    end
   end
 
   # copy one locale data to all present locale
@@ -97,7 +106,7 @@ module I18nRedis
    # find out all master keys i.e en
     master_keys= find_all("#{master_locale}.*")
     master_keys.each do |key|
-      clone_key = "#{i18n_key}.#{key.split('.').drop(1).join(".")}"  
+      clone_key = "#{i18n_key}.#{key.split('.').drop(1).join(".")}"
       create(clone_key,$i18n_redis.get(key))
     end
   end
@@ -106,14 +115,29 @@ module I18nRedis
   # en to us
 
   def self.copy_locale_to_other(src_locale,dest_locale)
-    src_keys= find_all("#{master_locale}.*")
+    src_keys= find_all("#{src_locale}.*")
     src_keys.each do |key|
-      clone_key = "#{dest_locale}.#{key.split('.').drop(1).join(".")}"  
+      clone_key = "#{dest_locale}.#{key.split('.').drop(1).join(".")}"
       create(clone_key,$i18n_redis.get(key))
     end
   end
 
-  def find_all_for_locale(locale)
+  # Clone only the keys that are missing from one locale to another
+  # Example:
+  # you have en.roles.administrator: administrator it copies empty string to the
+  # desired language like:
+  # es.roles.administrator: ""
+
+  def self.create_missing_keys_for_locale(src_locale="en",dest_locale, key_value)
+    # first we get all the keys for src locale and omit the locale
+    src_keys = self.find_all_for_locale(src_locale).map {|k| k.split('.').drop(1).join('.')}
+    dst_keys = self.find_all_for_locale(dest_locale).map {|k| k.split('.').drop(1).join('.')}
+    diff_keys = src_keys - dst_keys
+    diff_keys.each do |k|
+      self.add(k, key_value, dest_locale)
+    end
+  end
+  def self.find_all_for_locale(locale)
     self.find_all("#{locale}.*")
   end
 
@@ -125,9 +149,9 @@ module I18nRedis
   def self.get_locales
     $i18n_redis.hgetall("locale")
   end
-  
+
  # add key
-  def add(key,value,locale)
+  def self.add(key,value,locale)
     key = "#{locale}.#{key}" if locale
     self.create(key,value)
   end
@@ -147,7 +171,7 @@ module I18nRedis
   def self.destroy(key)
     $i18n_redis.del(key)
   end
-  
+
   # get data from redis
   def self.find(key)
     $i18n_redis.get(key)

data/lib/i18n_redis/version.rb

@@ -1,3 +1,3 @@
 module I18nRedis
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/files/devise.en.yml

@@ -0,0 +1,57 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  errors:
+    messages:
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      already_confirmed: "was already confirmed, please try signing in"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
+
+  devise:
+    failure:
+      already_authenticated: 'You are already signed in.'
+      unauthenticated: 'You need to sign in or sign up before continuing.'
+      unconfirmed: 'You have to confirm your account before continuing.'
+      locked: 'Your account is locked.'
+      invalid: 'Invalid email or password.'
+      invalid_token: 'Invalid authentication token.'
+      timeout: 'Your session expired, please sign in again to continue.'
+      inactive: 'Your account was not activated yet.'
+    sessions:
+      signed_in: 'Signed in successfully.'
+      signed_out: 'Signed out successfully.'
+    passwords:
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+      updated_not_active: 'Your password was changed successfully.'
+      send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
+    confirmations:
+      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
+      confirmed: 'Your account was successfully confirmed. You are now signed in.'
+    registrations:
+      signed_up: 'Welcome! You have signed up successfully.'
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
+      updated: 'You updated your account successfully.'
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+    unlocks:
+      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+      unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
+      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
+    omniauth_callbacks:
+      success: 'Successfully authorized from %{kind} account.'
+      failure: 'Could not authorize you from %{kind} because "%{reason}".'
+    mailer:
+      confirmation_instructions:
+        subject: 'Confirmation instructions'
+      reset_password_instructions:
+        subject: 'Reset password instructions'
+      unlock_instructions:
+        subject: 'Unlock Instructions'

data/spec/i18n_redis_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path('spec/spec_helper')
+require File.expand_path('lib/i18n_redis')
+
+describe I18nRedis do
+  before do
+    # should probably mock this somehow
+    @redis = I18nRedis.connect(db: 4)
+    @it = I18nRedis
+  end
+  after do
+    # we are going to flush the database after testing
+    @redis.flushdb
+  end
+  describe "before inserting" do
+    it "should have no keys inside" do
+      @redis.keys.count.must_equal 0
+    end
+  end
+  describe "locales" do
+    before do
+      @it.add_locale("test", "test")
+    end
+    it "should contain the inserted key within the locale" do
+      @redis.hget("locale","test").must_equal "test"
+    end
+    it "should remove the locale with remove_locale" do
+      @it.remove_locale("test")
+      @redis.hget("locale","test").must_be_nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require 'minitest/autorun'
+require 'turn'
+
+Turn.config do |c|
+  c.format = :outline
+  c.natural = :true
+end

metadata

@@ -1,49 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: i18n_redis
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Amar Daxini
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-19 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-description: I18n YAML to Redis Management.It convert exising yaml to redis.Provides various helper methods to add,update,remove,create,copy master to another locale,one locale to another locale etc.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+description: I18n YAML to Redis Management.It convert exising yaml to redis.Provides
+  various helper methods to add,update,remove,create,copy master to another locale,one
+  locale to another locale etc.
+email:
 - amar.daxini@livialegal.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.markdown
@@ -51,39 +43,34 @@ files:
 - i18n_redis.gemspec
 - lib/i18n_redis.rb
 - lib/i18n_redis/version.rb
-has_rdoc: true
-homepage: ""
+- spec/files/devise.en.yml
+- spec/i18n_redis_spec.rb
+- spec/spec_helper.rb
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: i18n_redis
-rubygems_version: 1.4.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: I18n YAML to Redis Management
-test_files: []
-
+test_files:
+- spec/files/devise.en.yml
+- spec/i18n_redis_spec.rb
+- spec/spec_helper.rb