phrase 0.4.12 → 0.4.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phrase (0.4.12)
+    phrase (0.4.13)
       colorize
       i18n
       json

data/lib/phrase/backend/phrase_service.rb

@@ -67,7 +67,7 @@ protected
     key = given_key_from_args(args)
     return nil unless present?(key)
     options = args[1].nil? ? {} : args[1]
-    Phrase::Delegate::I18n.new(key, options)
+    Phrase::Delegate::I18n.new(key, options, args)
   end
 
   def extract_normalized_key_from_args(args)

data/lib/phrase/delegate/i18n.rb

@@ -7,11 +7,12 @@ require 'phrase/delegate'
 require 'set'
 
 class Phrase::Delegate::I18n < Phrase::Delegate::Base
-  attr_accessor :key, :display_key, :options, :api_client, :fallback_keys
+  attr_accessor :key, :display_key, :options, :api_client, :fallback_keys, :original_args
   
-  def initialize(key, options={})
+  def initialize(key, options={}, original_args=nil)
     @display_key = @key = key
     @options = options
+    @original_args = original_args
     
     @fallback_keys = []
     
@@ -21,17 +22,19 @@ class Phrase::Delegate::I18n < Phrase::Delegate::Base
   end
   
   def method_missing(*args, &block)
-    if @key.respond_to?(args.first) 
+    self.class.log "Trying to execute missing method ##{args.first} on key #{@key}"
+
+    if @key.respond_to?(args.first)
       to_s.send(*args)
     else
       data = translation_or_subkeys
-      if data.is_a?(String)
-        to_s
-      elsif data.respond_to?(args.first)
+
+      if data.respond_to?(args.first)
         data.send(*args, &block)
       else
-        self.class.log "You are trying to execute the method ##{args.first} on a translation key which is not supported. Please make sure you treat your translations as strings only."
-        nil
+        self.class.log "You tried to execute the missing method ##{args.first} on key #{@key} which is not supported. Please make sure you treat your translations as strings only."
+        original_translation = I18n.translate_without_phrase(*@original_args)
+        original_translation.send(*args, &block)
       end
     end
   end

data/lib/phrase/delegate.rb

@@ -8,7 +8,7 @@ module Phrase::Delegate
     
     def self.log(message)
       message = "phrase: #{message}"
-      if defined?(Rails)
+      if defined?(Rails) and Rails.respond_to?(:logger)
         Rails.logger.warn(message)
       else
         $stderr.puts message

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381580900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381580900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381580440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381580440
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381579980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381579980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381579540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381579540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381579020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381579020
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381578520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381578520
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381577860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381577860
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381577060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381577060
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381576640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381576640
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70240381576180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,12 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70240381576180
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email:
@@ -275,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: phrase
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The best way to manage i18n.