haml-magic-translations 4.0.2 → 4.0.3

data/Rakefile

@@ -23,7 +23,7 @@ time with translations.
     gem.add_development_dependency "actionpack"
     gem.add_development_dependency "gettext", ">= 2.3"
     gem.add_development_dependency "fast_gettext"
-    gem.add_development_dependency "rspec", ">= 2"
+    gem.add_development_dependency "rspec", ">= 2.11"
     gem.add_development_dependency "rdoc", ">= 2.4.2"
     gem.add_development_dependency "maruku"
   end

data/VERSION

@@ -1 +1 @@
-4.0.2
+4.0.3

data/haml-magic-translations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{haml-magic-translations}
-  s.version = "4.0.2"
+  s.version = "4.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kriss Kowalik", "potager.org"]
-  s.date = %q{2014-05-04}
+  s.date = %q{2014-05-05}
   s.description = %q{This plugin provides "magical translations" in your .haml files. What does it
 mean? It's mean that all your raw texts in templates will be automatically
 translated by GetText, FastGettext or Gettext backend from I18n. No more 
@@ -56,7 +56,7 @@ time with translations.
       s.add_development_dependency(%q<actionpack>, [">= 0"])
       s.add_development_dependency(%q<gettext>, [">= 2.3"])
       s.add_development_dependency(%q<fast_gettext>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2"])
+      s.add_development_dependency(%q<rspec>, [">= 2.11"])
       s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
       s.add_development_dependency(%q<maruku>, [">= 0"])
     else
@@ -65,7 +65,7 @@ time with translations.
       s.add_dependency(%q<actionpack>, [">= 0"])
       s.add_dependency(%q<gettext>, [">= 2.3"])
       s.add_dependency(%q<fast_gettext>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2"])
+      s.add_dependency(%q<rspec>, [">= 2.11"])
       s.add_dependency(%q<rdoc>, [">= 2.4.2"])
       s.add_dependency(%q<maruku>, [">= 0"])
     end
@@ -75,7 +75,7 @@ time with translations.
     s.add_dependency(%q<actionpack>, [">= 0"])
     s.add_dependency(%q<gettext>, [">= 2.3"])
     s.add_dependency(%q<fast_gettext>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2"])
+    s.add_dependency(%q<rspec>, [">= 2.11"])
     s.add_dependency(%q<rdoc>, [">= 2.4.2"])
     s.add_dependency(%q<maruku>, [">= 0"])
   end

data/spec/haml/magic_translations/tasks_spec.rb

@@ -61,22 +61,22 @@ module Haml::MagicTranslations::Tasks
         task.app_version = 'test 1.0'
       end
       it 'should call update_pofiles' do
-        GetText.should_receive(:update_pofiles).with(
+        expect(GetText).to receive(:update_pofiles).with(
           task.text_domain, task.files, task.app_version, {})
         run
       end
       it 'should add a parser for ".haml" files to XGetText' do
-        GetText.stub!(:update_pofiles)
-        GetText::Tools::XGetText.should_receive(:add_parser) do |haml_parser|
-          haml_parser.should respond_to(:parse)
-          haml_parser.should be_a_target('example.haml')
+        allow(GetText).to receive(:update_pofiles)
+        expect(GetText::Tools::XGetText).to receive(:add_parser) do |haml_parser|
+          expect(haml_parser).to respond_to(:parse)
+          expect(haml_parser).to be_a_target('example.haml')
         end
         run
       end
       context 'with lang set' do
         it 'should pass lang in options' do
           task.lang = 'pl'
-          GetText.should_receive(:update_pofiles).with(
+          allow(GetText).to receive(:update_pofiles).with(
             task.text_domain, task.files, task.app_version,
             hash_including(:lang => task.lang))
           run
@@ -85,7 +85,7 @@ module Haml::MagicTranslations::Tasks
       context 'with po_root set' do
         it 'should pass po_root in options' do
           task.po_root = 'test/po'
-          GetText.should_receive(:update_pofiles).with(
+          expect(GetText).to receive(:update_pofiles).with(
             task.text_domain, task.files, task.app_version,
             hash_including(:po_root => task.po_root))
           run
@@ -94,7 +94,7 @@ module Haml::MagicTranslations::Tasks
       context 'with verbose set' do
         it 'should pass verbose in options' do
           task.verbose = true
-          GetText.should_receive(:update_pofiles).with(
+          expect(GetText).to receive(:update_pofiles).with(
             task.text_domain, task.files, task.app_version,
             hash_including(:verbose => task.verbose))
           run

data/spec/haml/magic_translations/xgettext/haml_parser_spec.rb

@@ -18,14 +18,14 @@ module Haml::MagicTranslations::XGetText
 
     describe '.parse' do
       it 'should properly instanciate a Parser' do
-        HamlParser::XGetTextParser.should_receive(:new).with('test.haml').
-            and_return(mock('XGetTextParser').as_null_object)
+        expect(HamlParser::XGetTextParser).to receive(:new).with('test.haml').
+            and_return(double('XGetTextParser').as_null_object)
         HamlParser.parse('test.haml')
       end
       it 'should run the parser' do
-        parser = mock('XGetTextParser')
-        parser.should_receive(:parse)
-        HamlParser::XGetTextParser.stub!(:new).and_return(parser)
+        parser = double('XGetTextParser')
+        expect(parser).to receive(:parse)
+        allow(HamlParser::XGetTextParser).to receive(:new).and_return(parser)
         HamlParser.parse('test.haml')
       end
     end
@@ -34,20 +34,20 @@ module Haml::MagicTranslations::XGetText
       describe '#initialize' do
         context 'when given "test.haml"' do
           before(:each) do
-            File.stub!(:open).and_return(StringIO.new('It works!'))
+            allow(File).to receive(:open).and_return(StringIO.new('It works!'))
             @parser = HamlParser::XGetTextParser.new('test.haml')
           end
           it 'should set file attribute' do
-            @parser.file.should == 'test.haml'
+            expect(@parser.file).to be == 'test.haml'
           end
           it 'should put the file content in the content attribute' do
-            @parser.content.should == 'It works!'
+            expect(@parser.content).to be == 'It works!'
           end
         end
         context 'when given a IO-like object' do
           let (:parser) { HamlParser::XGetTextParser.new(StringIO.new('It works!')) }
-          it { parser.file.should == '(haml)' }
-          it { parser.content.should == 'It works!' }
+          it { expect(parser.file).to be == '(haml)' }
+          it { expect(parser.content).to be == 'It works!' }
         end
       end
 
@@ -143,7 +143,7 @@ module Haml::MagicTranslations::XGetText
             HAML
           end
           it 'should appear only once in the targets' do
-            subject.collect { |t| t[0] }.should have(1).item
+            expect(subject.collect { |t| t[0] }).to have(1).item
           end
           it 'should record two target locations' do
             should == [['Hello!', '(haml):1', '(haml):2']]
@@ -198,7 +198,7 @@ module Haml::MagicTranslations::XGetText
         context 'after extracting translations' do
           it 'should still allow Haml::Engine to build templates' do
             HamlParser::XGetTextParser.new(StringIO.new('test')).parse
-            Haml::Engine.new('%p It works!').render.should == <<-'HTML'.strip_heredoc
+            expect(Haml::Engine.new('%p It works!').render).to be == <<-'HTML'.strip_heredoc
               <p>It works!</p>
             HTML
           end

data/spec/haml/magic_translations_spec.rb

@@ -23,21 +23,21 @@ module Haml
       after { Haml::MagicTranslations.disable }
       context 'when using :i18n as backend' do
         before { Haml::MagicTranslations.enable :i18n }
-        it { Haml::MagicTranslations.should be_enabled }
-        it { Haml::MagicTranslations::Compiler.
-                 magic_translations_helpers.should == I18n::Gettext::Helpers }
+        it { expect(Haml::MagicTranslations).to be_enabled }
+        it { expect(Haml::MagicTranslations::Compiler.
+                 magic_translations_helpers).to be == I18n::Gettext::Helpers }
       end
       context 'when using :gettext as backend' do
         before { Haml::MagicTranslations.enable :gettext }
-        it { Haml::MagicTranslations.should be_enabled }
-        it { Haml::MagicTranslations::Compiler.
-               magic_translations_helpers.should == GetText }
+        it { expect(Haml::MagicTranslations).to be_enabled }
+        it { expect(Haml::MagicTranslations::Compiler.
+               magic_translations_helpers).to be == GetText }
       end
       context 'when using :fast_gettext as backend' do
         before { Haml::MagicTranslations.enable :fast_gettext }
-        it { Haml::MagicTranslations.should be_enabled }
-        it { Haml::MagicTranslations::Compiler.
-               magic_translations_helpers.should == FastGettext::Translation }
+        it { expect(Haml::MagicTranslations).to be_enabled }
+        it { expect(Haml::MagicTranslations::Compiler.
+               magic_translations_helpers).to be == FastGettext::Translation }
       end
       context 'when giving another backend' do
         it 'should raise an error' do
@@ -45,20 +45,20 @@ module Haml
             Haml::MagicTranslations.enable :whatever
           }.to raise_error(ArgumentError)
         end
-        it { Haml::MagicTranslations.should_not be_enabled }
+        it { expect(Haml::MagicTranslations).to_not be_enabled }
       end
     end
 
     describe '.disable' do
       it 'should set Haml::MagicTranslations.enabled to false' do
         Haml::MagicTranslations.disable
-        Haml::MagicTranslations.should_not be_enabled
+        expect(Haml::MagicTranslations).to_not be_enabled
       end
     end
 
     shared_examples 'Haml magic translations' do
       it 'should translate text using existing locales' do
-        render(<<-'HAML'.strip_heredoc).should == <<-'HTML'.strip_heredoc
+        expect(render(<<-'HAML'.strip_heredoc)).to be == <<-'HTML'.strip_heredoc
           %p Magic translations works!
           %p Here with interpolation, and everything thanks to #{I18n.name} and #{GetText.name}
         HAML
@@ -68,7 +68,7 @@ module Haml
       end
 
       it 'should leave text without changes when translation is not available' do
-        render(<<-'HAML'.strip_heredoc).should == <<-'HTML'.strip_heredoc
+        expect(render(<<-'HAML'.strip_heredoc)).to be == <<-'HTML'.strip_heredoc
           %p Untranslated thanks to #{I18n.name} and #{GetText.name}
         HAML
           <p>Untranslated thanks to I18n and GetText</p>
@@ -76,7 +76,7 @@ module Haml
       end
 
       it 'should translate text with multiline plain text' do
-       render(<<-'HAML'.strip_heredoc).should == <<-'HTML'.strip_heredoc
+       expect(render(<<-'HAML'.strip_heredoc)).to be == <<-'HTML'.strip_heredoc
           %p Magic translations works!
           %p
             Now we will check multiline strings,
@@ -93,7 +93,7 @@ module Haml
       end
 
       it 'should translate escaped tags' do
-        render(<<-HAML.strip_heredoc).should == <<-HTML.strip_heredoc
+        expect(render(<<-HAML.strip_heredoc)).to be == <<-HTML.strip_heredoc
           %p& Magic translations works!
         HAML
           <p>Magiczne tłumaczenie działa!</p>
@@ -101,7 +101,7 @@ module Haml
       end
 
       it 'should translate unescaped tags' do
-        render(<<-HAML.strip_heredoc).should == <<-HTML.strip_heredoc
+        expect(render(<<-HAML.strip_heredoc)).to be == <<-HTML.strip_heredoc
           %p! Magic translations works!
         HAML
           <p>Magiczne tłumaczenie działa!</p>
@@ -109,7 +109,7 @@ module Haml
       end
 
       it 'should not translate evaluated tags' do
-        render(<<-HAML.strip_heredoc).should == <<-HTML.strip_heredoc
+        expect(render(<<-HAML.strip_heredoc)).to be == <<-HTML.strip_heredoc
           %p= 'Magic translations works!'
         HAML
           <p>Magic translations works!</p>
@@ -117,7 +117,7 @@ module Haml
       end
 
       it 'should not translate escaped evaluated tags' do
-        render(<<-HAML.strip_heredoc).should == <<-HTML.strip_heredoc
+        expect(render(<<-HAML.strip_heredoc)).to be == <<-HTML.strip_heredoc
           %p&= 'Magic translations works!'
         HAML
           <p>Magic translations works!</p>
@@ -125,7 +125,7 @@ module Haml
       end
 
       it 'should not translate unescaped evaluated tags' do
-        render(<<-HAML.strip_heredoc).should == <<-HTML.strip_heredoc
+        expect(render(<<-HAML.strip_heredoc)).to be == <<-HTML.strip_heredoc
           %p!= 'Magic translations works!'
         HAML
           <p>Magic translations works!</p>
@@ -134,7 +134,7 @@ module Haml
 
       context 'when translating strings in JavaScript' do
         it "should translate strings inside _('')" do
-          render(<<-'HAML'.strip_heredoc).translate_unicode.should == <<-'HTML'.strip_heredoc.translate_unicode
+          expect(render(<<-'HAML'.strip_heredoc).translate_unicode).to be == <<-'HTML'.strip_heredoc.translate_unicode
             :javascript
               var text = _('Magic translations works!');
           HAML
@@ -146,7 +146,7 @@ module Haml
           HTML
         end
         it 'should translate strings inside _("")' do
-          render(<<-'HAML'.strip_heredoc).translate_unicode.should == <<-'HTML'.strip_heredoc.translate_unicode
+          expect(render(<<-'HAML'.strip_heredoc).translate_unicode).to be == <<-'HTML'.strip_heredoc.translate_unicode
             :javascript
               var text = _("Magic translations works!");
           HAML
@@ -158,7 +158,7 @@ module Haml
           HTML
         end
         it 'should not choke on single-quote' do
-          render(<<-'HAML'.strip_heredoc).should == <<-'HTML'.strip_heredoc
+          expect(render(<<-'HAML'.strip_heredoc)).to be == <<-'HTML'.strip_heredoc
             :javascript
               var text = _("Don't you think?");
           HAML
@@ -170,7 +170,7 @@ module Haml
           HTML
         end
         it 'should not choke on double-quote' do
-          render(<<-'HAML'.strip_heredoc).should == <<-'HTML'.strip_heredoc
+          expect(render(<<-'HAML'.strip_heredoc)).to be == <<-'HTML'.strip_heredoc
             :javascript
               var text = _('One "quote" here');
           HAML
@@ -185,7 +185,7 @@ module Haml
 
       context 'when translating strings in Markdown' do
         it "should translate strings inside _('')" do
-          render(<<-'HAML'.strip_heredoc).should == <<-'HTML'.strip_heredoc
+          expect(render(<<-'HAML'.strip_heredoc).lstrip).to be == <<-'HTML'.strip_heredoc
             :maruku
               Now we will check multiline strings,
               which should be also translated.
@@ -198,7 +198,7 @@ module Haml
       context 'when disabling magic translations' do
         it 'should leave text untranslated' do
           Haml::MagicTranslations.disable
-          render(<<-'HAML'.strip_heredoc).should == <<-'HTML'.strip_heredoc
+          expect(render(<<-'HAML'.strip_heredoc)).to be == <<-'HTML'.strip_heredoc
             %p Magic translations works!
           HAML
             <p>Magic translations works!</p>

data/spec/spec_helper.rb

@@ -12,6 +12,12 @@ require 'action_view'
 
 require 'haml/magic_translations'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
 Haml::Options.defaults[:ugly] = false
 Haml::Options.defaults[:format] = :xhtml
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml-magic-translations
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement