phrasing 3.2.10 → 4.0.0rc1

data/{db/migrate/20120313191745_create_phrasing_phrases.rb → lib/generators/phrasing/templates/db/migrate/create_phrasing_phrases.rb}

@@ -1,10 +1,10 @@
 class CreatePhrasingPhrases < ActiveRecord::Migration
   def change
-    create_table :phrasing_phrases do |t|    
+    create_table :phrasing_phrases do |t|
       t.string :locale
       t.string :key
       t.text :value
       t.timestamps
     end
   end
-end
+end

data/lib/phrasing.rb

@@ -1,10 +1,8 @@
 require 'phrasing'
-require "phrasing/implementation"
-require "phrasing/simple"
 require "phrasing/serializer"
 require 'jquery-rails'
 require 'jquery-cookie-rails'
-require 'haml'
+require 'haml-rails'
 
 module Phrasing
   module Rails
@@ -12,7 +10,15 @@ module Phrasing
       initializer :assets, group: :all do
         ::Rails.application.config.assets.paths << ::Rails.root.join('app', 'assets', 'fonts')
         ::Rails.application.config.assets.paths << ::Rails.root.join('app', 'assets', 'images')
-        ::Rails.application.config.assets.precompile += ['editor.js', 'phrasing_engine.css', 'phrasing_engine.js', 'icomoon.dev.svg', 'icomoon.svg', 'icomoon.eot', 'icomoon.ttf', 'icomoon.woff', 'phrasing_icon_edit_all.png']
+        ::Rails.application.config.assets.precompile +=  %w(editor.js
+                                                            phrasing_engine.css
+                                                            phrasing_engine.js
+                                                            icomoon.dev.svg
+                                                            icomoon.svg
+                                                            icomoon.eot
+                                                            icomoon.ttf
+                                                            icomoon.woff
+                                                            phrasing_icon_edit_all.png)
       end
     end
   end
@@ -23,21 +29,9 @@ module Phrasing
 
   mattr_accessor :allow_update_on_all_models_and_attributes
   mattr_accessor :route
-  mattr_accessor :staging_server_endpoint
-  mattr_accessor :parent_controller
 
-  @@parent_controller = "ApplicationController"
   @@route = 'phrasing'
 
-  def self.log
-    @@log
-  end
-
-  def self.log=(log_value)
-    @@log = log_value
-    suppress_log if log_value == false
-  end
-
   def self.setup
     yield self
   end
@@ -59,24 +53,4 @@ module Phrasing
   def self.is_whitelisted?(klass,attribute)
     allow_update_on_all_models_and_attributes == true or whitelist.include? "#{klass}.#{attribute}"
   end
-
-  private
-
-    def self.suppress_log
-      logger_class = defined?(ActiveSupport::Logger) ? ActiveSupport::Logger::SimpleFormatter : Logger::SimpleFormatter
-
-      logger_class.class_eval do
-
-        alias_method :old_call, :call
-
-        def call(severity, timestamp, progname, msg)
-          unless (msg.include? "SELECT" and (msg.include? "phrasing_phrases" or msg.include? "phrasing_phrase_versions"))
-            old_call(severity, timestamp, progname, msg)
-          end
-        end
-
-      end
-    end
-
-
-end
+end

data/lib/phrasing/version.rb

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

data/phrasing.gemspec

@@ -18,10 +18,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 3.2.0"
   s.add_dependency "railties", ">= 3.2"
-  s.add_dependency "haml"
+  s.add_dependency "haml-rails"
   s.add_dependency "jquery-rails"
   s.add_dependency "jquery-cookie-rails"
   s.add_dependency "sass"
-
-  s.add_development_dependency 'pry'
 end

data/spec/features/dummy_spec.rb

@@ -5,47 +5,47 @@ feature "use #phrase" do
 
   it "should see the header phrase" do
     visit root_path
-    page.should have_content 'The Header'
+    expect(page).to have_content('The Header')
   end
 
   it "should see the header phrase modified if created before visiting" do
     FactoryGirl.create(:phrasing_phrase, key: 'site.index.header', value: 'The Header1')
     visit root_path
-    page.should have_content 'The Header1'
+    expect(page).to have_content 'The Header1'
   end
 
   it "creates a phrasing_phrase if the yaml has an entry" do
-    PhrasingPhrase.find_by_key('site.index.header').should be_nil
+    expect(PhrasingPhrase.find_by_key('site.index.header')).to be_nil
     visit root_path
-    PhrasingPhrase.find_by_key('site.index.header').should_not be_nil
+    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.find_by_key('site.index.intro').should be_nil
+    expect(PhrasingPhrase.find_by_key('site.index.intro')).to be_nil
     visit root_path
-    PhrasingPhrase.find_by_key('site.index.intro').should_not be_nil
+    expect(PhrasingPhrase.find_by_key('site.index.intro')).not_to be_nil
   end
 
   it "shows the phrasing_phrase instead of the yaml" do
     FactoryGirl.create(:phrasing_phrase, key: 'site.index.header', value: 'A different header')
     visit root_path
-    page.should_not have_content 'The Header'
-    page.should have_content 'A different header'
+    expect(page).not_to have_content 'The Header'
+    expect(page).to have_content 'A different header'
   end
 
   it "allows to treat every translation as html safe" do
     FactoryGirl.create(:phrasing_phrase, key: 'site.index.header', value: '<strong>Strong header</strong>')
     visit root_path
-    page.should have_content 'Strong header'
+    expect(page).to have_content 'Strong header'
     visit root_path
-    page.should_not have_content '<strong>Strong header</strong>'
-    page.should have_content 'Strong header'
+    expect(page).not_to have_content '<strong>Strong header</strong>'
+    expect(page).to have_content 'Strong header'
   end
 
   it 'allows to use scope like I18n' do
     visit root_path
-    page.should have_content 'models.errors.test'
-    page.should have_content 'site.test'
+    expect(page).to have_content 'models.errors.test'
+    expect(page).to have_content 'site.test'
   end
 end
 
@@ -57,18 +57,18 @@ feature "locales" do
 
     I18n.locale = :en
     visit root_path
-    page.should have_content 'world'
-    page.should_not have_content 'mundo'
+    expect(page).to     have_content 'world'
+    expect(page).not_to have_content 'mundo'
 
     I18n.locale = :es
     visit root_path
-    page.should have_content 'mundo'
-    page.should_not have_content 'world'
+    expect(page).to     have_content 'mundo'
+    expect(page).not_to have_content 'world'
 
     I18n.locale = :fa
     visit root_path
-    page.should_not have_content 'world'
-    page.should_not have_content 'mundo'
+    expect(page).not_to have_content 'world'
+    expect(page).not_to have_content 'mundo'
 
     I18n.locale = :en  # reset
   end
@@ -77,18 +77,21 @@ end
 
 feature "yaml" do
 
-  describe 'on first visit value should be' do
+  describe 'on first visit' do
 
-    it "same as keys if there is no translation available" do
+    it "value should be the same as keys if there is no translation available" do
       visit root_path
-      PhrasingPhrase.find_by_key('site.index.intro').value.should == 'site.index.intro'
+      expect(PhrasingPhrase.find_by_key('site.index.intro').value).to eq('site.index.intro')
     end
 
     it "same as translations in the yaml file if there is a translation available" do
       visit root_path
-      PhrasingPhrase.find_by_key('site.index.header').value.should == 'The Header'
-      PhrasingPhrase.find_by_key('site.index.footer').value.should == 'The Footer'
+      expect(PhrasingPhrase.find_by_key('site.index.header').value).to eq('The Header')
     end
 
+    it "if using I18n.t(), there shouldn't be a new PhrasingPhrase record." do
+      visit root_path
+      expect(PhrasingPhrase.find_by_key('site.index.footer')).to be_nil
+    end
   end
 end

