phrasing 3.2.1 → 3.2.2

data/Gemfile

@@ -7,4 +7,4 @@ gem 'factory_girl_rails'
 gem 'haml-rails'
 gem 'sqlite3'
 gem 'rspec-rails'
-gem 'capybara', '~> 2.0.0'
+gem 'capybara', '~> 2.2.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phrasing (3.2.1)
+    phrasing (3.2.2)
       haml-rails
       jquery-cookie-rails
       jquery-rails
@@ -39,15 +39,12 @@ GEM
     arel (4.0.1)
     atomic (1.1.13)
     builder (3.1.4)
-    capybara (2.0.3)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
+      xpath (~> 2.0)
     coderay (1.1.0)
     columnize (0.3.6)
     debugger (1.6.5)
@@ -56,15 +53,14 @@ GEM
       debugger-ruby_core_source (~> 1.3.1)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.3.1)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    factory_girl (4.2.0)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.3.0)
+      factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
-    ffi (1.9.0)
-    haml (4.0.3)
+    haml (4.0.4)
       tilt
     haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
@@ -73,9 +69,15 @@ GEM
       railties (>= 3.1, < 4.1)
     hike (1.2.3)
     i18n (0.6.5)
+    jasmine-core (1.3.1)
+    jasmine-rails (0.5.6)
+      jasmine-core (~> 1.3)
+      phantomjs
+      rails (>= 3.1.0)
+      sprockets-rails
     jquery-cookie-rails (1.3.1.1)
       railties (>= 3.2.0, < 5.0)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     mail (2.5.4)
@@ -88,6 +90,7 @@ GEM
     multi_json (1.7.9)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
+    phantomjs (1.9.2.1)
     polyglot (0.3.3)
     pry (0.9.12.4)
       coderay (~> 1.0)
@@ -113,10 +116,10 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec-mocks (2.14.4)
     rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -124,13 +127,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rubyzip (0.9.9)
-    sass (3.2.13)
-    selenium-webdriver (2.35.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
+    sass (3.2.14)
     slop (3.4.7)
     sprockets (2.10.1)
       hike (~> 1.2)
@@ -150,17 +147,17 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    websocket (1.0.7)
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (~> 2.0.0)
+  capybara (~> 2.2.0)
   factory_girl_rails
   haml-rails
+  jasmine-rails
   phrasing!
   pry-debugger
   rspec-rails

data/README.md

@@ -115,6 +115,7 @@ url: custom_url # point Phrasing to other actions in other controllers
 inverse: true # change the hovered background and underline colors to better fit darker backgrounds
 class: custom_class # add custom CSS classes to your phrases to change the appearance of phrases in your application 
 interpolation: { %min: 10 } # add variables to your translations just like w/ I18n
+scope: 'homepage.footer' # add scopes just like you would w/ I18.n. If the first argument is 'test', than the key would be 'homepage.footer.test'
 ```
 
 ## Credits

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

@@ -1,32 +1,27 @@
-//= require head
+//= require editor
 //= require jquery
 //= require jquery_ujs
 //= require jquery.cookie
 
 var phrasing_setup = function(){
 
-/// INITIALIZE THE BUBBLE
-  head.js( "<%= asset_path 'editor.js' %>",
-        function(){
-            editor.init();
-        });
-
-// Making sure to send csrf token from layout file.
-   $(document).ajaxSend(function(e, xhr, options) {
-      var token = $("meta[name='csrf-token']").attr("content");
-        xhr.setRequestHeader("X-CSRF-Token", token);
-   });
-
-// Hash size function
-  Object.size = function(obj) {
-      var size = 0, key;
-      for (key in obj) {
-          if (obj.hasOwnProperty(key)) size++;
-      }
-      return size;
+  // Initialize the editing bubble
+  editor.init();
+
+  // Making sure to send csrf token from layout file.
+  $(document).ajaxSend(function(e, xhr, options) {
+    var token = $("meta[name='csrf-token']").attr("content");
+    xhr.setRequestHeader("X-CSRF-Token", token);
+  });
+
+  // Hash size function
+  Object.size = function(obj){
+    var size = 0, key;
+    for (key in obj) { if (obj.hasOwnProperty(key)) size++; }
+    return size;
   };
 
-///ON TEXTCHANGE TRIGGER AJAX
+  // Trigger AJAX on textchange
   var trigger_binded_events_for_phrasable_class = 1;
   var timer = {}
   var timer_status = {}
@@ -39,8 +34,6 @@ var phrasing_setup = function(){
     if (trigger_binded_events_for_phrasable_class == 1){
 
       var record = this;
-
-      // console.log(timer)
       
       clearTimeout(timer[$(record).data("url")]);
       timer_status[$(record).data("url")] = 0;
@@ -54,7 +47,7 @@ var phrasing_setup = function(){
 
   });
 
-///AJAX REQUEST
+  // AJAX Request
   function savePhraseViaAjax(record){
     
     var url = $(record).data("url");
@@ -90,15 +83,15 @@ var phrasing_setup = function(){
     });
   }
 
-// EDIT MODE SWITCH MODE BUTTON
+  // Edit Mode On/Off Button
   $('#edit-mode-onoffswitch').on('change', function(){
     if(this.checked){
-        $('.phrasable').addClass("phrasable_on").attr("contenteditable", "true");
-        $.cookie("editing_mode", "true");
+      $('.phrasable').addClass("phrasable_on").attr("contenteditable", "true");
+      $.cookie("editing_mode", "true");
     }
     else{
-        $('.phrasable').removeClass("phrasable_on").attr("contenteditable", "false");
-        $.cookie("editing_mode", "false");
+      $('.phrasable').removeClass("phrasable_on").attr("contenteditable", "false");
+      $.cookie("editing_mode", "false");
     }
   });
 
@@ -114,5 +107,4 @@ var phrasing_setup = function(){
 
 };
 
-$(document).ready(phrasing_setup)
-// $(document).on('page:load', phrasing_setup)
+$(document).ready(phrasing_setup)

data/app/controllers/phrasing_phrases_controller.rb

@@ -11,14 +11,15 @@ class PhrasingPhrasesController < ActionController::Base
   def index
     params[:locale] ||= I18n.default_locale
     query = PhrasingPhrase
+    query = query.order("#{query.table_name}.key")
     query = query.where(locale: params[:locale]) unless params[:locale].blank?
-
+    
     if params[:search] and !params[:search].blank?
         key_like = PhrasingPhrase.arel_table[:key].matches("%#{params[:search]}%")
         value_like = PhrasingPhrase.arel_table[:value].matches("%#{params[:search]}%")
-        @phrasing_phrases = query.where(key_like.or(value_like)).order(:key)
+        @phrasing_phrases = query.where(key_like.or(value_like))
     else
-      @phrasing_phrases = query.where("value is not null").order(:key) + query.where("value is null").order(:key)
+      @phrasing_phrases = query.where("value is not null") + query.where("value is null")
     end
     
     @locale_names = PhrasingPhrase.uniq.pluck(:locale)

data/app/helpers/inline_helper.rb

@@ -1,6 +1,6 @@
 module InlineHelper
 # Normal phrase
-# phrase("headline", url: www.infinum.co/yabadaba, inverse: true, interpolation: {min: 15, max: 20})
+# phrase("headline", url: www.infinum.co/yabadaba, inverse: true, interpolation: {min: 15, max: 20}, scope: "models.errors")
 
 # Data model phrase
 # phrase(@record, :title, inverse: true, class: phrase-record-title)
@@ -8,7 +8,7 @@ module InlineHelper
   def phrase(*args)
     if args[0].class == String or args[0].class == Symbol
       key, options = args[0].to_s, args[1]
-      phrasing_phrase(key,options)
+      phrasing_phrase(key,options || {})
     else
       record, field_name, options = args[0], args[1], args[2]
       inline(record, field_name, options || {})
@@ -35,10 +35,10 @@ module InlineHelper
   private
   
     def phrasing_phrase(key, options = {})
-      key = key.to_s
+      key = options[:scope] ? "#{options[:scope]}.#{key}" : key.to_s
       if can_edit_phrases?
         @record = PhrasingPhrase.where(key: key, locale: I18n.locale.to_s).first || PhrasingPhrase.search_i18n_and_create_phrase(key)
-        inline(@record, :value, options || {})
+        inline(@record, :value, options)
       else
         options.try(:[], :interpolation) ? t(key, options[:interpolation]).html_safe : t(key).html_safe
       end

data/app/models/phrasing_phrase.rb

@@ -18,12 +18,12 @@ class PhrasingPhrase < ActiveRecord::Base
   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
+    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/app/views/phrasing/_initializer.html.haml

@@ -8,8 +8,11 @@
           %button.bold b
           %button.italic i
 
+
+
+
+
   #phrasing-edit-mode-bubble
-    
     #phrasing-edit-mode
       #phrasing-edit-mode-headline
         %p Edit
@@ -19,15 +22,13 @@
           %label.onoffswitch-label{for: "edit-mode-onoffswitch"}
             .onoffswitch-inner
             .onoffswitch-switch
-    
     #phrasing-saved-status
       #phrasing-saved-status-headline
         %p Saved
       #phrasing-saved-status-indicator
         #phrasing-saved-status-indicator-circle
-
     #phrasing-edit-all-phrases
       #phrasing-edit-all-phrases-headline
         %p Edit all
       #phrasing-edit-all-phrases-icon-container
-        = link_to image_tag("phrasing_icon_edit_all.png", class: 'phrasing-edit-all-phrases-icon'), phrasing_phrases_path, data: { no_turbolink: true }
+        = link_to image_tag("phrasing_icon_edit_all.png", class: 'phrasing-edit-all-phrases-icon'), phrasing_phrases_path, data: { no_turbolink: true }, class: "phrasing-edit-all-phrases-link"

data/lib/phrasing/implementation.rb

@@ -6,12 +6,13 @@ module Phrasing
 
       scoped_key = I18n.normalize_keys(nil, key, scope, options[:separator]).join(".")
 
-      cct = PhrasingPhrase.where(locale: locale.to_s, key: scoped_key).first
-      return cct.value if cct
+      phrase = PhrasingPhrase.where(locale: locale.to_s, key: scoped_key).first
+      return phrase.value if phrase
 
       value = super(locale, key, scope, options)
-      if value
-        #creation in background no matter if developer user the I18n#t or phrase helper
+
+      if value and (value.is_a? String or value.is_a? Symbol)
+        # creation in background no matter if developer user the I18n#t or phrase helper
         PhrasingPhrase.create_phrase(scoped_key, value)
       end
       value

data/lib/phrasing/version.rb

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

data/lib/tasks/phrasing_tasks.rake

@@ -1,3 +1,29 @@
+CONFIG_FILE = <<-CONFIG
+Phrasing.setup do |config|
+  config.route = 'phrasing'
+end
+
+# List all the model attributes you wish to edit with Phrasing, example:
+# Phrasing.whitelist = ["Post.title", "Post.description"]
+Phrasing.whitelist = []
+# Phrasing.allow_update_on_all_models_and_attributes = true;
+CONFIG
+
+MODULE_FILE = <<-MODULE 
+module PhrasingHelper
+  # You must implement the can_edit_phrases? method.
+  # Example:
+  #
+  # def can_edit_phrases?
+  #  current_user.is_admin?
+  # end
+
+  def can_edit_phrases?
+    raise NotImplementedError.new("You must implement the can_edit_phrases? method")
+  end
+end
+MODULE
+
 namespace :phrasing do
   desc "Install the plugin, including the migration."
   task :install do
@@ -10,61 +36,34 @@ namespace :phrasing do
   task :install_initializer do
     filepath = Rails.root.join *%w(config initializers phrasing.rb)
     if File.exists?(filepath)
-      alert "Phrasing config file already exists.\n"
+      alert "Phrasing config file already exists."
     else
       File.open(filepath, 'w') do |f|
-        f << <<-CONFIG
-Phrasing.setup do |config|
-  config.route = 'phrasing'
-end
-
-# List all the model attributes you wish to edit with Phrasing, example:
-# Phrasing.whitelist = ["Post.title", "Post.description"]
-Phrasing.whitelist = []
-# Phrasing.allow_update_on_all_models_and_attributes = true;
-CONFIG
+        f << CONFIG_FILE
       end
-      notice("created")
-      puts " config/intiializers/phrasing.rb"
+      notice "created", " config/intiializers/phrasing.rb"
     end
   end
 
-
   desc "Create the PhrasingHelper file"
   task :install_phrasing_helper do
     filepath = Rails.root.join *%w(app helpers phrasing_helper.rb)
     if File.exists?(filepath)
-      alert "Phrasing helper file already exists.\n"
+      alert "Phrasing helper file already exists."
     else    
       File.open(filepath, 'w') do |f|
-        f << <<-MODULE 
-module PhrasingHelper
-  # You must implement the can_edit_phrases? method.
-  # Example:
-  #
-  # def can_edit_phrases?
-  #  current_user.is_admin?
-  # end
-
-  def can_edit_phrases?
-    raise NotImplementedError.new("You must implement the can_edit_phrases? method")
-  end
-end
-      MODULE
+        f << MODULE_FILE
       end
-      notice("created")
-      puts " app/helpers/phrasing_helper.rb" 
-      notice "Now run 'rake db:migrate'.\n"
+      notice "created", "app/helpers/phrasing_helper.rb"
+      notice "Now run 'rake db:migrate'."
     end 
   end
-
-
 end
 
-def notice(text)
-  print "\033[#{32}m#{text}\033[0m"
+def notice(colored_text, tailing_text = nil)
+  puts "\033[#{32}m#{colored_text}\033[0m #{tailing_text}"
 end
 
-def alert(text)
-  print "\033[#{31}m#{text}\033[0m"
-end
+def alert(colored_text, tailing_text = nil)
+  puts "\033[#{31}m#{colored_text}\033[0m #{tailing_text}"
+end