dansguardian 0.4.1 → 0.5.0

data/Changelog

@@ -1,3 +1,7 @@
+0.5.0 (2011-02.20)
+
+* Updater: the special :remove! value and other fixes
+
 0.4.1 (2011-02-20)
 
 * filtergroup: default value for :weightedphrasemode

data/lib/dansguardian.rb

@@ -5,7 +5,7 @@ autoload :Set,    'set'
 require 'configfiles'
 
 module DansGuardian
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 
   autoload :Config,     'dansguardian/config'
   autoload :Parser,     'dansguardian/parser'

data/lib/dansguardian/config/filtergroup.rb

@@ -60,7 +60,7 @@ module DansGuardian
 
       # may override the main config file
       parameter :weightedphrasemode,
-        '0'   => false,
+        '0'   => :disabled,
         '1'   => :normal,
         '2'   => :singular
       default   :weightedphrasemode, :inherit

data/lib/dansguardian/updater.rb

@@ -4,6 +4,9 @@ autoload :FileUtils,  'fileutils'
 module DansGuardian
   module Updater
 
+    # Update the configuration file +file+ with the +data+ Hash,
+    # preserving the origin file layout, including comments.
+    # The spacial value +:remove!+ comments out the 'key = ...' line.
     def self.update!(file, data)
       tmp = Tempfile.new 'ruby_dansguardian_updater'
       update file, data do |line|
@@ -14,6 +17,8 @@ module DansGuardian
       tmp.unlink
     end
 
+    # Like update! but also accept IO objects and yields updated lines
+    # instead of actually writing to a file.
     def self.update(io_or_file, data)
       if io_or_file.is_a? IO
         io = io_or_file
@@ -50,7 +55,11 @@ module DansGuardian
               yield "#{key} = #{val}"
             end
           else
-            yield "#{key} = #{new_value}"
+            if new_value == :remove!
+              yield "# #{line}" 
+            else
+              yield "#{key} = #{new_value}"
+            end
           end
           already_written << key
           # next # "optimized out"
@@ -62,6 +71,10 @@ module DansGuardian
 
       to_be_written = 
           data.keys.map{|k| k.to_sym} - already_written.map{|k| k.to_sym}
+      to_be_written.select!{|k| data[k.to_s] || data[k.to_sym]} # reject nil values
+      to_be_written.reject! do |k|
+        (data[k.to_s] || data[k.to_sym]) == :remove!
+      end
       if to_be_written.length > 0
         yield ""
         yield "# Added by ::#{self} :"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Guido De Rosa