phrasing 3.2.0 → 3.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c7efc7bcebc790fc33dc2ad4a7364d2bd08b7d35
+  data.tar.gz: aeba9e1bb51923ad1bc3237378cc5806a15c5ff2
+SHA512:
+  metadata.gz: 25e0c5c1a418044a56c768eb831ac06b18d1293632d1c216734cdde54c0a3ee041ba7492e978ea9086468c7f379721fa8d5833b54b0838210c2519666d8f0c14
+  data.tar.gz: e8d102720009260e083de23a020f26b315ceb64c486349f03a5b45cf6c43f8d31ff280bfd85db1824fac3016d54428cb3215f901d2ff3dcbbdaee467dde36dca

data/.gitignore

@@ -1,2 +1,4 @@
 *.gem
-.ruby-version
+.ruby-version
+spec/dummy/log/test.log
+tmp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phrasing (3.0.2)
+    phrasing (3.2.1)
       haml-rails
       jquery-cookie-rails
       jquery-rails
@@ -48,6 +48,14 @@ GEM
       xpath (~> 1.0.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.0)
+    columnize (0.3.6)
+    debugger (1.6.5)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.1)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.1)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     factory_girl (4.2.0)
@@ -73,6 +81,7 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    method_source (0.8.2)
     mime-types (1.24)
     mini_portile (0.5.1)
     minitest (4.7.5)
@@ -80,6 +89,13 @@ GEM
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     polyglot (0.3.3)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
+      pry (~> 0.9.10)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -109,13 +125,14 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rubyzip (0.9.9)
-    sass (3.2.12)
+    sass (3.2.13)
     selenium-webdriver (2.35.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
-    sprockets (2.10.0)
+    slop (3.4.7)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -145,5 +162,6 @@ DEPENDENCIES
   factory_girl_rails
   haml-rails
   phrasing!
+  pry-debugger
   rspec-rails
   sqlite3

data/app/assets/javascripts/phrasing.js.erb

@@ -1,5 +1,4 @@
 //= require head
-//= require spin
 //= require jquery
 //= require jquery_ujs
 //= require jquery.cookie

data/app/assets/stylesheets/phrasing_edit_mode_bubble.css.scss

@@ -29,6 +29,12 @@
     height:32px;
     margin-top:10px;
   }
+  #phrasing-edit-mode-headline, #phrasing-edit-all-phrases-headline, #phrasing-saved-status-headline{
+    p{
+      display: inline;
+    }
+  }
+
   #phrasing-edit-mode-headline{
     height:30px;
     width:45px;

data/app/helpers/inline_helper.rb

@@ -37,7 +37,7 @@ module InlineHelper
     def phrasing_phrase(key, options = {})
       key = key.to_s
       if can_edit_phrases?
-        @record = PhrasingPhrase.where(key: key, locale: I18n.locale.to_s).first || PhrasingPhrase.create_phrase(key)
+        @record = PhrasingPhrase.where(key: key, locale: I18n.locale.to_s).first || PhrasingPhrase.search_i18n_and_create_phrase(key)
         inline(@record, :value, options || {})
       else
         options.try(:[], :interpolation) ? t(key, options[:interpolation]).html_safe : t(key).html_safe

data/app/models/phrasing_phrase.rb

@@ -8,13 +8,22 @@ class PhrasingPhrase < ActiveRecord::Base
 
   after_update :version_it
 
-  def self.create_phrase(key)
-    phrasing_phrase = PhrasingPhrase.new
-    phrasing_phrase.locale = I18n.locale.to_s
-    phrasing_phrase.key = key.to_s
-    phrasing_phrase.value = key.to_s
-    phrasing_phrase.save!
-    phrasing_phrase
+  def self.search_i18n_and_create_phrase key
+    begin
+      value = I18n.t key, raise: true
+      PhrasingPhrase.where(key: key, locale: I18n.locale).first
+    rescue I18n::MissingTranslationData
+      create_phrase(key)
+    end
+  end
+
+  def self.create_phrase key, value = nil
+      phrasing_phrase = PhrasingPhrase.new
+      phrasing_phrase.locale = I18n.locale.to_s
+      phrasing_phrase.key = key.to_s
+      phrasing_phrase.value = value || key.to_s
+      phrasing_phrase.save
+      phrasing_phrase
   end
 
   module Serialize

data/lib/phrasing/implementation.rb

@@ -10,12 +10,9 @@ module Phrasing
       return cct.value if cct
 
       value = super(locale, key, scope, options)
-      if value.is_a?(String) || value.nil?
-        phrasing_phrase = PhrasingPhrase.new
-        phrasing_phrase.locale = locale.to_s
-        phrasing_phrase.key = scoped_key
-        phrasing_phrase.value = value
-        phrasing_phrase.save
+      if value
+        #creation in background no matter if developer user the I18n#t or phrase helper
+        PhrasingPhrase.create_phrase(scoped_key, value)
       end
       value
     end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/phrasing.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-rails"
   s.add_dependency "jquery-cookie-rails"
   s.add_dependency "sass"
+
+  s.add_development_dependency 'pry-debugger'
 end

data/spec/dummy/app/views/site/index.html.erb

@@ -1,3 +1,5 @@
 <h2><%= phrase('site.index.header') %></h2>
 
 <div><%= phrase('site.index.intro') %></div>
+
+<div><%= t('site.index.footer') %></div>

data/spec/dummy/config/locales/en.yml

@@ -5,3 +5,4 @@ en:
   site:
     index:
       header: "The Header"
+      footer: "The Footer"