tr8n_core 4.0.1 → 4.0.2

data/spec/{helper.rb → spec_helper.rb}

@@ -12,6 +12,10 @@ SimpleCov.start
 
 require 'tr8n_core'
 
+Tr8n.configure do |config|
+  config.format = :text
+end
+
 def fixtures_root
   File.join(File.dirname(__FILE__), 'fixtures')
 end
@@ -20,14 +24,18 @@ def load_json(file_path)
   JSON.parse(File.read("#{fixtures_root}/#{file_path}"))
 end
 
-def load_translation_keys_from_file(app, path)
-  load_json(path).each do |jkey|
-    load_translation_key_from_hash(app, jkey)
+def load_translation_key_from_hash(app, hash)
+  app.cache_translation_key(Tr8n::TranslationKey.new(hash.merge(:application => app)))
+end
+
+def load_translation_key_from_array(app, arr)
+  arr.each do |tkey|
+    load_translation_key_from_hash(app, tkey)
   end
 end
 
-def load_translation_key_from_hash(app, hash)
-  app.cache_translation_key(Tr8n::TranslationKey.new(hash.merge(:application => app)))
+def load_translation_keys_from_file(app, path)
+  load_translation_key_from_array(app, load_json(path))
 end
 
 def stub_object(attrs)
@@ -44,8 +52,8 @@ def init_application(locales = [], path = 'application.json')
   locales.each do |locale|
     app.add_language(Tr8n::Language.new(load_json("languages/#{locale}.json")))
   end
-  Tr8n.config.application = app
-  Tr8n.config.current_language = app.language('en-US')
+  Tr8n.session.application = app
+  Tr8n.session.current_language = app.language('en-US')
   app
 end
 

data/spec/tokens/data_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper'
+require 'spec_helper'
 
 describe Tr8n::Tokens::Data do
   before do
@@ -95,7 +95,7 @@ describe Tr8n::Tokens::Data do
         users << stub_object({:first_name => "First name #{i}", :last_name => "Last name #{i}", :gender => "Male"})
       end
 
