copycat 0.2.6 → 0.2.7

data/spec/lib/copycat_spec.rb

@@ -27,16 +27,16 @@ describe Copycat do
 
   describe ".lookup" do
     it "returns simple lookup if copycat_translation missing" do
-      base.lookup(nil, '').should == "translation missing"
+      expect(base.lookup(nil, '')).to eq("translation missing")
     end
     it "returns copycat_translation if present" do
-      cct = FactoryGirl.create(:copycat_translation)
-      base.lookup(cct.locale, cct.key).should == cct.value
+      cct = create(:copycat_translation)
+      expect(base.lookup(cct.locale, cct.key)).to eq(cct.value)
     end
     it "creates copycat_translation if one is missing" do
-      CopycatTranslation.where(locale: 'en', key: 'foo').should be_empty
+      expect(CopycatTranslation.where(locale: 'en', key: 'foo')).to be_empty
       base.lookup('en', 'foo')
-      CopycatTranslation.where(locale: 'en', key: 'foo').should_not be_empty
+      expect(CopycatTranslation.where(locale: 'en', key: 'foo')).not_to be_empty
     end
   end
 

data/spec/models/copycat_translation_spec.rb

@@ -3,88 +3,69 @@ require 'spec_helper'
 
 describe CopycatTranslation do
 
-  describe "database constraints" do
-    it "validates uniqueness of key & locale" do
-      CopycatTranslation.new(key: "foo", locale: "en", value: "bar").save
-      a = CopycatTranslation.new(key: "foo", locale: "en", value: "bar2")
-      expect { a.save }.should raise_error
-      b = CopycatTranslation.new(key: "foo", locale: "fa", value: "bar")
-      expect { b.save }.should_not raise_error
-    end
-  end
-  
-  describe "helper methods" do
-    it "flattens hashes" do
-      before = {"a" => {"b" => "c", "d" => "e"}, "f" => {"g" => {"h" => "i", "j" => "k"}, "l" => "m"}}
-      after = CopycatTranslation.hash_flatten(before)
-      assert after == {"a.b" => "c", "a.d" => "e", "f.g.h" => "i", "f.g.j" => "k", "f.l" => "m"}
-    end
+  it { should validate_presence_of(:locale) }
+  it { should validate_presence_of(:key) }
 
-    it "fattens hashes" do
-      hash = {"a" => {"b" => "c", "d" => "e"}, "f" => {"g" => {"h" => "i"}, "l" => "m"}}
-      keys = "f.g.j".split(".")
-      value = "k"
-      CopycatTranslation.hash_fatten!(hash, keys, value)
-      assert hash == {"a" => {"b" => "c", "d" => "e"}, "f" => {"g" => {"h" => "i", "j" => "k"}, "l" => "m"}}
-    end
-  end
+  it "validates uniqueness of key & locale" do
+    create(:copycat_translation, :key => "foo", :locale => "en", :value => "bar")
 
-  it "imports YAML" do
-    FactoryGirl.create(:copycat_translation, :key => "sample_copy", :value => "copyfoo")
-    FactoryGirl.create(:copycat_translation, :key => "sample_copy2", :value => "copybaz")
+    expect do
+      create(:copycat_translation, :key => "foo", :locale => "en", :value => "bar")
+    end.to raise_error ActiveRecord::RecordNotUnique
+
+    expect do
+      create(:copycat_translation, :key => "foo", :locale => "es", :value => "bar")
+    end.not_to raise_error
+  end
 
-    assert CopycatTranslation.find_by_key("sample_copy").value == "copyfoo"
-    assert CopycatTranslation.find_by_key("sample_copy2").value == "copybaz"
-    assert CopycatTranslation.find_by_key("hello").nil?
+  it 'imports YAML string, updating existing keys, ignoring keys with blank values' do
+    create(:copycat_translation, :key => 'foo', :value => 'bar')
+    create(:copycat_translation, :key => 'controller.view.copy', :value => 'derp')
+    create(:copycat_translation, :key => 'controller.view.partial.copy', :value => 'foo')
 
-    yaml = <<-YAML
+    yaml = <<-YAML.strip_heredoc
       en:
         hello: "Hello world"
-        sample_copy: "lorem ipsum"   
+        foo: "lorem ipsum"
+        controller:
+          view:
+            partial:
+              copy: 'bar'
+              blank:
     YAML
-    CopycatTranslation.import_yaml(StringIO.new(yaml))
 
-    assert CopycatTranslation.find_by_key("sample_copy").value == "lorem ipsum"
-    assert CopycatTranslation.find_by_key("sample_copy2").value == "copybaz"
-    assert CopycatTranslation.find_by_key("hello").value == "Hello world"
-  end
+    CopycatTranslation.import_yaml(yaml)
 
-  describe "export YAML" do
-    it "can be consumed by i18N" do
-      I18n.t('site.title').should_not == 'My Blog'
-      CopycatTranslation.destroy_all
-      CopycatTranslation.create(key: 'site.title', value: 'My Blog', locale: 'en')
-      data = YAML.load(CopycatTranslation.export_yaml)
-      CopycatTranslation.destroy_all
-      data.each { |locale, d| I18n.backend.store_translations(locale, d || {}) } #i18n/backend/base.rb:159
-      I18n.t('site.title').should == 'My Blog'
-    end
+    expect(I18n.t('foo')).to eq 'lorem ipsum'
+    expect(I18n.t('hello')).to eq 'Hello world'
+    expect(I18n.t('controller.view.copy')).to eq 'derp'
+    expect(I18n.t('controller.view.partial.copy')).to eq 'bar'
+    expect(I18n.t('controller.view.blank')).to eq 'translation missing: en.controller.view.blank'
   end
 
-  it "exports YAML" do
-    FactoryGirl.create(:copycat_translation, :key => "sample_copy", :value => "copyfoo")
-    FactoryGirl.create(:copycat_translation, :key => "sample_copy2", :value => "copybaz")
-    yaml = CopycatTranslation.export_yaml
-    assert yaml =~ /sample_copy: copyfoo\n\s*sample_copy2: copybaz/
-    
-    FactoryGirl.create(:copycat_translation, :key => "a.sample_copy3", :value => "copyfoo")
-    FactoryGirl.create(:copycat_translation, :key => "a.sample_copy4", :value => "copybaz")
-    yaml = CopycatTranslation.export_yaml
-    assert yaml =~ /a:\n\s*sample_copy3: copyfoo\n\s* sample_copy4: copybaz/
-  end
+  it 'exports YAML that can be consumed by I18n' do
+    # Assert that the translation doesn't already exist to avoid false postives
+    expect(I18n.t('apple')).not_to eq('Apple')
+    expect(I18n.t('apple', :locale => :es)).not_to eq('Manzana')
+    expect(I18n.t('site.title')).not_to eq('My Blog')
 
-  it "exports and then imports complicated YAML" do
-    key = "moby_dick"
-    value = %|<p>Lorem ipsum</p><p class="highlight">∆'≈:</p>|
-    FactoryGirl.create(:copycat_translation, key: key, value: value)
-    yaml = CopycatTranslation.export_yaml
-    CopycatTranslation.destroy_all
-    CopycatTranslation.import_yaml(StringIO.new(yaml))
-    CopycatTranslation.find_by_key(key).value.should == value
-  end
-
-end
+    # The previous calls to I18n populate the database
+    CopycatTranslation.delete_all
+    create(:copycat_translation, :locale => 'en', :key => 'site.title', :value => 'My Blog')
+    create(:copycat_translation, :locale => 'en', :key => 'site.blogs.index.markup', :value =>%|<p>Lorem ipsum</p><p class="highlight">∆'≈:</p>|)
+    create(:copycat_translation, :locale => 'en', :key => 'apple', :value => 'Apple')
+    create(:copycat_translation, :locale => 'es', :key => 'apple', :value => 'Manzana')
 
+    yaml = CopycatTranslation.export_yaml
 
+    filepath = Pathname.new(File.expand_path(File.join(__FILE__, '..', '..', 'support', 'export.yml')))
+    File.open(filepath, 'w') { |f| f.write yaml }
 
+    I18n.backend.load_translations(filepath)
 
+    expect(I18n.t('apple')).to eq 'Apple'
+    expect(I18n.t('apple', :locale => :es)).to eq 'Manzana'
+    expect(I18n.t('site.title')).to eq 'My Blog'
+    expect(I18n.t('site.blogs.index.markup')).to eq %|<p>Lorem ipsum</p><p class="highlight">∆'≈:</p>|
+  end
+end

data/spec/spec_helper.rb

@@ -3,10 +3,13 @@ require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require 'rspec/rails'
 require 'capybara/rspec'
 require 'tempfile'
-
-Dir["#{File.dirname(__FILE__)}/factories/**/*.rb"].each { |f| require f }
+require 'factory_girl_rails'
+require 'shoulda-matchers'
+require 'pry'
 
 RSpec.configure do |config|
   config.mock_with :rspec
   config.use_transactional_fixtures = true
+
+  config.include FactoryGirl::Syntax::Methods
 end

data/spec/support/export.yml

@@ -0,0 +1,10 @@
+---
+en:
+  site:
+    title: My Blog
+    blogs:
+      index:
+        markup: <p>Lorem ipsum</p><p class="highlight">∆'≈:</p>
+  apple: Apple
+es:
+  apple: Manzana

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copycat
 version: !ruby/object:Gem::Version
-  version: 0.2.6
-  prerelease: 
+  version: 0.2.7
 platform: ruby
 authors:
 - Andrew Ross
@@ -10,24 +9,126 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: Edit live website copy.
 email:
 - info@vermonster.com
@@ -35,6 +136,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/assets/stylesheets/copycat_engine.css
 - app/controllers/copycat_translations_controller.rb
 - app/models/copycat_translation.rb
@@ -45,16 +149,14 @@ files:
 - app/views/layouts/copycat.html.erb
 - config/routes.rb
 - db/migrate/20120313191745_create_copycat_translations.rb
+- lib/copycat.rb
 - lib/copycat/engine.rb
 - lib/copycat/implementation.rb
 - lib/copycat/routes.rb
 - lib/copycat/simple.rb
 - lib/copycat/version.rb
-- lib/copycat.rb
 - lib/tasks/copycat_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -62,6 +164,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/site/index.html.erb
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -78,9 +181,8 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/20120320194234_create_copycat_translations.copycat_engine.rb
+- spec/dummy/db/migrate/20150824125132_create_copycat_translations.copycat_engine.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -89,48 +191,44 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
 - spec/dummy/script/rails
-- spec/dummy/tmp/cache/assets/C19/060/sprockets%2F125436f53217b7f564aa5016d1168709
-- spec/dummy/tmp/cache/assets/CB3/6E0/sprockets%2F0f4c96b04436bf7ae900561753947d4c
-- spec/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
-- spec/dummy/tmp/cache/assets/D09/190/sprockets%2Fb2bddd007999a56d8b20c92301ea1983
-- spec/dummy/tmp/cache/assets/D1A/DB0/sprockets%2F26d700197b8d25f954d56d8f31f2c8bc
-- spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
-- spec/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
-- spec/dummy/tmp/cache/assets/DA4/EE0/sprockets%2Fcd39e3d56788faea331e0f5bac67329b
-- spec/dummy/tmp/cache/assets/DBD/220/sprockets%2F0cbff5c1a349439c1c444cbb4a57acc4
-- spec/dummy/tmp/cache/assets/DDD/780/sprockets%2Fe7880b84c3ecb507fabc99b9ef6b70e3
-- spec/dummy/tmp/cache/assets/DF8/310/sprockets%2Fccb12c4009c2f876d51dee8bae4c64ec
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/5pjjE7UQ1zT-W3Rm7l8onDEWZV9b-lyRmeW9nFAbLoU.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/9ZnyF5L7jalLFn0sk_WNwUCeeXBylJBp2yRgFPQE3ho.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/IfC1KmXTw1ppvrXEYn3N4C2stMo3ing1GipxNQ0oML4.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/YQfOnucF3bHs51e6OOpX6Gh8ih98sfqcSc88X90cxYg.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/bUaVNTYJb9Cp-33TI2vIHrdmO8U0fOh3szyB6M4K7BY.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/j2gYDVPsuXlIFLdHtvLu9pJtjz2Z1dmLFVDQp9jNEwc.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/qGrLWZnG1ElHmKVImQl1l5olVVtVeDSZ13_9Ll1qeYU.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/zQEVaz1UlfTQQY8e-XT2PRLny8dybtFJeuDtPTwwS2E.cache
 - spec/factories/copycat_translations.rb
-- spec/integration/copycat_spec.rb
-- spec/integration/dummy_spec.rb
+- spec/features/copycat_spec.rb
+- spec/features/dummy_spec.rb
 - spec/lib/copycat_spec.rb
 - spec/models/copycat_translation_spec.rb
 - spec/spec_helper.rb
+- spec/support/export.yml
 homepage: https://github.com/Vermonster/copycat
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails engine for editing live website copy.
 test_files:
 - spec/dummy/app/assets/javascripts/application.js
@@ -158,7 +256,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/20120320194234_create_copycat_translations.copycat_engine.rb
+- spec/dummy/db/migrate/20150824125132_create_copycat_translations.copycat_engine.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -169,20 +267,18 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
-- spec/dummy/tmp/cache/assets/C19/060/sprockets%2F125436f53217b7f564aa5016d1168709
-- spec/dummy/tmp/cache/assets/CB3/6E0/sprockets%2F0f4c96b04436bf7ae900561753947d4c
-- spec/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
-- spec/dummy/tmp/cache/assets/D09/190/sprockets%2Fb2bddd007999a56d8b20c92301ea1983
-- spec/dummy/tmp/cache/assets/D1A/DB0/sprockets%2F26d700197b8d25f954d56d8f31f2c8bc
-- spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
-- spec/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
-- spec/dummy/tmp/cache/assets/DA4/EE0/sprockets%2Fcd39e3d56788faea331e0f5bac67329b
-- spec/dummy/tmp/cache/assets/DBD/220/sprockets%2F0cbff5c1a349439c1c444cbb4a57acc4
-- spec/dummy/tmp/cache/assets/DDD/780/sprockets%2Fe7880b84c3ecb507fabc99b9ef6b70e3
-- spec/dummy/tmp/cache/assets/DF8/310/sprockets%2Fccb12c4009c2f876d51dee8bae4c64ec
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/5pjjE7UQ1zT-W3Rm7l8onDEWZV9b-lyRmeW9nFAbLoU.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/9ZnyF5L7jalLFn0sk_WNwUCeeXBylJBp2yRgFPQE3ho.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/bUaVNTYJb9Cp-33TI2vIHrdmO8U0fOh3szyB6M4K7BY.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/IfC1KmXTw1ppvrXEYn3N4C2stMo3ing1GipxNQ0oML4.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/j2gYDVPsuXlIFLdHtvLu9pJtjz2Z1dmLFVDQp9jNEwc.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/qGrLWZnG1ElHmKVImQl1l5olVVtVeDSZ13_9Ll1qeYU.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/YQfOnucF3bHs51e6OOpX6Gh8ih98sfqcSc88X90cxYg.cache
+- spec/dummy/tmp/cache/assets/test/sprockets/v3.0/zQEVaz1UlfTQQY8e-XT2PRLny8dybtFJeuDtPTwwS2E.cache
 - spec/factories/copycat_translations.rb
-- spec/integration/copycat_spec.rb
-- spec/integration/dummy_spec.rb
+- spec/features/copycat_spec.rb
+- spec/features/dummy_spec.rb
 - spec/lib/copycat_spec.rb
 - spec/models/copycat_translation_spec.rb
 - spec/spec_helper.rb
+- spec/support/export.yml