approvals 0.0.4 → 0.0.5

data/Rakefile

@@ -1 +1,4 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new :spec

data/approvals.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "approvals"
-  s.version     = "0.0.4"
+  s.version     = "0.0.5"
   s.authors     = ["Katrina Owen"]
   s.email       = ["katrina.owen@gmail.com"]
   s.homepage    = ""
@@ -17,7 +17,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.7'
+  s.add_development_dependency 'rspec', '~> 2.9'
   s.add_dependency 'thor'
   s.add_dependency 'nokogiri'
 end

data/lib/approvals/extensions/rspec.rb

@@ -1,9 +1,11 @@
 if defined? RSpec
   require 'approvals/extensions/rspec/dsl'
   require 'approvals/namers/rspec_namer'
+  require 'approvals/namers/directory_namer'
 
   RSpec.configure do |c|
     c.include Approvals::RSpec::DSL
     c.add_setting :approvals_path, :default => 'spec/fixtures/approvals/'
+    c.add_setting :approvals_namer_class, :default => Approvals::Namers::DirectoryNamer
   end
 end

data/lib/approvals/extensions/rspec/dsl.rb

@@ -7,7 +7,7 @@ module Approvals
 
       def verify(options = {}, &block)
         group = eval "self", block.binding
-        namer = Approvals::Namers::RSpecNamer.new(group.example)
+        namer = ::RSpec.configuration.approvals_namer_class.new(group.example)
         Approvals.verify(block.call, options.merge(:namer => namer))
       end
     end

data/lib/approvals/namers/directory_namer.rb

@@ -0,0 +1,23 @@
+module Approvals
+  module Namers
+    class DirectoryNamer < RSpecNamer
+
+      def initialize(example)
+        @name = directorize example
+      end
+
+      private
+
+      def directorize(example)
+        parts     = [ ]
+        metadata  = example.metadata
+
+        begin
+          parts << metadata[ :description ]
+        end while metadata = metadata[ :example_group ]
+
+        parts.reverse.map { |p| normalize p }.join '/'
+      end
+    end
+  end
+end

data/lib/approvals/writers/text_writer.rb

@@ -8,6 +8,7 @@ module Approvals
       end
 
       def write(data, path)
+        FileUtils.mkdir_p(File.dirname(path))
         File.open(path, 'w') do |f|
           f.write format(data)
         end

data/spec/approvals_spec.rb

@@ -1,4 +1,4 @@
-require 'approvals'
+require 'spec_helper'
 require 'approvals/namers/rspec_namer'
 
 describe Approvals do

data/spec/configuration_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/configuration'
 
 describe Approvals::Configuration do

data/spec/extensions/rspec_approvals_spec.rb

@@ -1,7 +1,7 @@
-require 'approvals'
+require 'spec_helper'
 require 'approvals/rspec'
 
-describe "Verifies" do
+shared_context 'verify examples' do
   specify "a string" do
     verify do
       "We have, I fear, confused power with greatness."
@@ -62,3 +62,29 @@ describe "Verifies" do
     end
   end
 end
+
+RSpec.configure do |c|
+  c.after :each do
+    c.approvals_namer_class = nil
+  end
+end
+
+describe "Verifies" do
+  before :each do
+    RSpec.configure do |c|
+      c.approvals_namer_class = Approvals::Namers::RSpecNamer
+    end
+  end
+
+  include_context 'verify examples'
+end
+
+describe "Verifies (directory)" do
+  before :each do
+    RSpec.configure do |c|
+      c.approvals_namer_class = Approvals::Namers::DirectoryNamer
+    end
+  end
+
+  include_context 'verify examples'
+end

data/spec/fixtures/approvals/verifies_directory/a_complex_object.approved.txt

@@ -0,0 +1 @@
+Hello, World!

data/spec/fixtures/approvals/verifies_directory/a_string.approved.txt

@@ -0,0 +1 @@
+We have, I fear, confused power with greatness.

data/spec/fixtures/approvals/verifies_directory/an_array.approved.txt

@@ -0,0 +1,4 @@
+[0] "abc"
+[1] 123
+[2] :zomg_fooooood
+[3] ["cheese", "burger", "ribs", "steak", "bacon"]

data/spec/fixtures/approvals/verifies_directory/an_executable.approved.txt

@@ -0,0 +1 @@
+SELECT 1

data/spec/fixtures/approvals/verifies_directory/html.approved.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Approval</title>
+  </head>
+  <body>
+    <h1>An Approval</h1>
+    <p>It has a paragraph</p>
+  </body>
+</html>

data/spec/fixtures/approvals/verifies_directory/json.approved.json

@@ -0,0 +1,7 @@
+{
+  "pet": {
+    "species": "turtle",
+    "color": "green",
+    "name": "Anthony"
+  }
+}

data/spec/fixtures/approvals/verifies_directory/xml.approved.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xml char="kiddo">
+  <node>
+    <content name="beatrice"/>
+  </node>
+  <node aliases="5">
+    <content/>
+  </node>
+</xml>

data/spec/namers/default_namer_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/configuration'
 require 'approvals/namers/default_namer'
 

data/spec/namers/directory_namer_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Approvals::Namers::DirectoryNamer do
+
+  it "uses non-$%^&*funky example description" do
+    Approvals::Namers::DirectoryNamer.new(self.example).name.should eq("approvals_namers_directorynamer/uses_non_funky_example_description")
+  end
+
+  it "has a decent default" do
+    Approvals::Namers::DirectoryNamer.new(self.example).output_dir.should eq('spec/fixtures/approvals/')
+  end
+
+  context "when RSpec is configured" do
+    before :each do
+      RSpec.configure do |c|
+        c.approvals_path = 'spec/output/dir/'
+      end
+    end
+
+    after :each do
+      RSpec.configure do |c|
+        c.approvals_path = nil
+      end
+    end
+
+    it "uses the rspec config option" do
+      Approvals::Namers::DirectoryNamer.new(self.example).output_dir.should eq('spec/output/dir/')
+    end
+  end
+end

data/spec/namers/rspec_namer_spec.rb

@@ -1,4 +1,4 @@
-require 'approvals'
+require 'spec_helper'
 
 describe Approvals::Namers::RSpecNamer do
 

data/spec/namers_spec.rb

@@ -1,4 +1,4 @@
-require 'approvals'
+require 'spec_helper'
 
 describe Approvals::Namers do
 

data/spec/reporters/first_working_reporter_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/reporters/first_working_reporter'
 
 describe Approvals::Reporters::FirstWorkingReporter do

data/spec/reporters/html_image_reporter_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/reporters'
 require 'approvals/utilities/scrubber'
 

data/spec/reporters/image_magick_reporter_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/reporters'
 
 describe Approvals::Reporters::ImageMagickReporter do

data/spec/reporters/launcher_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/reporters/launcher'
 
 describe Approvals::Reporters::Launcher do

data/spec/reporters/opendiff_reporter_spec.rb

@@ -1,4 +1,4 @@
-require 'approvals'
+require 'spec_helper'
 
 describe Approvals::Reporters::OpendiffReporter do
 

data/spec/reporters/reporter_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/reporters'
 
 describe Approvals::Reporters::Reporter do

data/spec/spec_helper.rb

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

data/spec/utilities/dotfile_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/utilities/dotfile'
 
 describe Approvals::Dotfile do

data/spec/utilities/executable_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/utilities/executable'
 
 describe Approvals::Executable do

data/spec/utilities/scrubber_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/utilities/scrubber'
 
 describe Approvals::Scrubber do

data/spec/utilities/system_command_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'approvals/utilities/system_command'
 
 describe Approvals::SystemCommand, "#exists?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: approvals
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70128394108280 !ruby/object:Gem::Requirement
+  requirement: &70114913577820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70128394108280
+  version_requirements: *70114913577820
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70128394107880 !ruby/object:Gem::Requirement
+  requirement: &70114913577220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70128394107880
+  version_requirements: *70114913577220
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70128394107400 !ruby/object:Gem::Requirement
+  requirement: &70114913576740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70128394107400
+  version_requirements: *70114913576740
 description: Approval Tests for Ruby
 email:
 - katrina.owen@gmail.com
@@ -68,6 +68,7 @@ files:
 - lib/approvals/extensions/rspec.rb
 - lib/approvals/extensions/rspec/dsl.rb
 - lib/approvals/namers/default_namer.rb
+- lib/approvals/namers/directory_namer.rb
 - lib/approvals/namers/rspec_namer.rb
 - lib/approvals/reporters.rb
 - lib/approvals/reporters/diff_reporter/diffmerge_reporter.rb
@@ -112,6 +113,13 @@ files:
 - spec/fixtures/approvals/verifies_a_string.approved.txt
 - spec/fixtures/approvals/verifies_an_array.approved.txt
 - spec/fixtures/approvals/verifies_an_executable.approved.txt
+- spec/fixtures/approvals/verifies_directory/a_complex_object.approved.txt
+- spec/fixtures/approvals/verifies_directory/a_string.approved.txt
+- spec/fixtures/approvals/verifies_directory/an_array.approved.txt
+- spec/fixtures/approvals/verifies_directory/an_executable.approved.txt
+- spec/fixtures/approvals/verifies_directory/html.approved.html
+- spec/fixtures/approvals/verifies_directory/json.approved.json
+- spec/fixtures/approvals/verifies_directory/xml.approved.xml
 - spec/fixtures/approvals/verifies_html.approved.html
 - spec/fixtures/approvals/verifies_json.approved.json
 - spec/fixtures/approvals/verifies_xml.approved.xml
@@ -120,6 +128,7 @@ files:
 - spec/fixtures/two.png
 - spec/fixtures/two.txt
 - spec/namers/default_namer_spec.rb
+- spec/namers/directory_namer_spec.rb
 - spec/namers/rspec_namer_spec.rb
 - spec/namers_spec.rb
 - spec/reporters/first_working_reporter_spec.rb
@@ -128,6 +137,7 @@ files:
 - spec/reporters/launcher_spec.rb
 - spec/reporters/opendiff_reporter_spec.rb
 - spec/reporters/reporter_spec.rb
+- spec/spec_helper.rb
 - spec/utilities/dotfile_spec.rb
 - spec/utilities/executable_spec.rb
 - spec/utilities/scrubber_spec.rb