phrasing 4.0.0rc3 → 4.0.0rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa17e70cddb3a13fbaefc3f473d185c93ddad028
-  data.tar.gz: 4947a95d4f5c5f1dda178056a589b2f2548fedf9
+  metadata.gz: 6ec5cf82a1f8789b4f8c7f25f1fd93ec9c370ded
+  data.tar.gz: 9d92db89baa70f2adf1fd122ced6cb949ee4e44e
 SHA512:
-  metadata.gz: 645b4738ea92b854116bac7cdaef56a797c4121629788a5d7b7b956a11d0869152ccb694a319552ff87ec9938ebc537c64716f419931e60fc6503a9772ac5014
-  data.tar.gz: 01aff8859f2081498e5f274a5239f329b6f5ce0faf16b14b85170dd843edfaaaed5ab9a411874552e60708b662be0d945f60857b9a46eb47efe9fb6a76fbc91a
+  metadata.gz: 1ab0220b8ad7cf33ec522ba8155d2aeb65ffed693bb2c4eed8a8ce736efc0ae8b96d859618829092b6c3a6984dd4a13affe8cc9935fafc199f08ea3f9afd717b
+  data.tar.gz: 61f3907edde2443d5b50f050f01edfec95f258614601aebc3d77e02db8795868a6067b4e17e7ab6318cf7ce9436dd666271e80edcf7812b9bf470261d40b9197

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-env:
-  - "RAILS_VERSION=3.2.0"
-  - "RAILS_VERSION=4.0.0"
-  - "RAILS_VERSION=4.1.0"
+
+matrix:
+  include:
+    - rvm: 1.9.3
+      env: "RAILS_VERSION=3.2.0"
+    - rvm: 2.0.0
+      env: "RAILS_VERSION=4.0.0"
+    - rvm: 2.1.2
+      env: "RAILS_VERSION=4.1.0"
+    - rvm: 2.2.0
+      env: "RAILS_VERSION=4.2.0"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Phrasing Change Log
 
+## 3.2.9 (January 7th, 2015)
+
+Require only haml, not haml-rails.
+
+## 3.2.8 (January 6th, 2015)
+
+Fix confirm dialogs when deleting phrases and phrase versions.
+
 ## 3.2.7 (October 3rd, 2014)
 
 Add a config option to set a parent controller to Phrasing Engine Controllers.

data/Gemfile

@@ -8,10 +8,9 @@ rails_version = ENV["RAILS_VERSION"] || "4.1.4"
 gem "rails", "~> #{rails_version}"
 
 gem 'factory_girl_rails'
-gem 'haml-rails'
 gem 'sqlite3'
 gem 'rspec-rails'
 gem 'capybara', '~> 2.3.0'
 gem 'jasmine-rails'
 gem 'pry-rails'
-gem 'sass', '3.4.0'
+gem 'sass', '3.4.0'

data/app/assets/javascripts/phrasing.js

@@ -0,0 +1,153 @@
+//= require editor
+
+var Phrasing = {
+  Bus : $({}),
+  EDIT_MODE_KEY : 'editing-mode'
+};
+
+function StatusBubbleWidget(options){
+  this.$statusText       = options.$statusText;
+  this.$statusIndicator  = options.$statusIndicator;
+  this.$editModeChechbox = options.$editModeChechbox;
+  this._init();
+}
+
+StatusBubbleWidget.prototype = {
+  _init : function(){
+    this.$editModeChechbox.on('change', function(){
+      if(this.checked){
+        Phrasing.Bus.trigger('phrasing:edit-mode:on');
+      }else{
+        Phrasing.Bus.trigger('phrasing:edit-mode:off');
+      }
+    });
+  },
+
+  _alterStatus : function(text, color){
+    this.$statusText.text(text);
+    this.$statusIndicator.css('background-color', color);
+  },
+
+  saving : function(){
+    this._alterStatus('Saving', 'orange');
+  },
+
+  saved : function(){
+    this._alterStatus('Saved', '#56AE45');
+  },
+
+  error : function(){
+    this._alterStatus('Error', 'red');
+  }
+};
+
+var phrasing_setup = function(){
+  var statusBubbleWidget = new StatusBubbleWidget({
+    $statusText       : $('#phrasing-edit-mode-bubble #phrasing-saved-status-headline p'),
+    $statusIndicator  : $('#phrasing-saved-status-indicator-circle'),
+    $editModeChechbox : $('#edit-mode-onoffswitch')
+  });
+
+  Phrasing.Bus.on('phrasing:edit-mode:on', function(){
+    $('.phrasable').addClass("phrasable-on").attr("contenteditable", 'true');
+    localStorage.setItem(Phrasing.EDIT_MODE_KEY, 'true');
+  });
+
+  Phrasing.Bus.on('phrasing:edit-mode:off', function(){
+    $('.phrasable').removeClass("phrasable-on").attr("contenteditable", "false");
+    localStorage.setItem(Phrasing.EDIT_MODE_KEY, "false");
+  });
+
+  // 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;
+  };
+
+  // Trigger AJAX on textchange
+  var userTriggeredPhrasingDOMChange = true;
+  var timer = {};
+  var timer_status = {};
+
+  $('.phrasable').on('DOMNodeInserted DOMNodeRemoved DOMCharacterDataModified', function(e){
+    if (userTriggeredPhrasingDOMChange === false){
+      return;
+    }
+
+    statusBubbleWidget.saving();
+
+    var record = this;
+
+    clearTimeout(timer[$(record).data("url")]);
+    timer_status[$(record).data("url")] = 0;
+
+    timer[$(record).data("url")] = setTimeout(function(){
+      savePhraseViaAjax(record);
+      delete timer_status[$(record).data("url")];
+    },2500);
+
+    timer_status[$(record).data("url")] = 1;
+  });
+
+  // AJAX Request
+  function savePhraseViaAjax(record){
+
+    var url = $(record).data("url");
+
+    var content = record.innerHTML;
+
+    if(content.length === 0){
+      content = "Empty";
+    }
+
+    $.ajax({
+      type: "PUT",
+      url: url,
+      data: { new_value: content },
+      success: function(e){
+        userTriggeredPhrasingDOMChange = false;
+        if(content === "Empty"){
+          $('span.phrasable[data-url="'+ url +'"]').html(content);
+        }else{
+          // Not to lose the cursor on the current contenteditable element
+          $('span.phrasable[data-url="'+ url +'"]').not(record).html(content);
+        }
+        userTriggeredPhrasingDOMChange = true;
+
+        if (Object.size(timer_status) === 0){
+          statusBubbleWidget.saved();
+        }
+      },
+      error: function(e){
+        statusBubbleWidget.error();
+      }
+    });
+  }
+
+  if(localStorage.getItem(Phrasing.EDIT_MODE_KEY) === undefined){
+    localStorage.setItem(Phrasing.EDIT_MODE_KEY, 'true');
+  }
+
+  if(localStorage.getItem(Phrasing.EDIT_MODE_KEY) == 'true'){
+    $('#edit-mode-onoffswitch').prop('checked', true).change();
+  }else{
+    $('#edit-mode-onoffswitch').prop('checked', false).change();
+  }
+
+};
+
+$(document).ready(phrasing_setup);
+
+$(document).on('page:before-change', function() {
+  Phrasing.Bus.off();
+});

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

@@ -8,14 +8,14 @@
 	overflow: hidden;
 }*/
 
