phrase 0.2.0.beta.8 → 0.2.0

data/lib/phrase/backend/phrase_service.rb

@@ -11,20 +11,34 @@ class Phrase::Backend::PhraseService
   end
   
   def translate(*args)
-    key = lookup_normalized_key(*args)
-    if Phrase.disabled? or key_is_blacklisted?(key[:key]) or (args.last.is_a?(Hash) and args.last[:resolve] == false)
+    if to_be_translated_without_phrase?(args)
       I18n.translate_without_phrase(*args)
     else
-      phrase_delegate_for(key[:key], *args)
+      phrase_delegate_for(args)
     end
   end
 
 protected
-  def key_is_blacklisted?(key)
+  def to_be_translated_without_phrase?(args)
+    Phrase.disabled? or has_been_given_blacklisted_key?(args) or has_been_forced_to_resolve_with_phrase?(args)
+  end
+
+  def has_been_given_blacklisted_key?(args)
+    key = given_key_from_args(args)
+    has_blacklist_entry_for_key?(key)
+  end
+
+  def has_been_forced_to_resolve_with_phrase?(args)
+    (args.last.is_a?(Hash) and args.last[:resolve] == false)
+  end
+
+  def given_key_from_args(args)
+    extract_normalized_key_from_args(args)
+  end
+
+  def has_blacklist_entry_for_key?(key)
     blacklisted_keys.each do |blacklisted_key|
-      if key.to_s[/\A#{blacklisted_key.gsub("*", ".*")}\Z/].present?
-        return true
-      end
+      return true if present?(key.to_s[/\A#{blacklisted_key.gsub("*", ".*")}\Z/])
     end
     false
   end
@@ -37,66 +51,85 @@ protected
     @api_client ||= Phrase::Api::Client.new(Phrase.auth_token)
   end
   
-  def phrase_delegate_for(key=nil, *args)
-    return nil unless key.present?
+  def phrase_delegate_for(args)
+    key = given_key_from_args(args)
+    return nil unless present?(key)
     options = args[1].nil? ? {} : args[1]
     Phrase::Delegate.new(key, options)
   end
 
-  def lookup_normalized_key(*args)
-    caller = identify_caller
-    duped_args = args.map { |item| item.is_a?(Symbol) ? item : item.dup }
+  def extract_normalized_key_from_args(args)
+    transformed_args = transform_args(args)
+    normalized_key(transformed_args)
+  end
+
+  def transform_args(args)
+    duped_args = args.map { |item| (item.is_a?(Symbol) or item.nil?) ? item : item.dup }
+    transform_args_based_on_caller(duped_args)
+  end
+
+
+  def normalized_key(duped_args)
+    splitted_args = split_args(duped_args)
+    key = I18n::Backend::Flatten.normalize_flat_keys(*splitted_args)
+    key.gsub!("..", ".")
+    key
+  end
+  
+  def split_args(args)
+    options = options_from_args(args) 
+    key ||= args.shift
+    locale = options.delete(:locale) || I18n.locale
+    return [locale, key, options[:scope], nil]
+  end
+
+  def options_from_args(args)
+    args.last.is_a?(Hash) ? args.pop : {}
+  end
+
+  def transform_args_based_on_caller(args)
+    translation_caller = identify_caller
     
-    if caller && duped_args.first =~ /^\./
-      duped_args = transform_args_for_caller(caller, *duped_args)
-    end
+    if translation_caller and args.first =~ /^\./
+      options = options_from_args(args)
 
-    new_args = split_args(*duped_args)
+      if not present?(options[:scope]) and present?(translation_caller)
+        options[:scope] = translation_caller
+      end
 
-    normalized_key = I18n::Backend::Flatten.normalize_flat_keys(*new_args)
-    normalized_key.gsub!("..", ".")
+      args.push(options)
+      parts = args.first.to_s.split(".").select { |e| not blank?(e) }
+      args[0] = parts[0] if parts.size == 1
+    end
 
-    {:key => normalized_key}
+    args
   end
 
   def identify_caller
-    caller = nil
-    send(:caller)[0..6].each do |string|
-      caller = match_caller(string) unless caller
+    translation_caller = nil
+    send(:caller)[0..6].each do |intermediate_caller|
+      translation_caller = calling_template(intermediate_caller) unless translation_caller
     end
     
-    if caller && caller.present? 
-      find_lookup_scope(caller) 
+    if present?(translation_caller)
+      find_lookup_scope(translation_caller)
     else
       nil
     end
   end
 
-  def match_caller(string)
+  def calling_template(string)
     string.match(/(views)(\/.+)(?>:[0-9]+:in)/)
   end
 
-  def split_args(*args)
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    key ||= args.shift
-    locale = options.delete(:locale) || I18n.locale
-    return [locale, key, options[:scope], nil]
+  def blank?(str)
+    raise "blank?(str) can only be given a String or nil" unless str.is_a?(String) or str.nil?
+    str.nil? or str == '' 
   end
 
-  def transform_args_for_caller(caller, *args)
-    _scope = caller
-
-    options = args.last.is_a?(Hash) ? args.pop : {}
-
-    if !options[:scope].presence && _scope.presence
-      options[:scope] = _scope
-    end
-
-    args.push(options)
-    parts = args.first.to_s.split(".").select { |e| !e.blank? }
-    args[0] = parts[0] if parts.size == 1
-
-    return args
+  def present?(str)
+    raise "present?(str) can only be given a String or nil" unless str.is_a?(String) or str.nil?
+    not blank?(str)
   end
 
   def find_lookup_scope(caller)

data/phrase.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "phrase"
-  s.version = "0.2.0.beta.8"
+  s.version = "0.2.0"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Dynport GmbH"]
   s.email = ["info@phraseapp.com"]

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.8
-  prerelease: 6
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Dynport GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70300432260120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300432260120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70300432259400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: 2.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70300432259400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.8
 description: phrase allows you to edit translations inline, on the page itself. More
   information at phraseapp.com
 email:
@@ -83,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: phrase
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The best way to manage i18n.