phrase 0.0.7 → 0.0.8

data/Gemfile

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

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.0.0)
     addressable (2.2.7)
     crack (0.3.1)
     diff-lcs (1.1.3)
@@ -22,6 +23,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   json
   rspec
   vcr

data/lib/phrase.rb

@@ -1,9 +1,12 @@
 # -*- encoding : utf-8 -*-
 
+require 'active_support/all'
+
 module Phrase
   autoload :Config,  'phrase/config'
   
   class << self
+    
     def config
       Thread.current[:phrase_config] ||= Phrase::Config.new
     end
@@ -32,3 +35,12 @@ module Phrase
   require               'phrase/engine'
   require               'phrase/backend'
 end
+
+module I18n
+  class << self
+    def translate(*args)
+      Phrase.backend.translate(*args)
+    end
+    alias_method :t, :translate
+  end
+end

data/lib/phrase/backend/base.rb

@@ -4,10 +4,7 @@ module Phrase::Backend::Base
   
   def translate(*args)
     key = lookup_normalized_key(*args)
-    case key[:translation]
-      when String, nil, "" then decorate_translation(key[:key])
-      else key[:translation]
-    end
+    decorate_translation(key[:key])
   end
 
   protected
@@ -16,19 +13,11 @@ module Phrase::Backend::Base
       "#{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)
@@ -36,13 +25,20 @@ module Phrase::Backend::Base
       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)

data/lib/phrase/engine.rb

@@ -1,19 +1,21 @@
 # -*- 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
       end
     end
   end
-end
+end

data/lib/phrase/extensions/hash.rb

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

data/phrase.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "phrase"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Dynport GmbH"]
   s.email = ["info@phraseapp.com"]
@@ -16,5 +16,6 @@ Gem::Specification.new do |s|
   git_files = `git ls-files | grep -v spec/`.split("\n") rescue ''
   s.files = git_files
   s.executables = %w(phrase)
-  s.require_paths = ["lib"]
+  s.require_paths = ["lib"]  
+  s.add_dependency('activesupport', '~> 3.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000Z
-dependencies: []
+date: 2012-04-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70124418301040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70124418301040
 description: phrase allows you to edit translations inline, on the page itself. More
   information at phraseapp.com
 email: