dreamy 0.5.2 → 0.5.3

data/VERSION.yml

@@ -1,4 +1,5 @@
----
+--- 
 :minor: 5
-:patch: 2
+:patch: 3
 :major: 0
+:build: 

data/dreamy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dreamy}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jerod Santo"]
-  s.date = %q{2009-12-29}
+  s.date = %q{2010-01-12}
   s.default_executable = %q{dh}
   s.email = %q{jerod.santo@gmail.com}
   s.executables = ["dh"]
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/dreamy/dns.rb",
      "lib/dreamy/domain.rb",
      "lib/dreamy/easy_class_maker.rb",
+     "lib/dreamy/mail_filter.rb",
      "lib/dreamy/mysql/db.rb",
      "lib/dreamy/mysql/host.rb",
      "lib/dreamy/mysql/user.rb",
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
      "test/base_test.rb",
      "test/dns_test.rb",
      "test/domain_test.rb",
+     "test/mail_filter_test.rb",
      "test/mysql_db_test.rb",
      "test/mysql_host_test.rb",
      "test/mysql_user_test.rb",
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
      "test/base_test.rb",
      "test/dns_test.rb",
      "test/domain_test.rb",
+     "test/mail_filter_test.rb",
      "test/mysql_db_test.rb",
      "test/mysql_host_test.rb",
      "test/mysql_user_test.rb",

data/lib/dreamy.rb

@@ -16,6 +16,7 @@ require 'dreamy/announce_list'
 require 'dreamy/private_server'
 require 'dreamy/subscriber'
 require 'dreamy/user'
+require 'dreamy/mail_filter'
 require 'dreamy/mysql/db'
 require 'dreamy/mysql/host'
 require 'dreamy/mysql/user'

data/lib/dreamy/base.rb

@@ -90,7 +90,45 @@ module Dreamy
       api_error?(doc)
       true
     end
-    
+   
+		def mail_list_filters
+      doc = request("mail-list_filters")
+      api_error?(doc)
+      (doc/:data).inject([]) { |filters, filter| filters << MailFilter.new_from_xml(filter); filters }
+		end
+
+		def mail_add_filter(address,filter_on,filter,action,action_value,contains="",stop="",rank="")
+      doc = request("mail-add_filter",
+				{
+					"address"       => address,
+					"filter_on"     => filter_on,
+					"filter"        => filter,
+					"action"        => action,
+					"action_value"  => action_value,
+					"contains"      => contains,
+					"stop"          => stop,
+					"rank"          => rank
+				})
+      api_error?(doc)
+			true
+		end
+
+    def mail_remove_filter(address,filter_on,filter,action,action_value,contains,stop,rank)
+      doc = request("mail-remove_filter",
+        {
+					"address"       => address,
+					"filter_on"     => filter_on,
+					"filter"        => filter,
+					"action"        => action,
+					"action_value"  => action_value,
+					"contains"      => contains,
+					"stop"          => stop,
+					"rank"          => rank
+        })
+      api_error?(doc)
+			true
+		end
+ 
     def mysql_dbs
       doc = request("mysql-list_dbs")
       api_error?(doc)
@@ -231,4 +269,4 @@ module Dreamy
     end
 
   end
-end
+end

data/lib/dreamy/mail_filter.rb

@@ -0,0 +1,21 @@
+module Dreamy
+  class MailFilter
+    include EasyClassMaker
+
+    attributes	:account_id, :address, :rank, :filter, :filter_on, :action_value, :action, :contains, :stop
+
+    def self.new_from_xml(xml)
+      f = new
+      f.account_id        = (xml).at('account_id').innerHTML.to_i
+      f.address           = (xml).at('address').innerHTML
+      f.rank              = (xml).at('rank').innerHTML.to_i
+      f.filter            = (xml).at('filter').innerHTML
+      f.filter_on         = (xml).at('filter_on').innerHTML
+      f.action            = (xml).at('action').innerHTML
+      f.action_value      = (xml).at('action_value').innerHTML
+      f.contains          = (xml).at('contains').innerHTML
+      f.stop              = (xml).at('stop').innerHTML
+      f
+    end
+  end
+end

data/test/base_test.rb

@@ -136,6 +136,44 @@ class DreamyBaseTest < Test::Unit::TestCase
     
   end # announcement lists
   
+  
+  context "Mail filters" do
+
+    should "return an array of mail filters" do
+      filters = @@base.mail_list_filters
+      assert_kind_of Array, filters
+      assert_kind_of Dreamy::MailFilter, filters.first unless filters.empty?
+    end
+
+    context "add mail filter" do
+      setup { @list_count = @@base.mail_list_filters.size }
+
+      should "requires 5 arguments " do
+        assert_raise(ArgumentError) { @@base.mail_add_filter('example@mydomain.com', 'from', 'sender@mydomain.com', 'add_subject') }
+      end
+
+      should "add filter and return true with valid data" do
+        assert @@base.mail_add_filter('seankibler@skiblerspot.net', 'from', 'sender@mydomain.com', 'forward', 'example2@mydomain.com','', '', '')
+        assert_equal @list_count + 1, @@base.mail_list_filters.size
+      end
+    end
+
+    context "remove mail filter" do
+      setup { @list_count = @@base.mail_list_filters.size }
+      
+      should "requires 8 arguments" do
+        assert_raise(ArgumentError) { @@base.mail_remove_filter('example@mydomain.com', 'from', 'sender@mydomain.com', 'forward') }
+      end
+
+      should "remove filter and return true with valid data" do
+        @list_count = @@base.mail_list_filters.size
+        assert @@base.mail_remove_filter('seankibler@skiblerspot.net', 'from', 'sender@mydomain.com', 'forward', 'example2@mydomain.com', '', '', '')
+        assert_equal @list_count - 1, @@base.mail_list_filters.size
+      end
+    end
+    
+  end # mail filters
+
   context "MySQL" do
     
     should "return array of MysqlDb records" do
@@ -147,7 +185,7 @@ class DreamyBaseTest < Test::Unit::TestCase
     should "return array of MysqlHost records" do
       hosts = @@base.mysql_hosts
       assert_kind_of Array, hosts
-      assert_kind_of Dreamy::MysqlDb, hosts.first unless hosts.empty?
+      assert_kind_of Dreamy::MysqlHost, hosts.first unless hosts.empty?
     end
     
     should "return array of MysqlUser records" do

data/test/mail_filter_test.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + "/test_helper.rb"
+
+class DreamyMailFilterTest < Test::Unit::TestCase
+
+  context "Creation" do
+    setup do
+      @xml = <<EOF
+<data>
+    <account_id>8675309</account_id>
+    <address>test@anessalee.net</address>
+    <filter_on>from</filter_on>
+    <filter>sender@mydomain.com</filter>
+    <action>forward</action>
+    <action_value>test2@anessalee.net</action_value>
+    <contains></contains>
+    <stop></stop>
+    <rank>0</rank>
+</data>
+EOF
+    end
+
+    should "create a new user from xml" do
+      s = Dreamy::MailFilter.new_from_xml(Hpricot.XML(@xml))
+      assert_equal 8675309, s.account_id
+      assert_equal "test@anessalee.net", s.address
+      assert_equal "from", s.filter_on
+      assert_equal "sender@mydomain.com", s.filter
+      assert_equal "forward", s.action
+      assert_equal "test2@anessalee.net", s.action_value
+      assert_equal "", s.contains
+      assert_equal "", s.stop
+      assert_equal 0, s.rank
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dreamy
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Jerod Santo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -06:00
+date: 2010-01-12 00:00:00 -06:00
 default_executable: dh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - lib/dreamy/dns.rb
 - lib/dreamy/domain.rb
 - lib/dreamy/easy_class_maker.rb
+- lib/dreamy/mail_filter.rb
 - lib/dreamy/mysql/db.rb
 - lib/dreamy/mysql/host.rb
 - lib/dreamy/mysql/user.rb
@@ -83,6 +84,7 @@ files:
 - test/base_test.rb
 - test/dns_test.rb
 - test/domain_test.rb
+- test/mail_filter_test.rb
 - test/mysql_db_test.rb
 - test/mysql_host_test.rb
 - test/mysql_user_test.rb
@@ -123,6 +125,7 @@ test_files:
 - test/base_test.rb
 - test/dns_test.rb
 - test/domain_test.rb
+- test/mail_filter_test.rb
 - test/mysql_db_test.rb
 - test/mysql_host_test.rb
 - test/mysql_user_test.rb