phrasing 4.0.0rc16 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a638909e5f75504ad5a6775cf1af6fc6d0706dc
-  data.tar.gz: 2c772e81d2089512e022b26ceea9f0199f7bd638
+  metadata.gz: ac71c985745a5d8d7ee591a4961f984c93c38e6e
+  data.tar.gz: c08b20fe85f8d0f79c065a686c4781ff4d18bfac
 SHA512:
-  metadata.gz: 2daf9ac1fa5d83e5cbdce6b91989012ef6bd50ac2d3065a16bdfec3c7330817168032d4e8dfbaf9bad4f88dc2cb01ecfd54b85987fd0e134c7b4d0174f97e621
-  data.tar.gz: 627ffd7cf5922061e5674f4072ac9296f9be293aa8c3ce24bfab1df022b831c8c0968180c4efdec652d716fb108156bf37cc272d24d8e564abeea39c38629bdd
+  metadata.gz: 814529d02b1759ae377698ec1377c53bc503933d6c43bb5bc664482eb0ec36ac9566f5642eba588e6ee233d93934895bfac35cfe6dd115838a04c6667a8925e4
+  data.tar.gz: 94f4bec1be3674a20c13960805845c7b4cdc9e9d1f6f4199f8afedbde1b0807bb23510fd25d33f1292d11d0b0e5e612c4cdcf91928ab8adf4a2b2ef343ba5f7a

data/.travis.yml

@@ -8,8 +8,6 @@ script:
 
 matrix:
   include:
-    - rvm: 2.0.0
-      env: "RAILS_VERSION=4.0.0"
     - rvm: 2.1.2
       env: "RAILS_VERSION=4.1.0"
     - rvm: 2.2.0

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Phrasing Change Log
 
+## 4.0.0 (February 27th, 2018)
+
+### Separation of I18n and Phrasing:
+
+Phrasing no longer does monkeypatching over the I18n gem, so the I18n and Phrasings behaviors are completely separate.
+When using the I18n.t() method, Phrasing will no longer copy the data from the translations file and continue to use translations from the database.
+
+However, when using the phrase(key) method, if the key doesn't currently exist in the PhrasingPhrase table, it will do a lookup in the translations file and copy the data from there to the database.
+
+### Interpolation
+
+The interpolation option has been kicked out.
+
+The problem with the interpolation option is that most clients won't understand what's happening when they see something like "Hi, my name is %{name}" once they are editing data.
+
+If they try to erase parts of it, the developer also might end up being confused and the UI might get broken or at least ugly for some time until the developer fixes the issue.
+
+### Loading asset dependencies
+
+From phrasing v4.0.0rc3, add your jquery files manually:
+
+```javascript
+//= require jquery
+//= require jquery_ujs
+//= require phrasing
+```
+
+### Switching rake tasks with Rails generators
+
+Since Rails comes with outofbox generators that enable easy existing file detection and similar behaviors, Phrasing 4 will use Rails generators instead of the old rake tasks.
+
+To run the initial setup generator, just do: `rails generate phrasing`
+
+## 3.2.10 (October 2nd, 2015)
+
+Change order parameters in PhrasingPhrases#index to support SQLServer.
+
 ## 3.2.9 (January 7th, 2015)
 
 Require only haml, not haml-rails.

data/Gemfile

@@ -9,6 +9,7 @@ gem 'rails', "~> #{rails_version}"
 
 gem 'capybara'
 gem 'factory_girl_rails'
+gem 'jasmine-core', '~> 2.9.1'
 gem 'jasmine-rails'
 gem 'poltergeist'
 gem 'pry-rails'

data/README.md

