phrase 0.2.0.beta.3 → 0.2.0.beta.4

data/lib/phrase.rb

@@ -35,6 +35,10 @@ module Phrase
     def enabled?
       enabled
     end
+    
+    def disabled?
+      !enabled
+    end
   end
   
   autoload :ViewHelpers, 'phrase/view_helpers'

data/lib/phrase/api/client.rb

@@ -28,6 +28,15 @@ class Phrase::Api::Client
     locales
   end
   
+  def fetch_blacklisted_keys
+    result = perform_api_request("/blacklisted_keys", :get)
+    blacklisted_keys = []
+    JSON.parse(result).map do |blacklisted_key| 
+      blacklisted_keys << blacklisted_key['name']
+    end
+    blacklisted_keys
+  end
+  
   def translate(key)
     raise "You must specify a key" if key.nil? or key.blank?
     keys = {}    

data/lib/phrase/backend/base.rb

@@ -1,94 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-require 'phrase/delegate'
-
 module Phrase::Backend::Base
-  
-  def translate(*args)
-    if Phrase.enabled?
-      key = lookup_normalized_key(*args)
-      phrase_delegate_for(key[:key], *args)
-    else
-      I18n.translate_without_phrase(*args)
-    end
-  end
-
-  protected
-    def phrase_delegate_for(key=nil, *args)
-      return nil unless key.present?
-      options = args[1].nil? ? {} : args[1]
-      Phrase::Delegate.new(key, options)
-    end
-
-    def lookup_normalized_key(*args)
-      caller = identify_caller
-
-      if caller && args.first =~ /^\./
-        args = transform_args_for_caller(caller, *args)
-      end
-
-      new_args = split_args(*args)
-
-      normalized_key = I18n::Backend::Flatten.normalize_flat_keys(*new_args)
-      normalized_key.gsub!("..", ".")
-
-      {:key => normalized_key}
-    end
-
-    def identify_caller
-      caller = nil
-      send(:caller)[0..6].each do |string|
-        caller = match_caller(string) unless caller
-      end
-      
-      if caller && caller.present? 
-        find_lookup_scope(caller) 
-      else
-        nil
-      end
-    end
-
-    def match_caller(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]
-    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
-    end
-
-    def find_lookup_scope(caller)
-      split_path = caller[2][1..-1].split(".")[0].split("/")
-
-      template_or_partial = remove_underscore_form_partial(split_path[-1])
-      split_path[-1] = template_or_partial
-
-      split_path.map!(&:to_sym)
-    end
+end
 
-    def remove_underscore_form_partial(template_or_partial)
-      if template_or_partial.to_s[0,1] == "_"
-        template_or_partial.to_s[1..-1] 
-      else
-        template_or_partial.to_s
-      end
-    end
-end
+require 'phrase/backend/phrase_service'

data/lib/phrase/backend/phrase_service.rb

@@ -1,11 +1,117 @@
 # -*- encoding : utf-8 -*-
 
-module Phrase::Backend
-  class PhraseService
-    include Base
+require 'phrase/delegate'
+
+class Phrase::Backend::PhraseService
+  
+  attr_accessor :api_client, :blacklisted_keys
+    
+  def initialize(args = {})
+    self
+  end
+  
+  def translate(*args)
+    key = lookup_normalized_key(*args)    
+    if Phrase.disabled? or key_is_blacklisted?(key[:key])
+      I18n.translate_without_phrase(*args)
+    else
+      phrase_delegate_for(key[:key], *args)
+    end
+  end
+
+protected
+  def key_is_blacklisted?(key)
+    blacklisted_keys.each do |blacklisted_key|
+      if key.to_s[/\A#{blacklisted_key.gsub("*", ".*")}\Z/].present?
+        return true
+      end
+    end
+    false
+  end
+  
+  def blacklisted_keys
+    @blacklisted_keys ||= api_client.fetch_blacklisted_keys
+  end
+  
+  def api_client
+    @api_client ||= Phrase::Api::Client.new(Phrase.auth_token)
+  end
+  
+  def phrase_delegate_for(key=nil, *args)
+    return nil unless key.present?
+    options = args[1].nil? ? {} : args[1]
+    Phrase::Delegate.new(key, options)
+  end
+
+  def lookup_normalized_key(*args)
+    caller = identify_caller
+
+    if caller && args.first =~ /^\./
+      args = transform_args_for_caller(caller, *args)
+    end
+
+    new_args = split_args(*args)
+
+    normalized_key = I18n::Backend::Flatten.normalize_flat_keys(*new_args)
+    normalized_key.gsub!("..", ".")
+
+    {:key => normalized_key}
+  end
+
+  def identify_caller
+    caller = nil
+    send(:caller)[0..6].each do |string|
+      caller = match_caller(string) unless caller
+    end
     
-    def initialize(args = {})
-      self
-    end    
+    if caller && caller.present? 
+      find_lookup_scope(caller) 
+    else
+      nil
+    end
+  end
+
+  def match_caller(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]
+  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
+  end
+
+  def find_lookup_scope(caller)
+    split_path = caller[2][1..-1].split(".")[0].split("/")
+
+    template_or_partial = remove_underscore_form_partial(split_path[-1])
+    split_path[-1] = template_or_partial
+
+    split_path.map!(&:to_sym)
+  end
+
+  def remove_underscore_form_partial(template_or_partial)
+    if template_or_partial.to_s[0,1] == "_"
+      template_or_partial.to_s[1..-1] 
+    else
+      template_or_partial.to_s
+    end
   end
 end

data/lib/phrase/delegate.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 require 'phrase/api'
 
 class Phrase::Delegate
@@ -17,6 +19,7 @@ class Phrase::Delegate
   end
   
   def method_missing(*args, &block)
+    puts args.first
     if @key.respond_to?(args.first) 
       to_s.send(*args)
     else

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.3"
+  s.version = "0.2.0.beta.4"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Dynport GmbH"]
   s.email = ["info@phraseapp.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.3
+  version: 0.2.0.beta.4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport