dansguardian 0.5.0 → 0.5.1

data/Changelog

@@ -1,6 +1,14 @@
-0.5.0 (2011-02.20)
+0.5.1 (2011-02-24)
 
-* Updater: the special :remove! value and other fixes
+* add sqlauthdbuser
+* multiple-values params fixes
+* do not overengineer: leave KiB as KiB
+* main: fix weightedphrasemode map
+* default values for Array params
+
+0.5.0 (2011-02-21)
+
+* SQLAuth plugin support plus various fixes
 
 0.4.1 (2011-02-20)
 

data/lib/dansguardian.rb

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

data/lib/dansguardian/config.rb

@@ -3,6 +3,9 @@ require 'dansguardian/config/filtergroup'
 
 module DansGuardian
   class Config
+
+    autoload :Auth, 'dansguardian/config/auth'
+
     # +arg+ May be +String+-like (the main config file name) or +Hash+-like :
     #
     #   DansGuardian::Config.new('path/to/dansguardian.conf')

data/lib/dansguardian/config/main.rb

@@ -96,7 +96,7 @@ module DansGuardian
       parameter   :showweightedfound,           BOOL
       
       parameter   :weightedphrasemode,
-        '0'   => false,
+        '0'   => :disabled,
         '1'   => :normal,
         '2'   => :singular
       
@@ -137,36 +137,13 @@ module DansGuardian
 
       parameter   :createlistcachefiles,        BOOL
 
-      parameter   :maxuploadsize do |str|
-        case str
-        when '-1'
-          -1 # should be easily interpreted as 'unlimited'          
-        else
-          str.to_i * 1024
-        end
-      end
+      parameter   :maxuploadsize,               :to_i # KiB
 
-      parameter   :maxcontentfiltersize do |str|
-        case str
-        when '0'
-          lambda {|confdata| confdata[:maxcontentramcachescansize]} 
-        else
-          str.to_i * 1024
-        end
-      end
+      parameter   :maxcontentfiltersize,        :to_i # KiB
 
-      parameter   :maxcontentramcachescansize do |str|
-        case str
-        when '0'
-          lambda {|confdata| confdata[:maxcontentfilecachescansize]}
-        else
-          str.to_i * 1024
-        end
-      end
+      parameter   :maxcontentramcachescansize,  :to_i # KiB
 
-      parameter   :maxcontentfilecachescansize do |str| 
-        str.to_i * 1024
-      end
+      parameter   :maxcontentfilecachescansize, :to_i # KiB 
 
       parameter   :filecachedir
 
@@ -180,8 +157,13 @@ module DansGuardian
       # You don't really need to lazy-evaluate (short) Arrays
       #
       parameter   :downloadmanager              # Array    
+      default     :downloadmanager,             []
+
       parameter   :contentscanner               # Array
+      default     :contentscanner,              []
+
       parameter   :authplugin                   # Array
+      default     :authplugin,                  []
 
       parameter   :contentscannertimeout,       :to_i
       default     :contentscannertimeout,       60

data/lib/dansguardian/updater.rb

@@ -76,10 +76,15 @@ module DansGuardian
         (data[k.to_s] || data[k.to_sym]) == :remove!
       end
       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]}" 
+          v = data[k] || data[k.to_s]
+          if v.respond_to? :each
+            v.each do |val|
+              yield "#{k} = #{val}"  
+            end
+          else
+            yield "#{k} = #{v}" 
+          end
         end
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Guido De Rosa
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +01:00
+date: 2011-02-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency