git-approvals 0.4.0 → 0.4.1

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/README.md

@@ -2,6 +2,9 @@
 
 Simple git-powered approval tests.
 
+[![Build Status](https://travis-ci.org/jeremyruppel/git-approvals.png)](https://travis-ci.org/jeremyruppel/git-approvals)
+[![Coverage Status](https://coveralls.io/repos/jeremyruppel/git-approvals/badge.png?branch=master)](https://coveralls.io/r/jeremyruppel/git-approvals?branch=master)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -55,11 +58,11 @@ describe Foo do
 end
 ```
 
-The result of `Foo.bar` will be written to `spec/foo_spec/foo/bar.txt`.
+The result of `Foo.bar` will be written to `spec/foo_spec/foo_bar`.
 The test will fail because the file is not checked in to your git repo,
 meaning you haven't approved it yet, so add it to approve it:
 
-`git add spec/foo_spec/foo_bar.txt`
+`git add spec/foo_spec/foo_bar`
 
 Another test run shows that the test now passes. On the next test run, the
 same file will be written out. If git says the file has changed, the
@@ -71,8 +74,8 @@ The `verify` method accepts the same options hash as the Approval constructor.
 
 The following options are supported:
 
-- `:format`: specifies the format to use when writing out the approved file. The format is inferred from the extension of the approved file, but if you specify it here, it will change the extension to match. This option accepts any extension that is registered with [tilt][tilt].
-- `:filename`: specifies the filename of the approved file.
+- `:format`: specifies the format to use when writing out the approved file. The format can be inferred from the extension of the approved file, but if you specify it here, it will change the extension to match. This option accepts any extension that is registered with [tilt][tilt].
+- `:filename`: specifies the base filename of the approved file.
 
 ### Formatters
 
@@ -83,7 +86,7 @@ The following options are supported:
 - `js` pretty-prints JavaScript source using [uglifier][uglifier].
 - `css` pretty-prints CSS source using [SASS][sass].
 
-The format will be determined by checking the `:format` key of the options hash, then the extension of the approved filename, and finally will default to `txt`.
+The format is determined by checking the `:format` key of the options hash, then the extension of the approved filename. If neither are present, the file will be written as plain text.
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new :spec
+
+task :default => :spec

data/git-approvals.gemspec

@@ -24,11 +24,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'awesome_print', '~> 1.1.0'
   spec.add_development_dependency 'uglifier',      '~> 2.1.1'
   spec.add_development_dependency 'sass',          '~> 3.2.9'
+  spec.add_development_dependency 'nokogiri',      '~> 1.6.0'
 
   spec.add_development_dependency 'bundler',     '~> 1.3'
   spec.add_development_dependency 'rspec',       '~> 2.13.0'
   spec.add_development_dependency 'guard-rspec', '~> 2.5.2'
   spec.add_development_dependency 'rb-fsevent',  '~> 0.9'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'pry'
 end

data/lib/git/approvals.rb

@@ -3,11 +3,12 @@ require 'git/approvals/version'
 module Git
   module Approvals
     autoload :Approval,              'git/approvals/approval'
-    autoload :AwesomePrintFormatter, 'git/approvals/awesome_print_formatter.rb'
-    autoload :JSONFormatter,         'git/approvals/json_formatter.rb'
-    autoload :PlainFormatter,        'git/approvals/plain_formatter.rb'
-    autoload :SassFormatter,         'git/approvals/sass_formatter.rb'
-    autoload :UglifierFormatter,     'git/approvals/uglifier_formatter.rb'
+    autoload :AwesomePrintFormatter, 'git/approvals/awesome_print_formatter'
+    autoload :HTMLFormatter,         'git/approvals/html_formatter'
+    autoload :JSONFormatter,         'git/approvals/json_formatter'
+    autoload :PlainFormatter,        'git/approvals/plain_formatter'
+    autoload :SassFormatter,         'git/approvals/sass_formatter'
+    autoload :UglifierFormatter,     'git/approvals/uglifier_formatter'
     autoload :Utils,                 'git/approvals/utils'
   end
 end

data/lib/git/approvals/approval.rb

@@ -53,8 +53,14 @@ module Git
     # Register all formatters as tilt templates.
     Tilt.register PlainFormatter,        ''
     Tilt.register AwesomePrintFormatter, 'txt'
+    Tilt.register HTMLFormatter,         'html'
     Tilt.register JSONFormatter,         'json'
     Tilt.register UglifierFormatter,     'js'
     Tilt.register SassFormatter,         'css'
+
+    # FIXME there is already a template registered for 'html',
+    # so we need to prefer ours here. There has to be a better
+    # way to avoid that conflict though.
+    Tilt.prefer HTMLFormatter, 'html'
   end
 end

data/lib/git/approvals/html_formatter.rb

@@ -0,0 +1,23 @@
+require 'tilt'
+
+module Git
+  module Approvals
+    class HTMLFormatter < Tilt::Template
+
+      def self.engine_initialized?
+        defined?(::Nokogiri)
+      end
+
+      def initialize_engine
+        require_template_library 'nokogiri'
+      end
+
+      def prepare
+      end
+
+      def evaluate( context, locals, &block )
+        Nokogiri::XML( context ).to_xhtml :indent => 2
+      end
+    end
+  end
+end

data/lib/git/approvals/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Approvals
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/spec/fixtures/input.html

@@ -0,0 +1 @@
+<output><h1>Git + Approvals</h1><p>Pretty <strong>dope.</strong></p></output>

data/spec/fixtures/output.html

@@ -0,0 +1,4 @@
+<output>
+  <h1>Git + Approvals</h1>
+  <p>Pretty <strong>dope.</strong></p>
+</output>

data/spec/git/approvals/formatter_spec.rb

@@ -16,6 +16,9 @@ end
 describe Git::Approvals::JSONFormatter do
   include_examples 'formatter', '.json'
 end
+describe Git::Approvals::HTMLFormatter do
+  include_examples 'formatter', '.html'
+end
 describe Git::Approvals::UglifierFormatter do
   include_examples 'formatter', '.js'
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'git-approvals'
 
+Dir[ './spec/support/**/*.rb' ].each { |f| require f }
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

data/spec/support/coveralls.rb

@@ -0,0 +1,2 @@
+require 'coveralls'
+Coveralls.wear!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-approvals
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.9
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -171,6 +187,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple git-powered approval tests. With RSpec integration.
 email:
 - jeremy.ruppel@gmail.com
@@ -182,6 +214,7 @@ files:
 - .gitignore
 - .pryrc
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -193,6 +226,7 @@ files:
 - lib/git/approvals.rb
 - lib/git/approvals/approval.rb
 - lib/git/approvals/awesome_print_formatter.rb
+- lib/git/approvals/html_formatter.rb
 - lib/git/approvals/json_formatter.rb
 - lib/git/approvals/plain_formatter.rb
 - lib/git/approvals/rspec.rb
@@ -203,10 +237,12 @@ files:
 - lib/rspec/approvals.rb
 - spec/fixtures/input
 - spec/fixtures/input.css
+- spec/fixtures/input.html
 - spec/fixtures/input.js
 - spec/fixtures/input.json
 - spec/fixtures/output
 - spec/fixtures/output.css
+- spec/fixtures/output.html
 - spec/fixtures/output.js
 - spec/fixtures/output.json
 - spec/fixtures/output.txt
@@ -217,6 +253,7 @@ files:
 - spec/git/approvals/rspec_spec/rspec_integration/verify/passes_when_unchanged
 - spec/git/approvals/utils_spec.rb
 - spec/spec_helper.rb
+- spec/support/coveralls.rb
 homepage: https://github.com/jeremyruppel/git-approvals
 licenses:
 - MIT
@@ -245,10 +282,12 @@ summary: Simple git-powered approval tests.
 test_files:
 - spec/fixtures/input
 - spec/fixtures/input.css
+- spec/fixtures/input.html
 - spec/fixtures/input.js
 - spec/fixtures/input.json
 - spec/fixtures/output
 - spec/fixtures/output.css
+- spec/fixtures/output.html
 - spec/fixtures/output.js
 - spec/fixtures/output.json
 - spec/fixtures/output.txt
@@ -259,4 +298,5 @@ test_files:
 - spec/git/approvals/rspec_spec/rspec_integration/verify/passes_when_unchanged
 - spec/git/approvals/utils_spec.rb
 - spec/spec_helper.rb
+- spec/support/coveralls.rb
 has_rdoc: