tr8n_core 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3d5a8a77266054697c3f8dcd30f7fd59a8c563
-  data.tar.gz: 244e312b0f03a9f6f6b232f5357a9b0c7991316d
+  metadata.gz: 176e098158a14899141b0806820928ab5a5dca78
+  data.tar.gz: ec746b4fb3729d02b5689ba15aa6639403977b99
 SHA512:
-  metadata.gz: 06e875646e358cd4a3228268d594eec6cc105b5c32176c6b430024de3c806856226b0833a329b060541628803213a8f032a76e2f8eba60e7b84b8291e4957aaf
-  data.tar.gz: d11ddd0b0f3d64bdb7abdfba80c1dcfb4bcc45453c1ca5847bd6076fe7ad7dae124b66bf71562c03ba16a22642890d0e6deea3ccf2e1bda29d5bddbe2134ede4
+  metadata.gz: bbec300dd025ef1981175efb9b245115c320080bacd001efb8ed2cd5ee0aff0d0ae66a9fd4f6c1a84b40f583a4cb0324bbdfb04e89437e17a79e2bf48033c22d
+  data.tar.gz: 3a80ed12cccb3ebe9d34ff032fafc59d8b7d8ce5db78f11abe15d23236c2cc33d409718ff03ac12a017b477fbfb5d140d4b5ea89d1a8fb2ec2138165143ab59b

data/lib/tr8n/cache.rb

@@ -66,7 +66,7 @@ module Tr8n
     end
 
     def cache_name
-      self.class.name.underscore.split('_').last
+      self.class.name.split('::').last
     end
 
     def info(msg)

data/lib/tr8n/cache_adapters/cdb.rb

@@ -29,6 +29,10 @@ class Tr8n::CacheAdapters::Cdb < Tr8n::Cache
     @cache = LibCDB::CDB.open(cache_path)
   end
 
+  def cache_name
+    "cdb"
+  end
+
   def self.cache_path
     "#{Tr8n.config.cache[:path]}/cdb/current.cdb"
   end

data/lib/tr8n/cache_adapters/file.rb

@@ -35,6 +35,10 @@ class Tr8n::CacheAdapters::File < Tr8n::Cache
     "#{cache_path}/#{file_name(key)}"
   end
 
+  def cache_name
+    "file"
+  end
+
   def fetch(key, opts = {})
     path = self.class.file_path(key)
 
@@ -60,7 +64,7 @@ class Tr8n::CacheAdapters::File < Tr8n::Cache
   end
 
   def exist?(key, opts = {})
-    File.exists(file_path(key))
+    File.exists?(self.class.file_path(key))
   end
 
   def clear(opts = {})

data/lib/tr8n/cache_adapters/memcache.rb

@@ -26,10 +26,14 @@ require 'dalli' if defined?(Dalli)
 class Tr8n::CacheAdapters::Memcache < Tr8n::Cache
 
   def initialize
-    options = { :namespace => "tr8n", :compress => true }
+    options = { :namespace => Tr8n.config.cache[:namespace] || "tr8n", :compress => Tr8n.config.cache[:compress].nil? ? true : Tr8n.config.cache[:compress]}
     @cache = Dalli::Client.new(Tr8n.config.cache[:host], options)
   end
 
+  def cache_name
+    "memcache"
+  end
+
   def read_only?
     false
   end

data/lib/tr8n/cache_adapters/redis.rb

@@ -33,6 +33,10 @@ class Tr8n::CacheAdapters::Redis < Tr8n::Cache
     @cache = ::Redis.new(host: cache_host, port: cache_port)
   end
 
+  def cache_name
+    "redis"
+  end
+
   def read_only?
     false
   end

data/lib/tr8n/config.rb

@@ -58,7 +58,7 @@ module Tr8n
   #  end
   #
 
-  def with_config_settings
+  def self.with_config_settings
     old_config = @config.dup
     yield(@config)
     @config = old_config
@@ -88,11 +88,13 @@ module Tr8n
       @current_locale_method = :current_locale
       @current_user_method = :current_user
 
-      @application = {
-        :host     => 'http://localhost:3000',
-        :key      => 'default',
-        :secret   => '12345',
-      }
+      #@application = {
+      #  :host     => 'https://localhost:3000',
+      #  :key      => 'default',
+      #  :secret   => '12345',
+      #}
+
+      @application = nil
 
       @context_rules = {
         :number => {

data/lib/tr8n/language.rb

@@ -151,7 +151,7 @@ class Tr8n::Language < Tr8n::Base
 
       # if it came from cache, it will be full of translation keys with translations for the locale
       if source
-        translation_keys = source.translation_keys
+        translation_keys = source.translation_keys || {}
       elsif Tr8n.cache.read_only?
         translation_keys = {}
       else

data/lib/tr8n/session.rb

@@ -35,7 +35,11 @@ module Tr8n
                   :current_source, :current_component, :block_options
 
     def init
-      Tr8n::Application.init(Tr8n.config.application[:key], Tr8n.config.application[:secret], Tr8n.config.application[:host])
+      return unless Tr8n.config.application # not configured
+
+      unless @application
+        Tr8n::Application.init(Tr8n.config.application[:key], Tr8n.config.application[:secret], Tr8n.config.application[:host])
+      end
       self.current_source = "/tr8n/core"
     end
 
@@ -63,7 +67,7 @@ module Tr8n
       if block_given?
         ret = yield
       end
-      @block_options.pop
+      @block_options.pop if @block_options
       ret
     end
 

data/lib/tr8n/source.rb

@@ -27,10 +27,10 @@ class Tr8n::Source < Tr8n::Base
   has_many    :translation_keys
 
   def self.normalize(url)
-    return nil if url.blank?
+    return nil if url.nil? or url == ""
     uri = URI.parse(url)
     path = uri.path
-    return "/" if uri.path.blank?
+    return "/" if uri.path.nil? or uri.path == ""
     return path if path == "/"
 
     # always must start with /

data/lib/tr8n_core/ext/hash.rb

@@ -23,30 +23,6 @@
 
 class Hash
 
-  # Return all combinations of a hash.
-  #
-  # Example:
-  #   {
-  #     :a => [1, 2]
-  #     :b => [1, 2]
-  #   }.combinations #=> [{:a=>1, :b=>1}, {:a=>1, :b=>2}, {:a=>2, :b=>1}, {:a=>2, :b=>2}]
-  #
-  def combinations
-    return [{}] if empty?
-
-    copy = dup
-    values = copy.delete(key = keys.first)
-
-    result = []
-    copy.combinations.each do |tail|
-      values.each do |value|
-        result << tail.merge(key=>value)
-      end
-    end
-
-    result
-  end
-
   def tr8n_translated
     return self if frozen?
     @tr8n_translated = true

data/lib/tr8n_core/generators/cache/base.rb

@@ -23,8 +23,10 @@
 
 class Tr8nCore::Generators::Cache::Base
 
+  attr_accessor :started_at, :finished_at
+
   def log(msg)
-    puts("#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}: #{msg}\n")
+    Tr8n.logger.debug("#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}: #{msg}\n")
   end
 
   def cache_path

data/lib/tr8n_core/generators/cache/file.rb

@@ -26,16 +26,19 @@ class Tr8nCore::Generators::Cache::File < Tr8nCore::Generators::Cache::Base
   def cache_path
     @cache_path ||= begin
       path = "#{Tr8n.config.cache[:path]}/files/tr8n_#{Tr8n.session.application.key}_#{@started_at.strftime('%Y_%m_%d_%H_%M_%S')}"
-      pp "Cache will be stored in #{path}"
+      log("Cache will be stored in #{path}")
       FileUtils.mkdir_p(path)
       FileUtils.chmod(0777, path)
       path
     end
   end
 
+  def file_path(key)
+    "#{cache_path}/#{Tr8n::CacheAdapters::File.file_name(key)}"
+  end
+
   def cache(key, data)
-    file_path = "#{cache_path}/#{Tr8n::CacheAdapters::File.file_name(key)}"
-    File.open(file_path, 'w') { |file| file.write(JSON.pretty_generate(data)) }
+    File.open(file_path(key), 'w') { |file| file.write(JSON.pretty_generate(data)) }
   end
 
   def symlink_path

data/lib/tr8n_core/version.rb

@@ -23,5 +23,5 @@
 
 
 module Tr8nCore
-  VERSION = "4.0.2"
+  VERSION = "4.0.4"
 end

data/spec/application_spec.rb

@@ -36,6 +36,17 @@ describe Tr8n::Application do
       expect(russian.contexts.keys.size).to eq(6)
       expect(russian.contexts.keys).to eq(["date", "gender", "genders", "list", "number", "value"])
     end
+
+    it "should reset translations" do
+      @app.reset_translation_cache
+      expect(@app.translation_keys).to eq({})
+    end
+
+    it "should reset translations" do
+      @app.register_missing_key(Tr8n::TranslationKey.new(:application => @app, :label => "Hello"), Tr8n::Source.new(:key => "test"))
+    end
+
   end
 
+
 end

data/spec/cache/adapters/file_spec.rb

@@ -0,0 +1,32 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Tr8n::CacheAdapters::File do
+  describe "#configuration" do
+    it "provides correct values" do
+
+      Tr8n.with_config_settings do |config|
+
+        config.cache = {
+            :path => "./cache"
+        }
+
+        c = Tr8n::CacheAdapters::File.new
+
+        expect(c.class.cache_path).to eq("./cache/files/current")
+
+        expect(c.class.file_name("test_key")).to eq("test_key.json")
+        expect(c.class.file_name("test/key")).to eq("test-key.json")
+        expect(c.class.file_path("test/key")).to eq("./cache/files/current/test-key.json")
+
+        c.store("a", "b")
+        c.delete("a")
+        c.clear()
+
+        expect(c.exist?("some_new_key")).to be_false
+      end
+
+    end
+  end
+end

data/spec/cache/adapters/memcache_spec.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Tr8n::CacheAdapters::Memcache do
+  describe "#configuration" do
+    it "provides correct values" do
+
+      Tr8n.with_config_settings do |config|
+
+      end
+
+    end
+  end
+end

data/spec/cache/generators/file_generator_spec.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Tr8nCore::Generators::Cache::File do
+  describe "#configuration" do
+    it "provides correct values" do
+
+      Tr8n.with_config_settings do |config|
+        Tr8n.session.application = init_application
+
+        config.cache = {
+            :path => "./cache"
+        }
+
+        g = Tr8nCore::Generators::Cache::File.new
+        g.started_at = Time.new(2014, 01, 01, 10, 11, 12)
+        expect(g.cache_path).to eq("./cache/files/tr8n_default_2014_01_01_10_11_12")
+        expect(g.symlink_path).to eq("./cache/files/current")
+
+        expect(g.file_path("test_key")).to eq("./cache/files/tr8n_default_2014_01_01_10_11_12/test_key.json")
+
+        g.cache("test_key", {"a" => "b"})
+        expect(File.exists?(g.file_path("test_key"))).to be_true
+
+      end
+
+    end
+  end
+end

data/spec/ext/array_spec.rb

@@ -0,0 +1,12 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Array do
+  it "must provide correct attributes" do
+    expect([].tr8n_translated?).to be_nil
+
+    a = [].tr8n_translated
+    expect(a.tr8n_translated?).to be_true
+  end
+end

data/spec/ext/hash_spec.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Hash do
+  it "must provide correct attributes" do
+    h = {}.tr8n_translated
+    expect(h.tr8n_translated?).to be_true
+
+    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
+    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
+    expect(h1.rmerge(h2)).to eq({"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}})
+    expect(h1.rmerge!(h2)).to eq({"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}})
+  end
+end

data/spec/ext/string_spec.rb

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe String do
+  it "must provide correct attributes" do
+    s = "".tr8n_translated
+    expect(s.tr8n_translated?).to be_true
+  end
+end

data/spec/language_spec.rb

@@ -18,6 +18,8 @@ describe Tr8n::Language do
       expect(@russian.class.cache_key("ru")).to eq("l@_[ru]")
       expect(@russian.class.cache_prefix).to eq("l@")
 
+      expect(@russian.has_definition?).to be_true
+
     end
   end
 
@@ -387,8 +389,6 @@ describe Tr8n::Language do
         Tr8n.session.with_block_options(:dry => true) do
 
           time = Time.new(2014, 01, 02, 11, 12, 13)
-          expect(@english.translate("This message was received at {time}", :time => time)).to eq("This message was received at 2014-01-02 11:12:13 -0800")
-
 
           expect(time.translate()).to eq("1/2/2014")
           expect(time.tr()).to eq("1/2/2014")

data/spec/logger_spec.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Tr8n::Logger do
+  it "must provide correct data" do
+    Tr8n.logger.trace_api_call("/test", {}) do
+      # do nothing
+    end
+
+    Tr8n.logger.trace("Testing code") do
+      # do nothing
+    end
+  end
+end

data/spec/source_spec.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Tr8n::Source do
+  describe "#initialize" do
+    it "helper methods" do
+      expect(Tr8n::Source.normalize("https://travis-ci.org/tr8n/tr8n_ruby_core")).to eq("/tr8n/tr8n_ruby_core")
+      expect(Tr8n::Source.normalize("https://www.google.com/search?q=test&source=lnms")).to eq("/search")
+      expect(Tr8n::Source.cache_prefix).to eq('s@')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'rspec'
 require 'json'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_core
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.4
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -80,11 +80,17 @@ files:
 - README.md
 - spec/application_spec.rb
 - spec/base_spec.rb
+- spec/cache/adapters/file_spec.rb
+- spec/cache/adapters/memcache_spec.rb
+- spec/cache/generators/file_generator_spec.rb
 - spec/config_spec.rb
 - spec/decorator_spec.rb
 - spec/decorators/base_spec.rb
 - spec/decorators/default_spec.rb
 - spec/decorators/html_spec.rb
+- spec/ext/array_spec.rb
+- spec/ext/hash_spec.rb
+- spec/ext/string_spec.rb
 - spec/fixtures/application.json
 - spec/fixtures/languages/en-US.json
 - spec/fixtures/languages/es.json
@@ -100,8 +106,10 @@ files:
 - spec/language_context_rule_spec.rb
 - spec/language_context_spec.rb
 - spec/language_spec.rb
+- spec/logger_spec.rb
 - spec/rules_engine/evaluator_spec.rb
 - spec/rules_engine/parser_spec.rb
+- spec/source_spec.rb
 - spec/spec_helper.rb
 - spec/tokens/data_spec.rb
 - spec/tokens/data_tokenizer_spec.rb
@@ -112,7 +120,7 @@ files:
 - spec/translation_key_spec.rb
 - spec/translation_spec.rb
 - spec/utils_spec.rb
-homepage: https://tr8nhub.com
+homepage: https://github.com/tr8n/tr8n_ruby_core
 licenses:
 - MIT-LICENSE
 metadata: {}
@@ -139,11 +147,17 @@ summary: Tr8n Core Classes
 test_files:
 - spec/application_spec.rb
 - spec/base_spec.rb
+- spec/cache/adapters/file_spec.rb
+- spec/cache/adapters/memcache_spec.rb
+- spec/cache/generators/file_generator_spec.rb
 - spec/config_spec.rb
 - spec/decorator_spec.rb
 - spec/decorators/base_spec.rb
 - spec/decorators/default_spec.rb
 - spec/decorators/html_spec.rb
+- spec/ext/array_spec.rb
+- spec/ext/hash_spec.rb
+- spec/ext/string_spec.rb
 - spec/fixtures/application.json
 - spec/fixtures/languages/en-US.json
 - spec/fixtures/languages/es.json
@@ -159,8 +173,10 @@ test_files:
 - spec/language_context_rule_spec.rb
 - spec/language_context_spec.rb
 - spec/language_spec.rb
+- spec/logger_spec.rb
 - spec/rules_engine/evaluator_spec.rb
 - spec/rules_engine/parser_spec.rb
+- spec/source_spec.rb
 - spec/spec_helper.rb
 - spec/tokens/data_spec.rb
 - spec/tokens/data_tokenizer_spec.rb