-.phrasable_on{
+.phrasable.phrasable-on{
 	border-bottom: 1px dashed black;
-	
+
 	a{
   	pointer-events: none;
    	cursor: default;
 	}
-	
+
 	&:focus{
 		outline: none;
 	}
@@ -172,7 +172,7 @@ span.no-overflow {
 			margin-right: 0px;
 			opacity: 0;
 		}
-		
+
 		input{
 			border-left: 2px solid transparent;
 			padding-right: 5px;
@@ -248,4 +248,4 @@ span.no-overflow {
 
 .url {
 	-webkit-font-smoothing: antialiased;
-}
+}

data/app/controllers/phrasing_phrases_controller.rb

@@ -8,8 +8,11 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
 
   before_filter :authorize_editor
 
-  def import_export; end
-  def help; end
+  def import_export
+  end
+
+  def help
+  end
 
   def index
     params[:locale] ||= I18n.default_locale
@@ -22,33 +25,29 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
   end
 
   def update
-    if request.xhr?
-      xhr_phrase_update
-    else
-      phrase_update
-    end
+    request.xhr? ? xhr_phrase_update : phrase_update
   end
 
   def download
     app_name = Rails.application.class.to_s.split("::").first
     app_env = Rails.env
-    filename = "phrasing_phrases_#{app_name}_#{app_env}_#{Time.now.strftime("%Y_%m_%d_%H_%M_%S")}.yml"
+    time = Time.now.strftime('%Y_%m_%d_%H_%M_%S')
+    filename = "phrasing_phrases_#{app_name}_#{app_env}_#{time}.yml"
     send_data Phrasing::Serializer.export_yaml, filename: filename
   end
 
   def upload
-      number_of_changes = Phrasing::Serializer.import_yaml(params["file"].tempfile)
-      redirect_to phrasing_phrases_path, notice: "YAML file uploaded successfully! Number of phrases changed: #{number_of_changes}."
-    rescue => e
-      logger.info "\n#{e.class}\n#{e.message}"
-      message = if params[:file].nil?
-        "Please choose a file."
-      else
-        "Please upload a valid YAML file."
-      end
-
-      flash[:alert] = "There was an error processing your upload! #{message}"
-      render action: 'import_export', status: 400
+    number_of_changes = Phrasing::Serializer.import_yaml(params["file"].tempfile)
+    redirect_to phrasing_phrases_path, notice: "YAML file uploaded successfully! Number of phrases changed: #{number_of_changes}."
+  rescue => e
+    message = if params[:file].nil?
+                'Please choose a file.'
+              else
+                'Please upload a valid YAML file.'
+              end
+
+    flash[:alert] = "There was an error processing your upload! #{message}"
+    render action: 'import_export', status: 400
   end
 
   def destroy
@@ -59,33 +58,30 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
 
   private
 
-    def authorize_editor
-      redirect_to root_path unless can_edit_phrases?
-    end
+  def authorize_editor
+    redirect_to root_path unless can_edit_phrases?
+  end
 
-    def xhr_phrase_update
-      klass, attribute = params[:klass], params[:attribute]
-
-      if Phrasing.is_whitelisted?(klass, attribute)
-        class_object = klass.classify.constantize
-        @object = class_object.where(id: params[:id]).first
-        @object.send("#{attribute}=",params[:new_value])
-        @object.save!
-        render json: @object
-      else
-        render status: 403, text: "Attribute not whitelisted!"
-      end
-
-      rescue ActiveRecord::RecordInvalid => e
-        render status: 403, text: e
-    end
+  def xhr_phrase_update
+    klass, attribute = params[:klass], params[:attribute]
+
+    return render status: 403, text: 'Phrase not whitelisted' unless Phrasing.whitelisted?(klass, attribute)
 
-    def phrase_update
-      phrase = PhrasingPhrase.find(params[:id])
-      phrase.value = params[:phrasing_phrase][:value]
-      phrase.save!
+    record = klass.classify.constantize.find(params[:id])
 
-      redirect_to phrasing_phrases_path, notice: "#{phrase.key} updated!"
+    if record.update(attribute => params[:new_value])
+      render json: record
+    else
+      render status: 403, json: record.error.full_messages
     end
+  end
+
+  def phrase_update
+    phrase = PhrasingPhrase.find(params[:id])
+    phrase.value = params[:phrasing_phrase][:value]
+    phrase.save!
+
+    redirect_to phrasing_phrases_path, notice: "#{phrase.key} updated!"
+  end
 
 end

data/app/helpers/inline_helper.rb

@@ -1,14 +1,13 @@
 module InlineHelper
-# Normal phrase
-# phrase("headline", url: www.infinum.co/yabadaba, inverse: true, scope: "models.errors")
-
-# Data model phrase
-# phrase(record, :title, inverse: true, class: phrase-record-title)
 
+  # Normal phrase
+  # phrase("headline", url: www.infinum.co/yabadaba, inverse: true, scope: "models.errors")
+  # Data model phrase
+  # phrase(record, :title, inverse: true, class: phrase-record-title)
   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 || {})
+    if args[0].class.in? [String, Symbol]
+      key, options = args[0].to_s, (args[1] || {})
+      inline(extract_record(key, options), :value, options)
     else
       record, attribute, options = args[0], args[1], args[2]
       inline(record, attribute, options || {})
@@ -17,33 +16,31 @@ module InlineHelper
 
   private
 
-    def inline(record, attribute, options={})
-      return uneditable_phrase(record, attribute) unless can_edit_phrases?
+  def inline(record, attribute, options = {})
+    return uneditable_phrase(record, attribute) unless can_edit_phrases?
 
-      klass  = 'phrasable phrasable_on'
-      klass += ' inverse'      if options[:inverse]
-      klass += options[:class] if options[:class]
+    klass  = 'phrasable'
+    klass += ' inverse'      if options[:inverse]
+    klass += options[:class] if options[:class]
 
-      url = phrasing_polymorphic_url(record, attribute)
+    url = phrasing_polymorphic_url(record, attribute)
 
-      content_tag(:span, { class: klass, contenteditable: true, spellcheck: false, "data-url" => url }) do
-        (record.send(attribute) || record.try(:key)).to_s.html_safe
-      end
+    content_tag(:span, class: klass, contenteditable: true, spellcheck: false, 'data-url' => url) do
+      (record.send(attribute) || record.try(:key)).to_s.html_safe
     end
+  end
 
-    def phrasing_phrase(key, options = {})
-      key = options[:scope] ? "#{options[:scope]}.#{key}" : key
-      record = PhrasingPhrase.find_phrase(key)
-      inline(record, :value, options)
-    end
+  def extract_record(key, options = {})
+    key = options[:scope] ? "#{options[:scope]}.#{key}" : key
+    PhrasingPhrase.find_phrase(key)
+  end
 
-    def uneditable_phrase(record, attribute)
-      record_value = record.send(attribute)
-      record_value.to_s.html_safe
-    end
+  def uneditable_phrase(record, attribute)
+    record.public_send(attribute).to_s.html_safe
+  end
 
-    def phrasing_polymorphic_url(record, attribute)
-      phrasing_phrase_path(klass: record.class.to_s, id: record.id, attribute: attribute)
-    end
+  def phrasing_polymorphic_url(record, attribute)
+    phrasing_phrase_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, onclick: "return 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, onclick: "return 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.rb

@@ -3,7 +3,7 @@ require 'phrasing/serializer'
 require 'phrasing/rails/engine'
 require 'jquery-rails'
 require 'jquery-cookie-rails'
-require 'haml-rails'
+require 'haml'
 
 module Phrasing
   mattr_accessor :allow_update_on_all_models_and_attributes
@@ -33,7 +33,7 @@ module Phrasing
     @@whitelist = whitelist
   end
 
-  def self.is_whitelisted?(klass,attribute)
-    allow_update_on_all_models_and_attributes == true or whitelist.include? "#{klass}.#{attribute}"
+  def self.whitelisted?(klass, attribute)
+    allow_update_on_all_models_and_attributes == true || whitelist.include?("#{klass}.#{attribute}")
   end
-end
+end

data/lib/phrasing/version.rb

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

data/phrasing.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 3.2.0"
   s.add_dependency "railties", ">= 3.2"
-  s.add_dependency "haml-rails"
+  s.add_dependency "haml"
   s.add_dependency "jquery-rails"
   s.add_dependency "jquery-cookie-rails"
   s.add_dependency "sass"

data/spec/controllers/phrasing_phrases_controller.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe PhrasingPhrasesController do
+  describe 'GET #new' do
+    it 'renders index template' do
+      get :index
+      expect(response).to render_template(:index)
+    end
+
+    let(:phrase) { FactoryGirl.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')
+
+      expect(response.code).to eq('200')
+    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 }
+
+      expect(response.code).to eq('403')
+    end
+  end
+end

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

@@ -6,6 +6,8 @@
 
 <div><%= phrase('test', scope: 'models.errors') %></div>
 
+<div><%= phrase('test', scope: 'models.errors') %></div>
+
 <div><%= phrase 'test', scope: :site %></div>
 
-<div><%= distance_of_time_in_words(Time.now, Time.now) %></div>
+<div><%= distance_of_time_in_words(Time.now, Time.now) %></div>

data/spec/lib/phrasing_serializer_spec.rb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 
 describe Phrasing::Serializer do
-
   let(:english_phrases) do
     PhrasingPhrase.where(locale: :en)
   end
@@ -12,15 +11,14 @@ describe Phrasing::Serializer do
   end
 
   describe 'flatten_the_hash' do
-
     it 'with simple data' do
-      hash = { "site.intro" => "Hello", "site.outro" => "KthnxBye", "site.overture" => "The Butler"}
+      hash = { "site.intro" => "Hello", "site.outro" => "KthnxBye", "site.overture" => "The Butler" }
       new_hash = Phrasing::Serializer.flatten_the_hash(hash)
       expect(new_hash).to eq(hash)
     end
 
     it 'with nested data' do
-      hash = { "site.text" => {"intro" => "Hello", "outro" => "KthnxBye"}}
+      hash = { "site.text" => { "intro" => "Hello", "outro" => "KthnxBye" } }
       new_hash = Phrasing::Serializer.flatten_the_hash(hash)
 
       predicted_new_hash = { "site.text.intro" => "Hello", "site.text.outro" => "KthnxBye" }
@@ -28,17 +26,24 @@ describe Phrasing::Serializer do
     end
 
     it 'with deeply nested data' do
-      hash = { "site" => {"text" => {"intro" => "Hello", "outro" => "KthnxBye", "overture" => {"intro" => "Overture intro", "outro" => "Overture outro"}}}}
+      hash = { "site" => { "text" => { "intro" => "Hello",
+                                       "outro" => "KthnxBye",
+                                       "overture" => { "intro" => "Overture intro",
+                                                       "outro" => "Overture outro" }
+                                      }
+                          }
+              }
       new_hash = Phrasing::Serializer.flatten_the_hash(hash)
 
-      predicted_new_hash = { "site.text.intro" => "Hello", "site.text.outro" => "KthnxBye", "site.text.overture.intro" => "Overture intro", "site.text.overture.outro" => "Overture outro"}
+      predicted_new_hash = { "site.text.intro" => "Hello",
+                             "site.text.outro" => "KthnxBye",
+                             "site.text.overture.intro" => "Overture intro",
+                             "site.text.overture.outro" => "Overture outro" }
       expect(new_hash).to eq(predicted_new_hash)
     end
-
   end
 
   context 'import_yaml' do
-
     it 'simply formatted phrases' do
       yaml = <<-YAML
         en:
@@ -84,7 +89,6 @@ describe Phrasing::Serializer do
       expect(english_phrases.where(key: "site.text.overture.outro").first.value).to eq("Overture outro")
     end
 
-
     it 'overrides old values' do
       FactoryGirl.create(:phrasing_phrase, key: "site.intro", value: "Go Home")
       FactoryGirl.create(:phrasing_phrase, key: "site.outro", value: "Kthnx Bye")
@@ -104,10 +108,8 @@ describe Phrasing::Serializer do
 
       expect(number_of_changes).to eq(1)
     end
-
   end
 
-
   context 'imports and exports' do
     it 'without changing, should return 0 number of changes' do
       FactoryGirl.create(:phrasing_phrase, key: "site.intro", value: "Go Home")
@@ -126,7 +128,6 @@ describe Phrasing::Serializer do
     end
   end
 
-
   context 'export_yaml' do
     it 'flattened phrases' do
       FactoryGirl.create(:phrasing_phrase, key: "site.intro", value: "Go Home")
@@ -153,13 +154,5 @@ describe Phrasing::Serializer do
       expect(yaml).to match(/en:\s*\n\s*site.intro:\sHello/)
       expect(yaml).to match(/fr:\s*\n\s*site.intro:\sBonjour/)
     end
-
   end
-
-
-
 end
-
-
-
-

data/spec/spec_helper.rb

@@ -10,4 +10,5 @@ Dir["#{File.dirname(__FILE__)}/factories/**/*.rb"].each { |f| require f }
 RSpec.configure do |config|
   config.mock_with :rspec
   config.use_transactional_fixtures = true
+  config.infer_spec_type_from_file_location!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc3
+  version: 4.0.0rc4
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -118,7 +118,7 @@ files:
 - app/assets/fonts/icomoon.woff
 - app/assets/images/phrasing_icon_edit_all.png
 - app/assets/javascripts/editor.js
-- app/assets/javascripts/phrasing.js.erb
+- app/assets/javascripts/phrasing.js
 - app/assets/javascripts/phrasing_engine.js
 - app/assets/stylesheets/phrasing.css.scss
 - app/assets/stylesheets/phrasing_edit_mode_bubble.css.scss
@@ -149,6 +149,7 @@ files:
 - lib/phrasing/serializer.rb
 - lib/phrasing/version.rb
 - phrasing.gemspec
+- spec/controllers/phrasing_phrases_controller.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css

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

@@ -1,127 +0,0 @@
-//= require editor
-
-function StatusBubble(){
-  var $headline = $('#phrasing-edit-mode-bubble #phrasing-saved-status-headline p');
-  var $circle = $('#phrasing-saved-status-indicator-circle');
-
-  var alterStatus = function(text, color){
-    $headline.text(text);
-    $circle.css('background-color', color);
-  }
-
-  this.saving = function(){
-    alterStatus('Saving', 'orange');
-  }
-
-  this.saved = function(){
-    alterStatus('Saved', '#56AE45');
-  }
-
-  this.error = function(){
-    alterStatus('Error', 'red');
-  }
-}
-
-var phrasing_setup = function(){
-  var status = new StatusBubble();
-
-  // 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;
-  };
-
-  // Trigger AJAX on textchange
-  var trigger_binded_events_for_phrasable_class = 1;
-  var timer = {}
-  var timer_status = {}
-
-  $('.phrasable').on('DOMNodeInserted DOMNodeRemoved DOMCharacterDataModified', function(e){
-    status.saving();
-
-    if (trigger_binded_events_for_phrasable_class == 1){
-
-      var record = this;
-
-      clearTimeout(timer[$(record).data("url")]);
-      timer_status[$(record).data("url")] = 0;
-
-      timer[$(record).data("url")] = setTimeout(function(){
-        savePhraseViaAjax(record);
-        delete timer_status[$(record).data("url")]
-      },2500)
-      timer_status[$(record).data("url")] = 1;
-    }
-
-  });
-
-  // AJAX Request
-  function savePhraseViaAjax(record){
-
-    var url = $(record).data("url");
-
-    var content = record.innerHTML;
-
-    if(content.length == 0){
-      content = "Empty"
-    }
-
-    $.ajax({
-      type: "PUT",
-      url: url,
-      data: { new_value: content },
-      success: function(e){
-        trigger_binded_events_for_phrasable_class = 0;
-        if(content === "Empty"){
-          $('span.phrasable[data-url="'+ url +'"]').html(content)
-        }else{
-          // Not to lose the cursor on the current contenteditable element
-          $('span.phrasable[data-url="'+ url +'"]').not(record).html(content)
-        }
-        trigger_binded_events_for_phrasable_class = 1;
-
-        if (Object.size(timer_status) == 0){
-          status.saved();
-        }
-      },
-      error: function(e){
-        status.error();
-      }
-    });
-  }
-
-  // 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");
-    }
-    else{
-      $('.phrasable').removeClass("phrasable_on").attr("contenteditable", "false");
-      $.cookie("editing_mode", "false");
-    }
-  });
-
-  if($.cookie("editing_mode") === null){
-    $.cookie("editing_mode", "true");
-    $('#edit-mode-onoffswitch').prop('checked', true).change();
-  }
-  else if($.cookie("editing_mode") == "true"){
-    $('#edit-mode-onoffswitch').prop('checked', true).change();
-  }else{
-    $('#edit-mode-onoffswitch').prop('checked', false).change();
-  }
-
-};
-
-$(document).ready(phrasing_setup)