data/spec/features/phrasing_spec.rb

@@ -9,34 +9,34 @@ feature 'edit mode bubble' do
 
   it '(un)check edit mode checkbox' do
     edit_mode_checkbox = find(:css, ".onoffswitch-checkbox")
-    edit_mode_checkbox.should be_checked
+    expect(edit_mode_checkbox).to be_checked
     edit_mode_checkbox.set(false)
-    edit_mode_checkbox.should_not be_checked
+    expect(edit_mode_checkbox).not_to be_checked
   end
 
   it "phrases should have class 'phrasable_on' and contenteditable=true" do
-    page.find('.header').first('.phrasable').text.should == 'The Header'
-    page.find('.header').first('.phrasable')['class'].should == 'phrasable phrasable_on'
-    page.find('.header').first('.phrasable')['contenteditable'].should == 'true'
+    expect(page.find('.header').first('.phrasable').text).to eq 'The Header'
+    expect(page.find('.header').first('.phrasable')['class']).to eq 'phrasable phrasable_on'
+    expect(page.find('.header').first('.phrasable')['contenteditable']).to eq 'true'
   end
 
   it 'should be able to visit phrasing index via edit_all icon' do
     find(:css, ".phrasing-edit-all-phrases-link").click
-    current_path.should == phrasing_phrases_path
+    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
-    page.find('.header').first('.phrasable')['class'].should == 'phrasable'
+    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 == 'phrasable phrasable_on'
-    header_phrase.text.should == 'The Header'
+    header_phrase['class'].should eq 'phrasable phrasable_on'
+    expect(header_phrase.text).to eq 'The Header'
     header_phrase.set "content"
-    header_phrase.text.should == 'content'
+    expect(header_phrase.expect.text).to eq 'content'
   end
 end
 
@@ -54,50 +54,50 @@ feature "phrasing index" do
   end
 
   it " shows phrases" do
-    page.should have_content 'foo'
-    page.should have_content 'bar'
+    expect(page).to have_content 'foo'
+    expect(page).to have_content 'bar'
   end
 
   it "allows search by key" do
     fill_in 'search', with: 'foo'
     click_button 'Search'
-    page.should have_content 'foo'
-    page.should have_content 'bar'
+    expect(page).to have_content 'foo'
+    expect(page).to have_content 'bar'
   end
 
   it "allows search by key" do
     fill_in 'search', with: 'xfoo'
     click_button 'Search'
-    page.should_not have_content 'foo'
-    page.should_not have_content 'bar'
+    expect(page).not_to have_content 'foo'
+    expect(page).not_to have_content 'bar'
   end
 
   it "allows search by value" do
     fill_in 'search', with: 'bar'
     click_button 'Search'
-    page.should have_content 'foo'
-    page.should have_content 'bar'
+    expect(page).to have_content 'foo'
+    expect(page).to have_content 'bar'
   end
 
   it "allows search by value" do
     fill_in 'search', with: 'xbar'
     click_button 'Search'
-    page.should_not have_content 'foo'
-    page.should_not have_content 'bar'
+    expect(page).not_to have_content 'foo'
+    expect(page).not_to have_content 'bar'
   end
 
   it "searches in the middles of strings" do
     FactoryGirl.create(:phrasing_phrase, key: "site.index.something")
     fill_in 'search', with: 'index'
     click_button 'Search'
-    page.should have_content 'site.index.something'
+    expect(page).to have_content 'site.index.something'
   end
 
   it "can show all" do
     FactoryGirl.create(:phrasing_phrase, key: "foe", value: "beer")
     click_button 'Search'
-    page.should have_content 'foo'
-    page.should have_content 'foe'
+    expect(page).to have_content 'foo'
+    expect(page).to have_content 'foe'
   end
 
   it 'not null values first, global order by key' do
@@ -105,7 +105,7 @@ feature "phrasing index" do
     FactoryGirl.create(:phrasing_phrase, key: "foo2", value: "beer")
     FactoryGirl.create(:phrasing_phrase, key: "foo3", value: nil)
     visit phrasing_phrases_path
-    page.body.should =~ /foo[\s\S]*foo2[\s\S]*foo1[\s\S]*foo3/
+    expect(page.body).to match /foo[\s\S]*foo2[\s\S]*foo1[\s\S]*foo3/
   end
 
   context "more than one locale" do
@@ -120,94 +120,94 @@ feature "phrasing index" do
     it "nil locale, blank search" do
       # impossible for user to replicate this case
       visit phrasing_phrases_path('search' => '', 'commit' => 'Search')
-      page.should have_content 'bar1'
-      page.should_not have_content 'bar2'
-      page.should_not have_content 'bar3'
+      expect(page).to have_content 'bar1'
+      expect(page).not_to have_content 'bar2'
+      expect(page).not_to have_content 'bar3'
     end
 
     it "nil locale, present search" do
       # impossible for user to replicate this case
       visit phrasing_phrases_path('search' => 'foo', 'commit' => 'Search')
-      page.should have_content 'bar1'
-      page.should_not have_content 'bar2'
-      page.should_not have_content 'bar3'
+      expect(page).to have_content 'bar1'
+      expect(page).not_to have_content 'bar2'
+      expect(page).not_to have_content 'bar3'
       visit phrasing_phrases_path('search' => 'fuu', 'commit' => 'Search')
-      page.should_not have_content 'foo'
+      expect(page).not_to have_content 'foo'
     end
 
     it "blank locale, foo search" do
       # impossible for user to replicate this case
       visit phrasing_phrases_path('locale' => '', 'commit' => 'Search')
-      page.should have_content 'foo'
+      expect(page).to have_content 'foo'
     end
 
     it "blank locale, blank search" do
       select '', from: 'locale'
       click_button 'Search'
-      page.should have_content 'bar1'
-      page.should have_content 'bar2'
-      page.should have_content 'bar3'
+      expect(page).to have_content 'bar1'
+      expect(page).to have_content 'bar2'
+      expect(page).to have_content 'bar3'
     end
 
     it "blank locale, present search" do
       select '', from: 'locale'
       fill_in 'search', with: 'foo'
       click_button 'Search'
-      page.should have_content 'bar1'
-      page.should have_content 'bar2'
-      page.should have_content 'bar3'
+      expect(page).to have_content 'bar1'
+      expect(page).to have_content 'bar2'
+      expect(page).to have_content 'bar3'
       fill_in 'search', with: 'fuu'
       click_button 'Search'
-      page.should_not have_content 'foo'
+      expect(page).not_to have_content 'foo'
     end
 
     it "present locale, foo search" do
       # impossible for user to replicate this case
       visit phrasing_phrases_path('locale' => 'en', 'commit' => 'Search')
-      page.should have_content 'foo'
+      expect(page).to have_content 'foo'
     end
 
     it "present locale, blank search" do
       select 'en', from: 'locale'
       click_button 'Search'
-      page.should have_content 'bar1'
-      page.should_not have_content 'bar2'
-      page.should_not have_content 'bar3'
+      expect(page).to have_content 'bar1'
+      expect(page).not_to have_content 'bar2'
+      expect(page).not_to have_content 'bar3'
       select 'fa', from: 'locale'
       click_button 'Search'
-      page.should_not have_content 'bar1'
-      page.should have_content 'bar2'
-      page.should_not have_content 'bar3'
+      expect(page).not_to have_content 'bar1'
+      expect(page).to have_content 'bar2'
+      expect(page).not_to have_content 'bar3'
       select 'it', from: 'locale'
       click_button 'Search'
-      page.should_not have_content 'bar1'
-      page.should_not have_content 'bar2'
-      page.should have_content 'bar3'
+      expect(page).not_to have_content 'bar1'
+      expect(page).not_to have_content 'bar2'
+      expect(page).to have_content 'bar3'
     end
 
     it "present locale, present search" do
       select 'en', from: 'locale'
       fill_in 'search', with: 'foo'
       click_button 'Search'
-      page.should have_content 'bar1'
-      page.should_not have_content 'bar2'
-      page.should_not have_content 'bar3'
+      expect(page).to have_content 'bar1'
+      expect(page).not_to have_content 'bar2'
+      expect(page).not_to have_content 'bar3'
       select 'fa', from: 'locale'
       fill_in 'search', with: 'foo'
       click_button 'Search'
-      page.should_not have_content 'bar1'
-      page.should have_content 'bar2'
-      page.should_not have_content 'bar3'
+      expect(page).not_to have_content 'bar1'
+      expect(page).to have_content 'bar2'
+      expect(page).not_to have_content 'bar3'
       select 'it', from: 'locale'
       fill_in 'search', with: 'foo'
       click_button 'Search'
-      page.should_not have_content 'bar1'
-      page.should_not have_content 'bar2'
-      page.should have_content 'bar3'
+      expect(page).not_to have_content 'bar1'
+      expect(page).not_to have_content 'bar2'
+      expect(page).to have_content 'bar3'
       select 'en', from: 'locale'
       fill_in 'search', with: 'fuu'
       click_button 'Search'
-      page.should_not have_content 'foo'
+      expect(page).not_to have_content 'foo'
     end
 
   end
@@ -219,8 +219,9 @@ feature "phrasing edit" do
     FactoryGirl.create(:phrasing_phrase, key: "foo", value: "bar")
     visit phrasing_phrases_path
   end
+
   after do
-    PhrasingPhrase.delete_all
+    PhrasingPhrase.destroy_all
   end
 
   scenario "visit edit form" do
@@ -240,18 +241,61 @@ feature "phrasing update" do
     click_link 'foo'
   end
 
+  scenario 'has delete and update buttons' do
+    expect(page).to have_selector(:link_or_button, 'Delete Phrase')
+    expect(page).to have_selector(:link_or_button, 'Update')
+  end
+
   scenario "update" do
     fill_in "phrasing_phrase[value]", with: 'baz'
     click_button "Update"
-    current_path.should == phrasing_phrases_path
-    PhrasingPhrase.find_by_key("foo").value.should == 'baz'
-    page.should have_content "foo updated!"
+    expect(current_path).to eq phrasing_phrases_path
+    expect(PhrasingPhrase.find_by_key("foo").value).to eq 'baz'
+    expect(page).to have_content "foo updated!"
   end
 end
 
+feature 'phrase versions' do
+  before do
+    phrase = FactoryGirl.create(:phrasing_phrase, key: "foo", value: "bar")
+    visit edit_phrasing_phrase_path(phrase)
+  end
+
+  def update_phrase
+    fill_in "phrasing_phrase[value]", with: 'baz'
+    click_button "Update"
+  end
+
+  it " shows phrases" do
+    expect(page).to have_content 'foo'
+    expect(page).to have_content 'bar'
+  end
+
+  it 'update a phrase and get first phrase versions' do
+    expect(PhrasingPhraseVersion.count).to eq 0
+    update_phrase
+    expect(PhrasingPhraseVersion.count).to eq 1
+    expect(current_path).to eq phrasing_phrases_path
+    expect(PhrasingPhrase.find_by_key("foo").value).to eq 'baz'
+    expect(page).to have_content "foo updated!"
+  end
+
+  it 'view first phrase' do
+    expect(PhrasingPhraseVersion.count).to eq 0
+    update_phrase
+    expect(PhrasingPhraseVersion.count).to eq 1
+    click_link 'foo'
+    expect(page).to have_selector(:link_or_button, 'Delete')
+    expect(page).to have_selector(:link_or_button, 'Revert')
+    expect(page).to have_content 'bar'
+    expect(page).to have_content 'baz'
+  end
+
+end
+
 feature "downloading and uploading yaml files" do
   after do
-    PhrasingPhrase.delete_all
+    PhrasingPhrase.destroy_all
   end
 
   it "round-trips the YAML" do
@@ -260,13 +304,13 @@ feature "downloading and uploading yaml files" do
     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")
-    assert PhrasingPhrase.count == 5
+    expect(PhrasingPhrase.count).to eq 5
 
     visit import_export_phrasing_phrases_path
 
     click_link 'Download as YAML'
     PhrasingPhrase.destroy_all
-    assert PhrasingPhrase.count == 0
+    expect(PhrasingPhrase.count).to eq 0
 
     yaml = page.source
     file = Tempfile.new 'phrasing'
@@ -278,12 +322,12 @@ feature "downloading and uploading yaml files" do
     click_button "Upload"
     file.unlink
 
-    assert PhrasingPhrase.count == 5
-    assert PhrasingPhrase.find_by_key("a.foo1").value == "bar1"
-    assert PhrasingPhrase.find_by_key("a.foo2:").value == "bar2"
-    assert PhrasingPhrase.find_by_key("a.b.foo3").value == "bar3"
-    assert PhrasingPhrase.find_by_key("c.foo4").value == "bar4"
-    assert PhrasingPhrase.find_by_key(2).value == "bar5"
+    expect(PhrasingPhrase.count).to eq 5
+    expect(PhrasingPhrase.find_by_key("a.foo1").value).to eq "bar1"
+    expect(PhrasingPhrase.find_by_key("a.foo2:").value).to eq "bar2"
+    expect(PhrasingPhrase.find_by_key("a.b.foo3").value).to eq "bar3"
+    expect(PhrasingPhrase.find_by_key("c.foo4").value).to eq "bar4"
+    expect(PhrasingPhrase.find_by_key(2).value).to eq "bar5"
   end
 
   it "round-trips the yaml with complicated text" do
@@ -303,7 +347,7 @@ feature "downloading and uploading yaml files" do
     attach_file "file", file.path
     click_button "Upload"
     file.unlink
-    assert PhrasingPhrase.find_by_key("a.foo").value == value
+    expect(PhrasingPhrase.find_by_key("a.foo").value).to eq value
   end
 
   it "gives 400 on bad upload" do
@@ -315,9 +359,9 @@ feature "downloading and uploading yaml files" do
     attach_file "file", file.path
     click_button "Upload"
     file.unlink
-    page.status_code.should == 400
-    page.should have_content("There was an error processing your upload!")
-    assert PhrasingPhrase.count == 0
+    expect(page.status_code).to eq 400
+    expect(page).to have_content("There was an error processing your upload!")
+    expect(PhrasingPhrase.count).to eq 0
   end
 
 end
@@ -326,7 +370,7 @@ feature "locales" do
   before do
   end
   after do
-    PhrasingPhrase.delete_all
+    PhrasingPhrase.destroy_all
   end
   it "imports yaml containing multiple locales" do
     file = Tempfile.new 'phrasing'
@@ -343,13 +387,13 @@ feature "locales" do
     click_button "Upload"
     file.unlink
 
-    assert PhrasingPhrase.count == 2
+    expect(PhrasingPhrase.count).to eq 2
     a = PhrasingPhrase.where(locale: 'en').first
-    assert a.key == 'hello'
-    assert a.value == 'world'
+    expect(a.key).to eq 'hello'
+    expect(a.value).to eq 'world'
     b = PhrasingPhrase.where(locale: 'es').first
-    assert b.key == 'hello'
-    assert b.value == 'mundo'
+    expect(b.key).to eq 'hello'
+    expect(b.value).to eq 'mundo'
   end
 
   it "exports yaml containing multiple locales" do
@@ -358,8 +402,8 @@ feature "locales" do
 
     visit download_phrasing_phrases_path
     yaml = page.source
-    assert yaml =~ /en:\s*hello: world/
-    assert yaml =~ /es:\s*hello: mundo/
+    expect(yaml).to match(/en:\s*hello: world/)
+    expect(yaml).to match(/es:\s*hello: mundo/)
   end
 
 end