i18n_scopes 0.3.1 → 0.3.2

data/README.md

@@ -30,7 +30,7 @@ Or install it yourself as:
 ### In your class (for example Controller)
     
     class Local::ExampleController < ActionController::Base
-      i18n_default_scope :class_name, :translation, :action_name, :strip_controller_suffix => true, :plural_class => false
+      i18n_default_scope :class_name, :translation, :action_name, :strip_controller_suffix => true, :plural_classes => false
       i18n_scope :flash, :class_name, :action_name, :flashes
 
       def index

data/lib/i18n_scopes/scope.rb

@@ -24,11 +24,11 @@ module I18nScopes
       # === Params:
       # * +path+: Either a single String or Symbol, or an Array of Symbols and Strings
       # * +options+: options to be used within this class, they will overwrite the configuration made in Configuration
-      #   * :plural_class: if the class name should be pluralized or singularized
+      #   * :plural_classes: if the class name should be pluralized or singularized
       #   * :strip_controller_suffix: if the _controller suffix of classes should be stripped or not
       # 
       # == Usage:
-      #   i18n_scope :flash, :modules, :class_name, :action_name, :custom_value, "static_prefix", :plural_class => true, :strip_controller_suffix => true
+      #   i18n_scope :flash, :modules, :class_name, :action_name, :custom_value, "static_prefix", :plural_classes => true, :strip_controller_suffix => true
       #
       # this will create a +t_flash+ method
       #

data/lib/i18n_scopes/translation_helper.rb

@@ -29,6 +29,7 @@ module I18nScopes
       respondables = [object]
       respondables += [*options.delete(:respondable)]       if options.include?(:respondable)
       respondables << I18nScopes::TranslationUtils # add utils at last
+      parameter_matchings[:options] = self.options.merge(parameter_matchings[:options]) # merge options
       custom_path.each do |path_name|
         if path_name.is_a?(Symbol)
           # find a respondable which responds_to path_name

data/lib/i18n_scopes/translation_methods.rb

@@ -22,7 +22,6 @@ module I18nScopes
         {}
       end
       additional_parameters.merge!(options.delete(:parameter_matchings)) if options.include?(:parameter_matchings)
-
       parameter_matchings = {
         klass:   self.class,
         object:  self,

data/lib/i18n_scopes/translation_utils.rb

@@ -2,8 +2,6 @@ module I18nScopes
 
   module TranslationUtils
 
-    CONTROLLER_SUFFIX = "_controller"
-
     # this method will return all modules in a array, each module will be underscored
     #
     # === Params:
@@ -16,20 +14,19 @@ module I18nScopes
 
     # this method will return a underscored class_name
     #
-    # Note: plural_class and strip_controller_suffix will be used here
+    # Note: plural_classes and strip_controller_suffix will be used here
     #
     # === Params:
     # * +klass+: the class on which the name should be get
-    # * +options+: options like plural_class and strip_controller_suffix
+    # * +options+: options like plural_classes and strip_controller_suffix
     def self.class_name(klass, options = {})
-      class_name_options = options.merge(options)
-      class_name = if class_name_options[:strip_controller_suffix] && klass.respond_to?(:controller_name)
+      class_name = if options[:strip_controller_suffix] && klass.respond_to?(:controller_name)
         klass.controller_name
       else
         demodulized = ActiveSupport::Inflector.demodulize(klass.name) 
         ActiveSupport::Inflector.underscore(demodulized)
       end
-      if class_name_options[:plural_class]
+      if options[:plural_classes]
         ActiveSupport::Inflector.pluralize(class_name)
       else
         ActiveSupport::Inflector.singularize(class_name)

data/lib/i18n_scopes/version.rb

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

data/spec/example_classes/scope_t_with_path.rb

@@ -18,7 +18,7 @@ class ScopeTWithPath
   end
 
   def translate_with_respondable
-    t_scoped(:name, :path_extension => [:type], :respondable => Respondable.new)
+    t_scoped(:name, :path_extension => [:type], respondable: Respondable.new)
   end
 
   def translate_flash

data/spec/example_classes/translate_without_controller_suffix.rb

@@ -0,0 +1,15 @@
+class TranslateWithoutControllerSuffix
+
+  include I18nScopes::Scope
+
+  i18n_scope :controller_name, :class_name, strip_controller_suffix: true, plural_classes: false
+
+  def translate
+    t_controller_name(:name)
+  end
+
+  def self.controller_name
+    "scopes"
+  end
+
+end

data/spec/locales/en.yml

@@ -23,4 +23,6 @@ en:
       message: ScopeTWithPathFromScope
   inheritance_overwritten:
     flashes: 
-      message: InheritedScopeOverwritten
+      message: InheritedScopeOverwritten
+  scopes:
+    name: ScopeTWithPathAndControllerName

data/spec/should_translate_without_controller_name_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+require 'example_classes/translate_without_controller_suffix'
+
+describe TranslateWithoutControllerSuffix do
+
+  
+  its(:translate)       { should == "ScopeTWithPathAndControllerName"}
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_scopes
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -57,6 +57,7 @@ files:
 - spec/example_classes/scope_t_with_path_in_module.rb
 - spec/example_classes/should_define_scope.rb
 - spec/example_classes/should_have_attached_scoped_t.rb
+- spec/example_classes/translate_without_controller_suffix.rb
 - spec/include_scope_spec.rb
 - spec/inherit_from_parent_spec.rb
 - spec/inherited_spec.rb
@@ -64,6 +65,7 @@ files:
 - spec/scope_spec.rb
 - spec/should_define_scope_in_module_spec.rb
 - spec/should_define_scope_spec.rb
+- spec/should_translate_without_controller_name_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/menostos/i18n_scopes
 licenses: []
@@ -99,6 +101,7 @@ test_files:
 - spec/example_classes/scope_t_with_path_in_module.rb
 - spec/example_classes/should_define_scope.rb
 - spec/example_classes/should_have_attached_scoped_t.rb
+- spec/example_classes/translate_without_controller_suffix.rb
 - spec/include_scope_spec.rb
 - spec/inherit_from_parent_spec.rb
 - spec/inherited_spec.rb
@@ -106,4 +109,5 @@ test_files:
 - spec/scope_spec.rb
 - spec/should_define_scope_in_module_spec.rb
 - spec/should_define_scope_spec.rb
+- spec/should_translate_without_controller_name_spec.rb
 - spec/spec_helper.rb