babylonia 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 471b84c7ea7c5f3e6a22c69a64b74438b159480c
-  data.tar.gz: 3895c1969ff6a922574c66123a819211e849f60f
+  metadata.gz: e5e07171440e9ebac6b51d3f768b68471dcbd5cd
+  data.tar.gz: 7c0141cd5353cfe4e8e4fa10abdad68675388466
 SHA512:
-  metadata.gz: 960ef518e49a6a76ab9fd5ac1a1016123b9b3a10cba86c2fb646f7ad2cdd03d52b55cdd1ad474c5b36c2188efeead630c238bf21ca42135cd1bc73538c9f8090
-  data.tar.gz: 1a0d5661cc64f338b0d83fac5bf1d8f370e4c33a526c65c749cd5a59f64262d3e168626aea25af7c7c13d98c3f609c921ab473acba4168553d9eb3722ae9925f
+  metadata.gz: bc939cba85b5aadb2bf909dcccafff796137489ee22956aaf91c000f347e21b3fc3db967f2736c871b78848f56b8f4b77ec65af1cc2c172da6548a056952b30d
+  data.tar.gz: df443e957bc998fb312d3f483f9fb38c68e8bfd817abf897db36f200ea7804811268cf1655a2b38a8f6508aefb76b836caa1e384c1d873120f3ec266bddab4e9

data/lib/babylonia/class_methods.rb

@@ -30,14 +30,15 @@ module Babylonia
       fields.each do |field|
         # Alias method chain the field to a translated value
         # @param [Symbol] locale Pass a locale to get the field translation in this specific locale
+        # @param [Boolean] fallback Whether a fallback should be used, defaults to true
         # @return [String, NilClass] Either the string with the translation, the fallback, the placeholder or nil
         # @example Call a field in italian
         #   your_instance.field(:it) #=> "Translation" 
         #
-        define_method :"#{field}_translated" do |l=nil|
+        define_method :"#{field}_translated" do |l=nil, options={fallback: true}|
           field_hash    = send(:"#{field}_hash")
           translation   = field_hash[l || locale]
-          translation   = field_hash[default_locale] if translation.nil? or translation.empty? and locale_fallback?
+          translation   = field_hash[default_locale] if translation.nil? or translation.empty? and options[:fallback] and locale_fallback?
           (translation.nil? or translation.empty?) ? missing_translation_placeholder(field) : translation
         end
         alias_method :"#{field}_raw", field
@@ -141,9 +142,20 @@ module Babylonia
       end
       
       # Define method missing to be able to access a language directly
+      # Enables to call a language virtual attribute directly
+      # @note Since the virtual attribute is called directly, there is no fallback on this unless you set it to true
+      # @example Call a getter directly
+      #   object.field_de #=> 'DEUTSCH'
+      # @example Call a setter directly
+      #   object.field_de = 'DEUTSCH'
+      # @example Call an untranslated field
+      #   object.field_it #=> nil
+      #
+      # @example Call a field with fallback
+      #   object.field_it(fallback: true)
       define_method :method_missing do |meth, *args, &block|
         if (m = meth.to_s.match(/\A([^_]+)_(\w+)(=)?\z/).to_a[1..3]) && localized?(m[0]) && has_available_locale?(m[1])
-          send(m[0] + m[2].to_s, m[2] ? {m[1].to_sym => args.first} : m[1].to_sym)
+          m[2] ? send(m[0] + m[2].to_s, {m[1].to_sym => args.first}) : send(m[0], m[1].to_sym, args.first || {})
         else
           super(meth, *args, &block)
         end

data/lib/babylonia/version.rb

@@ -1,5 +1,5 @@
 module Babylonia
   # The current gem version
   #
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/babylonia/class_methods_spec.rb

@@ -32,6 +32,11 @@ describe Babylonia::ClassMethods do
           it "should return the translation in that locale" do
             subject.marshes(:de).should == 'FALLBACK'
           end
+          context "with fallback to false" do
+            it "should return nil" do
+              subject.marshes(:it, fallback: false).should be_nil
+            end
+          end
         end
       end
       context "with only fallback data" do
@@ -66,10 +71,17 @@ describe Babylonia::ClassMethods do
         context "with the missing method matching the pattern FIELD_LANGUAGE" do
           let(:meth) { :marshes_en }
           it "should call the attribute method with an argument" do
-            subject.should_receive(:marshes).with(:en).once
+            subject.should_receive(:marshes).with(:en, {}).once
             subject.send(meth)
           end
         end
+        context "with the missing method matching the pattern FIELD_LANGUAGE and a fallback argument" do
+          let(:meth) { :marshes_en }
+          it "should call the attribute method with the fallback argument" do
+            subject.should_receive(:marshes).with(:en, {fallback: true}).once
+            subject.send(meth, fallback: true)
+          end
+        end
         context "with the missing method not matching the pattern" do
           let(:meth) { :marshes_something_else_entirely }
           it "should raise Method Missing" do
@@ -270,6 +282,11 @@ describe Babylonia::ClassMethods do
           it "should return the translation in that locale" do
             subject.grasslands(:de).should == 'FALLBACK'
           end
+          context "with fallback to false" do
+            it "should return the placeholder" do
+              subject.grasslands(:gb, fallback: false).should == "<span class='missing translation'>Translation missing for grasslands</span>"
+            end
+          end
         end
       end
       context "with only fallback data" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babylonia
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Beat Richartz