tr8n_core 4.0.4 → 4.0.5

data/lib/tr8n_core/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,5 +23,5 @@
 
 
 module Tr8nCore
-  VERSION = "4.0.4"
+  VERSION = "4.0.5"
 end

data/spec/language_case_spec.rb

@@ -32,11 +32,11 @@ describe Tr8n::LanguageCase do
     end
 
     it "should correctly process default cases" do
-      possessive = @english.language_case_by_keyword('pos')
+      possessive = @english.case_by_keyword('pos')
       expect(possessive.apply("Michael")).to eq("Michael's")
 
 
-      plural = @english.language_case_by_keyword('plural')
+      plural = @english.case_by_keyword('plural')
 
       expect(plural.apply("fish")).to eq("fish")
       expect(plural.apply("money")).to eq("money")
@@ -48,7 +48,7 @@ describe Tr8n::LanguageCase do
       expect(plural.apply("quiz")).to eq("quizzes")
       expect(plural.apply("wife")).to eq("wives")
 
-      singular = @english.language_case_by_keyword('singular')
+      singular = @english.case_by_keyword('singular')
       expect(singular.apply("quizzes")).to eq("quiz")
       expect(singular.apply("cars")).to eq("car")
       expect(singular.apply("wives")).to eq("wife")

data/spec/tokens/data_spec.rb

@@ -27,36 +27,20 @@ describe Tr8n::Tokens::Data do
       user.stub(:last_name_with_prefix) {|prefix| "#{prefix} #{user.last_name}"}
 
       # tr("Hello {user}", "", {:user => current_user}}
-      expect(@token.token_value(user, {}, @english)).to eq(user.to_s)
-
-      # tr("Hello {user}", "", {:user => [current_user]}}
-      expect(@token.token_value([user], {}, @english)).to eq(user.to_s)
+      expect(@token.token_value(user, @english)).to eq(user.to_s)
 
       # tr("Hello {user}", "", {:user => [current_user, current_user.name]}}
-      expect(@token.token_value([user, user.first_name], {}, @english)).to eq(user.first_name)
-
-      # tr("Hello {user}", "", {:user => [current_user, "{$0} {$1}", "param1"]}}
-      expect(@token.token_value([user, "{$0} {$1}", "param1"], {}, @english)).to eq(user.to_s + " param1")
-      expect(@token.token_value([user, "{$0} {$1} {$2}", "param1", "param2"], {}, @english)).to eq(user.to_s + " param1 param2")
+      expect(@token.token_value([user, user.first_name], @english)).to eq(user.first_name)
 
       # tr("Hello {user}", "", {:user => [current_user, :name]}}
-      expect(@token.token_value([user, :first_name], {}, @english)).to eq(user.first_name)
-
-      # tr("Hello {user}", "", {:user => [current_user, :method_name, "param1"]}}
-      expect(@token.token_value([user, :last_name_with_prefix, 'Mr.'], {}, @english)).to eq("Mr. Anderson")
-
-      # tr("Hello {user}", "", {:user => [current_user, lambda{|user| user.name}]}}
-      expect(@token.token_value([user, lambda{|user| user.to_s}], {}, @english)).to eq(user.to_s)
-
-      # tr("Hello {user}", "", {:user => [current_user, lambda{|user, param1| user.name}, "param1"]}}
-      expect(@token.token_value([user, lambda{|user, param1| user.to_s + " " + param1}, "extra_param1"], {}, @english)).to eq(user.to_s + " extra_param1")
+      expect(@token.token_value([user, :first_name], @english)).to eq(user.first_name)
 
       # tr("Hello {user}", "", {:user => {:object => current_user, :value => current_user.name}]}}
-      expect(@token.token_value({:object => user, :value => user.to_s}, {}, @english)).to eq(user.to_s)
+      expect(@token.token_value({:object => user, :value => user.to_s}, @english)).to eq(user.to_s)
 
       # tr("Hello {user}", "", {:user => {:object => current_user, :attribute => :first_name}]}}
-      expect(@token.token_value({:object => user, :attribute => :first_name}, {}, @english)).to eq(user.first_name)
-      expect(@token.token_value({:object => {:first_name => "Michael"}, :attribute => :first_name}, {}, @english)).to eq("Michael")
+      expect(@token.token_value({:object => user, :attribute => :first_name}, @english)).to eq(user.first_name)
+      expect(@token.token_value({:object => {:first_name => "Michael"}, :attribute => :first_name}, @english)).to eq("Michael")
     end
 
     it "should perform complete substitution" do
