dansguardian 0.1.0 → 0.2.1

data/Changelog

@@ -1,3 +1,7 @@
+0.2.0 (2011-02-15)
+
+* manage lists
+
 0.1.0
 
 * edit config files

data/example.rb

@@ -22,17 +22,19 @@ dgconf.main
 
 dgconf.filtergroup(1, :cached => true) 
 
-wfl = dgconf.filtergroup(1)[:weightedphraselist]
+listfile = dgconf.filtergroup(1)[:weightedphraselist]
+listobject = DansGuardian::List.new(:file => listfile)
+pp listobject
 
-p wfl
+listfile2 = "/etc/dansguardian/lists/phraselists/goodphrases/weighted_news"
+listobject2 = DansGuardian::List.new(listfile2)
+listobject2.read!
+pp listobject2
 
-pp DansGuardian::Inclusion.get(wfl) 
 
 
 
 
 
-#dg.config.filtergroup(1).inclusiontree('weightedphraselist')
-
 
 

data/lib/dansguardian.rb

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

data/lib/dansguardian/list.rb

@@ -0,0 +1,44 @@
+module DansGuardian
+  # this class does not inherit from ConfigFiles::Base
+  class List
+
+    attr_reader :items, :includes, :listcategory
+
+    #   DansGuardian::List.new(:file = '/path/to/list')
+    def initialize(h={})
+      if h.is_a? String
+        @init         = {:file => h}
+      else
+        @init         = h      
+      end
+      @items        = []
+      @includes     = []
+      @listcategory = nil
+
+      #read! if @init[:file] 
+    end
+
+    def filename; @init[:file]; end
+
+    # Reads the file and fill @items ad @includes . 
+    # This method might be overridden for non-trivial list types (?)
+    def read!
+      File.foreach(@init[:file]) do |line|
+        line.strip!
+        # Special comment used to "categorize" DG message pages
+        if line =~ /^#listcategory:\s*"(.*)"/ 
+          @listcategory = $1
+          next
+        end
+        next if line =~ /^\s*#/
+        line.sub! /\s#.*$/, '' # remove comments but allow http://url#anchor 
+        if    line =~ /^\.Include<(.*)>/
+          @includes << $1
+        elsif line =~ /\S/
+          @items << line.strip
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Guido De Rosa
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +00:00
+date: 2011-02-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,18 +39,18 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- Changelog
-- README.rdoc
-- example.rb
-- lib/dansguardian.rb
-- lib/dansguardian/config/constants.rb
 - lib/dansguardian/config/filtergroup.rb
 - lib/dansguardian/config/main.rb
+- lib/dansguardian/config/constants.rb
 - lib/dansguardian/extensions/float.rb
-- lib/dansguardian/config.rb
-- lib/dansguardian/inclusion.rb
 - lib/dansguardian/parser.rb
+- lib/dansguardian/config.rb
 - lib/dansguardian/updater.rb
+- lib/dansguardian/list.rb
+- lib/dansguardian.rb
+- README.rdoc
+- Changelog
+- example.rb
 has_rdoc: true
 homepage: http://github.com/gderosa/dansguardian.rb
 licenses: []

data/lib/dansguardian/inclusion.rb

@@ -1,16 +0,0 @@
-module DansGuardian
-  module Inclusion
-    # no distinction between text parser and ConfigFile conversion here ...
-    def self.get(filename)
-      all = {}
-      File.foreach filename do |line|
-        if line =~ /^\s*\.Include\s*<(.*)>/
-          all[$1] = {:active => true}
-        elsif line =~ /^\s*#+\s*\.Include\s*<(.*)>/
-          all[$1] = {:active => false}
-        end
-      end
-      return all
-    end
-  end
-end