sieve-parser 0.0.4 → 0.0.5

data/lib/sieve-parser/filter.rb

@@ -19,6 +19,7 @@ module Sieve
       @type = (params[:type]) ? params[:name] : "if"
       @name = params[:name]
       @join = params[:join]
+      @disabled = params[:disabled]
       @conditions = (params[:conditions]) ? params[:conditions] : []
       @actions = (params[:actions]) ? params[:actions] : []
       parse unless @text.nil?
@@ -61,15 +62,17 @@ module Sieve
     #@return [string] text of filter
     def to_s
       text = "# #{name}\n"
-      text += ((disabled?) ? "false #" : "") + "#{@type}"
+      text += "#{@type}" + ((disabled?) ? " false #" : "")
       if conditions.count > 1
         text += " #{@join} (" + conditions.join(", ") + ")"
       else
         text += " " + conditions[0].to_s
       end
-      text += "\n{\n\t"
-      text += actions.join("\n\t")
+      text += "\n{\n"
+      text += "\t" + actions.join("\n\t") if actions.count > 0
       text += "\n}\n"
+    rescue => e
+      puts e.to_s
     end
 
     # Is disabled or not? Return the status of filter
@@ -85,24 +88,28 @@ module Sieve
     private
     # Parse conditions, call the parse_common or parse_vacation
     def parse
-      #regex_rules_params = "(^#.*)\nif([\s\w\:\"\.\;\(\)\,\-]+)\{([\@\<>=a-zA-Z0-9\s\[\]\_\:\"\.\;\(\)\,\-\/]+)\}$"
-      #regex_rules_params2 = "(^#.*)\n(\S+)(.+)\n\{\n([\s\S]*)\}"
-      parts = @text.scan(/(^#.*)\n(\S+)\s(.+)\n\{\n([\s\S]*;)\n\}/)[0]
-      parse_name(parts[0])
-      @type = parts[1]
-
-      self.disable! if parts[2] =~ /.*false #/
-      #if the join is true, dont have conditions...
-      if parts[2] =~ /true/
-        @conditions << Condition.new(type:"true")
-      elsif parts[2] =~ /(anyof|allof)/
-        @join = parts[2][/^\S+/]
-        @conditions.concat(Condition.parse_all( parts[2].scan(/\(([\S\s]+)\)/)[0][0] ))
-      else
-        @conditions << Condition.new(text:parts[2])
+      begin
+        #regex_rules_params = "(^#.*)\nif([\s\w\:\"\.\;\(\)\,\-]+)\{([\@\<>=a-zA-Z0-9\s\[\]\_\:\"\.\;\(\)\,\-\/]+)\}$"
+        #regex_rules_params2 = "(^#.*)\n(\S+)(.+)\n\{\n([\s\S]*)\}"
+        parts = @text.scan(/(^#.*)\n(\S+)\s(.+)\n\{\n([\s\S]*)\n\}/)[0]
+        parse_name(parts[0])
+        @type = parts[1]
+
+        self.disable! if parts[2] =~ /.*false #/
+        #if the join is true, dont have conditions...
+        if parts[2] =~ /true/
+          @conditions << Condition.new(type:"true")
+        elsif parts[2] =~ /(anyof|allof)/
+          @join = parts[2][/^\S+/]
+          @conditions.concat(Condition.parse_all( parts[2].scan(/\(([\S\s]+)\)/)[0][0] ))
+        else
+          @conditions << Condition.new(text:parts[2])
+        end
+
+        @actions.concat(Action.parse_all(parts[3]))
+      rescue => e
+        puts e.to_s + " - text: #{@text}"
       end
-
-      @actions.concat(Action.parse_all(parts[3]))
     end
 
 

data/lib/sieve-parser/filterset.rb

@@ -11,7 +11,13 @@
 # @author Thiago Coutinho<thiago.coutinho@locaweb.com.br>
 # @note This code folow de "THE BEER-WARE LICENSE"
 
+class SieveErrors
+  class FilterNotFound < StandardError;end
+  class InvalidParam < StandardError;end
+end
+
 module Sieve
+
   class FilterSet
     attr_accessor :text_sieve, :auto_require
     
@@ -22,7 +28,7 @@ module Sieve
       @text_sieve = text_sieve
       @requires = []
       @filters = []
-      @auto_require = true;
+      @auto_require = true
       parse unless @text_sieve.nil?
     end
 
@@ -44,7 +50,7 @@ module Sieve
     # @return [Sieve::Filter]
     def filter_index_by_name(name)
       key = @filters.index{|f| f.name==name}
-      raise Exception.new("Filter not found") unless key
+      raise SieveErrors::FilterNotFound unless key
       key
     end
 
@@ -83,8 +89,26 @@ module Sieve
     # Return a text of filterset
     #@return [string] text of filterset
     def to_s
+      text = ""
       text = "require [\"#{requires.join('","')}\"];\n" if @requires.count > 0
-      text += filters.join("")
+      text += filters.join("") if filters.count > 0
+      text
+    end
+
+    # Return a array of filters by select with all given params
+    #@param [{:name=>String, :disabled => Boolean, :text => String}] 
+    #@note The :text only have text to search
+    #@return [Array<Sieve::Filter>]
+    def where
+      entries =[]
+      @filters.each do |filter| 
+        cond = false
+        cond = filter.name == args[:name] unless args[:name].nil?
+        cond = filter.disabled? == args[:disabled] unless args[:disabled].nil?
+        cond = filter.to_s =~ /#{args[:text]}/ unless args[:text].nil? 
+        entries << filter if cond
+      end
+      entries
     end
 
     private
@@ -95,7 +119,7 @@ module Sieve
         @requires.concat(r[0].split('","'))
       end
 
-      @text_sieve.scan(/(^#.*\nif[\s\w\:\"\.\;\(\)\,\-]*\n\{[a-zA-Z0-9\s\@\<>=\:\[\]\_\"\.\;\(\)\,\-\/]*\n\}$)/).each do |f| 
+      @text_sieve.scan(/(^#.*\nif[\s\w\:\"\.\;\(\)\,\-]*\n\{[a-zA-Z0-9\s\@\<>=\:\[\]\_\"\.\;\(\)\&\,\-\/]*\n\}$)/).each do |f| 
         @filters << Sieve::Filter.new(text:f[0])
       end
 

data/sieve-parser.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name = 'sieve-parser'
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   s.summary = 'A Ruby library for sieve parser'
   s.description = <<-EOF
     sieve-parser is a pure-ruby implementation for parsing and 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sieve-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000Z
+date: 2012-10-09 00:00:00.000000000Z
 dependencies: []
 description: ! "    sieve-parser is a pure-ruby implementation for parsing and \n
   \   manipulate the sieve scripts.\n"