phrasing 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac13135c189add2c1c995372d8afaff63863d697
-  data.tar.gz: a2a0ac009155ff6a8438e1e086567ef326e08539
+SHA256:
+  metadata.gz: 3fa80ff59b5b335272a27f88818c9b527182c7e91d367f4baeea71b680122372
+  data.tar.gz: dd0343b4dc10fdb3434251fb5f44124cc52b99fd0e6065391155a8072246f6ad
 SHA512:
-  metadata.gz: 31618d8667c75fad47e5dc4cbe460af00dd8c48916f53831b8c2eea722795616e3dbf8d8c0f62bcf0b5d5a2ed4ee19df7d34f2f6302efedc8c22e78b0553a400
-  data.tar.gz: c9f5575d6f24427aed3b837a0881129142eadae7d0a504c5bdc629183843b310c899fcacad487c974909ab308ba76cc4f53996bfff19fc3a70a0f4e75a4b8ca2
+  metadata.gz: eef3283f9cdf3dbda9a2de72e1628fac2403cb174e4a8ce64c5a9b7a45fa3ee4c5e68fe93bf3e52a92be2b190699007446cc663b7b52ac7ec6e403a9c7118fbd
+  data.tar.gz: '0873b3672640c7203f5b1f0a6c01a0f4ead2b4f24b4f1bdeb18ca6bd80db29d50099aff1fbbb05082345f1a7419334955a179855790cc381dbb82944d32c64a0'

data/.travis.yml

@@ -1,16 +1,17 @@
 sudo: false
 language: ruby
 before_install:
-  - gem update bundler
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 script:
   - RAILS_ENV=test bundle exec rake db:migrate --trace
   - bundle exec rspec spec/
 
 matrix:
   include:
-    - rvm: 2.1.2
+    - rvm: 2.3.0
       env: "RAILS_VERSION=4.1.0"
-    - rvm: 2.2.0
+    - rvm: 2.4.0
       env: "RAILS_VERSION=4.2.0"
-    - rvm: 2.3.0
+    - rvm: 2.5.0
       env: "RAILS_VERSION=5.0.0"

data/Gemfile

@@ -8,11 +8,12 @@ gem 'nokogiri', '~> 1.8.3'
 gem 'rails', "~> #{rails_version}"
 
 gem 'capybara'
-gem 'factory_girl_rails'
+gem 'factory_bot_rails'
 gem 'jasmine-core', '~> 2.9.1'
 gem 'jasmine-rails'
 gem 'poltergeist'
 gem 'pry-rails'
+gem 'rdoc'
 gem 'rspec-rails', '~> 3.7.1'
 gem 'sass'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'

data/README.md

@@ -100,14 +100,13 @@ config.allow_update_on_all_models_and_attributes = true
 
 ## Turbolinks
 
-If you're experiencing problems with Rails apps using Turbolinks, include the [jQuery-turbolinks](https://github.com/kossnocorp/jquery.turbolinks) gem in your application and simply require it in the following order:
+If you're using Turbolinks make sure the phrasing gem is required after it:
 
 ```javascript
 //= require jquery
 //= require jquery_ujs
-//= require jquery.turbolinks
-//= require phrasing
 //= require turbolinks
+//= require phrasing
 ```
 
 ## Phrasing Appearance

data/app/assets/javascripts/phrasing.js

@@ -163,7 +163,11 @@ var phrasing_setup = function(){
   }
 };
 
