i18n-spec 0.1.3 → 0.2.0

data/.travis.yml

@@ -1 +1,4 @@
-rvm: 1.9.2
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -4,5 +4,6 @@ group :development do
   gem "rspec", ">= 2.4.0"
   gem "bundler", "> 1.0.10" # so that we know we have Psych
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "rdoc"
+  gem "rcov", ">= 0" if RUBY_VERSION < '1.9'
 end

data/Gemfile.lock

@@ -7,8 +7,10 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.6.6)
     rake (0.9.2.2)
-    rcov (0.9.11)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
@@ -24,5 +26,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (> 1.0.10)
   jeweler (~> 1.6.4)
-  rcov
+  rdoc
   rspec (>= 2.4.0)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/i18n-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i18n-spec}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Christopher Dell}]
-  s.date = %q{2012-03-26}
+  s.date = %q{2012-03-28}
   s.description = %q{Includes a number of rspec matchers to make specing your locale files easy peasy.}
   s.email = %q{chris@tigrish.com}
   s.extra_rdoc_files = [
@@ -64,18 +64,18 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 2.4.0"])
       s.add_development_dependency(%q<bundler>, ["> 1.0.10"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 2.4.0"])
       s.add_dependency(%q<bundler>, ["> 1.0.10"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 2.4.0"])
     s.add_dependency(%q<bundler>, ["> 1.0.10"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
   end
 end
 

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

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :have_legacy_interpolations do |expected|
   match do |actual|
     locale_file = I18nSpec::LocaleFile.new(actual)
-    locale_file.content =~ /{{.+}}/
+    locale_file.content =~ /\{\{.+\}\}/
   end
 end

data/lib/i18n-spec/models/locale_file.rb

@@ -15,7 +15,7 @@ module I18nSpec
     end
 
     def translations
-      @translations ||= Psych.load(content)
+      @translations ||= yaml_load_content
     end
 
     def flattened_translations
@@ -23,9 +23,15 @@ module I18nSpec
     end
 
     def pluralizations
-      flatten_tree(translations).select do |key, value|
+      result = flatten_tree(translations).select do |key, value|
         value.is_a?(Hash)
       end
+
+      if result.is_a?(Array)
+        Hash[result]
+      else
+        result
+      end
     end
 
     def invalid_pluralization_keys
@@ -41,9 +47,12 @@ module I18nSpec
 
     def is_parseable?
       begin
-        Psych.load(content)
+        yaml_load_content
         true
-      rescue Psych::SyntaxError => e
+      rescue YAML::ParseError => e
+        @errors[:unparseable] = e.to_s
+        false
+      rescue ArgumentError => e
         @errors[:unparseable] = e.to_s
         false
       end
@@ -76,5 +85,13 @@ module I18nSpec
       keys.any? {|k| PLURALIZATION_KEYS.include?(k) }
     end
 
+    def yaml_load_content
+      if defined? Psych
+        Psych.load(content)
+      else
+        YAML.load(content)
+      end
+    end
+
   end
 end

data/lib/i18n-spec.rb

@@ -1,4 +1,7 @@
-require 'psych'
+if defined?(Psych) and !defined?(YAML::ParseError)
+  YAML::ParseError = Psych::SyntaxError
+end
+
 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 }
+Dir[File.dirname(__FILE__) + '/i18n-spec/shared_examples/*.rb'].each {|file| require file }

data/spec/lib/i18n-spec/models/locale_file_spec.rb

@@ -74,12 +74,18 @@ describe I18nSpec::LocaleFile do
       let(:locale_file) { locale_file_with_content(content) }
 
     it "returns the parent that contains invalid pluralizations" do
-      locale_file.invalid_pluralization_keys.should == ['en.cats', 'en.dogs']
+      locale_file.invalid_pluralization_keys.size.should == 2
+      locale_file.invalid_pluralization_keys.should be_include 'en.cats'
+      locale_file.invalid_pluralization_keys.should be_include 'en.dogs'
+      locale_file.invalid_pluralization_keys.should_not be_include 'en.birds'
     end
 
     it "adds a :invalid_pluralization_keys error with each invalid key" do
       locale_file.invalid_pluralization_keys
-      locale_file.errors[:invalid_pluralization_keys].should == ['en.cats', 'en.dogs']
+      locale_file.invalid_pluralization_keys.size.should == 2
+      locale_file.invalid_pluralization_keys.should be_include 'en.cats'
+      locale_file.invalid_pluralization_keys.should be_include 'en.dogs'
+      locale_file.invalid_pluralization_keys.should_not be_include 'en.birds'
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-spec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70114168057380 !ruby/object:Gem::Requirement
+  requirement: &70303016673480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70114168057380
+  version_requirements: *70303016673480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70114168056480 !ruby/object:Gem::Requirement
+  requirement: &70303016672820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *70114168056480
+  version_requirements: *70303016672820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70114168416980 !ruby/object:Gem::Requirement
+  requirement: &70303016688620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70114168416980
+  version_requirements: *70303016688620
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70114168415980 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &70303016687780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114168415980
+  version_requirements: *70303016687780
 description: Includes a number of rspec matchers to make specing your locale files
   easy peasy.
 email: chris@tigrish.com
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3463321469502897838
+      hash: -3260796434736364746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: