phrase 0.0.1 → 0.1

data/lib/phrase/backend/base.rb

@@ -1,115 +1,86 @@
 # -*- encoding : utf-8 -*-
 
 module Phrase::Backend::Base
-  PREFIX = "{{__phrase_"
-  SUFFIX = "__}}"
-  
-  attr_accessor :config
   
   def translate(*args)
-    key = lookup_normalized_key(*args)
-    case key[:translation]
-      when String, nil, "" then decorate_translation(key[:key])
-      else key[:translation]
+    if Phrase.enabled?
+      key = lookup_normalized_key(*args)
+      decorate_translation(key[:key])
+    else
+      I18n.translate_without_phrase(*args)
     end
   end
-  
-  def load_translations(*args)
-    raise NotImplementedError
-  end
-  
-  def store_translation(locale, key, translation, options = {})
-    I18n.backend.load_translations unless I18n.backend.initialized?
-    I18n.backend.store_translations(locale, key.expand_to_hash(translation))
-  end
-  
-  def raw_lookup(locale, key, scope=[], options={})
-    I18n.backend.load_translations unless I18n.backend.initialized?
-    keys = I18n.normalize_keys(locale, key, scope, options[:separator])
-    keys.inject(I18n.backend.send(:translations)) do |result, _key|
-      _key = _key.to_sym
-      return nil unless result.is_a?(Hash) && result.has_key?(_key)
-      result[_key]
-    end
-  end
-  
+
   protected
     def decorate_translation(key=nil)
       return nil unless key.presence
-      "#{PREFIX}#{key}#{SUFFIX}"
+      "#{Phrase.prefix}phrase_#{key}#{Phrase.suffix}"
     end
 
-    def translation_presence(*args)
-      I18n.translate!(*args)
-    rescue I18n::MissingTranslationData => e
-      nil
-    end
-    
     def lookup_normalized_key(*args)
-      translation = translation_presence(*args)
       caller = identify_caller
-    
-      if (translation.nil? || translation.is_a?(Hash)) && caller && args.first =~ /^\./
+
+      if caller && args.first =~ /^\./
         args = transform_args_for_caller(caller, *args)
-        translation = translation_presence(*args)
       end
-    
+
       new_args = split_args(*args)
-    
+
       normalized_key = I18n::Backend::Flatten.normalize_flat_keys(*new_args)
       normalized_key.gsub!("..", ".")
-    
-      {:key => normalized_key, :translation => translation}
+
+      {:key => normalized_key}
     end
 
     def identify_caller
       caller = nil
-      send(:caller)[0..6].each { |string| caller = match_caller(string) unless caller }
-      caller.present? ? find_lookup_scope(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 extract_required_vars(*args)
-      excluded = ["scope", "locale"]
-      required_vars = args.last.is_a?(Hash) ? args.pop.keys.sort { |a, b| a.to_s <=> b.to_s } : []
-      required_vars.delete_if { |var| excluded.include?(var.to_s) }
-    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] 
@@ -117,4 +88,4 @@ module Phrase::Backend::Base
         template_or_partial.to_s
       end
     end
-end
+end

data/lib/phrase/backend/phrase_service.rb

@@ -5,10 +5,8 @@ module Phrase::Backend
     include Base
     
     def initialize(args = {})
-      self.config = { "locales" => {}, "strings" => {} }
-      Phrase.available_locales = self.config["locales"].keys.map(&:to_sym)
       self
     end
     
   end
-end
+end

data/lib/phrase/backend.rb

@@ -1,134 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 module Phrase::Backend
-  # require_relative 'backend/base'
-module Phrase::Backend::Base
-  PREFIX = "{{__phrase_"
-  SUFFIX = "__}}"
-  
-  # attr_accessor :config
-  
-  def translate(*args)
-    key = lookup_normalized_key(*args)
-    case key[:translation]
-      when String, nil, "" then decorate_translation(key[:key])
-      else key[:translation]
-    end
-  end
-  
-  # def load_translations(*args)
-  #   raise NotImplementedError
-  # end
-  #   
-  # def raw_lookup(locale, key, scope=[], options={})
-  #   I18n.backend.load_translations unless I18n.backend.initialized?
-  #   keys = I18n.normalize_keys(locale, key, scope, options[:separator])
-  #   keys.inject(I18n.backend.send(:translations)) do |result, _key|
-  #     _key = _key.to_sym
-  #     return nil unless result.is_a?(Hash) && result.has_key?(_key)
-  #     result[_key]
-  #   end
-  # end
-  
-  protected
-    def decorate_translation(key=nil)
-      return nil unless key.presence
-      "#{PREFIX}#{key}#{SUFFIX}"
-    end
-
-    def translation_presence(*args)
-      I18n.translate!(*args)
-    rescue I18n::MissingTranslationData => e
-      nil
-    end
-    
-    def lookup_normalized_key(*args)
-      translation = translation_presence(*args)
-      caller = identify_caller
-    
-      if (translation.nil? || translation.is_a?(Hash)) && caller && args.first =~ /^\./
-        args = transform_args_for_caller(caller, *args)
-        translation = translation_presence(*args)
-      end
-    
-      new_args = split_args(*args)
-    
-      normalized_key = I18n::Backend::Flatten.normalize_flat_keys(*new_args)
-      normalized_key.gsub!("..", ".")
-    
-      {:key => normalized_key, :translation => translation}
-    end
-
-    def identify_caller
-      caller = nil
-      send(:caller)[0..6].each { |string| caller = match_caller(string) unless caller }
-      caller.present? ? find_lookup_scope(caller) : nil
-    end
-    
-    def match_caller(string)
-      string.match(/(views)(\/.+)(?>:[0-9]+:in)/)
-    end
-    
-    # def extract_required_vars(*args)
-    #   excluded = ["scope", "locale"]
-    #   required_vars = args.last.is_a?(Hash) ? args.pop.keys.sort { |a, b| a.to_s <=> b.to_s } : []
-    #   required_vars.delete_if { |var| excluded.include?(var.to_s) }
-    # 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
 
-  # require_relative 'backend/phrase_service'
-module Phrase::Backend
-  class PhraseService
-    include Base
-    
-    def initialize(args = {})
-      # self.config = { "locales" => {}, "strings" => {} }
-      # Phrase.available_locales = self.config["locales"].keys.map(&:to_sym)
-      self
-    end
-    
-  end
-end
-# LOCALE in keys mit schreiben, hilft der GUI!? -> manuel
-  
-end
+require File.join(File.dirname(__FILE__), 'backend/base')
+require File.join(File.dirname(__FILE__), 'backend/phrase_service')

data/lib/phrase/config.rb

@@ -1,16 +1,27 @@
 # -*- encoding : utf-8 -*-
+
 module Phrase
   class Config
-    def enabled?
-      ENV['TRANSLATABLE'] == "true" || (defined?(Rails) == true && Rails.env == "staging")
+    def client_version
+      Phrase::CLIENT_VERSION
     end
   
-    def locale
-      I18n.locale
+    def auth_token
+      @@auth_token = "" if !defined? @@auth_token or @@auth_token.nil?
+      @@auth_token
     end
-  
-    def default_locale
-      @@default_locale ||= I18n.default_locale
+    
+    def auth_token=(auth_token)
+      @@auth_token = auth_token
+    end
+    
+    def enabled
+      @@enabled = true if !defined? @@enabled or @@enabled.nil?
+      @@enabled
+    end
+    
+    def enabled=(enabled)
+      @@enabled = enabled
     end
       
     def backend
@@ -21,14 +32,37 @@ module Phrase
       @@backend = backend
     end
     
-    def available_locales
-      @@available_locales ||= nil
-      @@available_locales ||= I18n.available_locales
+    def prefix
+      @@prefix ||= "{{__"
     end
-      
-    def available_locales=(locales)
-      @@available_locales = Array(locales).map { |locale| locale.to_sym }
-      @@available_locales = nil if @@available_locales.empty?
+    
+    def prefix=(prefix)
+      @@prefix = prefix
+    end
+    
+    def suffix
+      @@suffix ||= "__}}"
+    end
+    
+    def suffix=(suffix)
+      @@suffix = suffix
+    end
+    
+    def js_host
+      @@js_host ||= 'phraseapp.com'
+    end
+    
+    def js_host=(js_host)
+      @@js_host = js_host
+    end
+    
+    def js_use_ssl
+      @@js_use_ssl = true if !defined? @@js_use_ssl or @@js_use_ssl.nil?
+      @@js_use_ssl
+    end
+    
+    def js_use_ssl=(js_use_ssl)
+      @@js_use_ssl = js_use_ssl
     end
   end
-end
+end

data/lib/phrase/engine.rb

@@ -1,18 +1,23 @@
 # -*- encoding : utf-8 -*-
+
 require 'phrase'
-require 'rails'
+require 'i18n'
 
-module Phrase
-  class Engine < Rails::Engine
+if defined? Rails
+  module Phrase
+    class Engine < Rails::Engine
     
-    initializer 'phrase' do |app|
-      ActiveSupport.on_load(:action_view) do
-        ::ActionView::Base.send :include, Phrase::Extensions::Base
-      end
+      initializer 'phrase' do |app|
+        ActiveSupport.on_load(:action_view) do
+          ::ActionView::Base.send :include, Phrase::Extensions::Base
+        end
       
-      ActiveSupport.on_load(:action_controller) do
-        ::ActionController::Base.send :include, Phrase::Extensions::Base
+        ActiveSupport.on_load(:action_controller) do
+          ::ActionController::Base.send :include, Phrase::Extensions::Base
+        end
+        
+        ActionView::Base.send :include, Phrase::ViewHelpers
       end
     end
   end
-end
+end

data/lib/phrase/extensions/base.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 module Phrase::Extensions::Base
   extend ActiveSupport::Concern
   

data/lib/phrase/extensions/hash.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 module Phrase::Extensions::Hash
   extend ActiveSupport::Concern
   

data/lib/phrase/extensions/string.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 module Phrase::Extensions::String
   extend ActiveSupport::Concern
   

data/lib/phrase/extensions.rb

@@ -1,7 +1,9 @@
+# -*- encoding : utf-8 -*-
+
 module Phrase::Extensions
 end
 
-require_relative 'extensions/hash'
-require_relative 'extensions/string'
-require_relative 'extensions/base'
+require File.join(File.dirname(__FILE__), 'extensions/hash')
+require File.join(File.dirname(__FILE__), 'extensions/string')
+require File.join(File.dirname(__FILE__), 'extensions/base')