phrase 0.0.5 → 0.0.6

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/backend/base.rb

@@ -1,11 +1,10 @@
 # -*- encoding : utf-8 -*-
 
 module Phrase::Backend::Base
+  
   PREFIX = "{{__phrase_"
   SUFFIX = "__}}"
-  
-  attr_accessor :config
-  
+
   def translate(*args)
     key = lookup_normalized_key(*args)
     case key[:translation]
@@ -13,26 +12,7 @@ module Phrase::Backend::Base
       else key[:translation]
     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
@@ -44,21 +24,21 @@ module Phrase::Backend::Base
     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
 
@@ -67,49 +47,43 @@ module Phrase::Backend::Base
       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] 
@@ -117,4 +91,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/config.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 module Phrase
   class Config
     def enabled?

data/lib/phrase/engine.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require 'phrase'
 require 'rails'
 

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')
 

data/lib/phrase/tool.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 require 'phrase/tool_config'
 
 require 'optparse'

data/lib/phrase/tool_config.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 require 'json'
 
 module PhraseGem
@@ -40,6 +42,7 @@ module PhraseGem
     end
 
     private
+    
     def config
       @config ||= {}
     end

data/phrase.gemspec

@@ -4,13 +4,13 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "phrase"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Dynport GmbH"]
   s.email = ["info@phraseapp.com"]
   s.homepage = "http://phraseapp.com"
   s.summary = %q{The best way to manage i18n.}
-  s.description = s.summary
+  s.description = %q{phrase allows you to edit translations inline, on the page itself. More information at phraseapp.com}
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project = "phrase"
   git_files = `git ls-files | grep -v spec/`.split("\n") rescue ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000Z
+date: 2012-03-29 00:00:00.000000000Z
 dependencies: []
-description: The best way to manage i18n.
+description: phrase allows you to edit translations inline, on the page itself. More
+  information at phraseapp.com
 email:
 - info@phraseapp.com
 executables: