sy18nc 0.0.2 → 0.1.0

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.9.3
+script: bundle exec rspec spec

data/Guardfile

@@ -0,0 +1,6 @@
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/michaldarda/sy18nc.png?branch=master)](https://travis-ci.org/michaldarda/sy18nc)
+
 # Sy18nc
 
 Simple tool to synchronize Rails .ymls with locales.
@@ -6,7 +8,9 @@ Simple tool to synchronize Rails .ymls with locales.
 
 Add this line to your application's Gemfile:
 
-    gem 'sy18nc', '~> 0.0.2'
+    group :development do
+      gem 'sy18nc', '~> 0.1.0'
+    end
 
 And then execute:
 
@@ -102,6 +106,18 @@ informing you that there is something missing in this locales and you need to fi
 
 Please post any issues via Github Issues. If you want to contribute, see [Contributing](#contributing).
 
+# Changelog
+
+## 0.1.0
+- Creating translations from scratch
+- Deleting keys which are not present in base
+
+## 0.0.2
+- Fixed huge bug with overwriting Rails methods
+
+## 0.0.1
+- Initial release
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -3,14 +3,6 @@ require "rake/testtask"
 
 require_relative "lib/sy18nc"
 
-Rake::TestTask.new(:spec) do |t|
-  t.libs.push "lib"
-  t.test_files = FileList["spec/*_spec.rb"]
-  t.verbose = true
-end
-
-task default: :spec
-
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -I lib -I extra -r ./lib/sy18nc.rb"

data/ext/object.rb

@@ -1,9 +1,5 @@
 class Object
-  def sy18nc_append!(val)
-    self
-  end
+  def sy18nc_append!(val); self end
 
-  def sy18nc_mark_fixme!
-    self
-  end
+  def sy18nc_mark_fixme!; self end
 end

data/lib/generators/templates/sy18nc.rb

@@ -1,4 +1,6 @@
-Sy18nc.configure do |c|
-  c.locales = []
-  c.files   = []
+if Rails.env.development?
+  Sy18nc.configure do |c|
+    c.locales = []
+    c.files   = []
+  end
 end

data/lib/sy18nc/locale.rb

@@ -5,10 +5,27 @@ module Sy18nc
     attr_reader :name, :hash
 
     def initialize(file)
+      # locale does not exists
+      unless File.exists?(File.expand_path(file))
+        # extracts name from locale file name
+        # ["devise", "en"]
+        tname = file.match(/(([A-z]+\.)*)(yml)$/)[1].split(".")
+        f = File.new(file, "w+")
+
+        # uses fetched keys before to create a skeleton of locale
+        locale_skeleton = tname.inject({}) do |result, k|
+          result[k] = {}
+          result
+        end
+
+        f.write(YAML.dump(locale_skeleton))
+        f.close
+      end
+
       @name = File.basename(file,".*")
 
+      file = File.read(File.expand_path(file))
       file = replace_fixmes(file)
-
     begin
       @hash = YAML.load(file)
     rescue Exception => e
@@ -56,7 +73,6 @@ module Sy18nc
     # little trick:
     # fetch with the comments
     def replace_fixmes(file)
-      file = File.read(File.expand_path(file))
       file.gsub("\' # FIXME", " g FIXME\'")
         .gsub("\" # FIXME", " g FIXME\"")
         .gsub("# FIXME", "g FIXME")

data/lib/sy18nc/version.rb

@@ -1,3 +1,3 @@
 module Sy18nc
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/ext_spec.rb

@@ -3,11 +3,11 @@ require_relative 'spec_helper'
 describe Array do
   it "extracts options" do
     a = [1, 2, 3, 4, { option: true, option2: false }]
-    a.sy18nc_extract_options!.must_equal({ option: true, option2: false })
-    a.must_equal([1,2,3,4])
+    a.sy18nc_extract_options!.should eql({ option: true, option2: false })
+    a.should eql([1,2,3,4])
 
-    a.sy18nc_extract_options!.must_equal({})
-    a.must_equal([1,2,3,4])
+    a.sy18nc_extract_options!.should eql({})
+    a.should eql([1,2,3,4])
   end
 
   it "appends" do
@@ -15,7 +15,7 @@ describe Array do
 
     a.sy18nc_append!("appended_string")
 
-    a.must_equal ["helloappended_string", "worldappended_string"]
+    a.should eql(["helloappended_string", "worldappended_string"])
   end
 end
 
@@ -57,7 +57,7 @@ describe Hash do
       }
     }
 
