dansguardian 0.0.2 → 0.1.0

data/Changelog

@@ -1,3 +1,6 @@
+0.1.0
+
+* edit config files
 
 0.0.1
 

data/lib/dansguardian.rb

@@ -5,9 +5,10 @@ autoload :Set,    'set'
 require 'configfiles'
 
 module DansGuardian
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 
   autoload :Config,     'dansguardian/config'
   autoload :Parser,     'dansguardian/parser'
+  autoload :Updater,    'dansguardian/updater'
   autoload :Inclusion,  'dansguardian/inclusion'
 end

data/lib/dansguardian/config.rb

@@ -35,7 +35,7 @@ module DansGuardian
     end
 
     # get filtergroup configuration data
-    def filtergroup(n=1, opt_h={:cached => false})
+    def filtergroup(n=1, opt_h={:cached => true})
       if opt_h[:cached]
         if @filtergroups[n]
           return @filtergroups[n]

data/lib/dansguardian/config/constants.rb

@@ -4,7 +4,7 @@ module DansGuardian
   class Config
 
       # Useful constants
-      INFINITY = ::Float::INFINITY
+      INFINITY = ::Float::INFINITY # do not use, JSON issues!!!
 
       # Recurring converters
       BOOL = {

data/lib/dansguardian/config/filtergroup.rb

@@ -10,12 +10,16 @@ module DansGuardian
         "FIXME: unknown parameter: value = #{s}"  
       end
 
-      parameter :groupmode,
+      GROUPMODE = {
         '0' => :banned,
         '1' => :filtered,
         '2' => :unfiltered
-
+      }
+      parameter :groupmode, GROUPMODE
+      default 	:groupmode, :filtered
+      
       parameter :groupname
+      default   :groupname, ''
 
       [
         :bannedphraselist,

data/lib/dansguardian/config/main.rb

@@ -140,7 +140,7 @@ module DansGuardian
       parameter   :maxuploadsize do |str|
         case str
         when '-1'
-          INFINITY
+          -1 # should be easily interpreted as 'unlimited'          
         else
           str.to_i * 1024
         end
@@ -213,13 +213,7 @@ module DansGuardian
         parameter par,                          :to_i
       end
 
-      parameter   :maxips do |str|
-        if str == '0'
-          INFINITY
-        else
-          str.to_i
-        end
-      end
+      parameter   :maxips,                      :to_i # 0 = unlimited
 
       [:ipcfilename, :urlipcfilename, :ipipcfilename, :pidfilename].each do |p|
         parameter p

data/lib/dansguardian/updater.rb

@@ -0,0 +1,79 @@
+autoload :Tempfile,   'tempfile'
+autoload :FileUtils,  'fileutils'
+
+module DansGuardian
+  module Updater
+
+    def self.update!(file, data)
+      tmp = Tempfile.new 'ruby_dansguardian_updater'
+      update file, data do |line|
+        tmp.puts line
+      end
+      tmp.close
+      FileUtils.cp tmp.path, file
+      tmp.unlink
+    end
+
+    def self.update(io_or_file, data)
+      if io_or_file.is_a? IO
+        io = io_or_file
+      else
+        io = File.open io_or_file
+      end
+
+      already_written = [] 
+      io.each_line do |line|
+        line.strip!
+        case line
+        # even replace commented lines
+        when /^(#\s*)?([^=\s#]+)\s*=\s*([^=\s#']*)/  
+          key = $2
+          value = $3
+        when /^(#\s*)?[\s#]*([^=\s#]+)\s*=\s*'(.*)'/ 
+          key = $2
+          value = $3.gsub(/\\'/, "'")
+        else
+          yield line # not a key/val line: leave untouched
+          next
+        end
+
+        # At this point, it is actually a key/value line
+
+        next if 
+            already_written.include?(key)         or 
+            already_written.include?(key.to_sym)
+
+        new_value = ( data[key] || data[key.to_sym] )
+        if new_value
+          if new_value.respond_to? :each # multiple values
+            new_value.each do |val|
+              yield "#{key} = #{val}"
+            end
+          else
+            yield "#{key} = #{new_value}"
+          end
+          already_written << key
+          # next # "optimized out"
+        else # not a key/val pair to edit: leave untouched
+          yield line
+          # next # "optimized out"
+        end
+      end
+
+      to_be_written = 
+          data.keys.map{|k| k.to_sym} - already_written.map{|k| k.to_sym}
+      if to_be_written.length > 0
+        yield ""
+        yield "# Added by ::#{self} :"
+        to_be_written.each do |k|
+          yield "#{k} = #{data[k] || data[k.to_s]}" 
+        end
+      end
+
+      io.close unless io_or_file.is_a? IO
+    end
+
+  end
+end
+
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Guido De Rosa
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +00:00
+date: 2011-02-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - lib/dansguardian/config.rb
 - lib/dansguardian/inclusion.rb
 - lib/dansguardian/parser.rb
+- lib/dansguardian/updater.rb
 has_rdoc: true
 homepage: http://github.com/gderosa/dansguardian.rb
 licenses: []