i18n_scopes 0.2.1 → 0.3.0

data/lib/i18n_scopes/scope.rb

@@ -38,7 +38,6 @@ module I18nScopes
       def i18n_scope(name, *path)
         @i18n_scope_initialized ||= begin
           self.send :include, I18nScopes::TranslationMethods
-          # self.i18n_scope_helper ||=  self.i18n_scope_helper.nil? ? {} : self.i18n_scope_helper.dup
           self.i18n_scope_helper ||= {}
           true
         end

data/lib/i18n_scopes/translation_helper.rb

@@ -3,8 +3,6 @@ module I18nScopes
   # this class provides helper methods to determine the actual scope in your class
   class TranslationHelper
 
-    CONTROLLER_SUFFIX = "_controller"
-
     attr_accessor :path
     attr_accessor :options
 
@@ -30,7 +28,7 @@ module I18nScopes
       custom_path += [*options.delete(:path_extension)]     if options.include?(:path_extension)
       respondables = [object]
       respondables += [*options.delete(:respondable)]       if options.include?(:respondable)
-      respondables << self # add self at last
+      respondables << I18nScopes::TranslationUtils # add utils at last
       custom_path.each do |path_name|
         if path_name.is_a?(Symbol)
           # find a respondable which responds_to path_name
@@ -64,7 +62,7 @@ module I18nScopes
     # * +method_name+: the method name to call
     # * +parameter_matchings+: additional parameter_matchings as a Hash
     def value_from_method_call(object, respondables, method_name, parameter_matchings)
-      method = object.class.instance_method(method_name)
+      method = object.method(method_name)
       if method.arity == 0
         return object.send(method_name)
       else
@@ -100,51 +98,7 @@ module I18nScopes
       return args
     end
 
-    # this method will return all modules in a array, each module will be underscored
-    #
-    # === Params:
-    # * +klass+: the klass of which the modules should be used
-    def modules(klass)
-      modules = ActiveSupport::Inflector.deconstantize(klass.name)
-      modules = ActiveSupport::Inflector.underscore(modules)
-      modules.split("::")
-    end
-
-    # this method will return a underscored class_name
-    #
-    # Note: plural_class 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
-    def class_name(klass, options = {})
-      class_name_options = self.options.merge(options)
-      class_name = ActiveSupport::Inflector.demodulize(klass.name) 
-      class_name = ActiveSupport::Inflector.underscore(class_name)
-      class_name = class_name[0, class_name.length - CONTROLLER_SUFFIX.length] if class_name_options[:strip_controller_suffix] && class_name.end_with?(CONTROLLER_SUFFIX)
-      if class_name_options[:plural_class]
-        ActiveSupport::Inflector.pluralize(class_name)
-      else
-        ActiveSupport::Inflector.singularize(class_name)
-      end
-    end
-
-    # returns the method name of the original caller
-    def method_name
-      found_scoped_t_at = nil
-      caller.each_with_index do |call, index|
-        if call.include?("scoped_translation")
-          found_scoped_t_at = index
-          break
-        end
-      end
-      if found_scoped_t_at && call = caller[found_scoped_t_at + 1]
-        if /^(.+?):(\d+)(?::in `(.*)')?/ =~ call
-          return Regexp.last_match[3]
-        end
-      end
-      raise "Failed to get method_name"
-    end
+    
 
   end
 

data/lib/i18n_scopes/translation_utils.rb

@@ -0,0 +1,55 @@
+module I18nScopes
+
+  module TranslationUtils
+
+    CONTROLLER_SUFFIX = "_controller"
+
+    # this method will return all modules in a array, each module will be underscored
+    #
+    # === Params:
+    # * +klass+: the klass of which the modules should be used
+    def self.modules(klass)
+      modules = ActiveSupport::Inflector.deconstantize(klass.name)
+      modules = ActiveSupport::Inflector.underscore(modules)
+      modules.split("::")
+    end
+
+    # this method will return a underscored class_name
+    #
+    # Note: plural_class 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
+    def self.class_name(klass, options = {})
+      class_name_options = options.merge(options)
+      class_name = ActiveSupport::Inflector.demodulize(klass.name) 
+      class_name = ActiveSupport::Inflector.underscore(class_name)
+      class_name = class_name[0, class_name.length - CONTROLLER_SUFFIX.length] if class_name_options[:strip_controller_suffix] && class_name.end_with?(CONTROLLER_SUFFIX)
+      if class_name_options[:plural_class]
+        ActiveSupport::Inflector.pluralize(class_name)
+      else
+        ActiveSupport::Inflector.singularize(class_name)
+      end
+    end
+
+    # returns the method name of the original caller
+    def self.method_name
+      found_scoped_t_at = nil
+      caller.each_with_index do |call, index|
+        if call.include?("scoped_translation")
+          found_scoped_t_at = index
+          break
+        end
+      end
+      if found_scoped_t_at && call = caller[found_scoped_t_at + 1]
+        if /^(.+?):(\d+)(?::in `(.*)')?/ =~ call
+          return Regexp.last_match[3]
+        end
+      end
+      raise "Failed to get method_name"
+    end
+    
+  end
+
+end

data/lib/i18n_scopes/version.rb

@@ -1,3 +1,3 @@
 module I18nScopes
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/i18n_scopes.rb

@@ -7,5 +7,5 @@ require 'i18n_scopes/option_accessor'
 require 'i18n_scopes/configuration'
 require 'i18n_scopes/translation_methods'
 require 'i18n_scopes/translation_helper'
+require 'i18n_scopes/translation_utils'
 
-Object.send :include, I18nScopes::Scope

data/spec/example_classes/scope_t_with_path.rb

@@ -1,5 +1,7 @@
 class ScopeTWithPath
 
+  include I18nScopes::Scope
+
   i18n_default_scope "static_prefix", :class_prefix, :with_a_parameter, :class_name
   i18n_scope :flash, :class_name, :flashes
 

data/spec/example_classes/scope_t_with_path_in_module.rb

@@ -1,6 +1,8 @@
 module SomeModule
   class ScopeTWithPathInModule
 
+    include I18nScopes::Scope
+
     i18n_default_scope :modules, :local, :class_name
 
     def translate

data/spec/example_classes/should_define_scope.rb

@@ -1,5 +1,7 @@
 class ShouldDefineScope
 
+  include I18nScopes::Scope
+
   i18n_default_scope "prefix"
 
 end

data/spec/example_classes/should_have_attached_scoped_t.rb

@@ -1,3 +1,5 @@
 class ShouldHaveAttachedScopedT
+
+  include I18nScopes::Scope
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_scopes
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -47,6 +47,7 @@ files:
 - lib/i18n_scopes/scope.rb
 - lib/i18n_scopes/translation_helper.rb
 - lib/i18n_scopes/translation_methods.rb
+- lib/i18n_scopes/translation_utils.rb
 - lib/i18n_scopes/version.rb
 - spec/configuration_spec.rb
 - spec/example_classes/inherit_from_parent.rb