@@ -65,14 +49,8 @@ describe Tr8n::Tokens::Data do
 
       [
         {:user => user},                                                                        "Hello Tom Anderson",
-        {:user => [user]},                                                                      "Hello Tom Anderson",
         {:user => [user, user.first_name]},                                                     "Hello Tom",
-        {:user => [user, "{$0} {$1}", "param1"]},                                               "Hello Tom Anderson param1",
-        {:user => [user, "{$0} {$1} {$2}", "param1", "param2"]},                                "Hello Tom Anderson param1 param2",
         {:user => [user, :first_name]},                                                         "Hello Tom",
-        {:user => [user, :last_name_with_prefix, 'Mr.']},                                       "Hello Mr. Anderson",
-        {:user => [user, lambda{|user| user.to_s}]},                                            "Hello Tom Anderson",
-        {:user => [user, lambda{|user, param1| user.to_s + " " + param1}, "extra_param1"]},     "Hello Tom Anderson extra_param1",
         {:user => {:object => user, :value => user.to_s}},                                      "Hello Tom Anderson",
         {:user => {:object => user, :attribute => :first_name}},                                "Hello Tom",
         {:user => {:object => {:first_name => "Michael"}, :attribute => :first_name}},          "Hello Michael"
@@ -96,62 +74,38 @@ describe Tr8n::Tokens::Data do
       end
 
       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], {
-          :translate_items => false,
-          :expandable => false,
-          :minimizable => true,
-          :to_sentence => true,
-          :limit => 4,
-          :separator => ", ",
-          :description => nil,
-          :andor => 'and'
-        }], {}, @english)).to eq("First name 1, First name 2, First name 3, First name 4 and 2 others")
-
-        expect(token.token_value([users, [:first_name], {
-          :translate_items => false,
-          :expandable => false,
-          :minimizable => true,
-          :to_sentence => false,
-          :limit => 4,
-          :separator => ", ",
-          :description => nil,
-          :andor => 'and'
-        }], {}, @english)).to eq("First name 1, First name 2, First name 3, First name 4, First name 5, First name 6")
-
-        expect(token.token_value([users, [:first_name], {
-          :translate_items => false,
-          :expandable => false,
-          :minimizable => true,
-          :to_sentence => true,
-          :limit => 4,
-          :separator => ", ",
-          :description => nil,
-          :andor => 'or'
-        }], {}, @english)).to eq("First name 1, First name 2, First name 3, First name 4 or 2 others")
-
-        expect(token.token_value([users, [:first_name], {
-          :translate_items => false,
-          :expandable => false,
-          :minimizable => true,
-          :to_sentence => true,
-          :limit => 2,
-          :separator => ", ",
-          :description => nil,
-          :andor => 'or'
-        }], {}, @english)).to eq("First name 1, First name 2 or 4 others")
-
-        expect(token.token_value([users, [:first_name], {
-          :translate_items => false,
-          :expandable => false,
-          :minimizable => true,
-          :to_sentence => true,
-          :limit => 2,
-          :separator => " & ",
-          :description => nil,
-          :andor => 'or'
-        }], {}, @english)).to eq("First name 1 & First name 2 or 4 others")
+        expect(token.token_value([users, :first_name], @english)).to match("2 others")
+
+        expect(token.token_value([users, :first_name, {
+            :description => "List joiner",
+            :limit => 4,
+            :separator => ", ",
+            :joiner => 'and',
+            :less => '{laquo} less',
+            :expandable => false,
+            :collapsable => true
+        }], @english)).to eq("First name 1, First name 2, First name 3, First name 4 and 2 others")
+
+        expect(token.token_value([users, :first_name, {
+            :description => "List joiner",
+            :limit => 10,
+            :separator => ", ",
+            :joiner => 'and',
+            :less => '{laquo} less',
+            :expandable => false,
+            :collapsable => true
+        }], @english)).to eq("First name 1, First name 2, First name 3, First name 4, First name 5 and First name 6")
+
+        expect(token.token_value([users, :first_name, {
+            :joiner => 'or',
+            :expandable => false,
+        }], @english)).to eq("First name 1, First name 2, First name 3, First name 4 or 2 others")
+
+        expect(token.token_value([users, :first_name, {
+            :limit => 2,
+            :joiner => 'or',
+            :expandable => false,
+        }], @english)).to eq("First name 1, First name 2 or 4 others")
 
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_core
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -26,11 +26,12 @@ dependencies:
         version: '0'
 description: Tr8n core classes that can be used by any Ruby framework
 email:
-- michael@tr8nhub.com
+- michael@translationexchange.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/tr8n/api_client.rb
 - lib/tr8n/application.rb
 - lib/tr8n/base.rb
 - lib/tr8n/cache.rb
@@ -73,6 +74,7 @@ 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/languages/en-US.json
 - lib/tr8n_core/version.rb
 - lib/tr8n_core.rb
 - LICENSE