html_acceptance 0.1.15 → 0.1.16

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/html_acceptance.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{html_acceptance}
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Beland"]
-  s.date = %q{2011-02-17}
+  s.date = %q{2011-02-18}
   s.description = %q{HTML Acceptance lets you accept warnings/errors.  Less noisey validation will hopefully let you build html validation into your test suite, but break the rules if you must.}
   s.email = %q{ebeland@testomatix.com}
   s.extra_rdoc_files = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.requirements = ["HTML Tidy on the command PATH or at /usr/bin/tidy"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Wrapper for HTMLTidy that lets you accept warnings/errors}
   s.test_files = [
     "spec/html_acceptance_spec.rb",
@@ -46,7 +46,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/html_acceptance/html_acceptance_result.rb

@@ -3,6 +3,7 @@ require 'open3'
 class HTMLAcceptanceResult
   attr_accessor :resource, :html, :exceptions
   
+  # valid options[:tidy_opts]
   def initialize(resource, html, datapath, options={})
     @resource = resource
     @html = html
@@ -12,11 +13,11 @@ class HTMLAcceptanceResult
     valid?
   end
 
-  # takes a .url.txt and loads the data into this object
-  def self.load_from_files(datapath)
-    resource = File.open("#{datapath}.resource.txt", 'r').read
-    html = File.open("#{datapath}.html.txt", 'r').read
-	  HTMLAcceptanceResult.new(resource, html, datapath)
+  # takes a .url and loads the data into this object
+  def self.load_from_files(filepath)
+    resource = File.open("#{filepath}.resource.txt", 'r').read
+    html = File.open("#{filepath}.html.txt", 'r').read
+	  HTMLAcceptanceResult.new(resource, html, filepath)
   end
   
   # Validates an html string using html tidy. If there are no warnings or exceptions, or 
@@ -25,23 +26,22 @@ class HTMLAcceptanceResult
   # compares the exception strings with the lines and columns removed. Name can be a filename,
   # file system path, or url, so long it is uniquely associated with the passed in html.
   def valid?
-    @exceptions = validate 
-    File.delete(data_path("accepted.txt")) if File.exists?(data_path("accepted.txt")) if @exceptions == '' 
-    valid=(filter(@exceptions) == '' or accepted?(@exceptions))
-    save_html_and_exceptions
+    @exceptions = validate    
+    File.delete(data_path("accepted")) if File.exists?(data_path("accepted")) if @exceptions == ''     
+    valid = (filter(@exceptions) == '' or accepted?(@exceptions))   
+    save_html_and_exceptions    
     valid
   end
-  
 
   # Saves the exception string for the given url or file path. When next run, if the exception
   # string is identical, valid? will return true. Note that #exceptions will still list the 
   # exception string, though, even if it is an accepted exception string.
   def accept!    
-    File.open(data_path("accepted.txt"), 'w') {|f| f.write(@exceptions) }
+    File.open(data_path("accepted"), 'w') {|f| f.write(@exceptions) }
   end
   
   private
-    # We specifically prefer /usr/bin/tidyby default on *nix as there is another "tidy" programs
+  # We specifically prefer /usr/bin/tidyby default on *nix as there is another "tidy" programs
   # that could end up earlier on the path.  On snow leopard, tidy was installed at this location 
   # for me by default.
   def tidy_command
@@ -52,19 +52,19 @@ class HTMLAcceptanceResult
     
   # get the filename for storing a type of data
   def data_path(filetype)
-    "#{@datapath}.#{filetype}"
+    "#{@datapath}.#{filetype}.txt"
   end
 
   def save_html_and_exceptions
-    File.open(data_path("exceptions.txt"), 'w') {|f| f.write(@exceptions) }      
-    File.open(data_path("html.txt"), 'w') {|f| f.write(@html) }
-    File.open(data_path("resource.txt"), 'w') {|f| f.write(@resource) }    
-  end      
+    File.open(data_path("html"), 'w') {|f| f.write(@html) }
+    File.open(data_path("resource"), 'w') {|f| f.write(@resource) } 
+	File.open(data_path("exceptions"), 'w') {|f| f.write(@exceptions) }       
+  end     
 
     # have we previously accepted this exact string for this path?
   def accepted?(exception_str)
     exception_str=filter(exception_str)
-    File.exists?(data_path('accepted.txt')) ? filter(File.open(data_path('accepted.txt'),"r").read) == exception_str : false
+    File.exists?(data_path('accepted')) ? filter(File.open(data_path('accepted'),"r").read) == exception_str : false
   end
   
   # Line numbers of exceptions are likely to change with any minor edit, so our validation 
@@ -77,11 +77,14 @@ class HTMLAcceptanceResult
    # /line [0-9]+ column [0-9]+ - / +  =~ "line 1 column 1 - Warning: missing <!DOCTYPE> declaration"
   end
       
-  def validate
-    stdin, stdout, stderr = Open3.popen3(tidy_command)
-    stdin.puts @html
-    stdin.close
-    result=stderr.read
+  def validate            
+    results=''
+    Open3.popen3(tidy_command) do |stdin, stdout, stderr, wait_thr|    
+      stdin.puts @html
+      stdin.close
+      results=stderr.read
+    end
+    results
   end
   
 end

data/spec/html_acceptance_spec.rb

@@ -4,7 +4,7 @@ describe "HtmlAcceptance" do
   
   before(:each) do
     FileUtils.mkdir tmp_path if !File.exists?('/tmp/validation')
-    clean_dir(tmp_path)
+#    clean_dir(tmp_path)
     @h=HTMLAcceptance.new('/tmp/validation')    
   end
   

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: html_acceptance
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 15
-  version: 0.1.15
+  prerelease: 
+  version: 0.1.16
 platform: ruby
 authors: 
 - Eric Beland
@@ -15,71 +10,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -05:00
+date: 2011-02-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id004
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 description: HTML Acceptance lets you accept warnings/errors.  Less noisey validation will hopefully let you build html validation into your test suite, but break the rules if you must.
 email: ebeland@testomatix.com
 executables: []
@@ -120,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3196192247928734117
       segments: 
       - 0
       version: "0"
@@ -129,14 +106,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: 
 - HTML Tidy on the command PATH or at /usr/bin/tidy
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Wrapper for HTMLTidy that lets you accept warnings/errors