phrase 0.2.0.beta.2 → 0.2.0.beta.3

data/Gemfile

@@ -2,6 +2,7 @@ source :rubygems
 
 gem 'json'
 gem "activesupport", :require => "active_support"
+gem 'addressable'
 
 group :test do
   gem 'rspec'

data/Gemfile.lock

@@ -25,6 +25,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
+  addressable
   i18n
   json
   rspec

data/lib/phrase/api/client.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 
+require 'addressable/uri'
 require 'net/http'
 require 'net/https'
 require 'phrase'
@@ -37,6 +38,11 @@ class Phrase::Api::Client
     keys
   end
   
+  def find_keys_by_name(key_names=[])
+    result = JSON.parse(perform_api_request("/translation_keys", :get, {:key_names => key_names}))
+    result
+  end
+  
   def create_locale(name)
     raise "You must specify a name" if name.nil? or name.blank?
     
@@ -128,11 +134,10 @@ private
   end
   
   def get_request(endpoint, params={})
-    query_string = "?auth_token=#{@auth_token}"
-    params.each do |key, value|
-      query_string << "&#{key}=#{value}"
-    end unless params.empty?
-    request = Net::HTTP::Get.new("#{api_path_for(endpoint)}#{query_string}")
+    params.merge!('auth_token' => @auth_token)
+    uri = Addressable::URI.new
+    uri.query_values = params
+    request = Net::HTTP::Get.new("#{api_path_for(endpoint)}?#{uri.query}")
     request
   end
   

data/lib/phrase/backend/base.rb

@@ -7,16 +7,17 @@ module Phrase::Backend::Base
   def translate(*args)
     if Phrase.enabled?
       key = lookup_normalized_key(*args)
-      phrase_delegate_for(key[:key])
+      phrase_delegate_for(key[:key], *args)
     else
       I18n.translate_without_phrase(*args)
     end
   end
 
   protected
-    def phrase_delegate_for(key=nil)
-      return nil unless key.presence
-      Phrase::Delegate.new(key)
+    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)

data/lib/phrase/delegate.rb

@@ -1,10 +1,15 @@
 require 'phrase/api'
 
 class Phrase::Delegate
-  attr_accessor :key, :api_client
+  attr_accessor :key, :display_key, :options, :api_client, :fallback_keys
   
-  def initialize(key)
-    @key = key
+  def initialize(key, options={})
+    @display_key = @key = key
+    @options = options
+    @fallback_keys = []
+    
+    extract_fallback_keys
+    identify_key_to_display if @fallback_keys.any?
   end
   
   def to_s
@@ -12,7 +17,7 @@ class Phrase::Delegate
   end
   
   def method_missing(*args, &block)
-    if @key.respond_to?(args.first)
+    if @key.respond_to?(args.first) 
       to_s.send(*args)
     else
       data = translation_or_subkeys
@@ -28,8 +33,47 @@ class Phrase::Delegate
   end
   
 private
+  def identify_key_to_display
+    key_names = [@key] | @fallback_keys
+    available_key_names = find_keys_from_service(key_names).map { |key| key["name"] }
+    @display_key = @key
+    key_names.each do |item|
+      if available_key_names.include?(item)
+        @display_key = item
+        break
+      end
+    end
+  end
+  
+  def find_keys_from_service(key_names)
+    api_client.find_keys_by_name(key_names)
+  end
+  
+  def extract_fallback_keys
+    fallback_items = []
+    if @options.has_key?(:default)
+      if @options[:default].kind_of?(Array)
+        fallback_items = @options[:default]
+      else
+        fallback_items << @options[:default]
+      end
+    end
+    fallback_items.each do |item|
+      process_fallback_item(item)
+    end
+  end
+  
+  def process_fallback_item(item)
+    if item.kind_of?(Symbol)
+      @fallback_keys << item.to_s
+      if @key == "helpers.label.#{item.to_s}" # http://apidock.com/rails/v3.1.0/ActionView/Helpers/FormHelper/label
+        @fallback_keys << "activerecord.attributes.#{item.to_s}"
+      end
+    end
+  end
+
   def decorated_key_name
-    "#{Phrase.prefix}phrase_#{@key}#{Phrase.suffix}"
+    "#{Phrase.prefix}phrase_#{@display_key}#{Phrase.suffix}"
   end
   
   def translation_or_subkeys

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.2"
+  s.version = "0.2.0.beta.3"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Dynport GmbH"]
   s.email = ["info@phraseapp.com"]
@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.executables = %w(phrase)
   s.require_paths = ["lib"]  
   s.add_dependency('activesupport', '~> 3.0')
+  s.add_dependency('addressable', '~> 2.2.8')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.2
+  version: 0.2.0.beta.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.8
+  type: :runtime
+  prerelease: false
+  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: