sieve-parser 0.0.5 → 0.0.6

data/lib/sieve-parser.rb

@@ -1,3 +1,5 @@
+require "split-where"
+
 module Sieve
   %w(filterset filter action condition vacation).each do |entity|
     require_relative "sieve-parser/#{entity}"

data/lib/sieve-parser/condition.rb

@@ -3,7 +3,7 @@
 module Sieve
   # This class contains the attributes of conditions/tests 
   class Condition
-    attr_accessor :test,:not,:arg1,:arg2,:type, :text
+    attr_accessor :test,:not,:arg1,:arg2,:type,:type_value, :comparator, :text
 
     # Create Condition object by text of condition or params
     #@note Example:
@@ -22,6 +22,7 @@ module Sieve
       @arg1=params[:arg1]
       @arg2=params[:arg2]
       @type= params[:type]
+      @comparator= params[:comparator] ? params[:comparator] : "i;ascii-numeric"
       parse unless @text.nil?
     end
     # Return a array of conditions after parse the text
@@ -32,8 +33,9 @@ module Sieve
     #@return [Array(Contition)] array of Condition
     def self.parse_all(text)
       contitions = []
-      text.scan(/([\s\w:]*\"\S+\"\s\"[\sa-zA-Z0-9,\.\-\@ÁÀÃÂÇÉÈÊÍÌÓÒÔÕÚÙÜÑáàãâçéèêíìóòôõúùüñ]*\")/).each do |item|
-        contitions << self.new(text:item[0])
+      #text.scan(/([\s\w:]*\"\S+\"\s\"[\sa-zA-Z0-9,\.\-\@ÁÀÃÂÇÉÈÊÍÌÓÒÔÕÚÙÜÑáàãâçéèêíìóòôõúùüñ]*\")/).each do |item|
+      text.split_where(value:",",outside:'"').each do |item| 
+        contitions << self.new(text:item.strip)
       end
       contitions
     end
@@ -42,7 +44,16 @@ module Sieve
     #@return [string] text of action
     def to_s
       text =""
-      {"not"=>@not,'test'=>@test,'type'=>@type,'arg1'=>@arg1,'arg2'=>@arg2}.each do |name, item|
+      {
+      'not'=>@not,
+      'test'=>@test,
+      'type'=>@type, 
+      'type_value'=>@type_value, 
+      'comparator_name'=>(":comparator" if [":count", ":value"].index(@type)),
+      'comparator'=>(@comparator if [":count", ":value"].index(@type)),
+      'arg1'=>@arg1,
+      'arg2'=>@arg2
+      }.each do |name, item|
         if ['arg1','arg2'].index(name)
           text += "\"#{item}\" " unless item.nil?
         else
@@ -63,22 +74,39 @@ module Sieve
         return
       end
 
-      res = @text.scan(/(([\s\w:]+)\"(\S+)\"\s\"([\sa-zA-Z0-9,\.\-\@ÁÀÃÂÇÉÈÊÍÌÓÒÔÕÚÙÜÑáàãâçéèêíìóòôõúùüñ]*)\"|true)/)
+      #res = @text.scan(/(([\s\w:]+)\"(\S+)\"\s\"([\sa-zA-Z0-9,\.\-\@ÁÀÃÂÇÉÈÊÍÌÓÒÔÕÚÙÜÑáàãâçéèêíìóòôõúùüñ]*)\"|true)/)
+      params = @text.split_where(value:" ",outside:'"')
 
-      params = res[0][1].strip.split(" ")
-      params += [res[0][2]] + [res[0][3]]
-      
+      # header :contains "Subject" "lala"
+      # not header :contains "Subject" "popo"
+      # not exists "Subject"
+      # exists "Subject"
+      # header :count "ge" :comparator "i;ascii-numeric" "Subject" "1"
+      # header :count "gt" :comparator "i;ascii-numeric" "Subject" "3"
+      # header :count "lt" :comparator "i;ascii-numeric" "Subject" "5"
+      # header :count "eq" :comparator "i;ascii-numeric" "Subject" "7"
+      # header :value "gt" :comparator "i;ascii-numeric" "Subject" "9"
+      # header :value "eq" :comparator "i;ascii-numeric" "Subject" "11"
+      x = -1
       if params[0] == "not"
-        @not = params[0]
-        @test = params[1]
-        @type = params[2]
-        @arg1 = params[3]
-        @arg2 = params[4]
-      else
-        @test = params[0]
-        @type = params[1]
-        @arg1 = params[2]
-        @arg2 = params[3]
+        @not = params[x+=1]
+      end
+
+      if @text =~ /contains/
+        @test = params[x+=1]
+        @type = params[x+=1]
+        @arg1 = params[x+=1].delete('"')
+        @arg2 = params[x+=1].delete('"')
+      elsif @text =~ /exists/
+        @test = params[x+=1]
+        @arg1 = params[x+=1].delete('"')
+      elsif @text =~ /count/ && @text =~ /comparator/
+        @test = params[x+=1]
+        @type = params[x+=1]
+        @type_value = params[x+=1]
+        @comparator = params[x+=2]
+        @arg1 = params[x+=1].delete('"')
+        @arg2 = params[x+=1].delete('"')
       end
     end
   end

data/lib/sieve-parser/filter.rb

@@ -1,9 +1,11 @@
 # -*- coding: UTF-8 -*-
 # This class implements a parse of sieve filter and returns a object
 # to manipulate
+# 
 # @author Thiago Coutinho<thiago @ osfeio.com>(selialkile)
 # @note This code folow de "THE BEER-WARE LICENSE"
 module Sieve
+  #TODO:For future, Filter will be has a childrem, and make more complex filter
   class Filter
 
     #@note [join] can be: any, allof or anyof

data/sieve-parser.gemspec

@@ -2,12 +2,13 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name = 'sieve-parser'
-  s.version = '0.0.5'
+  s.version = '0.0.6'
   s.summary = 'A Ruby library for sieve parser'
   s.description = <<-EOF
     sieve-parser is a pure-ruby implementation for parsing and 
     manipulate the sieve scripts.
   EOF
+  s.add_dependency 'split-where'
   s.requirements << 'A sieve script to parse and gem ruby-managesieve to connect on server.'
   s.files = [
             'lib/sieve-parser',
@@ -21,8 +22,8 @@ spec = Gem::Specification.new do |s|
             ]
 
   s.has_rdoc = true
-  s.author = 'Thiago Coutinho'
-  s.email = 'thiago.coutinho@locaweb.com.br'
+  s.author = 'Thiago Coutinho (www.locaweb.com.br)'
+  s.email = 'thiago@osfeio.com'
   s.rubyforge_project = 'sieve-parser'
   s.homepage = "http://github.com/selialkile/sieve-parser"
 end

metadata

@@ -1,19 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: sieve-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
-- Thiago Coutinho
+- Thiago Coutinho (www.locaweb.com.br)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000Z
-dependencies: []
+date: 2012-10-19 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: split-where
+  requirement: &2160457600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2160457600
 description: ! "    sieve-parser is a pure-ruby implementation for parsing and \n
   \   manipulate the sieve scripts.\n"
-email: thiago.coutinho@locaweb.com.br
+email: thiago@osfeio.com
 executables: []
 extensions: []
 extra_rdoc_files: []