@@ -2,12 +2,8 @@
 
 [![Build Status](https://travis-ci.org/infinum/phrasing.png)](https://travis-ci.org/infinum/phrasing)
 
-![Phrasing](http://www.miataturbo.net/attachments/miata-parts-sale-trade-5/74257-lots-leftovers-near-boston-archer-phrasing2-300x225-jpg?dateline=1366600534)
-
 Phrasing is a gem for live editing phrases (copy) on websites.
 
-**Notice:** If using Phrasing version 3, checkout the [old README](https://github.com/infinum/phrasing/blob/new-release-4/README-3.md).
-
 ## Installation
 
 Include the gem in your Gemfile
@@ -41,11 +37,9 @@ For example:
 
 ```ruby
 module PhrasingHelper
-
   def can_edit_phrases?
     current_user.is_admin?
   end
-
 end
 ```
 Include the phrasing **html** initializer at the top of your application layout file.
@@ -129,9 +123,9 @@ scope: 'homepage.footer' # add scopes just like you would w/ I18.n. If the first
 ## Credits
 
 Phrasing is maintained and sponsored by
-[Infinum] (http://www.infinum.co).
+[Infinum](http://www.infinum.co).
 
-![Infinum](https://www.infinum.co/assets/logo_pic-2e19713f50692ed9b0805b199676c19a.png)
+<img src="https://infinum.co/infinum.png" width="264">
 
 Phrasing leverages parts of [Copycat](https://github.com/Zorros/copycat) and [ZenPen](https://github.com/tholman/zenpen/tree/master/).
 

data/app/controllers/phrasing_phrases_controller.rb

@@ -16,7 +16,7 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
 
   def index
     params[:locale] ||= I18n.default_locale
-    @phrasing_phrases = PhrasingPhrase.fuzzy_search(params[:search], params[:locale])
+    @phrasing_phrases = phrasing_phrases
     @locale_names = PhrasingPhrase.distinct.pluck(:locale)
   end
 
@@ -33,7 +33,7 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
     app_env = Rails.env
     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
+    send_data Phrasing::Serializer.export_yaml(phrasing_phrases), filename: filename
   end
 
   def upload
@@ -84,4 +84,8 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
     redirect_to phrasing_phrases_path, notice: "#{phrase.key} updated!"
   end
 
+  def phrasing_phrases
+    PhrasingPhrase.fuzzy_search(params[:search], params[:locale])
+  end
+
 end

data/app/views/phrasing_phrases/index.html.haml

@@ -4,6 +4,8 @@
     = select_tag 'locale', locale_options
     = text_field_tag :search, params[:search], placeholder: 'Search for keys or values', size: 40
     = submit_tag 'Search', class: "btn btn-success"
+    = link_to 'Download', download_phrasing_phrases_path(search: params[:search], locale: params[:locale]), class: 'btn btn-success'
+
 - if @phrasing_phrases.any?
   %table.all-phrases
     %thead

data/lib/phrasing/serializer.rb

@@ -1,7 +1,7 @@
 module Phrasing
   module Serializer
     class << self
-      
+
       def import_yaml(yaml)
         number_of_changes = 0
         hash = YAML.load(yaml)
@@ -16,7 +16,7 @@ module Phrasing
             end
           end
         end
-        
+
         number_of_changes
       end
 
@@ -24,7 +24,7 @@ module Phrasing
         new_hash = {}
         hash.each do |key, value|
           if value.is_a? Hash
-            flatten_the_hash(value).each do |k,v| 
+            flatten_the_hash(value).each do |k,v|
               new_hash["#{key}.#{k}"] = v
             end
           else
@@ -34,9 +34,9 @@ module Phrasing
         new_hash
       end
 
-      def export_yaml
+      def export_yaml(phrasing_phrases)
         hash = {}
-        PhrasingPhrase.where("value is not null").each do |phrase|
+        phrasing_phrases.each do |phrase|
           hash[phrase.locale] ||= {}
           hash[phrase.locale][phrase.key] = phrase.value
         end
@@ -45,4 +45,4 @@ module Phrasing
 
     end
   end
-end
+end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "4.0.0rc16"
+  VERSION = '4.0.0'.freeze
 end

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

@@ -3,3 +3,4 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
+Mime::Type.register "text/yaml", :yaml

data/spec/lib/phrasing_serializer_spec.rb

@@ -118,7 +118,7 @@ describe Phrasing::Serializer do
       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")
 
-      yaml = Phrasing::Serializer.export_yaml
+      yaml = Phrasing::Serializer.export_yaml(PhrasingPhrase.where("value is not null"))
 
       number_of_changes = Phrasing::Serializer.import_yaml(StringIO.new(yaml))
 
@@ -139,7 +139,7 @@ describe Phrasing::Serializer do
       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")
 
-      yaml = Phrasing::Serializer.export_yaml
+      yaml = Phrasing::Serializer.export_yaml(PhrasingPhrase.where("value is not null"))
 
       expect(yaml).to match(/site.intro:\sGo Home/)
       expect(yaml).to match(/site.outro:\sKthnx Bye/)
@@ -152,7 +152,7 @@ describe Phrasing::Serializer do
       expect(english_phrases.where(key: "site.intro").first.value).to eq("Hello")
       expect(french_phrases.where(key: "site.intro").first.value).to eq("Bonjour")
 
-      yaml = Phrasing::Serializer.export_yaml
+      yaml = Phrasing::Serializer.export_yaml(PhrasingPhrase.where("value is not null"))
 
       expect(yaml).to match(/en:\s*\n\s*site.intro:\sHello/)
       expect(yaml).to match(/fr:\s*\n\s*site.intro:\sBonjour/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc16
+  version: 4.0.0
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,7 +89,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- 4.0.0_changes.md
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -196,12 +195,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Edit phrases inline for Rails applications!

data/4.0.0_changes.md

@@ -1 +0,0 @@
-# Changes