i18n-spec 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c461556989f0f5c2f6fa965f61f6ea6e2dd1608f
-  data.tar.gz: cc8bff3d5bf38c7260d75ce0f64fc19a848cd952
+  metadata.gz: 9f98bd04f57bcd38cd4ddbe0e602af7b40b13c17
+  data.tar.gz: f412910af3c451d65aa56b0cbcab5229966ecce2
 SHA512:
-  metadata.gz: 62800d74c38de3006d8538c890873331a196ca50f12f354938d88e1376d457b9acf412ba0a909175c8abc6c04ab5182946d00834776970712bf6552799d1daf2
-  data.tar.gz: bfb27e4abdfa363fcf5e94ef6735a1907a6e882fc9bc5ca73576b7987056555f5454061f50d32c93be2c63ffce1a846b45f149818d63fce70566d99465554ecb
+  metadata.gz: 049b6449737469f47587f31628ca059aee1f146347e9e7fc5d47bacbd1cac7cb8381800d87fd53e60701f40d3cc3203836cbdf5179bd218133954ec5f43dae14
+  data.tar.gz: 2565f959ad8f856902c219fdf00ac7963a6545193e03c6bd9366e3d717ca7c30981a678da7a7dae20ffa7b725b42a091fdaa42322b509e8f3c022376504574b9

data/.travis.yml

@@ -1,3 +1,8 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1
+
+gemfile:
+  - gemfiles/rspec_2.99.gemfile
+  - gemfiles/rspec_3.gemfile

data/README.md

@@ -9,13 +9,13 @@ i18n-spec provides RSpec matchers for testing your locale files and their transl
 There are a few matchers available; the subject of the spec is always a path to a locale file.
 
     describe "config/locales/en.yml" do
-      it { should be_parseable }
-      it { should have_valid_pluralization_keys }
-      it { should_not have_missing_pluralization_keys }
-      it { should have_one_top_level_namespace }
-      it { should be_named_like_top_level_namespace }
-      it { should_not have_legacy_interpolations }
-      it { should have_a_valid_locale }
+      it { is_expected.to be_parseable }
+      it { is_expected.to have_valid_pluralization_keys }
+      it { is_expected.to_not have_missing_pluralization_keys }
+      it { is_expected.to have_one_top_level_namespace }
+      it { is_expected.to be_named_like_top_level_namespace }
+      it { is_expected.to_not have_legacy_interpolations }
+      it { is_expected.to have_a_valid_locale }
     end
 
 All of these tests can be ran in one line with a shared example :
@@ -37,13 +37,13 @@ Even better, you can run all of these tests for every file in a directory like s
 To test that your locale file is a subset of the default locale file
 
 	describe "config/locales/fr.yml" do
-	  it { should be_a_subset_of 'config/locales/en.yml' }
+	  it { is_expected.to be_a_subset_of 'config/locales/en.yml' }
 	end
 
 If you need to test that all translations have been completed :
 
     describe "config/locales/fr.yml" do
-      it { should be_a_complete_translation_of 'config/locales/en.yml' }
+      it { is_expected.to be_a_complete_translation_of 'config/locales/en.yml' }
     end
 
 ## Rake tasks

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/gemfiles/rspec_2.99.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'bundler'
+gem 'iso'
+gem 'jeweler'
+gem 'rake'
+gem 'rdoc'
+gem 'rspec', '~> 2.99'

data/gemfiles/rspec_3.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'bundler'
+gem 'iso'
+gem 'jeweler'
+gem 'rake'
+gem 'rdoc'
+gem 'rspec', '~> 3.0'

data/i18n-spec.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: i18n-spec 0.5.1 ruby lib
+# stub: i18n-spec 0.5.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "i18n-spec"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Christopher Dell"]
-  s.date = "2014-07-23"
+  s.date = "2014-08-03"
   s.description = "Includes a number of rspec matchers to make specing your locale files easy peasy."
   s.email = "chris@tigrish.com"
   s.extra_rdoc_files = [
@@ -23,13 +23,15 @@ Gem::Specification.new do |s|
     ".rspec",
     ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
+    "gemfiles/rspec_2.99.gemfile",
+    "gemfiles/rspec_3.gemfile",
     "i18n-spec.gemspec",
     "lib/i18n-spec.rb",
+    "lib/i18n-spec/failure_message.rb",
     "lib/i18n-spec/matchers/be_a_complete_translation_of_matcher.rb",
     "lib/i18n-spec/matchers/be_a_subset_of_matcher.rb",
     "lib/i18n-spec/matchers/be_named_like_top_level_namespace_matcher.rb",

data/lib/i18n-spec.rb

@@ -5,6 +5,8 @@ end
 require 'rspec/core'
 require 'iso'
 require 'yaml'
+require 'i18n-spec/failure_message'
+Dir[File.dirname(__FILE__) + '/i18n-spec/models/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/i18n-spec/models/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/i18n-spec/matchers/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/i18n-spec/shared_examples/*.rb'].each {|file| require file }

data/lib/i18n-spec/failure_message.rb

@@ -0,0 +1,23 @@
+module I18nSpec
+  module FailureMessage
+    def failure_for_should
+      if respond_to?(:failure_message)
+        # Rspec 3
+        failure_message { |f| yield(f) }
+      else
+        # Rspec 2
+        failure_message_for_should { |f| yield(f) }
+      end
+    end
+
+    def failure_for_should_not
+      if respond_to?(:failure_message_when_negated)
+        # Rspec 3
+        failure_message_when_negated { |f| yield(f) }
+      else
+        # Rspec 2
+        failure_message_for_should_not { |f| yield(f) }
+      end
+    end
+  end
+end

data/lib/i18n-spec/matchers/be_a_complete_translation_of_matcher.rb

@@ -1,4 +1,6 @@
 RSpec::Matchers.define :be_a_complete_translation_of do |default_locale_filepath|
+  extend I18nSpec::FailureMessage
+
   match do |filepath|
     locale_file = I18nSpec::LocaleFile.new(filepath)
     default_locale = I18nSpec::LocaleFile.new(default_locale_filepath)
@@ -8,13 +10,7 @@ RSpec::Matchers.define :be_a_complete_translation_of do |default_locale_filepath
     @misses.empty?
   end
 
-  failure_meth = begin
-                   method(:failure_message)
-                 rescue NameError
-                   method(:failure_message_for_should)
-                 end
-
-  failure_meth.call do |filepath|
+  failure_for_should do |filepath|
     "expected #{filepath} to include :\n- " << @misses.join("\n- ")
   end
 end

data/lib/i18n-spec/matchers/be_a_subset_of_matcher.rb

@@ -1,4 +1,6 @@
 RSpec::Matchers.define :be_a_subset_of do |default_locale_filepath|
+  extend I18nSpec::FailureMessage
+
   match do |filepath|
     locale_file = I18nSpec::LocaleFile.new(filepath)
     default_locale = I18nSpec::LocaleFile.new(default_locale_filepath)
@@ -8,13 +10,7 @@ RSpec::Matchers.define :be_a_subset_of do |default_locale_filepath|
     @superset.empty?
   end
 
-  failure_meth = begin
-                   method(:failure_message)
-                 rescue NameError
-                   method(:failure_message_for_should)
-                 end
-
-  failure_meth.call do |filepath|
+  failure_for_should do |filepath|
     "expected #{filepath} to not include :\n- " << @superset.join("\n- ")
   end
 end

data/lib/i18n-spec/matchers/be_parseable_matcher.rb

@@ -1,16 +1,12 @@
 RSpec::Matchers.define :be_parseable do
+  extend I18nSpec::FailureMessage
+
   match do |actual|
     @locale_file = I18nSpec::LocaleFile.new(actual)
     @locale_file.is_parseable?
   end
 
-  failure_meth = begin
-                   method(:failure_message)
-                 rescue NameError
-                   method(:failure_message_for_should)
-                 end
-
-  failure_meth.call do |filepath|
+  failure_for_should do |filepath|
     "expected #{filepath} to be parseable but got :\n- #{@locale_file.errors[:unparseable]}"
   end
 end

data/lib/i18n-spec/matchers/have_missing_pluralization_keys_matcher.rb

@@ -1,16 +1,12 @@
 RSpec::Matchers.define :have_missing_pluralization_keys do
+  extend I18nSpec::FailureMessage
+
   match do |actual|
     @locale_file = I18nSpec::LocaleFile.new(actual)
     @locale_file.missing_pluralization_keys.any?
   end
 
-  failure_meth = begin
-                   method(:failure_message_when_negated)
-                 rescue NameError
-                   method(:failure_message_for_should_not)
-                 end
-
-  failure_meth.call do |filepath|
+  failure_for_should_not do |filepath|
     flattened_keys = []
 
     @locale_file.errors[:missing_pluralization_keys].each do |parent, subkeys|

data/lib/i18n-spec/matchers/have_valid_pluralization_keys_matcher.rb

@@ -1,16 +1,12 @@
 RSpec::Matchers.define :have_valid_pluralization_keys do
+  extend I18nSpec::FailureMessage
+
   match do |actual|
     @locale_file = I18nSpec::LocaleFile.new(actual)
     @locale_file.invalid_pluralization_keys.empty?
   end
 
-  failure_meth = begin
-                   method(:failure_message)
-                 rescue NameError
-                   method(:failure_message_for_should)
-                 end
-
-  failure_meth.call do |filepath|
+  failure_for_should do |filepath|
     "expected #{filepath} to not contain invalid pluralization keys in the following namespaces :\n- " << @locale_file.errors[:invalid_pluralization_keys].join("\n- ")
   end
 end

data/lib/i18n-spec/shared_examples/valid_locale_file.rb

@@ -1,11 +1,11 @@
-shared_examples_for "a valid locale file" do |locale_file|
+RSpec.shared_examples_for "a valid locale file" do |locale_file|
   describe locale_file do
-    it { should be_parseable }
-    it { should have_valid_pluralization_keys }
-    it { should_not have_missing_pluralization_keys }
-    it { should have_one_top_level_namespace }
-    it { should be_named_like_top_level_namespace }
-    it { should_not have_legacy_interpolations }
-    it { should have_a_valid_locale }
+    it { is_expected.to be_parseable }
+    it { is_expected.to have_valid_pluralization_keys }
+    it { is_expected.to_not have_missing_pluralization_keys }
+    it { is_expected.to have_one_top_level_namespace }
+    it { is_expected.to be_named_like_top_level_namespace }
+    it { is_expected.to_not have_legacy_interpolations }
+    it { is_expected.to have_a_valid_locale }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-spec
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Christopher Dell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso
@@ -93,13 +93,15 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
+- gemfiles/rspec_2.99.gemfile
+- gemfiles/rspec_3.gemfile
 - i18n-spec.gemspec
 - lib/i18n-spec.rb
+- lib/i18n-spec/failure_message.rb
 - lib/i18n-spec/matchers/be_a_complete_translation_of_matcher.rb
 - lib/i18n-spec/matchers/be_a_subset_of_matcher.rb
 - lib/i18n-spec/matchers/be_named_like_top_level_namespace_matcher.rb

data/Gemfile.lock

@@ -1,74 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    builder (3.2.2)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.7)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (3.1.0)
-    highline (1.6.21)
-    i18n (0.6.9)
-    iso (0.2.1)
-      i18n
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (1.0.0)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
-    thread_safe (0.3.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  iso
-  jeweler
-  rdoc
-  rspec (>= 2.4.0)