phrasing 4.0.0rc15 → 4.0.0rc16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 363ff7e672836ac3143fef33947f95101b10d314
-  data.tar.gz: c1b2b2a8a483553b3659ebd3aacbe3396bbbab53
+  metadata.gz: 2a638909e5f75504ad5a6775cf1af6fc6d0706dc
+  data.tar.gz: 2c772e81d2089512e022b26ceea9f0199f7bd638
 SHA512:
-  metadata.gz: 236cbd26a05837f61ac6ba1fdb501f024ae5f5c49328e8177243365f5a9bbfa73133f35d93c6d0a64af99c598bfa6c5ac5a559ab038cdef18d28e4de77e037ec
-  data.tar.gz: 00d517390daab7df483099dfe4636c184f200ae11ca26e082b3a97d28ace82e33e3da476ff34f707a81150d21c675eca06dc3673298b21efd3fede54c5d7b683
+  metadata.gz: 2daf9ac1fa5d83e5cbdce6b91989012ef6bd50ac2d3065a16bdfec3c7330817168032d4e8dfbaf9bad4f88dc2cb01ecfd54b85987fd0e134c7b4d0174f97e621
+  data.tar.gz: 627ffd7cf5922061e5674f4072ac9296f9be293aa8c3ce24bfab1df022b831c8c0968180c4efdec652d716fb108156bf37cc272d24d8e564abeea39c38629bdd

data/.gitignore

@@ -2,7 +2,8 @@
 .ruby-version
 spec/dummy/.sass-cache/
 spec/dummy/db/development.sqlite3
+spec/dummy/db/test.sqlite3
 spec/dummy/log/development.log
 spec/dummy/log/test.log
 tmp
-Gemfile.lock
+Gemfile.lock

data/.travis.yml

@@ -1,5 +1,10 @@
 sudo: false
 language: ruby
+before_install:
+  - gem update bundler
+script:
+  - RAILS_ENV=test bundle exec rake db:migrate --trace
+  - bundle exec rspec spec/
 
 matrix:
   include:

data/Gemfile

@@ -1,16 +1,17 @@
-# A sample Gemfile
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
-rails_version = ENV["RAILS_VERSION"] || "5.0.0"
+rails_version = ENV['RAILS_VERSION'] || '5.0.0'
 
-gem "rails", "~> #{rails_version}"
+gem 'nokogiri', '~> 1.6.8'
+gem 'rails', "~> #{rails_version}"
 
+gem 'capybara'
 gem 'factory_girl_rails'
-gem 'sqlite3'
-gem 'rspec-rails'
-gem 'capybara', '~> 2.7.0'
 gem 'jasmine-rails'
+gem 'poltergeist'
 gem 'pry-rails'
-gem 'sass', '3.4.0'
+gem 'rspec-rails'
+gem 'sass'
+gem 'sqlite3'

data/app/assets/javascripts/editor.js

@@ -303,6 +303,7 @@ var editor = (function() {
 
 	function rehighlightLastSelection() {
 
+		window.getSelection().removeAllRanges();
 		window.getSelection().addRange( lastSelection );
 	}
 

data/app/assets/javascripts/phrasing.js

@@ -55,11 +55,13 @@ var phrasing_setup = function(){
   Phrasing.Bus.on('phrasing:edit-mode:on', function(){
     $('.phrasable').addClass("phrasable-on").attr("contenteditable", 'true');
     localStorage.setItem(Phrasing.EDIT_MODE_KEY, 'true');
+    disable_links();
   });
 
   Phrasing.Bus.on('phrasing:edit-mode:off', function(){
     $('.phrasable').removeClass("phrasable-on").attr("contenteditable", "false");
     localStorage.setItem(Phrasing.EDIT_MODE_KEY, "false");
+    enable_links();
   });
 
   // Initialize the editing bubble
@@ -148,6 +150,17 @@ var phrasing_setup = function(){
     $('#edit-mode-onoffswitch').prop('checked', false).change();
   }
 
+  function disable_links() {
+    $('a').on("click.phrasing", function(e){
+      if($(this).find('span').hasClass('phrasable')) {
+        e.preventDefault();
+      }
+    });
+  }
+
+  function enable_links() {
+    $('a').off('click.phrasing')
+  }
 };
 
 $(document).ready(phrasing_setup);

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "4.0.0rc15"
+  VERSION = "4.0.0rc16"
 end

data/spec/dummy/app/controllers/site_controller.rb

@@ -1,4 +1,7 @@
 class SiteController < ApplicationController
   def index
   end
+
+  def example
+  end
 end

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

@@ -0,0 +1 @@
+Example page for phrasing

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

@@ -11,3 +11,7 @@
 <div><%= phrase 'test', scope: :site %></div>
 
 <div><%= distance_of_time_in_words(Time.now, Time.now) %></div>
+
+<div><%= link_to phrase('Editable link'), example_path %></div>
+
+<%= link_to 'Uneditable link', example_path %>

data/spec/dummy/config/routes.rb

@@ -1,3 +1,4 @@
 Dummy::Application.routes.draw do
   root to: "site#index"
+  get 'example', to: 'site#example'
 end

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -13,14 +12,14 @@
 
 ActiveRecord::Schema.define(version: 20131120000856) do
 
-  create_table "phrasing_phrase_versions", force: true do |t|
-    t.string   "phrasing_phrase_id"
+  create_table "phrasing_phrase_versions", force: :cascade do |t|
+    t.integer  "phrasing_phrase_id"
     t.text     "value"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "phrasing_phrases", force: true do |t|
+  create_table "phrasing_phrases", force: :cascade do |t|
     t.string   "locale"
     t.string   "key"
     t.text     "value"

data/spec/features/dummy_spec.rb

@@ -2,31 +2,34 @@
 require 'spec_helper'
 
 feature "use #phrase" do
-
   it "should see the header phrase" do
     visit root_path
     expect(page).to have_content('The Header')
   end
 
   it "should see the header phrase modified if created before visiting" do
+    PhrasingPhrase.where(key: 'site.index.header').destroy_all
     FactoryGirl.create(:phrasing_phrase, key: 'site.index.header', value: 'The Header1')
     visit root_path
     expect(page).to have_content 'The Header1'
   end
 
   it "creates a phrasing_phrase if the yaml has an entry" do
+    PhrasingPhrase.where(key: 'site.index.header').destroy_all
     expect(PhrasingPhrase.find_by_key('site.index.header')).to be_nil
     visit root_path
     expect(PhrasingPhrase.find_by_key('site.index.header')).not_to be_nil
   end
 
   it "creates a phrasing_phrase if the yaml does not have an entry" do
+    PhrasingPhrase.where(key: 'site.index.intro').destroy_all
     expect(PhrasingPhrase.find_by_key('site.index.intro')).to be_nil
     visit root_path
     expect(PhrasingPhrase.find_by_key('site.index.intro')).not_to be_nil
   end
 
   it "shows the phrasing_phrase instead of the yaml" do
+    PhrasingPhrase.where(key: 'site.index.header').destroy_all
     FactoryGirl.create(:phrasing_phrase, key: 'site.index.header', value: 'A different header')
     visit root_path
     expect(page).not_to have_content 'The Header'
@@ -34,6 +37,7 @@ feature "use #phrase" do
   end
 
   it "allows to treat every translation as html safe" do
+    PhrasingPhrase.where(key: 'site.index.header').destroy_all
     FactoryGirl.create(:phrasing_phrase, key: 'site.index.header', value: '<strong>Strong header</strong>')
     visit root_path
     expect(page).to have_content 'Strong header'
@@ -47,9 +51,46 @@ feature "use #phrase" do
     expect(page).to have_content 'models.errors.test'
     expect(page).to have_content 'site.test'
   end
+
+  context 'preventing link redirects', js: true do
+    context 'edit mode is enabled' do
+      it 'should prevent phrasing link redirects' do
+        visit root_path
+        find('#phrasing-onoffswitch').click
+        click_link 'Editable link'
+        expect(page).not_to have_content 'Example page for phrasing'
+        expect(page).to have_content 'Editable link'
+      end
+
+      it 'should not prevent other link redirects' do
+        visit root_path
+        click_link 'Uneditable link'
+        expect(page).to have_content 'Example page for phrasing'
+        expect(page).not_to have_content 'Editable link'
+      end
+
+      it 'should not prevent the phrasing edit all phrases link' do
+        visit root_path
+        find('#phrasing-edit-all-phrases-icon-container').click
+        expect(page).to have_content 'Phrasing'
+      end
+    end
+
+    context 'edit mode is disabled' do
+      it 'should not prevent link redirects' do
+        visit root_path
+        click_link 'Editable link'
+        expect(page).to have_content 'Example page for phrasing'
+        expect(page).not_to have_content 'Editable link'
+      end
+    end
+  end
 end
 
 feature "locales" do
+  before do
+    PhrasingPhrase.destroy_all
+  end
 
   it "displays different text based on users' locale" do
     FactoryGirl.create(:phrasing_phrase, locale: 'en', key: 'site.index.intro', value: 'world')
@@ -70,7 +111,7 @@ feature "locales" do
     expect(page).not_to have_content 'world'
     expect(page).not_to have_content 'mundo'
 
-    I18n.locale = :en  # reset
+    I18n.locale = :en # reset
   end
 
 end
@@ -94,4 +135,4 @@ feature "yaml" do
       expect(PhrasingPhrase.find_by_key('site.index.footer')).to be_nil
     end
   end
-end
+end

data/spec/features/phrasing_spec.rb

@@ -294,7 +294,7 @@ feature 'phrase versions' do
 end
 
 feature "downloading and uploading yaml files" do
-  after do
+  before do
     PhrasingPhrase.destroy_all
   end
 
@@ -368,10 +368,9 @@ end
 
 feature "locales" do
   before do
-  end
-  after do
     PhrasingPhrase.destroy_all
   end
+
   it "imports yaml containing multiple locales" do
     file = Tempfile.new 'phrasing'
     file.write <<-YAML
@@ -405,5 +404,4 @@ feature "locales" do
     expect(yaml).to match(/en:\s*hello: world/)
     expect(yaml).to match(/es:\s*hello: mundo/)
   end
-
 end

data/spec/lib/phrasing_serializer_spec.rb

@@ -129,6 +129,9 @@ describe Phrasing::Serializer do
   end
 
   context 'export_yaml' do
+    before do
+      PhrasingPhrase.destroy_all
+    end
     it 'flattened phrases' do
       FactoryGirl.create(:phrasing_phrase, key: "site.intro", value: "Go Home")
       FactoryGirl.create(:phrasing_phrase, key: "site.outro", value: "Kthnx Bye")

data/spec/spec_helper.rb

@@ -2,9 +2,12 @@ ENV["RAILS_ENV"] = 'test'
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require 'rspec/rails'
 require 'capybara/rspec'
+require 'capybara/poltergeist'
 require 'tempfile'
 require 'pry'
 
+Capybara.javascript_driver = :poltergeist
+
 Dir["#{File.dirname(__FILE__)}/factories/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc15
+  version: 4.0.0rc16
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,6 +145,7 @@ files:
 - spec/dummy/app/helpers/phrasing_helper.rb
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/site/example.html.erb
 - spec/dummy/app/views/site/index.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -167,7 +168,6 @@ files:
 - spec/dummy/db/migrate/20131120000855_create_phrasing_phrases.phrasing_rails_engine.rb
 - spec/dummy/db/migrate/20131120000856_create_phrasing_phrase_versions.phrasing_rails_engine.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Edit phrases inline for Rails applications!