-$(document).ready(phrasing_setup);
+if(typeof Turbolinks == "object") {
+  $(document).on('turbolinks:load', phrasing_setup);
+} else {
+  $(document).ready(phrasing_setup);
+}
 
 $(document).on('page:before-change', function() {
   Phrasing.Bus.off();

data/lib/generators/phrasing/phrasing_generator.rb

@@ -25,12 +25,10 @@ class PhrasingGenerator < Rails::Generators::Base
   end
 
   def migration_version
-    if rails5?
-      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-    end
+    "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if rails_major_version >= 5
   end
 
-  def rails5?
-    Rails.version.start_with? '5'
+  def rails_major_version
+    Rails.version.first.to_i
   end
 end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = '4.2.1'.freeze
+  VERSION = '4.3.0'.freeze
 end

data/spec/controllers/phrasing_phrases_controller.rb

@@ -7,7 +7,7 @@ describe PhrasingPhrasesController do
       expect(response).to render_template(:index)
     end
 
-    let(:phrase) { FactoryGirl.create(:phrasing_phrase, value: 'old_value') }
+    let(:phrase) { FactoryBot.create(:phrasing_phrase, value: 'old_value') }
 
     it 'updates phrase' do
       expect do

data/spec/dummy/config/application.rb

@@ -43,4 +43,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
-

data/spec/dummy/config/initializers/secret_token.rb

@@ -5,3 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Dummy::Application.config.secret_token = '58a2a6a84d84c3e438f9ca2616323039174f7da3337e52de287033934caa5d32051779feec0aba01731cd4811d60150b208b856b706bee47f510c8a0648f1600'
+Dummy::Application.config.secret_key_base = '91f7361433a40ea1fb938722ec727bd89312d0a2431a0e3f2770ebf4fe5ada502e8e9920ce5743e965c219cc153ef9f68fbcfd0f4c837cdb96174dc4068f3a69'

data/spec/factories/phrasing_phrases.rb

@@ -1,12 +1,11 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence :string do |n|
     "string%09d" % n
   end
-  
+
   factory :phrasing_phrase do
-    key { FactoryGirl.generate(:string) }
-    value { FactoryGirl.generate(:string) }
-    locale I18n.default_locale
+    key { FactoryBot.generate(:string) }
+    value { FactoryBot.generate(:string) }
+    locale { I18n.default_locale }
   end
 end
-

data/spec/features/dummy_spec.rb

@@ -9,7 +9,7 @@ feature "use #phrase" do
 
   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')
+    FactoryBot.create(:phrasing_phrase, key: 'site.index.header', value: 'The Header1')
     visit root_path
     expect(page).to have_content 'The Header1'
   end
@@ -30,7 +30,7 @@ feature "use #phrase" do
 
   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')
+    FactoryBot.create(:phrasing_phrase, key: 'site.index.header', value: 'A different header')
     visit root_path
     expect(page).not_to have_content 'The Header'
     expect(page).to have_content 'A different header'
@@ -38,7 +38,7 @@ feature "use #phrase" do
 
   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>')
+    FactoryBot.create(:phrasing_phrase, key: 'site.index.header', value: '<strong>Strong header</strong>')
     visit root_path
     expect(page).to have_content 'Strong header'
     visit root_path
@@ -93,8 +93,8 @@ feature "locales" do
   end
 
   it "displays different text based on users' locale" do
-    FactoryGirl.create(:phrasing_phrase, locale: 'en', key: 'site.index.intro', value: 'world')
-    FactoryGirl.create(:phrasing_phrase, locale: 'es', key: 'site.index.intro', value: 'mundo')
+    FactoryBot.create(:phrasing_phrase, locale: 'en', key: 'site.index.intro', value: 'world')
+    FactoryBot.create(:phrasing_phrase, locale: 'es', key: 'site.index.intro', value: 'mundo')
 
     I18n.locale = :en
     visit root_path

data/spec/features/phrasing_spec.rb

@@ -24,26 +24,12 @@ feature 'edit mode bubble' do
     find(:css, ".phrasing-edit-all-phrases-link").click
     expect(current_path).to eq phrasing_phrases_path
   end
-
-  xit "phrases should have class shouldn't have class phrasable on when edit mode is off", js: true do
-    edit_mode_checkbox = find(:css, ".onoffswitch-checkbox")
-    edit_mode_checkbox.click
-    expect(page.find('.header').first('.phrasable')['class']).to eq 'phrasable'
-  end
-
-  xit 'edit phrases', js: true do
-    header_phrase = page.find('.header').first('.phrasable')
-    header_phrase['class'].should eq 'phrasable phrasable_on'
-    expect(header_phrase.text).to eq 'The Header'
-    header_phrase.set "content"
-    expect(header_phrase.expect.text).to eq 'content'
-  end
 end
 
 feature "phrasing index" do
 
   before do
-    FactoryGirl.create(:phrasing_phrase, key: "foo", value: "bar")
+    FactoryBot.create(:phrasing_phrase, key: "foo", value: "bar")
     visit phrasing_phrases_path
   end
 
@@ -87,23 +73,23 @@ feature "phrasing index" do
   end
 
   it "searches in the middles of strings" do
-    FactoryGirl.create(:phrasing_phrase, key: "site.index.something")
+    FactoryBot.create(:phrasing_phrase, key: "site.index.something")
     fill_in 'search', with: 'index'
     click_button 'Search'
     expect(page).to have_content 'site.index.something'
   end
 
   it "can show all" do
-    FactoryGirl.create(:phrasing_phrase, key: "foe", value: "beer")
+    FactoryBot.create(:phrasing_phrase, key: "foe", value: "beer")
     click_button 'Search'
     expect(page).to have_content 'foo'
     expect(page).to have_content 'foe'
   end
 
   it 'not null values first, global order by key' do
-    FactoryGirl.create(:phrasing_phrase, key: "foo1", value: nil)
-    FactoryGirl.create(:phrasing_phrase, key: "foo2", value: "beer")
-    FactoryGirl.create(:phrasing_phrase, key: "foo3", value: nil)
+    FactoryBot.create(:phrasing_phrase, key: "foo1", value: nil)
+    FactoryBot.create(:phrasing_phrase, key: "foo2", value: "beer")
+    FactoryBot.create(:phrasing_phrase, key: "foo3", value: nil)
     visit phrasing_phrases_path
     expect(page.body).to match /foo[\s\S]*foo2[\s\S]*foo1[\s\S]*foo3/
   end
@@ -112,9 +98,9 @@ feature "phrasing index" do
 
     before do
       PhrasingPhrase.destroy_all
-      FactoryGirl.create(:phrasing_phrase, key: "foo", value: "bar1", locale: "en")
-      FactoryGirl.create(:phrasing_phrase, key: "foo", value: "bar2", locale: "fa")
-      FactoryGirl.create(:phrasing_phrase, key: "foo", value: "bar3", locale: "it")
+      FactoryBot.create(:phrasing_phrase, key: "foo", value: "bar1", locale: "en")
+      FactoryBot.create(:phrasing_phrase, key: "foo", value: "bar2", locale: "fa")
+      FactoryBot.create(:phrasing_phrase, key: "foo", value: "bar3", locale: "it")
     end
 
     it "nil locale, blank search" do
@@ -216,7 +202,7 @@ end
 
 feature "phrasing edit" do
   before do
-    FactoryGirl.create(:phrasing_phrase, key: "foo", value: "bar")
+    FactoryBot.create(:phrasing_phrase, key: "foo", value: "bar")
     visit phrasing_phrases_path
   end
 
@@ -234,7 +220,7 @@ end
 
 feature "phrasing update" do
   before do
-    FactoryGirl.create(:phrasing_phrase, key: "foo", value: "bar")
+    FactoryBot.create(:phrasing_phrase, key: "foo", value: "bar")
     visit phrasing_phrases_path
     fill_in 'search', with: 'foo'
     click_button 'Search'
@@ -257,7 +243,7 @@ end
 
 feature 'phrase versions' do
   before do
-    phrase = FactoryGirl.create(:phrasing_phrase, key: "foo", value: "bar")
+    phrase = FactoryBot.create(:phrasing_phrase, key: "foo", value: "bar")
     visit edit_phrasing_phrase_path(phrase)
   end
 
@@ -299,11 +285,11 @@ feature "downloading and uploading yaml files" do
   end
 
   it "round-trips the YAML" do
-    FactoryGirl.create(:phrasing_phrase, key: "a.foo1", value: "bar1")
-    FactoryGirl.create(:phrasing_phrase, key: "a.foo2:", value: "bar2")
-    FactoryGirl.create(:phrasing_phrase, key: "a.b.foo3", value: "bar3")
-    FactoryGirl.create(:phrasing_phrase, key: "c.foo4", value: "bar4")
-    FactoryGirl.create(:phrasing_phrase, key: 2, value: "bar5")
+    FactoryBot.create(:phrasing_phrase, key: "a.foo1", value: "bar1")
+    FactoryBot.create(:phrasing_phrase, key: "a.foo2:", value: "bar2")
+    FactoryBot.create(:phrasing_phrase, key: "a.b.foo3", value: "bar3")
+    FactoryBot.create(:phrasing_phrase, key: "c.foo4", value: "bar4")
+    FactoryBot.create(:phrasing_phrase, key: 2, value: "bar5")
     expect(PhrasingPhrase.count).to eq 5
 
     visit import_export_phrasing_phrases_path
@@ -332,7 +318,7 @@ feature "downloading and uploading yaml files" do
 
   it "round-trips the yaml with complicated text" do
     value = "“hello world“ üokåa®fgsdf;::fs;kdf"
-    FactoryGirl.create(:phrasing_phrase, key: "a.foo", value: value)
+    FactoryBot.create(:phrasing_phrase, key: "a.foo", value: value)
 
     visit import_export_phrasing_phrases_path
     click_link 'Download as YAML'
@@ -396,8 +382,8 @@ feature "locales" do
   end
 
   it "exports yaml containing multiple locales" do
-    FactoryGirl.create(:phrasing_phrase, locale: 'en', key: 'hello', value: 'world')
-    FactoryGirl.create(:phrasing_phrase, locale: 'es', key: 'hello', value: 'mundo')
+    FactoryBot.create(:phrasing_phrase, locale: 'en', key: 'hello', value: 'world')
+    FactoryBot.create(:phrasing_phrase, locale: 'es', key: 'hello', value: 'mundo')
 
     visit download_phrasing_phrases_path
     yaml = page.source

data/spec/lib/phrasing_serializer_spec.rb

@@ -90,8 +90,8 @@ describe Phrasing::Serializer do
     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")
+      FactoryBot.create(:phrasing_phrase, key: "site.intro", value: "Go Home")
+      FactoryBot.create(:phrasing_phrase, key: "site.outro", value: "Kthnx Bye")
 
       expect(english_phrases.where(key: "site.intro").first.value).to eq("Go Home")
       expect(english_phrases.where(key: "site.outro").first.value).to eq("Kthnx Bye")
@@ -112,8 +112,8 @@ describe Phrasing::Serializer do
 
   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")
-      FactoryGirl.create(:phrasing_phrase, key: "site.outro", value: "Kthnx Bye")
+      FactoryBot.create(:phrasing_phrase, key: "site.intro", value: "Go Home")
+      FactoryBot.create(:phrasing_phrase, key: "site.outro", value: "Kthnx Bye")
 
       expect(english_phrases.where(key: "site.intro").first.value).to eq("Go Home")
       expect(english_phrases.where(key: "site.outro").first.value).to eq("Kthnx Bye")
@@ -133,8 +133,8 @@ describe Phrasing::Serializer 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")
+      FactoryBot.create(:phrasing_phrase, key: "site.intro", value: "Go Home")
+      FactoryBot.create(:phrasing_phrase, key: "site.outro", value: "Kthnx Bye")
 
       expect(english_phrases.where(key: "site.intro").first.value).to eq("Go Home")
       expect(english_phrases.where(key: "site.outro").first.value).to eq("Kthnx Bye")
@@ -146,8 +146,8 @@ describe Phrasing::Serializer do
     end
 
     it 'with different locales' do
-      FactoryGirl.create(:phrasing_phrase, key: "site.intro", value: "Hello", locale: :en)
-      FactoryGirl.create(:phrasing_phrase, key: "site.intro", value: "Bonjour", locale: :fr)
+      FactoryBot.create(:phrasing_phrase, key: "site.intro", value: "Hello", locale: :en)
+      FactoryBot.create(:phrasing_phrase, key: "site.intro", value: "Bonjour", locale: :fr)
 
       expect(english_phrases.where(key: "site.intro").first.value).to eq("Hello")
       expect(french_phrases.where(key: "site.intro").first.value).to eq("Bonjour")

data/spec/lib/phrasing_spec.rb

@@ -31,7 +31,7 @@
 #     end
 
 #     it "returns phrasing_phrase if present" do
-#       cct = FactoryGirl.create(:phrasing_phrase)
+#       cct = FactoryBot.create(:phrasing_phrase)
 #       base.lookup(cct.locale, cct.key).should == cct.value
 #     end
 

data/spec/models/phrasing_phrase_spec.rb

@@ -9,7 +9,7 @@ describe PhrasingPhrase do
       it 'on #save! should raise errors if the key and locale are the same for two phrases' do
         PhrasingPhrase.create(key: "foo", locale: "en", value: "bar")
         new_phrase = PhrasingPhrase.new(key: "foo", locale: "en", value: "bar2")
-        expect { new_phrase.save! }.to raise_error
+        expect { new_phrase.save! }.to raise_error(ActiveRecord::RecordInvalid)
       end
 
       it 'on #save, if the key and locale are the same for two phrases, the latter one should be invalid' do
@@ -29,7 +29,3 @@ describe PhrasingPhrase do
   end
 
 end
-
-
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Edit phrases inline for Rails applications!