phrasing 3.2.2 → 3.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phrasing (3.2.2)
+    phrasing (3.2.3)
       haml-rails
       jquery-cookie-rails
       jquery-rails

data/README.md

@@ -1,5 +1,7 @@
 # Phrasing!
 
+[![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.

data/app/controllers/phrasing_phrases_controller.rb

@@ -52,11 +52,11 @@ class PhrasingPhrasesController < ActionController::Base
     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"
-    send_data PhrasingPhrase.export_yaml, filename: filename
+    send_data Phrasing::Serializer.export_yaml, filename: filename
   end
 
   def upload
-      number_of_changes = PhrasingPhrase.import_yaml(params["file"].tempfile)
+      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 Exception => e
       logger.info "\n#{e.class}\n#{e.message}"
@@ -86,7 +86,7 @@ class PhrasingPhrasesController < ActionController::Base
       yaml = read_remote_yaml(Phrasing.staging_server_endpoint)
 
       if yaml
-        PhrasingPhrase.import_yaml(yaml)
+        Phrasing::Serializer.import_yaml(yaml)
         redirect_to :back, notice: "Translations synced from source server"
       else
         redirect_to :back

data/app/models/phrasing_phrase.rb

@@ -26,41 +26,10 @@ class PhrasingPhrase < ActiveRecord::Base
     phrasing_phrase
   end
 
-  module Serialize
-
-    def import_yaml(yaml)
-      number_of_changes = 0
-      hash = YAML.load(yaml)
-      hash.each do |locale, data|
-        data.each do |key, value|
-          phrase = where(key: key, locale: locale).first || new(key: key, locale: locale)
-          if phrase.value != value
-            phrase.value = value
-            number_of_changes += 1
-            phrase.save
-          end
-        end
-      end
-      number_of_changes
-    end
-
-    def export_yaml
-      hash = {}
-      where("value is not null").each do |phrase|
-        hash[phrase.locale] ||= {}
-        hash[phrase.locale][phrase.key] = phrase.value
-      end
-      hash.to_yaml
-    end
-
-  end
-
-  extend Serialize
-
   private
 
     def uniqueness_of_key_on_locale_scope
-      errors.add(:key, "Duplicate entry #{key} for locale #{locale}") unless PhrasingPhrase.where(key: key).where(locale: locale).empty?
+      errors.add(:key, "Duplicate entry #{key} for locale #{locale}") unless PhrasingPhrase.where(key: key, locale: locale).empty?
     end
 
     def version_it

data/lib/phrasing.rb

@@ -1,6 +1,7 @@
 require 'phrasing'
 require "phrasing/implementation"
 require "phrasing/simple"
+require "phrasing/serializer"
 require 'jquery-rails'
 require 'jquery-cookie-rails'
 require 'haml-rails'

data/lib/phrasing/serializer.rb

@@ -0,0 +1,48 @@
+module Phrasing
+  module Serializer
+    class << self
+      
+      def import_yaml(yaml)
+        number_of_changes = 0
+        hash = YAML.load(yaml)
+
+        hash.each do |locale, data|
+          flatten_the_hash(data).each do |key, value|
+            phrase = PhrasingPhrase.where(key: key, locale: locale).first || PhrasingPhrase.new(key: key, locale: locale)
+            if phrase.value != value
+              phrase.value = value
+              number_of_changes += 1
+              phrase.save
+            end
+          end
+        end
+        
+        number_of_changes
+      end
+
+      def flatten_the_hash(hash)
+        new_hash = {}
+        hash.each do |key, value|
+          if value.is_a? Hash
+            flatten_the_hash(value).each do |k,v| 
+              new_hash["#{key}.#{k}"] = v
+            end
+          else
+            new_hash[key] = value
+          end
+        end
+        new_hash
+      end
+
+      def export_yaml
+        hash = {}
+        PhrasingPhrase.where("value is not null").each do |phrase|
+          hash[phrase.locale] ||= {}
+          hash[phrase.locale][phrase.key] = phrase.value
+        end
+        hash.to_yaml
+      end
+
+    end
+  end
+end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "3.2.2"
+  VERSION = "3.2.3"
 end

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

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

data/spec/dummy/log/development.log

@@ -7404,3 +7404,149 @@ Processing by PhrasingPhrasesController#download as HTML
   Rendered text template (0.0ms)
 Sent data phrasing_phrases_Dummy_development_2014_02_20_14_59_09.yml (12.6ms)
 Completed 200 OK in 45ms (Views: 12.3ms | ActiveRecord: 0.2ms)
+DEPRECATION WARNING: You didn't set config.secret_key_base. Read the upgrade documentation to learn more about this new config option. (called from service at /Users/damirsvrtan/.rbenv/versions/1.9.3-p362/lib/ruby/1.9.1/webrick/httpserver.rb:138)
+
+
+Started GET "/" for 127.0.0.1 at 2014-03-03 15:16:54 +0100
+Processing by SiteController#index as HTML
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.index.header' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.3ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.index.intro' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND "phrasing_phrases"."key" = 'site.index.footer' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.1ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'models.errors.test' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.test' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND "phrasing_phrases"."key" = 'datetime.distance_in_words.less_than_x_minutes' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  Rendered site/index.html.erb within layouts/application (44.0ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_initializer.html.haml (9.0ms)
+Completed 200 OK in 279ms (Views: 274.6ms | ActiveRecord: 3.8ms)
+
+
+Started GET "/assets/phrasing.css?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/phrasing_edit_mode_bubble.css?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/editor.js?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/jquery.cookie.js?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/phrasing.js?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/phrasing_fonts.css?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/phrasing_icon_edit_all.png" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/assets/icomoon.woff" for 127.0.0.1 at 2014-03-03 15:16:55 +0100
+
+
+Started GET "/phrasing" for 127.0.0.1 at 2014-03-03 15:17:02 +0100
+Processing by PhrasingPhrasesController#index as HTML
+  PhrasingPhrase Load (0.3ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND (value is not null) ORDER BY phrasing_phrases.key
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND (value is null) ORDER BY phrasing_phrases.key
+   (0.2ms)  SELECT DISTINCT "phrasing_phrases"."locale" FROM "phrasing_phrases"
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing_phrases/index.html.haml within layouts/phrasing (5.2ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_menu.html.haml (2.8ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_messages.html.haml (1.6ms)
+Completed 200 OK in 52ms (Views: 41.5ms | ActiveRecord: 0.7ms)
+
+
+Started GET "/assets/phrasing_engine.css?body=1" for 127.0.0.1 at 2014-03-03 15:17:02 +0100
+
+
+Started GET "/assets/phrasing_engine.js?body=1" for 127.0.0.1 at 2014-03-03 15:17:02 +0100
+
+
+Started GET "/phrasing/import_export" for 127.0.0.1 at 2014-03-03 15:17:04 +0100
+Processing by PhrasingPhrasesController#import_export as HTML
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing_phrases/import_export.html.haml within layouts/phrasing (3.5ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_menu.html.haml (1.5ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_messages.html.haml (0.2ms)
+Completed 200 OK in 13ms (Views: 12.5ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/phrasing/download" for 127.0.0.1 at 2014-03-03 15:17:07 +0100
+Processing by PhrasingPhrasesController#download as HTML
+  PhrasingPhrase Load (0.5ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE (value is not null)
+  Rendered text template (0.0ms)
+Sent data phrasing_phrases_Dummy_development_2014_03_03_15_17_07.yml (3.6ms)
+Completed 200 OK in 10ms (Views: 3.4ms | ActiveRecord: 0.5ms)
+
+
+Started GET "/phrasing/download" for 127.0.0.1 at 2014-03-03 15:17:18 +0100
+Processing by PhrasingPhrasesController#download as HTML
+  PhrasingPhrase Load (0.3ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE (value is not null)
+  Rendered text template (0.0ms)
+Sent data phrasing_phrases_Dummy_development_2014_03_03_15_17_18.yml (0.5ms)
+Completed 200 OK in 4ms (Views: 0.4ms | ActiveRecord: 0.3ms)
+
+
+Started POST "/phrasing/upload" for 127.0.0.1 at 2014-03-03 15:17:22 +0100
+Processing by PhrasingPhrasesController#upload as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"3LjfrYRliYOJpG5+jrxNczvfGAWe9mG9VdLB69x9ZT0=", "file"=>#<ActionDispatch::Http::UploadedFile:0x000001032dc310 @tempfile=#<File:/var/folders/sr/sriroFQ2HY8-IgGJc7Y7qE+++To/-Tmp-/RackMultipart20140303-6179-rm2q9f>, @original_filename="phrasing_phrases_Dummy_development_2014_03_03_15_17_18.yml", @content_type="application/octet-stream", @headers="Content-Disposition: form-data; name=\"file\"; filename=\"phrasing_phrases_Dummy_development_2014_03_03_15_17_18.yml\"\r\nContent-Type: application/octet-stream\r\n">, "commit"=>"Upload"}
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.index.header' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.index.intro' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.1ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.index.footer' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'models.errors.test' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.1ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.test' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+Redirected to http://localhost:3000/phrasing
+Completed 302 Found in 5ms (ActiveRecord: 0.8ms)
+
+
+Started GET "/phrasing" for 127.0.0.1 at 2014-03-03 15:17:22 +0100
+Processing by PhrasingPhrasesController#index as HTML
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND (value is not null) ORDER BY phrasing_phrases.key
+  PhrasingPhrase Load (0.1ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND (value is null) ORDER BY phrasing_phrases.key
+   (0.1ms)  SELECT DISTINCT "phrasing_phrases"."locale" FROM "phrasing_phrases"
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing_phrases/index.html.haml within layouts/phrasing (2.1ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_menu.html.haml (0.5ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_messages.html.haml (0.2ms)
+Completed 200 OK in 11ms (Views: 8.6ms | ActiveRecord: 0.5ms)
+
+
+Started GET "/phrasing" for 127.0.0.1 at 2014-03-03 15:17:24 +0100
+Processing by PhrasingPhrasesController#index as HTML
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND (value is not null) ORDER BY phrasing_phrases.key
+  PhrasingPhrase Load (0.1ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND (value is null) ORDER BY phrasing_phrases.key
+   (0.1ms)  SELECT DISTINCT "phrasing_phrases"."locale" FROM "phrasing_phrases"
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing_phrases/index.html.haml within layouts/phrasing (2.4ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_menu.html.haml (0.4ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_messages.html.haml (0.1ms)
+Completed 200 OK in 12ms (Views: 10.0ms | ActiveRecord: 0.5ms)
+
+
+Started GET "/phrasing/import_export" for 127.0.0.1 at 2014-03-03 15:17:26 +0100
+Processing by PhrasingPhrasesController#import_export as HTML
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing_phrases/import_export.html.haml within layouts/phrasing (1.3ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_menu.html.haml (0.5ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_messages.html.haml (0.1ms)
+Completed 200 OK in 25ms (Views: 25.0ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/" for 127.0.0.1 at 2014-03-03 15:17:51 +0100
+Processing by SiteController#index as HTML
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.index.header' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.index.intro' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND "phrasing_phrases"."key" = 'site.index.footer' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'models.errors.test' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.3ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."key" = 'site.test' AND "phrasing_phrases"."locale" = 'en' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  PhrasingPhrase Load (0.2ms)  SELECT "phrasing_phrases".* FROM "phrasing_phrases" WHERE "phrasing_phrases"."locale" = 'en' AND "phrasing_phrases"."key" = 'datetime.distance_in_words.less_than_x_minutes' ORDER BY "phrasing_phrases"."id" ASC LIMIT 1
+  Rendered site/index.html.erb within layouts/application (8.1ms)
+  Rendered /Users/damirsvrtan/Documents/rails_infinum_projects/phrasing/app/views/phrasing/_initializer.html.haml (1.1ms)
+Completed 200 OK in 18ms (Views: 16.2ms | ActiveRecord: 1.2ms)

data/spec/features/dummy_spec.rb

@@ -80,12 +80,12 @@ feature "yaml" do
 
   describe 'on first visit value should be' do
     
-    it "same as keys" do
+    it "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'
     end
 
-    it "same as translations in the yaml file" do
+    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'

data/spec/features/phrasing_spec.rb

@@ -251,8 +251,6 @@ feature "phrasing update" do
 end
 
 feature "downloading and uploading yaml files" do
-  before do
-  end
   after do
     PhrasingPhrase.delete_all
   end

data/spec/lib/phrasing_serializer_spec.rb

@@ -0,0 +1,166 @@
+#encoding: utf-8
+require 'spec_helper'
+require 'pry-debugger'
+
+describe Phrasing::Serializer do
+
+  let(:english_phrases) do
+    PhrasingPhrase.where(locale: :en)
+  end
+
+  let(:french_phrases) do
+    PhrasingPhrase.where(locale: :fr)
+  end
+
+  describe 'flatten_the_hash' do
+
+    it 'with simple data' do
+      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"}}
+      new_hash = Phrasing::Serializer.flatten_the_hash(hash)
+
+      predicted_new_hash = { "site.text.intro" => "Hello", "site.text.outro" => "KthnxBye" }
+      expect(new_hash).to eq(predicted_new_hash)
+    end
+
+    it 'with deeply nested data' do
+      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"}
+      expect(new_hash).to eq(predicted_new_hash)
+    end
+
+  end
+
+  context 'import_yaml' do
+
+    it 'simply formatted phrases' do
+      yaml = <<-YAML
+        en:
+          intro: "Hello World"
+          outro: "Kthnx Bye"
+      YAML
+      Phrasing::Serializer.import_yaml(StringIO.new(yaml))
+
+      expect(english_phrases.where(key: "intro").first.value).to eq("Hello World")
+      expect(english_phrases.where(key: "outro").first.value).to eq("Kthnx Bye")
+    end
+
+    it 'nested phrases' do
+      yaml = <<-YAML
+        en:
+          site:
+            intro: "Hello World"
+            outro: "Kthnx Bye"
+      YAML
+      Phrasing::Serializer.import_yaml(StringIO.new(yaml))
+
+      expect(english_phrases.where(key: "site.intro").first.value).to eq("Hello World")
+      expect(english_phrases.where(key: "site.outro").first.value).to eq("Kthnx Bye")
+    end
+
+    it 'deeply nested phrases' do
+      yaml = <<-YAML
+        en:
+          site:
+            text:
+              intro: "Hello World"
+              outro: "Kthnx Bye"
+              overture:
+                intro: "Overture intro"
+                outro: "Overture outro"
+      YAML
+      Phrasing::Serializer.import_yaml(StringIO.new(yaml))
+
+      expect(english_phrases.where(key: "site.text.intro").first.value).to eq("Hello World")
+      expect(english_phrases.where(key: "site.text.outro").first.value).to eq("Kthnx Bye")
+
+      expect(english_phrases.where(key: "site.text.overture.intro").first.value).to eq("Overture intro")
+      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")
+
+      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 = <<-YAML
+        en:
+          site:
+            intro: "Hello World"
+      YAML
+      number_of_changes = Phrasing::Serializer.import_yaml(StringIO.new(yaml))
+
+      expect(english_phrases.where(key: "site.intro").first.value).to eq("Hello World")
+      expect(english_phrases.where(key: "site.outro").first.value).to eq("Kthnx Bye")
+
+      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")
+      FactoryGirl.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")
+
+      yaml = Phrasing::Serializer.export_yaml
+
+      number_of_changes = Phrasing::Serializer.import_yaml(StringIO.new(yaml))
+
+      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")
+      expect(number_of_changes).to eq(0)
+    end
+  end
+
+
+  context 'export_yaml' do
+    it 'flattened phrases' do
+      FactoryGirl.create(:phrasing_phrase, key: "site.intro", value: "Go Home")
+      FactoryGirl.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")
+
+      yaml = Phrasing::Serializer.export_yaml
+
+      expect(yaml).to match(/site.intro:\sGo Home/)
+      expect(yaml).to match(/site.outro:\sKthnx Bye/)
+    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)
+
+      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
+
+      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/models/phrasing_phrase_spec.rb

@@ -1,46 +1,32 @@
 #encoding: utf-8
 require 'spec_helper'
+require 'pry-debugger'
 
 describe PhrasingPhrase do
 
   describe "database constraints" do
-    it "validates uniqueness of key & locale" do
-      PhrasingPhrase.new(key: "foo", locale: "en", value: "bar").save
-      # a = PhrasingPhrase.new(key: "foo", locale: "en", value: "bar2")
-      # expect { a.save }.to raise_error
-      b = PhrasingPhrase.new(key: "foo", locale: "fa", value: "bar")
-      expect { b.save }.not_to raise_error
-    end
-  end
-
-  it "imports YAML" do
-    FactoryGirl.create(:phrasing_phrase, :key => "sample_copy", :value => "copyfoo")
-    FactoryGirl.create(:phrasing_phrase, :key => "sample_copy2", :value => "copybaz")
-
-    assert PhrasingPhrase.find_by_key("sample_copy").value == "copyfoo"
-    assert PhrasingPhrase.find_by_key("sample_copy2").value == "copybaz"
-    assert PhrasingPhrase.find_by_key("hello").nil?
+    context "validates uniqueness of key & locale" 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
+      end
+
+      it 'on #save, if the key and locale are the same for two phrases, the latter one should be invalid' do
+        PhrasingPhrase.create(key: "foo", locale: "en", value: "bar")
+        new_phrase = PhrasingPhrase.create(key: "foo", locale: "en", value: "bar2")
+        expect(new_phrase).to be_invalid
+      end
+
+      it "shouldn't raise errors if the key is the same but locales are different" do
+       PhrasingPhrase.create(key: "foo", locale: "en", value: "bar")
+       new_phrase = PhrasingPhrase.new(key: "foo", locale: "fr", value: "bar")
+       expect { new_phrase.save! }.not_to raise_error
+       expect(new_phrase).to be_valid
+     end
 
-    yaml = <<-YAML
-      en:
-        hello: "Hello world"
-        sample_copy: "lorem ipsum"
-    YAML
-    PhrasingPhrase.import_yaml(StringIO.new(yaml))
-
-    assert PhrasingPhrase.find_by_key("sample_copy").value == "lorem ipsum"
-    assert PhrasingPhrase.find_by_key("sample_copy2").value == "copybaz"
-    assert PhrasingPhrase.find_by_key("hello").value == "Hello world"
-  end
-
-  it "exports and then imports complicated YAML" do
-    key = "moby_dick"
-    value = %|<p>Lorem ipsum</p><p class="highlight">∆'≈:</p>|
-    FactoryGirl.create(:phrasing_phrase, key: key, value: value)
-    yaml = PhrasingPhrase.export_yaml
-    PhrasingPhrase.destroy_all
-    PhrasingPhrase.import_yaml(StringIO.new(yaml))
-    PhrasingPhrase.find_by_key(key).value.should == value
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,6 +184,7 @@ files:
 - db/migrate/20131010101010_create_phrasing_phrase_versions.rb
 - lib/phrasing.rb
 - lib/phrasing/implementation.rb
+- lib/phrasing/serializer.rb
 - lib/phrasing/simple.rb
 - lib/phrasing/version.rb
 - lib/tasks/phrasing_tasks.rake
@@ -195,7 +196,6 @@ files:
 - spec/dummy/app/controllers/site_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/helpers/phrasing_helper.rb
-- spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/site/index.html.erb
@@ -222,7 +222,6 @@ files:
 - 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/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
@@ -234,6 +233,7 @@ files:
 - spec/factories/phrasing_phrases.rb
 - spec/features/dummy_spec.rb
 - spec/features/phrasing_spec.rb
+- spec/lib/phrasing_serializer_spec.rb
 - spec/lib/phrasing_spec.rb
 - spec/models/phrasing_phrase_spec.rb
 - spec/spec_helper.rb