tidy-ext 0.1.8 → 0.1.9

data/Rakefile

@@ -2,10 +2,6 @@ require 'rubygems'
 require 'rake'
 require 'rake/extensiontask'
 
-#require File.join(File.expand_path(File.dirname(__FILE__)), "lib")
-
-MAKE = 'make'
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -53,6 +49,19 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Rake::ExtensionTask.new('tidy')
+Rake::ExtensionTask.new do |ext|
+  ext.name = 'tidy'
+  ext.ext_dir = 'ext/tidy'
+  ext.config_options << '--with-coverage' if ENV['COV']
+end
 
+desc "Recompile with gcc coverage options and run specs"
+task :gcov => [:clean] do |t|
+  ENV['COV'] = '1'
+  Rake::Task[:compile].invoke
+  Rake::Task[:spec].invoke
+
+  ruby_tidy_o = Dir.glob('**/ruby-tidy.o').first
+  puts %x{gcov --no-output --object-file #{ruby_tidy_o} ext/tidy/ruby-tidy.c}
+end
 

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/ext/tidy/extconf.rb

@@ -1,5 +1,10 @@
 require 'mkmf'
 
+if arg_config('--with-coverage') || ENV['COV']
+  $CFLAGS += ' -fprofile-arcs -ftest-coverage '
+  $LDFLAGS += ' -fprofile-arcs -ftest-coverage '
+end
+
 dir_config("tidy")
 create_makefile("tidy")
 

data/ext/tidy/ruby-tidy.c

@@ -55,6 +55,61 @@ static VALUE rb_tidy_new(int argc, VALUE *argv, VALUE class)
   return self;
 }
 
