sieve-parser 0.0.3 → 0.0.4

data/lib/sieve-parser/action.rb

@@ -51,7 +51,7 @@ module Sieve
         end
 
       end
-      text[text.length-1] = ";"
+      text[text.length-1] = ";" if text.length > 0
       text
     end
 

data/lib/sieve-parser/filter.rb

@@ -16,6 +16,9 @@ module Sieve
     #@return [object] Object of self
     def initialize params={}
       @text = params[:text]
+      @type = (params[:type]) ? params[:name] : "if"
+      @name = params[:name]
+      @join = params[:join]
       @conditions = (params[:conditions]) ? params[:conditions] : []
       @actions = (params[:actions]) ? params[:actions] : []
       parse unless @text.nil?
@@ -39,10 +42,18 @@ module Sieve
       @name
     end
 
+    # Add object of Action to filter
+    #@param [Sieve::Action]
+    def add_action(action)
+      types = ["Sieve::Action", "Sieve::Vacation"]
+      raise "the param is not a Action" unless types.index(action.class.to_s)
+      @actions << action
+    end
+
     # Add object of Condition to filter
     #@param [Sieve::Condition]
     def add_condition(condition)
-      raise "the param is not a Condition" unless condition.class.to_s == "Sieve::Action"
+      raise "the param is not a Condition" unless condition.class.to_s == "Sieve::Condition"
       @conditions << condition
     end
 
@@ -50,7 +61,7 @@ module Sieve
     #@return [string] text of filter
     def to_s
       text = "# #{name}\n"
-      text += "#{@type}"
+      text += ((disabled?) ? "false #" : "") + "#{@type}"
       if conditions.count > 1
         text += " #{@join} (" + conditions.join(", ") + ")"
       else

data/lib/sieve-parser/filterset.rb

@@ -13,7 +13,7 @@
 
 module Sieve
   class FilterSet
-    attr_accessor :text_sieve
+    attr_accessor :text_sieve, :auto_require
     
     #Create FilterSet
     #@param [String] text of sieve
@@ -22,6 +22,7 @@ module Sieve
       @text_sieve = text_sieve
       @requires = []
       @filters = []
+      @auto_require = true;
       parse unless @text_sieve.nil?
     end
 
@@ -31,16 +32,42 @@ module Sieve
       @filters
     end
 
+    # Return filter by name
+    # @param [String] name of filter
+    # @return [integer] index of filter
+    def find_filter_by_name(name)
+      @filters[filter_index_by_name(name)]
+    end
+
+    # Return filter index by name
+    # @param [String] name of filter
+    # @return [Sieve::Filter]
+    def filter_index_by_name(name)
+      key = @filters.index{|f| f.name==name}
+      raise Exception.new("Filter not found") unless key
+      key
+    end
+
+    # Remove filter by name
+    # @param [String] name of filter
+    # @return [Array] @filter array
+    def remove_filter_by_name(name)
+      filter_index_by_name(name)
+      @filters.delete_if {|f| f.name == name }
+    end
+
     # Add filter to filters of filterset
     #@param [Filter] filter object
     def add_filter(filter)
       raise Exception.new("The param is not a Filter!") unless filter.class.to_s == "Sieve::Filter"
+      load_requires(filter) if @auto_require == true
       @filters << filter
     end
 
     # Requires inside the script
     #@return [array] names of requires
     def requires
+      @requires.uniq!
       @requires
     end
 
@@ -50,12 +77,13 @@ module Sieve
       #TODO: Implement config of requires allowed
       raise Exception.new("Is not a require valid!") unless req =~ /\S+/ 
       @requires << req
+      @requires.uniq!
     end
 
     # Return a text of filterset
     #@return [string] text of filterset
     def to_s
-      text = "require [\"#{requires.join('","')}\"];\n"
+      text = "require [\"#{requires.join('","')}\"];\n" if @requires.count > 0
       text += filters.join("")
     end
 
@@ -72,5 +100,18 @@ module Sieve
       end
 
     end
+
+    #Load requires by filter
+    #@param [Sieve::Filter] object of filter
+    def load_requires(filter)
+      text_requires =  "fileinto reject envelope encoded-character vacation "
+      text_requires += "subaddress comparator-i;ascii-numeric relational regex "
+      text_requires += "imap4flags copy include variables body enotify environment mailbox date"
+      text_requires.split(" ").each do |search|
+        if filter.to_s.index(search)
+          add_require(search)
+        end
+      end
+    end
   end
 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.3'
+  s.version = '0.0.4'
   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.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000Z
+date: 2012-10-01 00:00:00.000000000Z
 dependencies: []
 description: ! "    sieve-parser is a pure-ruby implementation for parsing and \n
   \   manipulate the sieve scripts.\n"