-      Tr8n.config.with_block_options(:dry => true) do
+      Tr8n.session.with_block_options(:dry => true) do
         expect(token.token_value([users, :first_name], {}, @english)).to match("2 others")
 
         expect(token.token_value([users, [:first_name], {

data/spec/tokens/data_tokenizer_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper'
+require 'spec_helper'
 
 describe Tr8n::Tokens::DataTokenizer do
   before do

data/spec/tokens/decoration_tokenizer_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper'
+require 'spec_helper'
 
 describe Tr8n::Tokens::DecorationTokenizer do
 

data/spec/tokens/hidden_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper'
+require 'spec_helper'
 
 describe Tr8n::Tokens::Hidden do
   before do

data/spec/tokens/method_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper'
+require 'spec_helper'
 
 describe Tr8n::Tokens::Method do
   #before do

data/spec/tokens/transform_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper'
+require 'spec_helper'
 
 describe Tr8n::Tokens::Transform do
   #before do

data/spec/translation_key_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper'
+require 'spec_helper'
 
 describe Tr8n::TranslationKey do
   describe "#initialize" do

data/spec/translation_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper'
+require 'spec_helper'
 
 describe Tr8n::Translation do
   describe "initialize" do

data/spec/utils_spec.rb

@@ -1,12 +1,10 @@
 # encoding: UTF-8
 
-require 'helper'
+require 'spec_helper'
 
 describe Tr8n::Utils do
   describe "helper methods" do
     it "should return correct values" do
-      #expect(Tr8n::Utils.root).to eq(File.expand_path("#{__dir__}/../"))
-      expect(Tr8n::Utils.load_yaml("#{Tr8n.config.root}/config/tokens/data.yml").class).to eq(Hash)
 
       expect(
         Tr8n::Utils.normalize_tr_params("Hello {user}", "Sample label", {:user => "Michael"}, {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_core
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,6 +52,7 @@ files:
 - lib/tr8n/logger.rb
 - lib/tr8n/rules_engine/evaluator.rb
 - lib/tr8n/rules_engine/parser.rb
+- lib/tr8n/session.rb
 - lib/tr8n/source.rb
 - lib/tr8n/tokens/data.rb
 - lib/tr8n/tokens/data_tokenizer.rb
@@ -72,12 +73,8 @@ files:
 - lib/tr8n_core/generators/cache/base.rb
 - lib/tr8n_core/generators/cache/cdb.rb
 - lib/tr8n_core/generators/cache/file.rb
-- lib/tr8n_core/modules/logger.rb
 - lib/tr8n_core/version.rb
 - lib/tr8n_core.rb
-- config/config.yml
-- config/tokens/data.yml
-- config/tokens/decorations.yml
 - LICENSE
 - Rakefile
 - README.md
@@ -98,7 +95,6 @@ files:
 - spec/fixtures/translations/ru/last_names.txt
 - spec/fixtures/translations/ru/names.json
 - spec/fixtures/translations/ru/names.txt
-- spec/helper.rb
 - spec/language_case_rule_spec.rb
 - spec/language_case_spec.rb
 - spec/language_context_rule_spec.rb
@@ -106,6 +102,7 @@ files:
 - spec/language_spec.rb
 - spec/rules_engine/evaluator_spec.rb
 - spec/rules_engine/parser_spec.rb
+- spec/spec_helper.rb
 - spec/tokens/data_spec.rb
 - spec/tokens/data_tokenizer_spec.rb
 - spec/tokens/decoration_tokenizer_spec.rb
@@ -157,7 +154,6 @@ test_files:
 - spec/fixtures/translations/ru/last_names.txt
 - spec/fixtures/translations/ru/names.json
 - spec/fixtures/translations/ru/names.txt
-- spec/helper.rb
 - spec/language_case_rule_spec.rb
 - spec/language_case_spec.rb
 - spec/language_context_rule_spec.rb
@@ -165,6 +161,7 @@ test_files:
 - spec/language_spec.rb
 - spec/rules_engine/evaluator_spec.rb
 - spec/rules_engine/parser_spec.rb
+- spec/spec_helper.rb
 - spec/tokens/data_spec.rb
 - spec/tokens/data_tokenizer_spec.rb
 - spec/tokens/decoration_tokenizer_spec.rb

data/config/config.yml

@@ -1,34 +0,0 @@
-defaults:
-  enabled:        true
-  default_locale: en-US
-  default_level:  0
-  application:
-    host:         http://localhost:3000
-    key:          default
-    secret:       12345
-  logger:
-    enabled:      true
-    path:         /log/tr8n.log
-  cache:
-    enabled:      false
-    adapter:      file
-    path:         /cache
-    version:      1
-    timeout:      3600
-    host:         localhost:11211
-  localization:
-    default_day_names:        [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
-    default_abbr_day_names:   [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
-    default_month_names:      [January, February, March, April, May, June, July, August, September, October, November, December]
-    default_abbr_month_names: [Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
-    custom_date_formats:
-      default:                '%m/%d/%Y'            # 07/4/2008
-      short_numeric:          '%m/%d'               # 07/4
-      short_numeric_year:     '%m/%d/%y'            # 07/4/08
-      long_numeric:           '%m/%d/%Y'            # 07/4/2008
-      verbose:                '%A, %B %d, %Y'       # Friday, July  4, 2008
-      monthname:              '%B %d'               # July 4
-      monthname_year:         '%B %d, %Y'           # July 4, 2008
-      monthname_abbr:         '%b %d'               # Jul 4
-      monthname_abbr_year:    '%b %d, %Y'           # Jul 4, 2008
-      date_time:              '%m/%d/%Y at %H:%M'   # 01/03/1010 at 5:30

data/config/tokens/data.yml

@@ -1,45 +0,0 @@
-#############################################################################
-#
-# Tr8n Default Data Tokens
-#
-#############################################################################
-
-html:
-  ndash:    "–"       # –
-  mdash:    "—"       # —
-  iexcl:    "¡"       # ¡
-  iquest:   "¿"      # ¿
-  quot:     """        # "
-  ldquo:    "“"       # “
-  rdquo:    "”"       # ”
-  lsquo:    "‘"       # ‘
-  rsquo:    "’"       # ’
-  laquo:    "«"       # «
-  raquo:    "»"       # »
-  nbsp:     " "        # space
-  lsaquo:   "‹"      # ‹
-  rsaquo:   "›"      # ›
-  br:       "<br/>"         # line break
-  lbrace:   "{"
-  rbrace:   "}"
-  trade:    "&trade;"       # TM
-
-plain:
-  ndash:        "–"         # –
-  mdash:        "—"         # —
-  iexcl:        "¡"         # ¡
-  iquest:       "¿"         # ¿
-  quot:         '"'         # "
-  ldquo:        "“"         # “
-  rdquo:        "”"         # ”
-  lsquo:        "‘"         # ‘
-  rsquo:        "’"         # ’
-  laquo:        "«"         # «
-  raquo:        "»"         # »
-  nbsp:         " "         # space
-  lsaquo:       "‹"         # ‹
-  rsaquo:       "›"         # ›
-  br:           "\n"        # line break
-  lbrace:       "{"
-  rbrace:       "}"
-  trade:        "™"         # TM

data/config/tokens/decorations.yml

@@ -1,37 +0,0 @@
-#############################################################################
-#
-# Tr8n Default Decoration Tokens
-#
-#############################################################################
-
-html:
-  strong:     "<strong>{$0}</strong>"
-  bold:       "<strong>{$0}</strong>"
-  b:          "<strong>{$0}</strong>"
-  em:         "<em>{$0}</em>"
-  italic:     "<i>{$0}</i>"
-  i:          "<i>{$0}</i>"
-  link:       "<a href='{$href}'>{$0}</a>"
-  br:         "<br>{$0}"
-  strike:     "<strike>{$0}</strike>"
-  div:        "<div id='{$id}' class='{$class}' style='{$style}'>{$0}</div>"
-  span:       "<span id='{$id}' class='{$class}' style='{$style}'>{$0}</span>"
-  h1:         "<h1>{$0}</h1>"
-  h2:         "<h2>{$0}</h2>"
-  h3:         "<h3>{$0}</h3>"
-
-plain:
-  strong:     "{$0}"
-  bold:       "{$0}"
-  b:          "{$0}"
-  em:         "{$0}"
-  italic:     "{$0}"
-  i:          "{$0}"
-  link:       "{$0}:{$1}"
-  br:         "\n{$0}"
-  strike:     "{$0}"
-  div:        "{$0}"
-  span:       "{$0}"
-  h1:         "{$0}"
-  h2:         "{$0}"
-  h3:         "{$0}"

data/lib/tr8n_core/modules/logger.rb

@@ -1,43 +0,0 @@
-#--
-# Copyright (c) 2013 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
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-module Tr8nCore
-  module Modules
-    module Logger
-
-      def debug(msg)
-        Tr8n::Logger.debug(msg)
-      end
-
-      def info(msg)
-        Tr8n::Logger.info(msg)
-      end
-
-      def error(msg)
-        Tr8n::Logger.error(msg)
-      end
-
-    end
-  end
-end
-