-    @hash.sy18nc_append!("appended_string").must_equal appended_hash
+    @hash.sy18nc_append!("appended_string").should eql(appended_hash)
 
     hash2 = {
       :key1 => "helloworld",
@@ -77,7 +77,7 @@ describe Hash do
         ]
       }
 
-    hash2.sy18nc_append!("appended_string").must_equal appended_hash2
+    hash2.sy18nc_append!("appended_string").should eql(appended_hash2)
   end
 
   it "deep marks fixme" do
@@ -99,7 +99,7 @@ describe Hash do
     }
 
     @hash.sy18nc_mark_fixme!
-    @hash.must_equal fixme_hash
+    @hash.should eql(fixme_hash)
   end
 
   it "deep merges and marks fixme" do
@@ -131,7 +131,7 @@ describe Hash do
       }
     }
 
-    other_hash.sy18nc_deep_merge!(@hash).must_equal result
+    other_hash.sy18nc_deep_merge!(@hash).should eql(result)
   end
 
   it "deep merges hashes with nested arrays" do
@@ -139,11 +139,11 @@ describe Hash do
 
   describe String do
     it "marks fixme" do
-      "Hello".sy18nc_mark_fixme!.must_equal("Hello g FIXME")
+      "Hello".sy18nc_mark_fixme!.should eql("Hello g FIXME")
 
-      "Hello g FIXME".sy18nc_mark_fixme!.must_equal("Hello g FIXME")
+      "Hello g FIXME".sy18nc_mark_fixme!.should eql("Hello g FIXME")
 
-      "*hello_world".sy18nc_mark_fixme!.must_equal("*hello_world")
+      "*hello_world".sy18nc_mark_fixme!.should eql("*hello_world")
     end
   end
 end

data/spec/locale_spec.rb

@@ -6,80 +6,78 @@ describe Sy18nc::Locale do
   end
 
   it "loads the yaml" do
-    @locale.hash.wont_be_empty
-    @locale.hash.must_be_kind_of Hash
+    @locale.hash.should_not be_empty
+    @locale.hash.should be_a_kind_of(Hash)
 
     locale = Sy18nc::Locale.new("spec/fixtures/devise.tr.yml")
-    locale.hash.wont_be_empty
-    locale.hash.must_be_kind_of Hash
-    assert locale.synchronizable?
+    locale.hash.should_not be_empty
+    locale.hash.should be_a_kind_of(Hash)
+    locale.synchronizable?.should be_true
   end
 
   it "is not synchronizable when YAML is not valid" do
     t = Sy18nc::Locale.new("spec/fixtures/not_valid.yml")
-    refute t.synchronizable?
+    t.synchronizable?.should be_false
   end
 
   it "fetches the locale body" do
-    @locale.body.wont_equal "en"
-    @locale.body.must_be_kind_of Hash
+    @locale.body.should_not eql("en")
+    @locale.body.should be_a_kind_of(Hash)
 
     locale = Sy18nc::Locale.new("spec/fixtures/devise.tr.yml")
-    locale.body.wont_be_empty
-    locale.body.must_be_kind_of Hash
+    locale.body.should_not be_empty
+    locale.body.should be_a_kind_of(Hash)
   end
 
   it "writes the locale to file" do
-    refute File.exists?("en.yml")
+    File.exists?("en.yml").should be_false
     @locale.save
-    assert File.exists?("en.yml")
+    File.exists?("en.yml").should be_true
 
-    refute File.exists?("en.yml.bak")
+    File.exists?("en.yml.bak").should be_false
     @locale.save(backup: true)
-    assert File.exists?("en.yml.bak")
+    File.exists?("en.yml.bak").should be_true
 
-    refute File.exists?("locale_file.yml")
+    File.exists?("locale_file.yml").should be_false
     @locale.save(filename: "locale_file")
-    assert File.exists?("locale_file.yml")
+    File.exists?("locale_file.yml").should be_true
 
-    refute File.exists?("locale_file.yml.bak")
+    File.exists?("locale_file.yml.bak").should be_false
     @locale.save(filename: "locale_file", backup: true)
-    assert File.exists?("locale_file.yml.bak")
+    File.exists?("locale_file.yml.bak").should be_true
 
     cleanup
   end
 
   it "converts locale to yml" do
