tr8n_core 4.0.9 → 4.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d6598f1871117da1975503815421dff165daf9
-  data.tar.gz: e60f6a755c7fede60e1b47daf39ff93e0145636f
+  metadata.gz: dd3eb7989301e2c1d7d8734911a9ca036f0d5d51
+  data.tar.gz: eef105b2a1f9ace58ce79f4acfc3f44c5cfdf7fc
 SHA512:
-  metadata.gz: ccdd9f1b867a34c5bd87f195f57983606b18bacf0f65a0d227637fb761fd40d9a0050744d617d5d2a422be2c9fb4001f6dd7790a5fc406114716ccb68814a367
-  data.tar.gz: 0c718d53381c1ae518576653bd3db3c7a0c57834e2f38593f39c7ab87f66801b000f1cfc13cc0279f2142768c151abc92168ecbd0bcd26888d586088e88a6b8f
+  metadata.gz: 6ec1c94fe137730ca4c2d5365f980e43ceeaa9abdb39dfaa07ae750acb8662de91b85105f4c494a3e6fd0636e4dcb7afc74813e51bf0ee6bad429540ccb59998
+  data.tar.gz: 5e9c34a75ecb81b1d1059b27524c3061f284b649a649810336a8dd818d4fec0f0908881a5f982035984c22400ed3074e4f8696c243949fc9bf4bac22658bb155

data/lib/tr8n/application.rb

@@ -169,15 +169,19 @@ class Tr8n::Application < Tr8n::Base
     submit_missing_keys if Tr8n.config.submit_missing_keys_realtime
   end
 
-  def submit_missing_keys
-    return if @missing_keys_by_sources.nil? or @missing_keys_by_sources.empty?
+  def register_keys(keys)
     params = []
-    @missing_keys_by_sources.each do |source, keys|
+    keys.each do |source, keys|
       next unless keys.values.any?
       params << {:source => source, :keys => keys.values.collect{|tkey| tkey.to_hash(:label, :description, :locale, :level)}}
     end
 
     api_client.post('source/register_keys', {:source_keys => params.to_json})
+  end
+
+  def submit_missing_keys
+    return if @missing_keys_by_sources.nil? or @missing_keys_by_sources.empty?
+    register_keys(@missing_keys_by_sources)
     @missing_keys_by_sources = nil
   end
 

data/lib/tr8n/session.rb

@@ -42,6 +42,8 @@ module Tr8n
                   :current_source, :current_component, :block_options
 
     def init(key = nil, secret = nil, host = nil)
+      return unless Tr8n.config.enabled? and Tr8n.config.application
+
       key     ||= Tr8n.config.application[:key]
       secret  ||= Tr8n.config.application[:secret]
       host    ||= Tr8n.config.application[:host]

data/lib/tr8n/tokenizers/decoration.rb

@@ -122,7 +122,7 @@ module Tr8n
       end
 
       def default_decoration(token_name, token_value)
-        default_decoration = Tr8n.config.default_token_value(token_name, :decoration)
+        default_decoration = Tr8n.config.default_token_value(normalize_token(token_name), :decoration)
 
         unless default_decoration
           Tr8n.logger.error("Invalid decoration token value for #{token_name} in #{text}")
@@ -171,7 +171,7 @@ module Tr8n
           return value
         end
 
-        if Tr8n.config.default_token_value(token, :decoration)
+        if Tr8n.config.default_token_value(normalize_token(token), :decoration)
           return default_decoration(token, value)
         end
 
@@ -179,6 +179,10 @@ module Tr8n
         value
       end
 
+      def normalize_token(name)
+        name.to_s.gsub(/(\d)*$/, '')
+      end
+
       def evaluate(expr)
         unless expr.is_a?(Array)
           return expr

data/lib/tr8n_core/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tr8nCore
-  VERSION = "4.0.9"
+  VERSION = '4.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_core
 version: !ruby/object:Gem::Version
-  version: 4.0.9
+  version: 4.0.10
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday