be_valid_asset 1.2.3 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4f5e373c8a93d715175401ab7cf5957d0d25e0b2
+  data.tar.gz: af7fd77efaf14d9f6e7a7b66413ceedf5295dbfc
+SHA512:
+  metadata.gz: 188b91cfa1a6efe8c6adbcd9e7f54bff0ee1994dbcf00c5fd60223004427a982a5bec7e64445ff400b38595dbdcf3ed95d9c24608d43d38cf6c85011c23bb50f
+  data.tar.gz: 45c68a7d767852433d7e452e596eacb2aba14a99f68e679b7a54252253774fcd186d177313f02b8a83faef08f9069cf5b539fc6542e4a4f30e9ad4d41ac4b656

data/CHANGELOG.md

@@ -0,0 +1,49 @@
+# 1.3.0
+
+* Use RSpec 3 for development
+* Remove RSpec 3 dep warnings at runtime, while still supporting older RSpecs
+* Support ``BeValidAsset::Configuration.xxx_validator_host`` settings with a protocol
+* Support ``https`` as a protocol for host config
+
+# 1.2.3
+
+* Use Bundler to manage gem
+* Allow for markup to be modified prior to validation (e.g. to remove attributes you know won't pass)
+
+# 1.2.2
+
+* Turn off CSS validation warnings about vendor extensions
+* Fix gemspec
+
+# 1.2.1
+
+* Is broken, use 1.2.2
+* Deprecate ``be_valid_xhtml`` in favour of ``be_valid_markup``
+* Use rspec 2 in development
+
+# 1.1.2
+
+* Fix because validator response html is different
+
+# 1.1.1
+
+* Option for displaying context around failed validation
+* Handle empty CSS without getting a 500 from validator
+
+# 1.1.0
+
+* Added ``be_valid_feed`` for rss/atom by talking to w3c feed validator
+
+# 1.0.1
+
+* Allow ``be_valid_css`` to take a response object or a string (like ``be_valid_xhtml``).
+
+# 1.0.0
+
+* Allow to work with Merb
+* Add rspec dependency
+
+# 0.9.0
+
+* Hello!
+* Provides ``be_valid_css`` and ``be_valid_xhtml`` matchers for rspec to talk to w3c validators.

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in be_valid_asset.gemspec
 gemspec
+gem 'rake'
+gem 'rspec', '>= 3.0'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 Unboxed Consulting
+Copyright (c) 2009-2014 Unboxed Consulting
 
 MIT License
 

data/be_valid_asset.gemspec

@@ -6,7 +6,7 @@ require 'be_valid_asset/version'
 Gem::Specification.new do |gem|
   gem.name          = "be_valid_asset"
   gem.version       = BeValidAsset::VERSION
-  gem.authors       = ["Alex Tomlins", "Attila Gyorffy", "Ben Brinckerhoff", "Jolyon Pawlyn", "Sebastian de Castelberg"]
+  gem.authors       = ["Alex Tomlins", "Attila Gyorffy", "Ben Brinckerhoff", "Jolyon Pawlyn", "Sebastian de Castelberg", "Zubair Chaudary", "Murray Steele"]
   gem.email         = ["github@unboxedconsulting.com"]
   gem.description   = %q{Provides be_valid_markup, be_valid_css and be_valid_feed matchers for RSpec controller and view tests.}
   gem.summary       = %q{Markup and asset validation for RSpec}
@@ -18,7 +18,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('rspec')
-  gem.add_development_dependency('rake')
-  gem.add_development_dependency('rspec', '>= 2.0')
+  gem.add_runtime_dependency('rspec')
 end

data/lib/be_valid_asset/be_valid_base.rb

@@ -1,6 +1,8 @@
 
 module BeValidAsset
 
+  DontRunValidAssetSpecs = (defined? RSpec::Core::Pending::SkipDeclaredInExample) ? RSpec::Core::Pending::SkipDeclaredInExample : RSpec::Core::Pending::PendingDeclaredInExample
+
   # Abstract base class for other matchers
   class BeValidBase
 
@@ -8,7 +10,7 @@ module BeValidAsset
 
       def check_net_enabled
         if ENV["NONET"] == 'true'
-          raise RSpec::Core::Pending::PendingDeclaredInExample.new('Network tests disabled')
+          raise BeValidAsset::DontRunValidAssetSpecs.new('Network tests disabled')
         end
       end
 
@@ -84,14 +86,21 @@ module BeValidAsset
         ret << "\r\n--#{boundary}--\r\n"
         ret
       end
-      
+
       def http_start(host)
-        if ENV['http_proxy']
-          uri = URI.parse(ENV['http_proxy'])
-          proxy_user, proxy_pass = uri.userinfo.split(/:/) if uri.userinfo
-          Net::HTTP.start(host, nil, uri.host, uri.port, proxy_user, proxy_pass)
+        uri = URI.parse(host)
+        uri = URI.parse("http://#{host}") if uri.scheme.nil?
+        if uri.scheme == 'https'
+          http = Net::HTTP.new uri.host, uri.port
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          http.use_ssl = true
+          http.start
+        elsif ENV['http_proxy']
+          proxy_uri = URI.parse(ENV['http_proxy'])
+          proxy_user, proxy_pass = proxy_uri.userinfo.split(/:/) if proxy_uri.userinfo
+          Net::HTTP.start(uri.host, uri.port, proxy_uri.host, proxy_uri.port, proxy_user, proxy_pass)
         else
-          Net::HTTP.start(host)
+          Net::HTTP.start(uri.host, uri.port)
         end
       end
   end

data/lib/be_valid_asset/be_valid_css.rb

@@ -29,13 +29,15 @@ module BeValidAsset
     end
   
     def failure_message
-     " expected css to be valid, but validation produced these errors:\n#{@message}"
+      " expected css to be valid, but validation produced these errors:\n#{@message}"
     end
-  
-    def negative_failure_message
+
+    def failure_message_when_negated
       " expected to not be valid, but was (missing validation?)"
     end
-  
+    # continue to support Rspec < 3
+    alias :negative_failure_message :failure_message_when_negated
+
     private
 
       def validator_host

data/lib/be_valid_asset/be_valid_feed.rb

@@ -25,12 +25,14 @@ module BeValidAsset
     end
 
     def failure_message
-     " expected feed to be valid, but validation produced these errors:\n#{@message}"
+      " expected feed to be valid, but validation produced these errors:\n#{@message}"
     end
 
-    def negative_failure_message
+    def failure_message_when_negated
       " expected to not be valid, but was (missing validation?)"
     end
+    # continue to support Rspec < 3
+    alias :negative_failure_message :failure_message_when_negated
 
     private
 

data/lib/be_valid_asset/be_valid_markup.rb

@@ -12,13 +12,13 @@ module BeValidAsset
   Configuration.markup_modifiers = []
 
   class BeValidMarkup < BeValidBase
-  
+
     def initialize(options = {})
       @fragment = options[:fragment]
     end
-  
+
     # Assert that markup (html/xhtml) is valid according the W3C validator web service.
-  
+
     def matches?(fragment)
 
       if fragment.respond_to? :source
@@ -39,22 +39,24 @@ module BeValidAsset
         query_params[:prefill] = '1'
         query_params[:prefill_doctype] = 'xhtml10'
       end
-      
+
       return validate(query_params)
     end
-  
+
     def description
       "be valid markup"
     end
-  
+
     def failure_message
-     " expected markup to be valid, but validation produced these errors:\n#{@message}"
+      " expected markup to be valid, but validation produced these errors:\n#{@message}"
     end
-  
-    def negative_failure_message
+
+    def failure_message_when_negated
       " expected to not be valid, but was (missing validation?)"
     end
-  
+    # continue to support Rspec < 3
+    alias :negative_failure_message :failure_message_when_negated
+
     private
 
       def apply_modifiers_to_fragment(fragment)
@@ -92,7 +94,7 @@ module BeValidAsset
   def be_valid_markup
     BeValidMarkup.new
   end
-  
+
   def be_valid_markup_fragment()
     BeValidMarkup.new(:fragment => true)
   end

data/lib/be_valid_asset/be_valid_xhtml.rb

@@ -1,7 +1,7 @@
 module BeValidAsset
-  
+
   class BeValidXhtml < BeValidMarkup
-  
+
     def initialize(options = {})
       super
       Kernel.warn('[DEPRECATION] - `be_valid_xhtml` is deprecated, use `be_valid_markup` instead')
@@ -12,7 +12,7 @@ module BeValidAsset
     BeValidXhtml.new
   end
   alias :be_valid_html :be_valid_xhtml
-  
+
   def be_valid_xhtml_fragment()
     BeValidXhtml.new(:fragment => true)
   end

data/lib/be_valid_asset/version.rb

@@ -1,3 +1,3 @@
 module BeValidAsset
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

data/spec/be_valid_asset/be_valid_css_spec.rb

@@ -4,55 +4,55 @@ unless defined?(SpecFailed)
   SpecFailed = RSpec::Expectations::ExpectationNotMetError
 end
 
-describe 'be_valid_css' do
-  
+RSpec.describe 'be_valid_css' do
+
   describe "without caching" do
     it "should validate a valid string" do
       css = get_file('valid.css')
-      css.should be_valid_css
+      expect(css).to be_valid_css
     end
-    
+
     it "should validate an empty string" do
-      ''.should be_valid_css
+      expect('').to be_valid_css
     end
 
     it "should validate a valid response" do
       response = MockResponse.new(get_file('valid.css'))
-      response.should be_valid_css
+      expect(response).to be_valid_css
     end
 
     it "should validate if body is not a string but can be converted to valid string" do
-      response = MockResponse.new(stub("CSS", :to_s => get_file('valid.css')))
-      response.should be_valid_css
+      response = MockResponse.new(double("CSS", :to_s => get_file('valid.css')))
+      expect(response).to be_valid_css
     end
 
     it "should not validate an invalid string" do
       css = get_file('invalid.css')
-      lambda {
-        css.should be_valid_css
-      }.should raise_error(SpecFailed) { |e|
-        e.message.should match(/expected css to be valid, but validation produced these errors/)
-        e.message.should match(/Invalid css: line 8: Property wibble doesn't exist/)
+      expect {
+        expect(css).to be_valid_css
+      }.to raise_error(SpecFailed) { |e|
+        expect(e.message).to match(/expected css to be valid, but validation produced these errors/)
+        expect(e.message).to match(/Invalid css: line 8: Property wibble doesn't exist/)
       }
     end
 
     it "should not validate an invalid response" do
       response = MockResponse.new(get_file('invalid.css'))
-      lambda {
-        response.should be_valid_css
-      }.should raise_error(SpecFailed) { |e|
-        e.message.should match(/expected css to be valid, but validation produced these errors/)
-        e.message.should match(/Invalid css: line 8: Property wibble doesn't exist/)
+      expect {
+        expect(response).to be_valid_css
+      }.to raise_error(SpecFailed) { |e|
+        expect(e.message).to match(/expected css to be valid, but validation produced these errors/)
+        expect(e.message).to match(/Invalid css: line 8: Property wibble doesn't exist/)
       }
     end
 
     it "should display invalid content when requested" do
       BeValidAsset::Configuration.display_invalid_content = true
       css = get_file('invalid.css')
-      lambda {
-        css.should be_valid_css
-      }.should raise_error(SpecFailed) { |e|
-        e.message.should match(/wibble:0;/)
+      expect {
+        expect(css).to be_valid_css
+      }.to raise_error(SpecFailed) { |e|
+        expect(e.message).to match(/wibble:0;/)
       }
       BeValidAsset::Configuration.display_invalid_content = false
     end
@@ -62,21 +62,21 @@ describe 'be_valid_css' do
 
       r = Net::HTTPServiceUnavailable.new('1.1', 503, 'Service Unavailable')
       h = Net::HTTP.new(BeValidAsset::Configuration.css_validator_host)
-      h.stub!(:post2).and_return(r)
-      Net::HTTP.stub!(:start).and_return(h)
+      allow(h).to receive(:post2).and_return(r)
+      allow(Net::HTTP).to receive(:start).and_return(h)
 
-      lambda {
-        css.should be_valid_css
-      }.should raise_error
+      expect {
+        expect(css).to be_valid_css
+      }.to raise_error
     end
 
     it "should mark test as pending if ENV['NONET'] is true" do
       ENV['NONET'] = 'true'
 
       css = get_file('valid.css')
-      lambda {
-        css.should be_valid_css
-      }.should raise_error(RSpec::Core::Pending::PendingDeclaredInExample)
+      expect {
+        expect(css).to be_valid_css
+      }.to raise_error(BeValidAsset::DontRunValidAssetSpecs)
 
       ENV.delete('NONET')
     end
@@ -90,13 +90,13 @@ describe 'be_valid_css' do
           (1..3).each do |test_version|
             if test_version < version
               it "should not be valid css#{test_version.to_s}" do
-                lambda {
-                  @css.should send("be_valid_css#{test_version.to_s}".to_sym)
-                  }.should raise_error(SpecFailed)
+                expect {
+                  expect(@css).to send("be_valid_css#{test_version.to_s}".to_sym)
+                }.to raise_error(SpecFailed)
               end
             else
               it "should be valid css#{test_version.to_s}" do
-                @css.should send("be_valid_css#{test_version.to_s}".to_sym)
+                expect(@css).to send("be_valid_css#{test_version.to_s}".to_sym)
               end
             end
           end
@@ -104,7 +104,7 @@ describe 'be_valid_css' do
       end
     end
   end
-  
+
   describe "with caching" do
     before(:each) do
       BeValidAsset::Configuration.enable_caching = true
@@ -117,40 +117,40 @@ describe 'be_valid_css' do
     it "should validate valid css and cache the response" do
       css = get_file('valid.css')
       count = Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size
-      css.should be_valid_css
-      Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size.should eql(count + 1)
+      expect(css).to be_valid_css
+      expect(Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size).to eql(count + 1)
     end
 
     it "should validate valid css using the cached response" do
       css = get_file('valid.css')
-      css.should be_valid_css
+      expect(css).to be_valid_css
 
-      Net::HTTP.should_not_receive(:start)
-      css.should be_valid_css
+      expect(Net::HTTP).not_to receive(:start)
+      expect(css).to be_valid_css
     end
 
     it "should not validate invalid css, but still cache the response" do
       css = get_file('invalid.css')
       count = Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size
-      lambda {
-        css.should be_valid_css
-      }.should raise_error(SpecFailed) { |e|
-        e.message.should match(/expected css to be valid, but validation produced these errors/)
-        e.message.should match(/Invalid css: line 8: Property wibble doesn't exist/)
+      expect {
+        expect(css).to be_valid_css
+      }.to raise_error(SpecFailed) { |e|
+        expect(e.message).to match(/expected css to be valid, but validation produced these errors/)
+        expect(e.message).to match(/Invalid css: line 8: Property wibble doesn't exist/)
       }
-      Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size.should eql(count + 1)
+      expect(Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size).to eql(count + 1)
     end
 
     it "should not validate invalid css, but use the cached response" do
       css = get_file('invalid.css')
-      css.should_not be_valid_css
-
-      Net::HTTP.should_not_receive(:start)
-      lambda {
-        css.should be_valid_css
-      }.should raise_error(SpecFailed) { |e|
-        e.message.should match(/expected css to be valid, but validation produced these errors/)
-        e.message.should match(/Invalid css: line 8: Property wibble doesn't exist/)
+      expect(css).not_to be_valid_css
+
+      expect(Net::HTTP).not_to receive(:start)
+      expect {
+        expect(css).to be_valid_css
+      }.to raise_error(SpecFailed) { |e|
+        expect(e.message).to match(/expected css to be valid, but validation produced these errors/)
+        expect(e.message).to match(/Invalid css: line 8: Property wibble doesn't exist/)
       }
     end
 
@@ -160,23 +160,23 @@ describe 'be_valid_css' do
 
       r = Net::HTTPServiceUnavailable.new('1.1', 503, 'Service Unavailable')
       h = Net::HTTP.new(BeValidAsset::Configuration.css_validator_host)
-      h.stub!(:post2).and_return(r)
-      Net::HTTP.stub!(:start).and_return(h)
+      allow(h).to receive(:post2).and_return(r)
+      allow(Net::HTTP).to receive(:start).and_return(h)
 
-      lambda {
-        css.should be_valid_css
-      }.should raise_error
-      Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size.should eql(count)
+      expect {
+        expect(css).to be_valid_css
+      }.to raise_error
+      expect(Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size).to eql(count)
     end
 
     it "should use the cached result (if available) when network tests disabled" do
       css = get_file('valid.css')
-      css.should be_valid_css
+      expect(css).to be_valid_css
 
       ENV['NONET'] = 'true'
 
-      Net::HTTP.should_not_receive(:start)
-      css.should be_valid_css
+      expect(Net::HTTP).not_to receive(:start)
+      expect(css).to be_valid_css
 
       ENV.delete('NONET')
     end
@@ -185,9 +185,9 @@ describe 'be_valid_css' do
       ENV['NONET'] = 'true'
 
       css = get_file('valid.css')
-      lambda {
-        css.should be_valid_css
-      }.should raise_error(RSpec::Core::Pending::PendingDeclaredInExample)
+      expect {
+        expect(css).to be_valid_css
+      }.to raise_error(BeValidAsset::DontRunValidAssetSpecs)
 
       ENV.delete('NONET')
     end