phrasing 4.0.0rc2 → 4.0.0rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9dcfc2841ec28bd67e4753423cc4b95a6620b4f
-  data.tar.gz: 9979a2f18909e0e8acf2d1655cf7cc05c5a2f310
+  metadata.gz: aa17e70cddb3a13fbaefc3f473d185c93ddad028
+  data.tar.gz: 4947a95d4f5c5f1dda178056a589b2f2548fedf9
 SHA512:
-  metadata.gz: 626fdf49d11632970a2f55c434dd92c9bbd2cdc25d5a7a58ab365455580d7e723bb24a6cc4f77ff56d82244be3d747ade1f588ad8300eb6bc77f8d56f7947769
-  data.tar.gz: 6026e75cf96b9b934fde9f798c47462a70de07d51026bfbfa4095eabe8a8cebc1977179040c9ef55083d44062d8d4f5608207da66ec7fa7fdc329a12ca6f3077
+  metadata.gz: 645b4738ea92b854116bac7cdaef56a797c4121629788a5d7b7b956a11d0869152ccb694a319552ff87ec9938ebc537c64716f419931e60fc6503a9772ac5014
+  data.tar.gz: 01aff8859f2081498e5f274a5239f329b6f5ce0faf16b14b85170dd843edfaaaed5ab9a411874552e60708b662be0d945f60857b9a46eb47efe9fb6a76fbc91a

data/README.md

@@ -60,6 +60,15 @@ Include the required **javascript** files:
 //= require phrasing
 ```
 
+Include the required **javascript** files:
+
+```javascript
+//= require jquery
+//= require jquery_ujs
+//= require jquery.cookie
+//= require phrasing
+```
+
 Include the required **stylesheet** file:
 
 ```css
@@ -102,6 +111,8 @@ If you're experiencing problems with Rails apps using Turbolinks, include the [j
 
 ```javascript
 //= require jquery
+//= require jquery_ujs
+//= require jquery.cookie
 //= require jquery.turbolinks
 //= require phrasing
 //= require turbolinks

data/Release_notes_version_4.md

@@ -17,10 +17,21 @@ The problem with the interpolation option is that most clients won't understand
 
 If they try to erase parts of it, the developer also might end up being confused and the UI might get broken or at least ugly for some time until the developer fixes the issue.
 
-## HTML Sanitization
+## Loading asset dependencies
+
+From phrasing v4.0.0rc3, add your jquery files manually:
 
-There is a posibility we might add html sanitization to prevent ugly copy-pasted html insertion (as well as XSS attacks).
+```javascript
+//= require jquery
+//= require jquery_ujs
+//= require jquery.cookie
+//= require phrasing
+```
 
 ## Switching rake tasks with Rails generators
 
 Since Rails comes with outofbox generators that enable easy existing file detection and similar behaviors, Phrasing 4 will use Rails generators instead of the old rake tasks.
+
+## HTML Sanitization
+
+There is a posibility we might add html sanitization to prevent ugly copy-pasted html insertion as well as XSS attacks.

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

@@ -1,7 +1,4 @@
 //= require editor
-//= require jquery
-//= require jquery_ujs
-//= require jquery.cookie
 
 function StatusBubble(){
   var $headline = $('#phrasing-edit-mode-bubble #phrasing-saved-status-headline p');

data/app/controllers/phrasing_phrases_controller.rb

@@ -13,18 +13,7 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
 
   def index
     params[:locale] ||= I18n.default_locale
-    query = PhrasingPhrase.order("phrasing_phrases.key")
-    query = query.where(locale: params[:locale]) if params[:locale].present?
-
-    @phrasing_phrases = if params[:search].present?
-      key_like   = PhrasingPhrase.arel_table[:key].matches("%#{params[:search]}%")
-      value_like = PhrasingPhrase.arel_table[:value].matches("%#{params[:search]}%")
-      query.where(key_like.or(value_like))
-    else
-      # because we want to have non nil values first.
-      query.where("value is not null") + query.where("value is null")
-    end
-
+    @phrasing_phrases = PhrasingPhrase.fuzzy_search(params[:search], params[:locale])
     @locale_names = PhrasingPhrase.uniq.pluck(:locale)
   end
 

data/app/models/phrasing_phrase.rb

@@ -12,6 +12,20 @@ class PhrasingPhrase < ActiveRecord::Base
     where(key: key, locale: I18n.locale.to_s).first || search_i18n_and_create_phrase(key)
   end
 
+  def self.fuzzy_search(search_term, locale)
+    query = order("phrasing_phrases.key")
+    query = query.where(locale: locale) if locale.present?
+
+    if search_term.present?
+      key_like   = PhrasingPhrase.arel_table[:key].matches("%#{search_term}%")
+      value_like = PhrasingPhrase.arel_table[:value].matches("%#{search_term}%")
+      query.where(key_like.or(value_like))
+    else
+      # because we want to have non nil values first.
+      query.where("value is not null") + query.where("value is null")
+    end
+  end
+
   private
 
     def self.search_i18n_and_create_phrase(key)

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "4.0.0rc2"
+  VERSION = "4.0.0rc3"
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -6,5 +6,6 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require jquery.cookie
 //= require phrasing
 //= require_tree .

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc2
+  version: 4.0.0rc3
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails