tr8n_core 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a162e743cb6de4c17ba8f8f37d3213bdd9a99ba4
-  data.tar.gz: 8e94f38ea626036fd739a19d2c83c35fea72fc25
+  metadata.gz: 9a3d5a8a77266054697c3f8dcd30f7fd59a8c563
+  data.tar.gz: 244e312b0f03a9f6f6b232f5357a9b0c7991316d
 SHA512:
-  metadata.gz: 310264af7f85f21dae165ddb1b269218fc3941716292173251b198163fae28c9f561133f1d5efdcd86f27ce6e7b640605e600036e2150e3b8b8141113093b7d4
-  data.tar.gz: 3ec53152d4ce2a91302ba8737bee70773faad63342e0fc1c1d5a1166b8175680ac0d011cae0e91aeee967a451c2d1b75e2a1ae21edc90d85e41d867c9563321b
+  metadata.gz: 06e875646e358cd4a3228268d594eec6cc105b5c32176c6b430024de3c806856226b0833a329b060541628803213a8f032a76e2f8eba60e7b84b8291e4957aaf
+  data.tar.gz: d11ddd0b0f3d64bdb7abdfba80c1dcfb4bcc45453c1ca5847bd6076fe7ad7dae124b66bf71562c03ba16a22642890d0e6deea3ccf2e1bda29d5bddbe2134ede4

data/README.md

@@ -4,66 +4,196 @@
 
 Tr8n Core Library For Ruby
 ==================
-
-This library provides a set of Tr8n client side tools that can be used in any ruby based project.
-
 [![Build Status](https://travis-ci.org/tr8n/tr8n_ruby_core.png?branch=master)](https://travis-ci.org/tr8n/tr8n_ruby_core)
 [![Coverage Status](https://coveralls.io/repos/tr8n/tr8n_ruby_core/badge.png)](https://coveralls.io/r/tr8n/tr8n_ruby_core)
 [![Gem Version](https://badge.fury.io/rb/tr8n_core.png)](http://badge.fury.io/rb/tr8n_core)
 [![Dependency Status](https://www.versioneye.com/user/projects/52e36cc8ec1375c6f4000078/badge.png)](https://www.versioneye.com/user/projects/52e36cc8ec1375c6f4000078)
 [![Project status](http://stillmaintained.com/tr8n/tr8n_ruby_core.png)](http://stillmaintained.com/tr8n/tr8n_ruby_core.png)
 
+Tr8n core library for Ruby is a set of classes that provide translation functionality for any Ruby based application.
+The library uses Tr8n's TML (Translation Markup Language) that allows you to encode complex language structures in simple, yet powerful forms.
+
+The library works in conjunctions with tr8nhub.com service that provides machine and human translations for your application.
+In order to use the library, you should sign up at tr8nhub.com, create a new application and copy the application key and secret.
+
+
 Installation
 ==================
 
 To install the gem, use:
 
-    gem install tr8n_core
+```ssh
+gem install tr8n_core
+```
 
 
 Usage
 ==================
 
-The library can be invoked from the IRB. To use tr8n client you must first require it, and instantiat the application with the key and secret you aquired during registration:
+The library can be invoked from the IRB. To use tr8n client you must require it, and instantiate the application with the key and secret of your app from tr8nhub.com:
+
+```ruby
+irb(main)> require 'tr8n_core'
+irb(main)> app = Tr8n::Application.init(KEY, SECRET)
+```
+
+Now you can use the application to get any language registered with your app:
+
+```ruby
+irb(main)> english = app.language('en-US')
+irb(main)> russian = app.language('ru')
+irb(main)> spanish = app.language('es')
+irb(main)> chinese = app.language('zh')
+```
+
+Simple example:
+
+```ruby
+irb(main)> english.translate('Hello World')
+=> "Hello World"
+irb(main)> russian.translate('Hello World')
+=> "Привет Мир"
+irb(main)> spanish.translate('Hello World')
+=> "Hola Mundo"
+irb(main)> chinese.translate('Hello World')
+=> "你好世界"
+```
+
+Using description context:
+
+```ruby
+irb(main)> russian.translate('Invite', 'An invitation')
+=> "Приглашение"
+irb(main)> russian.translate('Invite', 'An action to invite')
+=> "Пригласить"
+```
+
+Numeric rules with piped tokens:
+
+```ruby
+irb(main)> english.translate('You have {count||message}.', :count => 1)
+=> "You have 1 message."
+irb(main)> english.translate('You have {count||message}.', :count => 2)
+=> "You have 2 messages."
+
+irb(main)> russian.translate('You have {count||message}.', :count => 1)
+=> "У вас есть 1 сообщение."
+irb(main)> russian.translate('You have {count||message}.', :count => 2)
+=> "У вас есть 2 сообщения."
+irb(main)> russian.translate('You have {count||message}.', :count => 5)
+=> "У вас есть 5 сообщений."
+```
+
+Gender rules:
+
+```ruby
+irb(main)> user = {:gender => :female, :name => "Anna"}
+irb(main)> english.translate('{user} updated {user| his, her} profile.', :user => {:object => user, :attribute => :name})
+=> "Anna updated her profile."
+
+irb(main)> russian.translate('{user} updated {user| his, her} profile.', :user => {:object => user, :attribute => :name})
+=> "Anna обновила свой профиль."
+
+irb(main)> user = {:gender => :male, :name => "Michael"}
+irb(main)> english.translate('{user} updated {user| his, her} profile.', :user => {:object => user, :attribute => :name})
+=> "Michael updated his profile."
+
+irb(main)> russian.translate('{user} updated {user| his, her} profile.', :user => {:object => user, :attribute => :name})
+=> "Michael обновил свой профиль."
+```
+
+Gender rules with language cases:
+
+```ruby
+irb(main)> actor = {:gender => :female, :name => "Анна"}
+irb(main)> target = {:gender => :male, :name => "Михаил"}
+irb(main)> russian.translate('{actor} sent {target} a gift.', :actor => {:object => actor, :attribute => :name}, :target => {:object => target, :attribute => :name})
+=> "Анна послала подарок Михаилу."
+irb(main)> russian.translate('{actor} sent {target} a gift.', :actor => {:object => target, :attribute => :name}, :target => {:object => actor, :attribute => :name})
+=> "Михаил послал подарок Анне."
+```
 
-    irb(main):001:0> require 'tr8n_core'
-    irb(main):002:0> app = Tr8n::Application.init(TR8N_SERVICE_HOST, APPLICATION_KEY, SECRET)
-    irb(main):003:0> russian = app.language('ru')
+Decoration tokens:
 
+```ruby
+irb(main)> english.translate("[bold: This text] should be bold", :bold => lambda{|text| "<strong>#{text}</strong>"})
+=> "<strong>This text</strong> should be bold"
+irb(main)> russian.translate("[bold: This text] should be bold", :bold => lambda{|text| "<strong>#{text}</strong>"})
+=> "<strong>Этот текст</strong> должны быть жирным"
+```
 
-Simplest example:
+Nested decoration tokens:
 
-    irb(main):004:0> russian.translate('Hello World')
-    => "Привет Мир"
+```ruby
+irb(main)> english.translate("[bold: Bold text [italic: with italic text]] together", :bold => "<b>{$0}</b>", :italic => "<i>{$0}</i>")
+=> "<b>Bold text <i>with italic text</i></b> together"
+irb(main)> russian.translate("[bold: Bold text [italic: with italic text]] together", :bold => "<b>{$0}</b>", :italic => "<i>{$0}</i>")
+=> "<b>Жирный текст <i>с курсив</i></b> вместе"
+```
 
-Using context:
+Data tokens with decoration tokens together:
 
-    irb(main):004:0> russian.translate('Invite', 'An invitation')
-    => "Приглашение"
-    irb(main):005:0> russian.translate('Invite', 'An action to invite')
-    => "Пригласить"
+```ruby
+irb(main)> user = {:gender => :male, :name => "Michael"}
+irb(main)> english.translate("[bold: {user}] received [link: [bold: {count}] {count|message}]", :user => {:object => user, :attribute => :name}, :bold => "<b>{$0}</b>", :count => 5, :link => "<a href='url'>{$0}</a>")
+=> "<b>Michael</b> received <a href='url'><b>5</b> messages</a>"
+irb(main)> russian.translate("[bold: {user}] received [link: [bold: {count}] {count|message}]", :user => {:object => user, :attribute => :name}, :bold => "<b>{$0}</b>", :count => 5, :link => "<a href='url'>{$0}</a>")
+=> "<b>Michael</b> получил <a href='url'><b>5</b> сообщений</a>"
+```
 
-Basic numeric rules with transform tokens:
+PS. The Russian translation on tr8nhub.com could either be provided by a set of 6-9 simple translations for {genders}(male, female, unknown) * count{one, few, many} or by a single advanced translation
+in the form of:
 
-    irb(main):006:0> russian.translate('You have {count||message}.', :count => 1)
-    => "У вас есть 1 сообщение."
-    irb(main):007:0> russian.translate('You have {count||message}.', :count => 2)
-    => "У вас есть 2 сообщения."
-    irb(main):008:0> russian.translate('You have {count||message}.', :count => 5)
-    => "У вас есть 5 сообщений."
+```ruby
+[bold: {user}] {user| male: получил, female: получила} [link: [bold: {count}] {count| one: сообщение, few: сообщения, other: сообщений}]
+```
 
-Basic gender rules with language cases:
+Or in a simpler form:
 
-    irb(main):009:0> actor = {:gender => :female, :name => "Анна"}
-    irb(main):010:0> target = {:gender => :male, :name => "Михаил"}
-    irb(main):011:0> russian.translate('{actor} sent {target} a gift.', :actor => {:object => actor, :attribute => :name}, :target => {:object => target, :attribute => :name})
-    => "Анна послала подарок Михаилу."
-    irb(main):011:0> russian.translate('{actor} sent {target} a gift.', :actor => {:object => target, :attribute => :name}, :target => {:object => actor, :attribute => :name})
-    => "Михаил послал подарок Анне."
+```ruby
+[bold: {user}] {user| получил, получила} [link: [bold: {count}] {count| сообщение, сообщения, сообщений}]
+```
 
-Tr8n
+
+One of the advantages of using TML is the ability to easily switch token values. The above example in a text based email can reuse translations:
+
+```ruby
+irb(main)> english.translate("[bold: {user}] received [link: [bold: {count}] {count|message}]", :user => {:object => user, :attribute => :name}, :count => 1, :bold => "{$0}", :link => "{$0}")
+=> "Michael received 1 message"
+
+irb(main)> russian.translate("[bold: {user}] received [link: [bold: {count}] {count|message}]", :user => {:object => user, :attribute => :name}, :count => 1, :bold => "{$0}", :link => "{$0}")
+=> "Michael получил 1 сообщение"
+```
+
+You should also notice that all of the translation keys you've been using in your experiments will be registered under your application by the tr8nhub service. You can view them all at:
+
+https://tr8nhub.com/tr8n/app/phrases
+
+If any translation key you've tried to translate was missing a translation, you can manually translate it using the service (with the help of a machine translation suggestion).
+
+```ruby
+irb(main)> russian.translate('This is a new phrase without translations')
+=> "This is a new phrase without translations"
+```
+
+Then without leaving your IRB session, you can call the following method to reset your application cache:
+
+```ruby
+irb(main)> app.reset_translation_cache
+```
+
+Then you can just rerun the translation method with the missing translation and you should get back the translated value.
+
+```ruby
+irb(main)> russian.translate('This is a new phrase without translations')
+=> "Это новая фраза без перевода"
+```
+
+More Information
 ==================
 
-To read more about TML (Translation Markup Language) syntax, please visit http://wiki.tr8nhub.com
+If you are planning to use Tr8n in Rails application, you should use tr8n_rails_client_sdk gem instead.
+
+https://github.com/tr8n/tr8n_rails_clientsdk
 
-If you are planning to use Tr8n in Rails application, you can use the tr8n_rails_client_sdk gem instead.
+To read more about TML (Translation Markup Language) syntax, please visit http://wiki.tr8nhub.com

data/lib/tr8n/application.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,20 +23,25 @@
 
 require 'faraday'
 
+API_HOST = 'https://tr8nhub.com'
 API_PATH = '/tr8n/api/'
 
 class Tr8n::Application < Tr8n::Base
   attributes :host, :key, :secret, :access_token, :name, :description, :threshold, :default_locale, :default_level
-  has_many :features, :languages, :sources, :components, :tokens
+  has_many :features, :languages, :featured_locales, :sources, :components, :tokens, :css, :shortcuts
 
-  def self.init(host, key, secret, options = {})
+  # Application Initialization
+  # If host can be provided to point to sandbox or other instance of the service
+  def self.init(key, secret, host = nil, options = {})
     options[:definition] = true if options[:definition].nil?
 
+    host ||= API_HOST
+
     Tr8n.cache.reset_version
 
     Tr8n.logger.info("Initializing application...")
 
-    Tr8n.config.application = Tr8n.cache.fetch(cache_key(key)) do
+    Tr8n.session.application = Tr8n.cache.fetch(cache_key(key)) do
       # get access token and store it in the application
       access_token = api("oauth/request_token", {:client_id => key, :client_secret => secret, :grant_type => :client_credentials}, {:host => host})
 
@@ -50,6 +55,7 @@ class Tr8n::Application < Tr8n::Base
     end
   end
 
+  # Initializes the application from a set of attributes received from the API
   def initialize(attrs = {})
     super
 
@@ -69,10 +75,10 @@ class Tr8n::Application < Tr8n::Base
     end
 
     @translation_keys         = {}
+    @sources_by_key           = {}
+    @components_by_key        = {}
 
     @languages_by_locale      = nil
-    @sources_by_key           = nil
-    @components_by_key        = nil
     @missing_keys_by_sources  = nil
   end
 
@@ -82,7 +88,7 @@ class Tr8n::Application < Tr8n::Base
     @languages_by_locale ||= {}
     return @languages_by_locale[locale] if @languages_by_locale[locale]
 
-    if Tr8n.config.cache_enabled?
+    if Tr8n.config.cache[:enabled]
       language = Tr8n.cache.fetch(Tr8n::Language.cache_key(locale))
       if language
         language.application = self
@@ -96,7 +102,7 @@ class Tr8n::Application < Tr8n::Base
     # for translator languages will continue to build application cache
     @languages_by_locale[locale] = get("language", {:locale => locale}, {:class => Tr8n::Language, :attributes => {:application => self}})
 
-    if Tr8n.config.cache_enabled? and not Tr8n.cache.read_only?
+    if Tr8n.config.cache[:enabled] and not Tr8n.cache.read_only?
       Tr8n.cache.store(Tr8n::Language.cache_key(locale), @languages_by_locale[locale])
     end
 
@@ -107,6 +113,10 @@ class Tr8n::Application < Tr8n::Base
     @locales ||= languages.collect{|lang| lang.locale}
   end
 
+  def url_for(path)
+    "#{host}#{path}"
+  end
+
   # Mostly used for testing
   def add_language(new_language)
     lang = language(new_language.locale, false)
@@ -121,14 +131,6 @@ class Tr8n::Application < Tr8n::Base
   def source(key, register = true)
     key = key.source if key.is_a?(Tr8n::Source)
 
-    @sources_by_key ||= begin
-      srcs = {}
-      (sources || []).each do |src|
-        srcs[src.source] = src
-      end
-      srcs
-    end
-
     return @sources_by_key[key] if @sources_by_key[key]
     return nil unless register
 
@@ -138,14 +140,6 @@ class Tr8n::Application < Tr8n::Base
   def component(key, register = true)
     key = key.key if key.is_a?(Tr8n::Component)
 
-    @components_by_key ||= begin
-      cmps = {}
-      (components || []).each do |cmp|
-        cmps[cmp.key] = cmp
-      end
-      cmps
-    end
-
     return @components_by_key[key] if @components_by_key[key]
     return nil unless register
 
@@ -181,10 +175,17 @@ class Tr8n::Application < Tr8n::Base
     end
   end
 
+  def reset_translation_cache
+    @translation_keys = {}
+    @sources_by_key = {}
+    @components_by_key = {}
+  end
+
   def register_missing_key(tkey, source)
     @missing_keys_by_sources ||= {}
     @missing_keys_by_sources[source.source] ||= {}
     @missing_keys_by_sources[source.source][tkey.key] ||= tkey
+    submit_missing_keys if Tr8n.config.submit_missing_keys_realtime
   end
 
   def submit_missing_keys
@@ -241,7 +242,10 @@ class Tr8n::Application < Tr8n::Base
   end
 
   def to_cache_hash
-    hash = to_hash(:host, :key, :secret, :access_token, :name, :description, :threshold, :default_locale, :default_level, :features)
+    hash = to_hash(:host, :key, :secret, :access_token,
+                   :name, :description, :threshold,
+                   :default_locale, :default_level, :features,
+                   :tokens, :css, :shortcuts)
     hash["languages"] = []
     languages.each do |lang|
       hash["languages"] << lang.to_hash(:locale, :name, :english_name, :native_name, :right_to_left, :flag_url)
@@ -252,8 +256,6 @@ class Tr8n::Application < Tr8n::Base
   #######################################################################################################
   ##  API Methods
   #######################################################################################################
-  ## TODO: maybe caching can be done generically on the API level during gets?
-  ## TODO: think about it...
 
   def get(path, params = {}, opts = {})
     api(path, params, opts)

data/lib/tr8n/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -41,12 +41,6 @@ class Tr8n::Base
   def self.belongs_to(*attrs) self.attributes(*attrs); end
   def self.has_many(*attrs) self.attributes(*attrs); end
 
-  def self.thread_safe_attributes(*attrs)
-    @thread_safe_attribute_names ||= []
-    @thread_safe_attribute_names += attrs.collect{|a| a.to_sym} unless attrs.nil?
-    @thread_safe_attribute_names
-  end
-
   def method_missing(meth, *args, &block)
     method_name = meth.to_s
     method_suffix = method_name[-1, 1]
@@ -56,21 +50,13 @@ class Tr8n::Base
     end
 
     if self.class.attributes.index(method_key)
-      if method_name[-1, 1] == '='
+      if method_suffix == '='
         attributes[method_key] = args.first
         return attributes[method_key]
       end
       return attributes[method_key]
     end
 
-    if self.class.thread_safe_attributes.index(method_key)
-      if method_name[-1, 1] == '='
-        Thread.current[method_key] = args.first
-        return Thread.current[method_key]
-      end
-      return Thread.current[method_key]
-    end
-
     super
   end      
 
@@ -90,12 +76,6 @@ class Tr8n::Base
     self.class.hash_value(hash, key, opts)
   end
 
-  def reset!
-    self.class.thread_safe_attributes.each do |key|
-      Thread.current[key] = nil
-    end
-  end
-
   def to_hash(*attrs)
     if attrs.nil? or attrs.empty?
       # default hashing only includes basic types

data/lib/tr8n/cache.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,8 +25,8 @@ module Tr8n
 
   def self.cache
     @cache ||= begin
-      if Tr8n.config.cache_enabled?
-        klass = Tr8n::CacheAdapters.const_get(Tr8n.config.cache_adapter.camelcase)
+      if Tr8n.config.cache[:enabled]
+        klass = Tr8n::CacheAdapters.const_get(Tr8n.config.cache[:adapter].camelcase)
         klass.new
       else
         # blank implementation
@@ -40,7 +40,7 @@ module Tr8n
     def version
       @version ||= begin
         v = fetch('tr8n_cache_version', :skip_version => true)
-        v ? v['version'] : Tr8n.config.cache_version
+        v ? v['version'] : Tr8n.config.cache[:version]
       end
     end
 
@@ -54,7 +54,7 @@ module Tr8n
     end
 
     def enabled?
-      Tr8n.config.cache_enabled?
+      Tr8n.config.cache[:enabled]
     end
 
     def cached_by_source?
@@ -126,13 +126,13 @@ module Tr8n
         when Tr8n::Application.cache_prefix
           return Tr8n::Application.new(JSON.parse(data))
         when Tr8n::Language.cache_prefix
-          return Tr8n::Language.new(JSON.parse(data).merge(:application => Tr8n.config.application))
+          return Tr8n::Language.new(JSON.parse(data).merge(:application => Tr8n.session.application))
         when Tr8n::Source.cache_prefix
-          return Tr8n::Source.new(JSON.parse(data).merge(:application => Tr8n.config.application))
+          return Tr8n::Source.new(JSON.parse(data).merge(:application => Tr8n.session.application))
         when Tr8n::Component.cache_prefix
-          return Tr8n::Component.new(JSON.parse(data).merge(:application => Tr8n.config.application))
+          return Tr8n::Component.new(JSON.parse(data).merge(:application => Tr8n.session.application))
         when Tr8n::TranslationKey.cache_prefix
-          return Tr8n::TranslationKey.new(JSON.parse(data).merge(:application => Tr8n.config.application))
+          return Tr8n::TranslationKey.new(JSON.parse(data).merge(:application => Tr8n.session.application))
       end
 
       # API response form will be here

data/lib/tr8n/cache_adapters/cdb.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ class Tr8n::CacheAdapters::Cdb < Tr8n::Cache
   end
 
   def self.cache_path
-    "#{Tr8n.config.cache_path}/cdb/current.cdb"
+    "#{Tr8n.config.cache[:path]}/cdb/current.cdb"
   end
 
   def cached_by_source?

data/lib/tr8n/cache_adapters/file.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@
 class Tr8n::CacheAdapters::File < Tr8n::Cache
 
   def self.cache_path
-    "#{Tr8n.config.cache_path}/files/current"
+    "#{Tr8n.config.cache[:path]}/files/current"
   end
 
   def self.file_name(key)

data/lib/tr8n/cache_adapters/memcache.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ class Tr8n::CacheAdapters::Memcache < Tr8n::Cache
 
   def initialize
     options = { :namespace => "tr8n", :compress => true }
-    @cache = Dalli::Client.new(Tr8n.config.cache_host, options)
+    @cache = Dalli::Client.new(Tr8n.config.cache[:host], options)
   end
 
   def read_only?
@@ -58,7 +58,7 @@ class Tr8n::CacheAdapters::Memcache < Tr8n::Cache
 
   def store(key, data, opts = {})
     info("Cache store: #{key}")
-    ttl = opts[:ttl] || Tr8n.config.cache_timeout
+    ttl = opts[:ttl] || Tr8n.config.cache[:timeout]
     @cache.set(versioned_key(key, opts), serialize_object(key, data), ttl)
     data
   rescue Exception => ex

data/lib/tr8n/cache_adapters/redis.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ require 'redis' if defined?(::Redis)
 class Tr8n::CacheAdapters::Redis < Tr8n::Cache
 
   def initialize
-    cache_host, cache_port = Tr8n.config.cache_host.split(':') if Tr8n.config.cache_host
+    cache_host, cache_port = Tr8n.config.cache[:host].split(':') if Tr8n.config.cache[:host]
     cache_host ||= 'localhost'
     cache_port ||= 6379
 
@@ -61,7 +61,7 @@ class Tr8n::CacheAdapters::Redis < Tr8n::Cache
 
   def store(key, data, opts = {})
     info("Cache store: #{key}")
-    ttl = opts[:ttl] || Tr8n.config.cache_timeout
+    ttl = opts[:ttl] || Tr8n.config.cache[:timeout]
     versioned_key = versioned_key(key, opts)
 
     @cache.set(versioned_key, serialize_object(key, data))

data/lib/tr8n/component.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the