wuparty 1.1.2 → 1.2.0

data/README.rdoc

@@ -96,7 +96,7 @@ Make the name field required. Then run:
     WUFOO_ACCOUNT=accountname \
     WUFOO_API_KEY=AAAA-BBBB-CCCC-DDDD \
     WUFOO_FORM_ID=test-form \
-    ruby -rrubygems test/wuparty_test.rb
+    rake test
 
 == License
 

data/lib/wuparty.rb

@@ -270,25 +270,40 @@ class WuParty
 
     # Return entries already submitted to the form.
     #
-    # If you need to filter entries, pass an array as the first argument:
-    #   entries([[field_id, operator, value], ...])
-    # e.g.:
-    #   entries([['EntryId', 'Is_after', 12], ['EntryId', 'Is_before', 17]])
-    #   entries([['Field1', 'Is_equal', 'Tim']])
-    # The second arg is the match parameter (AND/OR) and defaults to 'AND', e.g.
-    #   entries([['Field2', 'Is_equal', 'Morgan'], ['Field2', 'Is_equal', 'Smith']], 'OR')
+    # Supports:
+    #   - filtering:
+    #   entries(:filters => [['Field1', 'Is_equal_to', 'Tim']])
+    #   entries(:filters => [['Field1', 'Is_equal_to', 'Tim'], ['Field2', 'Is_equal_to', 'Morgan']], :filter_match => 'OR')
+    #
+    #   - sorting:
+    #   entries(:sort => 'EntryId DESC')
+    #
+    #   - limiting:
+    #   entries(:limit => 5)
+    #
     # See http://wufoo.com/docs/api/v3/entries/get/#filter for details
-    def entries(filters=[], filter_match='AND')
-      if filters.any?
-        options = {'match' => filter_match}
-        filters.each_with_index do |filter, index|
-          options["Filter#{index+1}"] = filter.join(' ')
+    def entries(options={})
+      query = {}
+
+      if options[:filters]
+        query['match'] = options[:filter_match] || 'AND'
+        options[:filters].each_with_index do |filter, index|
+          query["Filter#{ index + 1 }"] = filter.join(' ')
         end
-        options = {:query => options}
-      else
-        options = {}
       end
-      @party.get("forms/#{@id}/entries", options)['Entries']
+
+      if options[:limit]
+        query[:pageSize] = options[:limit]
+        query[:pageStart] = 0
+      end
+
+      if options[:sort]
+        field, direction = options[:sort].split(' ')
+        query[:sort] = field
+        query[:sortDirection] = direction || 'ASC'
+      end
+
+      @party.get("forms/#{@id}/entries", :query => query)['Entries']
     end
 
     # Submit form data to the form.

data/test/wuparty_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/wuparty'
+require './lib/wuparty'
 require 'test/unit'
 
 class WuPartyTest < Test::Unit::TestCase
@@ -55,8 +55,8 @@ class WuPartyTest < Test::Unit::TestCase
   def test_form_fields
     form = @wufoo.form(@form_id)
     field_names = form.fields.map { |f| f['Title'] }
-    assert field_names.include?('Name')
-    assert field_names.include?('Address')
+    assert field_names.include?('Name'), 'Name field not found in #fields'
+    assert field_names.include?('Address'), 'Address field not found in #fields'
   end
 
   def test_form_submit
@@ -86,17 +86,17 @@ class WuPartyTest < Test::Unit::TestCase
   def test_entries
     form = @wufoo.form(@form_id)
     form.submit('Field1' => 'Tim', 'Field2' => 'Morgan')
-    assert form.entries.last['Field1'].any?
+    assert_equal 'Tim', form.entries.last['Field1']
   end
 
   def test_filtering_entries
     form = @wufoo.form(@form_id)
     form.submit('Field1' => 'Tim', 'Field2' => 'Morgan')
     id = form.submit('Field1' => 'Jane', 'Field2' => 'Smith')['EntryId']
-    assert form.entries([['Field2', 'Is_equal_to', 'Morgan']]).any?
-    assert_equal 1, form.entries([['EntryId', 'Is_equal_to', id]]).length
+    assert form.entries(:filters => [['Field2', 'Is_equal_to', 'Morgan']]).any?
+    assert_equal 1, form.entries(:filters => [['EntryId', 'Is_equal_to', id]]).length
   end
-  
+
   def test_add_webhook
     # test with optional parameters
     response = @wufoo.add_webhook(@form_id, "http://#{ENV['WUFOO_ACCOUNT']}.com/#{@form_id}", true, "handshakeKey01")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wuparty
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &5541100 !ruby/object:Gem::Requirement
+  requirement: &8964580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *5541100
+  version_requirements: *8964580
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &5540580 !ruby/object:Gem::Requirement
+  requirement: &9022120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *5540580
+  version_requirements: *9022120
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &5539960 !ruby/object:Gem::Requirement
+  requirement: &9021640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *5539960
+  version_requirements: *9021640
 description: 
 email: tim@timmorgan.org
 executables: []