+/* called when iterating over options hash */
+static VALUE rb_tidy_set_option(VALUE arg1, VALUE arg2)
+{
+  VALUE key, value;
+  TidyDoc tdoc;
+  TidyOption opt;
+  Bool status = no;
+
+  /* See platform.h, opaque_type for typedef convention */
+  Data_Get_Struct(arg2, struct _TidyDoc, tdoc);
+
+  key   = rb_ary_entry(arg1, 0);
+  value = rb_ary_entry(arg1, 1);
+
+  /* if the key is a symbol, convert it to a string
+   * and replace the underscores '_' with minuses '-'
+   */
+  if (TYPE(key) == T_SYMBOL) {
+    char *ckey, *ptr;
+
+    ckey = (char *) rb_id2name(SYM2ID(key));
+
+    for(ptr = ckey; *ptr != '\0'; ptr++) {
+      if (*ptr == '_') {
+        *ptr = '-';
+      }
+    }
+
+    opt = tidyGetOptionByName(tdoc, ckey);
+  } else {
+    opt = tidyGetOptionByName(tdoc, StringValuePtr(key));
+  }
+
+  if ( opt != NULL ) {
+    TidyOptionId optId = tidyOptGetId(opt);
+
+    switch(TYPE(value)) {
+      case T_FALSE:
+        status = tidyOptSetBool(tdoc, optId, no);
+        break;
+      case T_TRUE:
+        status = tidyOptSetBool(tdoc, optId, yes);
+        break;
+      case T_FIXNUM:
+        status = tidyOptSetInt(tdoc, optId, NUM2ULONG(value));
+        break;
+      default:
+        status = tidyOptSetValue(tdoc, optId, StringValuePtr(value));
+        break;
+    }
+  }
+
+  return Qnil;
+}
+
 /* parse the given input and return the tidy errors and output */
 static VALUE rb_tidy_parse(VALUE self, VALUE input)
 {
@@ -82,10 +137,8 @@ static VALUE rb_tidy_parse(VALUE self, VALUE input)
 
   status = tidySetErrorBuffer( tdoc, &errbuf );
 
-  access = rb_iv_get(self, "@access");
-  tidyOptSetInt( tdoc, TidyAccessibilityCheckLevel, NUM2UINT(access));
-
   options = rb_iv_get(self, "@options");
+  rb_iterate(rb_each, options, rb_tidy_set_option, self);
 
   if (status >= 0) {
 
@@ -122,13 +175,11 @@ static VALUE rb_tidy_parse(VALUE self, VALUE input)
   if (status >= 0)
     status = tidySaveBuffer( tdoc, &output );
 
-  contentErrors   += tidyErrorCount( tdoc );
-  contentWarnings += tidyWarningCount( tdoc );
-  accessWarnings  += tidyAccessWarningCount( tdoc );
-
-  VALUE show_warnings = rb_hash_aref(options, ID2SYM(rb_intern("show_warnings")));
+  contentErrors   = tidyErrorCount( tdoc );
+  contentWarnings = tidyWarningCount( tdoc );
+  accessWarnings  = tidyAccessWarningCount( tdoc );
 
-  if (contentErrors > 0 || (show_warnings == Qtrue && contentWarnings > 0)) {
+  if (contentErrors > 0 || contentWarnings > 0) {
     errors = rb_str_new2(errbuf.bp);
   } else {
     errors = rb_str_new2("");
@@ -150,6 +201,7 @@ static VALUE rb_tidy_init(VALUE self)
   return self;
 }
 
+/* Create a tidy object */
 static VALUE rb_tidy_open(VALUE class, VALUE options)
 {
   VALUE args[1];
@@ -165,6 +217,7 @@ static VALUE rb_tidy_open(VALUE class, VALUE options)
   return tidy;
 }
 
+/* Given a string, returns the string after tidying */
 static VALUE rb_tidy_clean(VALUE self, VALUE input)
 {
   VALUE array;
@@ -174,6 +227,7 @@ static VALUE rb_tidy_clean(VALUE self, VALUE input)
   return rb_ary_entry(array, 1);
 }
 
+/* For sideways compatibility */
 static VALUE rb_tidy_path_get(VALUE self)
 {
   VALUE path;
@@ -181,6 +235,7 @@ static VALUE rb_tidy_path_get(VALUE self)
   return path;
 }
 
+/* For sideways compatibility */
 static VALUE rb_tidy_path_set(VALUE self, VALUE path)
 {
   rb_cv_set(self, "@@path", path);

data/spec/tidy/compat_spec.rb

@@ -48,18 +48,42 @@ describe "tidy compatibility methods" do
     errors1 = nil
     errors2 = nil
 
-    tidy = Tidy.open({:show_warnings => false}) do |tidy|
+    tidy = Tidy.open({'show-warnings' => false}) do |tidy|
       html = tidy.clean("<html><body>String</body></html>")
       errors1 = tidy.errors
-      puts errors1
     end
 
-    tidy = Tidy.open({:show_warnings => true}) do |tidy|
+    tidy = Tidy.open({'show-warnings' => true}) do |tidy|
       html = tidy.clean("<html><body>String</body></html>")
       errors2 = tidy.errors
-      puts errors2
     end
 
     errors1.should_not == errors2
   end
+
+  it "should observe the options hash when it uses strings" do
+    laundry = "<html><body>String<img src=''/></body></html>"
+    options = {
+      'alt-text' => 'hello world',
+      'uppercase-tags' => true
+    }
+    tidy = Tidy.open(options) do |tidy|
+      clean = tidy.clean(laundry)
+      clean.should =~ /<HTML>/
+      clean.should =~ /alt="hello world"/
+    end
+  end
+
+  it "should observe the options hash when it uses symbols" do
+    laundry = "<html><body>String<img src=''/></body></html>"
+    options = {
+      :alt_text => 'hello world',
+      :uppercase_tags => true
+    }
+    tidy = Tidy.open(options) do |tidy|
+      clean = tidy.clean(laundry)
+      clean.should =~ /<HTML>/
+      clean.should =~ /alt="hello world"/
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tidy-ext
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Carl Douglas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +10:00
+date: 2010-07-23 00:00:00 +10:00
 default_executable: 
 dependencies: []