phrasing 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a7fa5981d49230fb228307dbec0daa90401e3ce8ac7d341c2d29de997fe208
-  data.tar.gz: b02168d944d05b30cad1bc8c5dde71720a62e93a883a560150c706bcf95e67fb
+  metadata.gz: 83301b282dedbe937faf28eaf197cf9356c6beafff92f44d1f04847ab2a09ab7
+  data.tar.gz: b95a0281ff86a4f96b6915c946752b671dbdf6c469a1f1ec430835757a9bcda7
 SHA512:
-  metadata.gz: 3286529d7e7c899685d1e267e5352fac9f019458b3200b8a68c26bcd1652b0c09a7d27f91cdcd73b3efdef0affba940ca7110fce55688f6cb2b2bbdfa233462b
-  data.tar.gz: e5583b1e3e3c6578e7d8bb082e1b6ec1f726dc7bff75b3d9bf1a0d3c06601fce49ed115eefa57693139599603467b19f5f1d421ac1215cd22ff3dcc2d57f5cbc
+  metadata.gz: d0ee9d2fdd94f71c7e6c48e2e50103f0687232a1e7a93b46b893b78a63a673aa4a1548ec6e81e010cd317970c3efbcc0053d429a172c4d88b19b328a2c262204
+  data.tar.gz: 593e4c12e28556d1afa7a11cf5a5c7db2ea7550a716879c53bdcf539da5039650f8cacb2d52072617a8fb293844ad71a1f530d765a2b9f45fe4ecfe3b4a3bc4c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Phrasing Change Log
 
+## 4.3.2 (Oct 30th, 2020)
+
+- Send `edit_mode_enabled` as parameter and reject phrasing update if not `true` - fixes issue [#90](https://github.com/infinum/phrasing/issues/90)
+
 ## 4.3.1 (Sep 3rd, 2019)
 
 - Bump nokogiri version from 1.8.3 to 1.10.4 due to [security vulnerability](https://github.com/sparklemotion/nokogiri/issues/1915)

data/app/assets/javascripts/phrasing.js

@@ -119,7 +119,7 @@ var phrasing_setup = function(){
     $.ajax({
       type: "PUT",
       url: url,
-      data: { new_value: content },
+      data: { new_value: content, edit_mode_enabled: Phrasing.isEditModeEnabled() },
       success: function(e){
         userTriggeredPhrasingDOMChange = false;
         if(content === "Empty"){
@@ -135,6 +135,7 @@ var phrasing_setup = function(){
         }
       },
       error: function(e){
+        console.log("Phrasing:", e.responseText);
         statusBubbleWidget.error();
       }
     });

data/app/controllers/phrasing_phrases_controller.rb

@@ -1,3 +1,5 @@
+require 'phrasing/string'
+
 class PhrasingPhrasesController < Phrasing.parent_controller.constantize
 
   layout 'phrasing'
@@ -66,6 +68,7 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
     klass, attribute = params[:klass], params[:attribute]
 
     return render status: 403, text: 'Phrase not whitelisted' unless Phrasing.whitelisted?(klass, attribute)
+    return render status: 403, text: 'Edit mode is disabled' unless edit_mode?
 
     record = klass.classify.constantize.find(params[:id])
 
@@ -88,4 +91,7 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
     PhrasingPhrase.fuzzy_search(params[:search], params[:locale])
   end
 
+  def edit_mode?
+    Phrasing::String.new(params[:edit_mode_enabled]).to_bool
+  end
 end

data/lib/phrasing.rb

@@ -1,5 +1,6 @@
 require 'phrasing'
 require 'phrasing/serializer'
+require 'phrasing/string'
 require 'phrasing/rails/engine'
 require 'jquery-rails'
 require 'haml'

data/lib/phrasing/string.rb

@@ -0,0 +1,33 @@
+module Phrasing
+  class String
+    attr_reader :value
+
+    def initialize(value)
+      @value = value
+    end
+
+    def to_bool
+      if major_version >= 5
+        ActiveModel::Type::Boolean.new.cast(value)
+      elsif major_version == 4 && minor_version >= 2
+        ActiveRecord::Type::Boolean.new.type_cast_from_database(value)
+      else
+        ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
+      end
+    end
+
+    private
+
+    def major_version
+      rails_version.first.to_i
+    end
+
+    def minor_version
+      rails_version.second.to_i
+    end
+
+    def rails_version
+      @rails_version ||= ::Rails.version.split('.')
+    end
+  end
+end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = '4.3.1'.freeze
+  VERSION = '4.3.2'.freeze
 end

data/spec/controllers/phrasing_phrases_controller.rb

@@ -6,29 +6,61 @@ describe PhrasingPhrasesController do
       get :index
       expect(response).to render_template(:index)
     end
+  end
 
+  describe 'PUT #update' do
     let(:phrase) { FactoryBot.create(:phrasing_phrase, value: 'old_value') }
 
-    it 'updates phrase' do
-      expect do
-        xhr(:put, :update, klass: 'PhrasingPhrase',
-                           attribute: 'value',
-                           id: phrase.id,
-                           new_value: 'new_value')
-      end.to change { phrase.reload.value }.from('old_value').to('new_value')
+    context 'when edit model is enabled' do
+      it 'updates phrase' do
+        expect do
+          xhr(
+            :put,
+            :update,
+            klass: 'PhrasingPhrase',
+            attribute: 'value',
+            id: phrase.id,
+            new_value: 'new_value',
+            edit_model_enabled: 'true'
+          )
+        end.to change { phrase.reload.value }.from('old_value').to('new_value')
+
+        expect(response.code).to eq('200')
+      end
+
+      it "doesn't update locale" do
+        expect do
+          xhr(
+            :put,
+            :update,
+            klass: 'PhrasingPhrase',
+            attribute: 'locale',
+            id: phrase.id,
+            new_value: 'de',
+            edit_model_enabled: 'true'
+          )
+        end.to_not(change { phrase.reload.locale })
 
-      expect(response.code).to eq('200')
+        expect(response.code).to eq('403')
+      end
     end
 
-    it 'updates phrase' do
-      expect do
-        xhr(:put, :update, klass: 'PhrasingPhrase',
-                           attribute: 'locale',
-                           id: phrase.id,
-                           new_value: 'de')
-      end.to_not change { phrase.reload.locale }
+    context 'when edit mode is disabled' do
+      it "doesn't update phrase" do
+        expect do
+          xhr(
+            :put,
+            :update,
+            klass: 'PhrasingPhrase',
+            attribute: 'value',
+            id: phrase.id,
+            new_value: 'new_value',
+            edit_model_enabled: 'false'
+          )
+        end.not_to(change { phrase.reload.value })
 
-      expect(response.code).to eq('403')
+        expect(response.code).to eq('403')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,6 +132,7 @@ files:
 - lib/phrasing.rb
 - lib/phrasing/rails/engine.rb
 - lib/phrasing/serializer.rb
+- lib/phrasing/string.rb
 - lib/phrasing/version.rb
 - phrasing.gemspec
 - spec/controllers/phrasing_phrases_controller.rb