-    @locale.to_yaml.wont_be_empty
-    @locale.to_yaml.must_be_kind_of String
-    @locale.to_yaml.must_equal %q[---
+    @locale.to_yaml.should_not be_empty
+    @locale.to_yaml.should be_a_kind_of(String)
+    @locale.to_yaml.should eql(%q[---
 en:
   promo:
     link1: "Hello"
     link2: "Hello"
-]
+])
   end
 
   it "synchronizes locales" do
     russian_locale = Sy18nc::Locale.new("spec/fixtures/ru.yml")
     russian_locale.synchronize(@locale)
-    russian_locale.to_yaml.must_equal %q[---
+    russian_locale.to_yaml.should eql(%q[---
 ru:
   promo:
     link1: "Birbevoon"
     link2: "Hello" # FIXME
-]
-    @locale.to_yaml.lines.count.must_equal russian_locale.to_yaml.lines.count
+])
+    @locale.to_yaml.lines.count.should eql(russian_locale.to_yaml.lines.count)
 
     devise_en = Sy18nc::Locale.new("spec/fixtures/devise.en.yml")
     devise_tr = Sy18nc::Locale.new("spec/fixtures/devise.tr.yml")
-    devise_en.to_yaml.lines.count.wont_equal devise_tr.to_yaml.lines.count
+    devise_en.to_yaml.lines.count.should_not eql(devise_tr.to_yaml.lines.count)
 
     devise_tr.synchronize(devise_en)
-    devise_tr.to_yaml.lines.count.must_equal devise_en.to_yaml.lines.count
-    devise_tr.to_yaml.must_equal(File.read(File.expand_path("spec/fixtures/results/devise.tr.yml")))
-
-
+    devise_tr.to_yaml.lines.count.should eql(devise_en.to_yaml.lines.count)
+    devise_tr.to_yaml.should eql(File.read(File.expand_path("spec/fixtures/results/devise.tr.yml")))
   end
 
   def cleanup

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 require 'simplecov'
 SimpleCov.start 'rails'
 
-require 'minitest/autorun'
-require 'minitest/spec'
-require 'turn/autorun'
-
 require_relative '../lib/sy18nc.rb'
+
+RSpec.configure do |config|
+  config.failure_color = :magenta
+  config.tty = true
+  config.color = true
+end

data/spec/sy18nc_spec.rb

@@ -2,10 +2,10 @@ require_relative "spec_helper"
 
 describe Sy18nc do
   it "is configurable" do
-    Sy18nc.config.base_locale.must_equal "en"
-    Sy18nc.config.locales_dir.must_equal "#{Dir.pwd}/config/locales"
-    Sy18nc.config.files.must_equal []
-    Sy18nc.config.locales.must_equal []
+    Sy18nc.config.base_locale.should eql("en")
+    Sy18nc.config.locales_dir.should eql("#{Dir.pwd}/config/locales")
+    Sy18nc.config.files.should eql([])
+    Sy18nc.config.locales.should eql([])
 
     Sy18nc.configure do |c|
       c.base_locale = "ru"
@@ -15,10 +15,10 @@ describe Sy18nc do
       c.locales = ["en", "es", "fr", "de"]
     end
 
-    Sy18nc.config.base_locale.must_equal "ru"
-    Sy18nc.config.locales_dir.must_equal "spec/fixtures"
-    Sy18nc.config.backup.must_equal true
-    Sy18nc.config.files.must_equal ["code", "devise", "doorkeeper"]
-    Sy18nc.config.locales.must_equal ["en", "es", "fr", "de"]
+    Sy18nc.config.base_locale.should eql("ru")
+    Sy18nc.config.locales_dir.should eql("spec/fixtures")
+    Sy18nc.config.backup.should eql(true)
+    Sy18nc.config.files.should eql(["code", "devise", "doorkeeper"])
+    Sy18nc.config.locales.should eql(["en", "es", "fr", "de"])
   end
 end

data/spec/sychronizer_spec.rb

@@ -1,11 +1,11 @@
 require_relative 'spec_helper'
 
 describe Sy18nc::Synchronizer do
-  def setup
+  before do
     @synchronizer = Sy18nc::Synchronizer.new("spec/fixtures/", "en.yml" ,"ru.yml", backup: true)
   end
 
-  def teardown
+  after do
     %x[rm spec/fixtures/*.bak]
   end
 
@@ -16,13 +16,22 @@ describe Sy18nc::Synchronizer do
     synchronizer.synchronize_all
     after = File.read(File.expand_path("spec/fixtures/en.yml"))
 
-    after.must_equal before
+    after.should eq before
+  end
+
+  it "creates missing translations" do
+    File.exists?(File.expand_path("spec/fixtures/devise.es.yml")).should be_false
+    synchronizer = Sy18nc::Synchronizer.new("spec/fixtures/", "devise.en.yml", "devise.es.yml")
+    synchronizer.synchronize_all
+
+    File.exists?(File.expand_path("spec/fixtures/devise.es.yml")).should be_true
+    %x[rm spec/fixtures/devise.es.yml]
   end
 
   it "synchronizes translation only once" do
     3.times do
       @synchronizer.synchronize_all
-      File.read(File.expand_path("spec/fixtures/ru.yml.bak")).must_equal %q[---
+      File.read(File.expand_path("spec/fixtures/ru.yml.bak")).should eq %q[---
 ru:
   promo:
     link1: "Birbevoon"
@@ -33,25 +42,25 @@ ru:
     4.times do
       synchronizer = Sy18nc::Synchronizer.new("spec/fixtures/", "devise.en.yml", "devise.tr.yml", backup: true)
       synchronizer.synchronize_all
-      File.read(File.expand_path("spec/fixtures/devise.tr.yml.bak")).must_equal(File.read(File.expand_path("spec/fixtures/results/devise.tr.yml")))
+      File.read(File.expand_path("spec/fixtures/devise.tr.yml.bak")).should eq(File.read(File.expand_path("spec/fixtures/results/devise.tr.yml")))
     end
   end
 
   it "when backup option is set to true saves as a backup file and does not modify original files" do
-    refute File.exists?(File.expand_path("spec/fixtures/ru.yml.bak"))
+    File.exists?(File.expand_path("spec/fixtures/ru.yml.bak")).should be_false
     @synchronizer.synchronize_all
-    assert File.exists?(File.expand_path("spec/fixtures/ru.yml.bak"))
-    File.read(File.expand_path("spec/fixtures/ru.yml.bak")).must_equal %q[---
+    File.exists?(File.expand_path("spec/fixtures/ru.yml.bak")).should be_true
+    File.read(File.expand_path("spec/fixtures/ru.yml.bak")).should eq %q[---
 ru:
   promo:
     link1: "Birbevoon"
     link2: "Hello" # FIXME
 ]
 
-    refute File.exists?(File.expand_path("spec/fixtures/devise.tr.yml.bak"))
+    File.exists?(File.expand_path("spec/fixtures/devise.tr.yml.bak")).should be_false
     synchronizer = Sy18nc::Synchronizer.new("spec/fixtures/", "devise.en.yml", "devise.tr.yml", backup: true)
     synchronizer.synchronize_all
-    assert File.exists?(File.expand_path("spec/fixtures/devise.tr.yml.bak"))
-    File.read(File.expand_path("spec/fixtures/devise.tr.yml.bak")).must_equal(File.read(File.expand_path("spec/fixtures/results/devise.tr.yml")))
+    File.exists?(File.expand_path("spec/fixtures/devise.tr.yml.bak")).should be_true
+    File.read(File.expand_path("spec/fixtures/devise.tr.yml.bak")).should eq(File.read(File.expand_path("spec/fixtures/results/devise.tr.yml")))
   end
 end

data/sy18nc.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "psych", "~> 2.0.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "turn", "~> 0.9.6"
+  spec.add_development_dependency "rake", '~> 10.1.0'
   spec.add_development_dependency "simplecov", "~> 0.7.1"
+  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-rspec"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sy18nc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
@@ -48,25 +48,25 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,15 +74,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! ' Simple tool to synchronize Rails ymls with locales. '
 email:
 - michaldarda@gmail.com
@@ -100,7 +132,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -122,6 +156,7 @@ files:
 - spec/fixtures/devise.en.yml
 - spec/fixtures/devise.tr.yml
 - spec/fixtures/en.yml
+- spec/fixtures/es.yml
 - spec/fixtures/not_valid.yml
 - spec/fixtures/results/devise.tr.yml
 - spec/fixtures/ru.yml
@@ -160,6 +195,7 @@ test_files:
 - spec/fixtures/devise.en.yml
 - spec/fixtures/devise.tr.yml
 - spec/fixtures/en.yml
+- spec/fixtures/es.yml
 - spec/fixtures/not_valid.yml
 - spec/fixtures/results/devise.tr.yml
 - spec/fixtures/ru.yml
@@ -167,3 +203,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/sy18nc_spec.rb
 - spec/sychronizer_spec.rb
+has_rdoc: