i18n_scopes 0.3.2 → 0.4.0

data/lib/i18n_scopes/scope.rb

@@ -49,6 +49,9 @@ module I18nScopes
         define_method(as) do |*args|
           scoped_translation(self.class.i18n_scope_helper[name], *args)
         end
+        define_method(:"#{as}_key") do |*args|
+          scoped_translation_key(self.class.i18n_scope_helper[name], *args)
+        end
       end
 
       # this method creates a default scope

data/lib/i18n_scopes/translation_methods.rb

@@ -13,9 +13,31 @@ module I18nScopes
     #   * +path_extension+: +Array+ an additional path to the one configued using Scope::ClassMethods#i18n_scope (will be attached to the end)
     #   * +respondable+: an array of objects on which the methods should be looked up
     #   * +parameter_matchings+: a hash containing arguments for the dynamic method calls
+    #   * +scoped_default+: this can either be true, if the default translation should be scoped or can be an array with the same args as this method
+    # === Returns:
+    # a translated string
     def scoped_translation(scope_helper, *args)
+      scope = scoped_translation_key(scope_helper, *args)
       options = args.extract_options!
-      
+      return I18n.translate *args, options.merge(scope: scope)
+    end
+
+    # translates the given key under the configured scope
+    # 
+    # === Params:
+    # * +key+: the translation key to lookup
+    # * +options+:
+    #   * +path+: +Array+ the path to be overwritten
+    #   * +path_extension+: +Array+ an additional path to the one configued using Scope::ClassMethods#i18n_scope (will be attached to the end)
+    #   * +respondable+: an array of objects on which the methods should be looked up
+    #   * +parameter_matchings+: a hash containing arguments for the dynamic method calls
+    # === Returns:
+    # The translation key
+    def scoped_translation_key(scope_helper, *args)
+      dupped  = args.dup
+      options = dupped.extract_options!
+      key     = dupped.shift    
+
       additional_parameters = if self.respond_to?(:i18n_parameter_matchings)
         self.i18n_parameter_matchings
       else
@@ -31,7 +53,7 @@ module I18nScopes
       scope = scope_helper.scope_from_path(self, options, parameter_matchings)
       
       scope += options[:scope] if options.include?(:scope)
-      return I18n.translate *args, options.merge(scope: scope)
+      return scope       
     end
 
     # returns the i18n_scope_helper instance of TranslationHelper

data/lib/i18n_scopes/version.rb

@@ -1,3 +1,3 @@
 module I18nScopes
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/example_classes/scope_t_with_path.rb

@@ -25,6 +25,10 @@ class ScopeTWithPath
     t_flash(:message)
   end
 
+  def translate_with_default
+    t_flash(:message_not_found, default: :another_message)
+  end
+
   protected
   def class_prefix
     :some_prefix_from_local_class

data/spec/locales/en.yml

@@ -10,6 +10,9 @@ en:
             name: ScopeTWithPathAndRespondable
         inherited:
           name: InheritedScope
+  static_default:
+    scope_t_with_path:
+      default_message: ScopeTWithPathFallbackScopeMessage
 
   some_module:
       prefix_suffix:
@@ -21,8 +24,9 @@ en:
   scope_t_with_path:
     flashes:
       message: ScopeTWithPathFromScope
+      another_message: ScopeTWithPathFallbackMessage
   inheritance_overwritten:
     flashes: 
       message: InheritedScopeOverwritten
   scopes:
-    name: ScopeTWithPathAndControllerName
+    name: ScopeTWithPathAndControllerName

data/spec/should_define_scope_spec.rb

@@ -3,7 +3,6 @@ require 'example_classes/scope_t_with_path'
 require 'example_classes/respondable'
 
 describe ScopeTWithPath do
-
   
   its(:translate)       { should == "ScopeTWithPathTranslationFromFile"}
 
@@ -15,4 +14,6 @@ describe ScopeTWithPath do
 
   its(:translate_flash)             { should == "ScopeTWithPathFromScope" }
 
+  its(:translate_with_default)                            { should == "ScopeTWithPathFallbackMessage" }
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_scopes
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec