approvals 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f03c9912d647a41bc6ccef8ce020201e000f125b
-  data.tar.gz: 34f5917f013272df690db31f5edacc2929d8084f
+  metadata.gz: 6df7476eb9432577895df3170adc9653d7f7615f
+  data.tar.gz: 1ea30b6816e7282509c98524394ba9e76d787a27
 SHA512:
-  metadata.gz: a3ef07f8ccc9ccb287d81db21fa2ca6627eb5989c086bfd4c1fa8d8ed35dd612a3ea0fb96845c36719ae3a8f728a3cc03d39c5290acd31aa72d5de2691d8a658
-  data.tar.gz: d6396fcc5fd6692bdd3a802fe9e521fdf042c69a7549c239889815fba2db679c2d5bfe2c1b4cddd9cf6e07e17ac68b21ba428a1d0853f8ede62dec6948355941
+  metadata.gz: 2945a8151ca583748a19ea37448723a63fb0f9cb6eefc427cf2fa8a368b4d7372199231de86a7614e3e3746f9d9a1881b2f1e2bff23e6f2a1a16b55931446953
+  data.tar.gz: 478fbaf9846755cedb47216ccbec95f879faeee7ad1728b794992e9ae39b7653bfdb40dd0979f73c6c5a779dab63f1f4cedf91958f8bc4a20e7058ba16fe515a

data/approvals.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'rspec', '~> 2.99.0.beta2'
+  s.add_development_dependency 'rspec', '~> 3.1'
   s.add_development_dependency 'json', '~> 1.8'
   s.add_dependency 'thor', '~> 0.18'
   s.add_dependency 'nokogiri', '~> 1.6'

data/lib/approvals/namers/directory_namer.rb

@@ -12,11 +12,22 @@ module Approvals
         parts     = [ ]
         metadata  = example.metadata
 
-        begin
-          parts << metadata[ :description ]
-        end while metadata = metadata[ :example_group ]
+        approvals_path = lambda do |metadata|
+          description = normalize metadata[:description]
+          example_group = if metadata.key?(:example_group)
+                            metadata[:example_group]
+                          else
+                            metadata[:parent_example_group]
+                          end
 
-        parts.reverse.map { |p| normalize p }.join '/'
+          if example_group
+            [approvals_path[example_group], description].join('/')
+          else
+            description
+          end
+        end
+
+        approvals_path[example.metadata]
       end
     end
   end

data/lib/approvals/version.rb

@@ -1,3 +1,3 @@
 module Approvals
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/spec/approvals_spec.rb

@@ -6,10 +6,11 @@ describe Approvals do
   let(:namer) { |example| Approvals::Namers::RSpecNamer.new(example) }
 
   it "fails" do
-    Approvals::Dotfile.stub(:path => '/dev/null')
-    lambda {
+    allow(Approvals::Dotfile).to receive(:path).and_return('/dev/null')
+
+    expect do
       Approvals.verify "this one doesn't exist", :namer => namer
-    }.should raise_error Approvals::ApprovalError
+    end.to raise_error Approvals::ApprovalError
   end
 
   it "verifies a string" do

data/spec/configuration_spec.rb

@@ -4,7 +4,7 @@ require 'approvals/configuration'
 describe Approvals::Configuration do
 
   it "defaults to 'fixtures/approvals/'" do
-    Approvals.configuration.approvals_path.should eq('fixtures/approvals/')
+    expect(Approvals.configuration.approvals_path).to eq('fixtures/approvals/')
   end
 
   describe "when set" do
@@ -21,7 +21,7 @@ describe Approvals::Configuration do
     end
 
     it "overrides the output directory" do
-      Approvals.configuration.approvals_path.should eq('output/dir/')
+      expect(Approvals.configuration.approvals_path).to eq('output/dir/')
     end
   end
 

data/spec/dotfile_spec.rb

@@ -5,18 +5,18 @@ describe Approvals::Dotfile do
   let(:dotfile) { '/tmp/.approvals' }
 
   before(:each) do
-    Approvals::Dotfile.stub(:path => dotfile)
+    allow(Approvals::Dotfile).to receive(:path).and_return dotfile
     Approvals::Dotfile.reset
   end
 
   it "appends the text" do
     Approvals::Dotfile.append('text')
-    File.readlines(dotfile).map(&:chomp).should eq(['text'])
+    expect(File.readlines(dotfile).map(&:chomp)).to eq ['text']
   end
 
   it "appends the text exactly once" do
     Approvals::Dotfile.append('text')
     Approvals::Dotfile.append('text')
-    File.readlines(dotfile).map(&:chomp).should eq(['text'])
+    expect(File.readlines(dotfile).map(&:chomp)).to eq ['text']
   end
 end

data/spec/executable_spec.rb

@@ -5,13 +5,13 @@ describe Approvals::Executable do
 
   it "reflects the its value in inspect" do
     executable = Approvals::Executable.new('SELECT 1')
-    executable.inspect.should eq 'SELECT 1'
+    expect(executable.inspect).to eq 'SELECT 1'
   end
 
   it "takes a block" do
     executable = Approvals::Executable.new('SELECT 1') do |command|
       "execute query: #{command}"
     end
-    executable.on_failure.call('SELECT 1').should eq('execute query: SELECT 1')
+    expect(executable.on_failure.call('SELECT 1')).to eq 'execute query: SELECT 1'
   end
 end

data/spec/extensions/rspec_approvals_spec.rb

@@ -67,13 +67,13 @@ shared_context 'verify examples' do
 
   specify "a failure diff" do
     ::RSpec.configuration.diff_on_approval_failure = true
-    ::RSpec::Expectations.should_receive( :fail_with )
+    expect(::RSpec::Expectations).to receive(:fail_with)
     verify { 'no.' }
     ::RSpec.configuration.diff_on_approval_failure = false
   end
 
   specify "a failure diff", :diff_on_approval_failure => true do
-    ::RSpec::Expectations.should_receive( :fail_with )
+    expect(::RSpec::Expectations).to receive(:fail_with)
     verify { 'no.' }
   end
 end

data/spec/namers/default_namer_spec.rb

@@ -7,7 +7,7 @@ describe Approvals::Namers::DefaultNamer do
   subject { Approvals::Namers::DefaultNamer.new("a f!$^%&*(unky name") }
 
   it "normalizes the name" do
-    subject.name.should eq("a_funky_name")
+    expect(subject.name).to eq 'a_funky_name'
   end
 
   context "when configured" do
@@ -24,12 +24,14 @@ describe Approvals::Namers::DefaultNamer do
     end
 
     it "uses the approvals output dir" do
-      subject.output_dir.should eq('path/to/files/')
+      expect(subject.output_dir).to eq 'path/to/files/'
     end
   end
 
   it "must have a name" do
-    lambda { Approvals::Namers::DefaultNamer.new(nil) }.should raise_error(ArgumentError)
+    expect do
+      Approvals::Namers::DefaultNamer.new nil
+    end.to raise_error ArgumentError
   end
 
 end

data/spec/namers/directory_namer_spec.rb

@@ -4,11 +4,11 @@ require 'approvals/rspec'
 describe Approvals::Namers::DirectoryNamer do
 
   it "uses non-$%^&*funky example description" do |example|
-    Approvals::Namers::DirectoryNamer.new(example).name.should eq("approvals_namers_directorynamer/uses_non_funky_example_description")
+    expect(Approvals::Namers::DirectoryNamer.new(example).name).to eq 'approvals_namers_directorynamer/uses_non_funky_example_description'
   end
 
   it "has a decent default" do |example|
-    Approvals::Namers::DirectoryNamer.new(example).output_dir.should eq('spec/fixtures/approvals/')
+    expect(Approvals::Namers::DirectoryNamer.new(example).output_dir).to eq 'spec/fixtures/approvals/'
   end
 
   context "when RSpec is configured" do
@@ -25,7 +25,7 @@ describe Approvals::Namers::DirectoryNamer do
     end
 
     it "uses the rspec config option" do |example|
-      Approvals::Namers::DirectoryNamer.new(example).output_dir.should eq('spec/output/dir/')
+      expect(Approvals::Namers::DirectoryNamer.new(example).output_dir).to eq 'spec/output/dir/'
     end
   end
 end

data/spec/namers/rspec_namer_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Approvals::Namers::RSpecNamer do
 
   it "uses non-$%^&*funky example description" do |example|
-    Approvals::Namers::RSpecNamer.new(example).name.should eq("approvals_namers_rspecnamer_uses_non_funky_example_description")
+    expect(Approvals::Namers::RSpecNamer.new(example).name).to eq 'approvals_namers_rspecnamer_uses_non_funky_example_description'
   end
 
   it "has a decent default" do |example|
-    Approvals::Namers::RSpecNamer.new(example).output_dir.should eq('spec/fixtures/approvals/')
+    expect(Approvals::Namers::RSpecNamer.new(example).output_dir).to eq 'spec/fixtures/approvals/'
   end
 
   context "when RSpec is configured" do
@@ -24,7 +24,7 @@ describe Approvals::Namers::RSpecNamer do
     end
 
     it "uses the rspec config option" do |example|
-      Approvals::Namers::RSpecNamer.new(example).output_dir.should eq('spec/output/dir/')
+      expect(Approvals::Namers::RSpecNamer.new(example).output_dir).to eq 'spec/output/dir/'
     end
   end
 end

data/spec/namers_spec.rb

@@ -5,12 +5,12 @@ describe Approvals::Namers do
 
   it "uses the RSpecNamer" do |example|
     approval = Approvals::Approval.new("naming with rspec namer", :namer => Approvals::Namers::RSpecNamer.new(example))
-    approval.name.should eq("approvals_namers_uses_the_rspecnamer")
+    expect(approval.name).to eq("approvals_namers_uses_the_rspecnamer")
   end
 
   it "uses the DefaultNamer" do
     approval = Approvals::Approval.new("naming with default namer", :name => "a name")
-    approval.name.should eq("a_name")
+    expect(approval.name).to eq("a_name")
   end
 
 end

data/spec/reporters/first_working_reporter_spec.rb

@@ -10,20 +10,20 @@ describe Approvals::Reporters::FirstWorkingReporter do
 
   it "when at least one reporter works it is working" do
     reporter = Approvals::Reporters::FirstWorkingReporter.new(no, yes)
-    reporter.should be_working_in_this_environment
+    expect(reporter).to be_working_in_this_environment
   end
 
   it "when no reporters work it's not working" do
     reporter = Approvals::Reporters::FirstWorkingReporter.new(no, no)
-    reporter.should_not be_working_in_this_environment
+    expect(reporter).not_to be_working_in_this_environment
   end
 
   it "calls the first working reporter" do
     working = Approvals::Reporters::FirstWorkingReporter.new(no, yes, yes_too)
 
-    no.should_not_receive(:report)
-    yes.should_receive(:report)
-    yes_too.should_not_receive(:report)
+    expect(no).not_to receive(:report)
+    expect(yes).to receive(:report)
+    expect(yes_too).not_to receive(:report)
 
     working.report("r", "a")
   end

data/spec/reporters/html_image_reporter_spec.rb

@@ -8,7 +8,7 @@ describe Approvals::Reporters::HtmlImageReporter do
 
   it "creates the template" do
     scrubber = Approvals::Scrubber.new(subject.html("spec/fixtures/one.png", "spec/fixtures/two.png"))
-    scrubber.to_s.should eq('<html><head><title>Approval</title></head><body><center><table style="text-align: center;" border="1"><tr><td><img src="file://{{current_dir}}/spec/fixtures/one.png"></td><td><img src="file://{{current_dir}}/spec/fixtures/two.png"></td></tr><tr><td>received</td><td>approved</td></tr></table></center></body></html>')
+    expect(scrubber.to_s).to eq('<html><head><title>Approval</title></head><body><center><table style="text-align: center;" border="1"><tr><td><img src="file://{{current_dir}}/spec/fixtures/one.png"></td><td><img src="file://{{current_dir}}/spec/fixtures/two.png"></td></tr><tr><td>received</td><td>approved</td></tr></table></center></body></html>')
   end
 
   # verify "creates the appropriate command", :format => :html do

data/spec/reporters/image_magick_reporter_spec.rb

@@ -11,6 +11,6 @@ describe Approvals::Reporters::ImageMagickReporter do
       system(result)
       system(expected)
     end
-    result.should eq(expected)
+    expect(result).to eq(expected)
   end
 end

data/spec/reporters/launcher_spec.rb

@@ -2,25 +2,23 @@ require 'spec_helper'
 require 'approvals/reporters/launcher'
 
 describe Approvals::Reporters::Launcher do
-
-
   it "has a vimdiff launcher" do
-    Approvals::Reporters::Launcher.vimdiff.call('one', 'two').should eq("vimdiff one two")
+    expect(described_class.vimdiff.call('one', 'two')).to eq("vimdiff one two")
   end
 
   it "has an opendiff launcher" do
-    Approvals::Reporters::Launcher.opendiff.call('one', 'two').should eq("opendiff one two")
+    expect(described_class.opendiff.call('one', 'two')).to eq("opendiff one two")
   end
 
   it "has a diffmerge launcher" do
-    Approvals::Reporters::Launcher.diffmerge.call('one', 'two').should match(/DiffMerge.*\"one\"\ \"two\"/)
+    expect(described_class.diffmerge.call('one', 'two')).to match(/DiffMerge.*\"one\"\ \"two\"/)
   end
 
   it "has a tortoisediff launcher" do
-    Approvals::Reporters::Launcher.tortoisediff.call('one', 'two').should match(/TortoiseMerge.exe.*one.*two/)
+    expect(described_class.tortoisediff.call('one', 'two')).to match(/TortoiseMerge.exe.*one.*two/)
   end
 
   it "has a filelauncher launcher" do
-    Approvals::Reporters::Launcher.filelauncher.call('one', 'two').should eq("open one")
+    expect(described_class.filelauncher.call('one', 'two')).to eq("open one")
   end
 end

data/spec/reporters/reporter_spec.rb

@@ -4,7 +4,7 @@ require 'approvals/reporters'
 describe Approvals::Reporters::Reporter do
 
   it "is not approved by default" do
-    Approvals::Reporters::Reporter.new.should_not be_approved_when_reported
+    expect(Approvals::Reporters::Reporter.new).not_to be_approved_when_reported
   end
 
   it "takes a launcher" do
@@ -12,10 +12,10 @@ describe Approvals::Reporters::Reporter do
       "echo \"mv #{received} #{approved}\""
     }
 
-    Approvals::Reporters::Reporter.new(&move).launcher.call('received.txt', 'approved.txt').should eq("echo \"mv received.txt approved.txt\"")
+    expect(Approvals::Reporters::Reporter.new(&move).launcher.call('received.txt', 'approved.txt')).to eq("echo \"mv received.txt approved.txt\"")
   end
 
   it "defaults to the default OpenDiff launcher" do
-    Approvals::Reporters::Reporter.new.launcher.should eq(Approvals::Reporters::Launcher.opendiff)
+    expect(Approvals::Reporters::Reporter.new.launcher).to eq(Approvals::Reporters::Launcher.opendiff)
   end
 end

data/spec/scrubber_spec.rb

@@ -8,19 +8,19 @@ describe Approvals::Scrubber do
     subject { Approvals::Scrubber.new("I am currently at #{path}") }
 
     it "has a sensible to_s" do
-      subject.to_s.should eq("I am currently at {{current_dir}}")
+      expect(subject.to_s).to eq("I am currently at {{current_dir}}")
     end
 
     it "unscrubs" do
-      subject.unscrub.should eq("I am currently at #{path}")
+      expect(subject.unscrub).to eq("I am currently at #{path}")
     end
 
     it "unscrubs any old string" do
-      subject.unscrub("Hoy, where's {{current_dir}}?").should eq("Hoy, where's #{path}?")
+      expect(subject.unscrub("Hoy, where's {{current_dir}}?")).to eq("Hoy, where's #{path}?")
     end
   end
 
   it "overrides default hash" do
-    Approvals::Scrubber.new("oh, my GAWD", {"deity" => "GAWD"}).to_s.should eq('oh, my {{deity}}')
+    expect(Approvals::Scrubber.new("oh, my GAWD", {"deity" => "GAWD"}).to_s).to eq('oh, my {{deity}}')
   end
 end

data/spec/spec_helper.rb

@@ -3,5 +3,5 @@ require 'approvals'
 # Configure RSpec
 RSpec.configure do |config|
   # Use color
-  config.color_enabled = true
+  config.color = true
 end

data/spec/system_command_spec.rb

@@ -4,10 +4,10 @@ require 'approvals/system_command'
 describe Approvals::SystemCommand, "#exists?" do
 
   it "does" do
-    Approvals::SystemCommand.exists?("ls").should be_truthy
+    expect(Approvals::SystemCommand.exists?("ls")).to be_truthy
   end
 
   it "does not" do
-    Approvals::SystemCommand.exists?("absolutelydoesnotexistonyoursystem").should be_falsey
+    expect(Approvals::SystemCommand.exists?("absolutelydoesnotexistonyoursystem")).to be_falsey
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: approvals
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta2
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta2
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -204,3 +204,4 @@ signing_key:
 specification_version: 4
 summary: Approval Tests for Ruby
 test_files: []
+has_rdoc: