phrasing 3.2.9 → 3.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 206cd001ae079192daf6410a4b9be6bb757ea18e
-  data.tar.gz: 63433e277e04cfcfd66a89f4a4ffba8f3f94f7c9
+  metadata.gz: 8c4d9f1a1afdcb5aeadf72bdd9582d062a9a2ab0
+  data.tar.gz: d43f499b114f068bea2f8bb1566dae2357e8a110
 SHA512:
-  metadata.gz: c9c161bcfbea4965777007fe2a0c3e6b67291f803663f151c7ee8dacf8bc8385754a419a314f7c9c4b7a7a326c3ba161621909e675b831dd94a157cca440d41a
-  data.tar.gz: 1c0a1ff71038dd6cb0d4130bb507ca6630249c13083a2bd55fa2fa647ca9acf94b8228a6e8f7e73a2edaeb60a79f255c0fc9f8ce327c8a475f50978576d93433
+  metadata.gz: c981b81e3069c339740450619dcfdf72125fd2b9944f55ca83928da625ad066efdedbe1162a930ff8837b0aeaf26bfc152d8addee10fb60d531bd7693534fea3
+  data.tar.gz: 2e56e2910c3009017daf98ad51371a88957052f0333e6ae55108456b99b2e7c36bb86b9313c4eaed790c8e48a2bd798d59b444cbb48ee0b1731050dd9e951895

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Phrasing Change Log
 
+## 3.2.10 (October 2nd, 2015)
+
+Change order parameters in PhrasingPhrases#index to support SQLServer.
+
 ## 3.2.9 (January 7th, 2015)
 
 Require only haml, not haml-rails.

data/README.md

@@ -6,6 +6,8 @@
 
 Phrasing is a gem for live editing phrases (copy) on websites.
 
+**Phrasing is currently iterating over release candidates for a major update: 4.0. The Readme for those versions can be found** [here](https://github.com/infinum/phrasing/tree/new-release-4)
+
 ## Installation
 
 Include the gem in your Gemfile

data/app/controllers/phrasing_phrases_controller.rb

@@ -11,7 +11,7 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
   def index
     params[:locale] ||= I18n.default_locale
     query = PhrasingPhrase
-    query = query.order("#{query.table_name}.key")
+    query = query.order(:key)
     query = query.where(locale: params[:locale]) unless params[:locale].blank?
 
     if params[:search] and !params[:search].blank?

data/app/helpers/inline_helper.rb

@@ -25,7 +25,7 @@ module InlineHelper
 
     url = phrasing_polymorphic_url(record, field_name)
 
-    content_tag(:span, { class: klass, contenteditable: edit_mode_on?, spellcheck: false,   "data-url" => url}) do 
+    content_tag(:span, { class: klass, contenteditable: edit_mode_on?, spellcheck: false,   "data-url" => url}) do
       (record.send(field_name) || record.try(:key)).to_s.html_safe
     end
   end
@@ -33,7 +33,7 @@ module InlineHelper
   alias_method :model_phrase, :inline
 
   private
-  
+
     def phrasing_phrase(key, options = {})
       key = options[:scope] ? "#{options[:scope]}.#{key}" : key.to_s
       if can_edit_phrases?
@@ -48,7 +48,7 @@ module InlineHelper
       if cookies["editing_mode"].nil?
         cookies['editing_mode'] = "true"
         true
-      else  
+      else
         cookies['editing_mode'] == "true"
       end
     end
@@ -57,4 +57,4 @@ module InlineHelper
       remote_update_phrase_phrasing_phrases_path(klass: record.class.to_s, id: record.id, attribute: attribute)
     end
 
-end
+end

data/app/views/phrasing_phrases/edit.html.haml

@@ -1,6 +1,6 @@
 .edit
   %h2= @phrasing_phrase.key
-  = link_to "Delete Phrase", phrasing_phrase_path(@phrasing_phrase), class: "btn btn-danger delete-phrase", method: :delete, confirm: 'Are you sure?'
+  = link_to "Delete Phrase", phrasing_phrase_path(@phrasing_phrase), class: "btn btn-danger delete-phrase", method: :delete, data: { confirm: 'Are you sure?' }
   = form_for @phrasing_phrase, url: { action: "update" } do |f|
     = f.text_area :value, rows: 12
     = f.submit "Update", class: "btn btn-success submit-edit-phrase"
@@ -20,4 +20,4 @@
           %td.phrasing-version-value= version.value.html_safe
           %td.phrasing-version-created_at= version.created_at.strftime("%d-%m-%Y %H:%M:%S")
           %td= link_to "Revert", phrasing_phrase_path(@phrasing_phrase.id, phrasing_phrase: {value: version.value}), class: "btn btn-success", method: :put
-          %td= link_to "Delete", phrasing_phrase_version_path(version.id), class: "btn btn-danger", method: :delete, confirm: 'Are you sure?'
+          %td= link_to "Delete", phrasing_phrase_version_path(version.id), class: "btn btn-danger", method: :delete, data: { confirm: 'Are you sure?' }

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "3.2.9"
+  VERSION = "3.2.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.2.10
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Edit phrases inline for Rails applications!