singleton-ruby 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e092b1d69a9639d976877f5ad64486ebe37a6d64bdaef84f1aa10a1424ae6e
-  data.tar.gz: 42f5c443bf2e9a20004ba147586de5088d9fdb1a7cd56b422f0b8fff85ea82ec
+  metadata.gz: ffce54daa3338aaac24e5f302d46ea2b0d786def7c20dc5d737d5f8e839844d2
+  data.tar.gz: 934df8d9afc326b09981f12460e822db864ccb35f3e992c67b066689258343bf
 SHA512:
-  metadata.gz: 4e269b9d4dc398a51491bcaa8c71304c360cc082cce8bc6f49ca07ddd7d72849f26341d65d1700e452eb5976197eb5a95542f09e9bf1aa595e2448becd894353
-  data.tar.gz: d8230f6464e7c1c4f940665f55bfb0fdb577553c980b844ecd45803e77ee3ca4ffdf346c67deec784daf17d94fc2bd2cbbdf2ed8e4b9eb565f24a12d3191f788
+  metadata.gz: 6ec453c3a483d728b165cf734a2aaf361f4be3582579ec1853b49aa9ac3ece43fd1ffb1215b42a13bb90662ad53c16d723eb8123a747d7a5aeeb3bc22310639a
+  data.tar.gz: 2a073e29ebe320b9336156d80832f89f1b05300398d8ca5fb0551cc51772aa33359ee71652d0bc538d7e29e6f52b44bebc054232ec9bf06b22a7368710d61329

data/README.md

@@ -29,7 +29,25 @@ SgtnClient::Source.loadBundles(locale)
 SgtnClient::Translation.getString(component, key, locale)
 
 ### Get a string's translation and format it with placeholders
-SgtnClient::Translation.getString_F(component, key, args, locale)
+SgtnClient::Translation.getString_f(component, key, args, locale)
+
+### Get a component's translations
+SgtnClient::Translation.getStrings(component, locale)
+
+
+## API with request_store
+
+Before call below APIs(without locale and component arguments), it requires to set the locale
+and component add the initial codes.
+
+### Get a string's translation
+SgtnClient::T.s(key)
+
+### Get a string's translation and format it with placeholders
+SgtnClient::T.s_f(key, args)
+
+### Get a component's translations
+SgtnClient::T.c()
 
 
 

data/lib/sgtn-client/api/source.rb

@@ -2,7 +2,7 @@ require 'erb'
 require 'yaml'
 
 module SgtnClient
-
+  
   autoload :CacheUtil,       "sgtn-client/util/cache-util"
 
   class Source
@@ -41,18 +41,16 @@ module SgtnClient
         env = SgtnClient::Config.default_environment
         SgtnClient::Config.configurations.default = locale
         source_bundle = SgtnClient::Config.configurations[env]["source_bundle"]
-        SgtnClient.logger.debug "Loading [" + locale + "] bundles from path: " + source_bundle
+        SgtnClient.logger.debug "Loading [" + locale + "] source bundles from path: " + source_bundle
         Dir.children(source_bundle).each do |component|
           yamlfile = File.join(source_bundle, component + "/" + locale + ".yml")
           bundle = read_yml(yamlfile)
           cachekey = SgtnClient::CacheUtil.get_cachekey(component, locale)
           SgtnClient::CacheUtil.write_cache(cachekey,bundle)
         end
-
       end
 
       private
-
       def self.getBundle(component, locale)
         env = SgtnClient::Config.default_environment
         source_bundle = SgtnClient::Config.configurations[env]["source_bundle"]
@@ -71,7 +69,6 @@ module SgtnClient
         erb.filename = file_name
         YAML.load(erb.result)
       end
-
   end
 
 end

data/lib/sgtn-client/api/t.rb

@@ -0,0 +1,22 @@
+module SgtnClient
+    class T < Translation
+
+        def self.s(key)
+            locale = RequestStore.store[:locale]
+            component = RequestStore.store[:component]
+            return getString(component, key, locale)
+        end
+
+        def self.s_f(key, args)
+            locale = RequestStore.store[:locale]
+            component = RequestStore.store[:component]
+            return getString_f(component, key, args, locale)
+        end
+
+        def self.c()
+            locale = RequestStore.store[:locale]
+            component = RequestStore.store[:component]
+            return getStrings(component, locale)
+        end
+    end
+end

data/lib/sgtn-client/sgtn-client.rb

@@ -4,6 +4,7 @@ module SgtnClient
       end
 
       autoload :Translation,        "sgtn-client/api/translation"
+      autoload :T,                  "sgtn-client/api/t"
       autoload :Source,             "sgtn-client/api/source"
       autoload :Config,             "sgtn-client/core/config"
       autoload :Logging,            "sgtn-client/core/logging"

data/lib/version.rb

@@ -1,3 +1,3 @@
 
-    VERSION_INFO = [0, 1, 3].freeze
+    VERSION_INFO = [0, 1, 4].freeze
     VERSION = VERSION_INFO.map(&:to_s).join('.').freeze

data/spec/unit/request_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'request_store'
+
+describe SgtnClient do
+  describe "Locale" do
+
+    before :each do
+      env = SgtnClient::Config.default_environment
+      SgtnClient::Config.configurations[env]["bundle_mode"] = 'offline'
+      SgtnClient::Source.loadBundles("default")
+      RequestStore.store[:locale] = 'zh-Hans'
+      RequestStore.store[:component] = 'JAVA'
+    end
+
+    it "GET" do
+      expect(SgtnClient::T.s("helloworld")).to eq '你好世界'
+      expect(SgtnClient::T.s_f("welcome", ["机器人", "虚拟世界"])).to eq '机器人，欢迎登录虚拟世界！'
+      expect(SgtnClient::T.c()["component"]).to eq 'JAVA'
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -216,20 +230,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: twitter_cldr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.6'
 description: Singleton Ruby client
 email: g11n-vip-project@vmware.com
 executables: []
@@ -241,6 +241,7 @@ files:
 - README.md
 - Rakefile
 - lib/sgtn-client/api/source.rb
+- lib/sgtn-client/api/t.rb
 - lib/sgtn-client/api/translation.rb
 - lib/sgtn-client/core/cache.rb
 - lib/sgtn-client/core/config.rb
@@ -274,6 +275,7 @@ files:
 - spec/unit/logging_spec.rb
 - spec/unit/offclient_spec.rb
 - spec/unit/onclient_spec.rb
+- spec/unit/request_spec.rb
 - spec/unit/version_spec.rb
 homepage: https://github.com/vmware/singleton
 licenses:
@@ -320,4 +322,5 @@ test_files:
 - spec/unit/logging_spec.rb
 - spec/unit/offclient_spec.rb
 - spec/unit/onclient_spec.rb
+- spec/unit/request_spec.rb
 - spec/unit/version_spec.rb