gmail-britta 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/gmail-britta.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gmail-britta"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Fuchs"]

data/lib/gmail-britta/filter.rb

@@ -104,7 +104,7 @@ ATOM
     end
 
     def otherwise(&block)
-      filter = Filter.new(@britta).perform(&block)
+      filter = Filter.new(@britta, :log => @log).perform(&block)
       filter.merge_negated_criteria(self)
       filter.log_definition
       filter
@@ -118,7 +118,7 @@ ATOM
     end
 
     def also(&block)
-      filter = Filter.new(@britta).perform(&block)
+      filter = Filter.new(@britta, :log => @log).perform(&block)
       filter.merge_positive_criteria(self)
       filter.log_definition
       filter
@@ -127,7 +127,7 @@ ATOM
     def archive_unless_directed(options={})
       mark_as_read=options[:mark_read]
       tos=(options[:to] || me).to_a
-      filter = Filter.new(@britta).perform do
+      filter = Filter.new(@britta, :log => @log).perform do
         has_not [{:or => tos.map {|to| "to:#{to}"}}]
         archive
         if mark_as_read

data/test/test_gmail-britta.rb

@@ -9,9 +9,9 @@ describe GmailBritta do
   def simple_filterset
     fs = GmailBritta.filterset() do
       filter {
-        has 'to:asf@boinkor.net'
+        has %w{to:asf@boinkor.net}
         label 'ohai'
-      }
+      }.archive_unless_directed
     end
   end
 
@@ -37,9 +37,12 @@ describe GmailBritta do
   it "generates xml" do
     filters = dom(simple_filterset)
 
-    assert_equal(1, filters.xpath('/a:feed/a:entry',ns).length, "Should have exactly one filter entry")
-    assert_equal(2, filters.xpath('/a:feed/a:entry/apps:property',ns).length, "Should have two properties")
+    assert_equal(2, filters.xpath('/a:feed/a:entry',ns).length, "Should have exactly one filter entry")
+    assert_equal(5, filters.xpath('/a:feed/a:entry/apps:property',ns).length, "Should have two properties")
     assert_equal(1, filters.xpath('/a:feed/a:entry/apps:property[@name="label"]',ns).length, "Should have exactly one 'label' property")
-    assert_equal(1, filters.xpath('/a:feed/a:entry/apps:property[@name="hasTheWord"]',ns).length, "Should have exactly one 'has' property")
+    assert_equal(1, filters.xpath('/a:feed/a:entry/apps:property[@name="shouldArchive"]',ns).length, "Should have exactly one 'shouldArchive' property")
+    assert_equal(2, filters.xpath('/a:feed/a:entry/apps:property[@name="hasTheWord"]',ns).length, "Should have exactly one 'has' property")
   end
+
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmail-britta
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Andreas Fuchs