alephant-renderer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fee80f6f73582dd588edaa90618125a27ceaf6c
-  data.tar.gz: 19487c21a2c959aa75195ce3039cd5ebad362edc
+  metadata.gz: fc887b41ef374aeb80db2cb2a46ec195cca52e7e
+  data.tar.gz: 51cc19c95ec243a96cee9238f78389c04ced70f5
 SHA512:
-  metadata.gz: 108b9c8f2ba7e33146c5c377c9bb2fd36bb6e331a162308a4dfbc066cd7744b21172a51c4b3b343133bb4837399a5ff4f5664a1c10db0e4c04de267f6dde512b
-  data.tar.gz: 46db4d9d1bbe6e89d5bbbe5fcf5c1461ab5172dc4b1a5120a1ce31b4e9d916b2d04ebbc3f4a11765aab9091b05d1af743f8b061c2d05a08719271cf3381f971e
+  metadata.gz: 2eea51315385b73e5ff8971d8bdf4e75cc40ef2716cc241aeee43f7828abadd0836560a648d573964d4fade6e7a918e502294dd952f7031fad196f55767d820b
+  data.tar.gz: bf73813fd0c097ebf63a77296cdde9b4f28f9374bc02abb051eb95225b0595fda64c7556a366aa153c600a65bbe687d6147450ff0d0c09b985e87ac471708013

data/lib/alephant/renderer/engines/mustache.rb

@@ -40,7 +40,7 @@ module Alephant
       def load_translations_from(base_path)
         if I18n.load_path.empty?
           I18n.config.enforce_available_locales = false
-          I18n.load_path << i18n_load_path_from(base_path)
+          I18n.load_path = i18n_load_path_from(base_path)
           I18n.backend.load_translations
         end
       end

data/lib/alephant/renderer/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Renderer
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/alephant/views/base.rb

@@ -14,16 +14,10 @@ module Alephant::Views
       @data = Hashie::Mash.new data
     end
 
-    def t(*args)
+    def t(key, params = {})
       I18n.locale = self.class::LOCALE
-      lambda do |comma_delimited_args|
-        args   = comma_delimited_args.strip.split ','
-        key    = args.shift
-        params = args.empty? ? {} : JSON.parse(args.first).with_indifferent_access
-        prefix = /\/([^\/]+)\./.match(template_file)[1]
-
-        I18n.translate("#{prefix}.#{key}", params)
-      end
+      prefix = /\/([^\/]+)\./.match(template_file)[1]
+      I18n.translate("#{prefix}.#{key}", params)
     end
 
     def self.inherited(subclass)

data/spec/fixtures/components/foo/models/welsh.rb

@@ -0,0 +1,5 @@
+module Fixtures
+  class Welsh < ::Alephant::Views::Base
+    LOCALE = :cy
+  end
+end

data/spec/fixtures/components/locale/cy.yml

@@ -0,0 +1,3 @@
+cy:
+  welsh:
+    bar: 'Welsh Translation'

data/spec/fixtures/components/locale/en.yml

@@ -0,0 +1,3 @@
+en:
+  base:
+    bar: 'Translation'

data/spec/spec_helper.rb

@@ -2,4 +2,5 @@ $: << File.join(File.dirname(__FILE__),"..", "lib")
 
 require 'pry'
 require 'alephant/renderer'
+require 'alephant/views/base'
 

data/spec/views_base_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require 'fixtures/components/foo/models/welsh'
+
+describe Alephant::Views::Base do
+  let(:base_path) do
+    File.join(
+      File.dirname(__FILE__),
+      'fixtures',
+      'components',
+      'foo'
+    )
+  end
+
+  describe "t(key, param{})" do
+    it "Translates a key for the default locale" do
+      Alephant::Renderer.create('foo', base_path, :model)
+
+      expect(subject.t('bar')).to eq('Translation')
+    end
+
+    it "Translates a key for an overridden locale" do
+      Alephant::Renderer.create('welsh', base_path, :model)
+
+      expect(Fixtures::Welsh.new.t('bar')).to eq('Welsh Translation')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alephant-renderer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Robert Kenny
@@ -214,10 +214,14 @@ files:
 - lib/alephant/views.rb
 - lib/alephant/views/base.rb
 - spec/fixtures/components/foo/models/foo.rb
+- spec/fixtures/components/foo/models/welsh.rb
 - spec/fixtures/components/foo/templates/bar.mustache
 - spec/fixtures/components/foo/templates/foo.mustache
+- spec/fixtures/components/locale/cy.yml
+- spec/fixtures/components/locale/en.yml
 - spec/renderer_spec.rb
 - spec/spec_helper.rb
+- spec/views_base_spec.rb
 - trans.yml
 homepage: ''
 licenses:
@@ -245,7 +249,11 @@ specification_version: 4
 summary: Render HTML snippets
 test_files:
 - spec/fixtures/components/foo/models/foo.rb
+- spec/fixtures/components/foo/models/welsh.rb
 - spec/fixtures/components/foo/templates/bar.mustache
 - spec/fixtures/components/foo/templates/foo.mustache
+- spec/fixtures/components/locale/cy.yml
+- spec/fixtures/components/locale/en.yml
 - spec/renderer_spec.rb
 - spec/spec_helper.rb
+- spec/views_base_spec.rb