aweber 1.4.2 → 1.4.3

data/aweber.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name         = "aweber"
-  s.version      = "1.4.2"
+  s.version      = "1.4.3"
   s.platform     = Gem::Platform::RUBY
   s.summary      = "Ruby interface to AWeber's API"
   s.description  = "Ruby interface to AWeber's API"

data/lib/aweber.rb

@@ -1,6 +1,6 @@
 require "forwardable"
 require "oauth"
-require "json/pure"
+require "json"
 
 module AWeber
   API_VERSION  = "1.0".freeze
@@ -59,6 +59,8 @@ module AWeber
   class OAuthError < Exception; end
   class NotFoundError < Exception; end
   class UnknownRequestError < Exception; end
+  class RateLimitError < Exception; end
+  class ForbiddenRequestError < Exception; end
 end
 
 $LOAD_PATH << File.dirname(__FILE__) unless $LOAD_PATH.include?(File.dirname(__FILE__))

data/lib/aweber/base.rb

@@ -42,6 +42,12 @@ module AWeber
         raise NotFoundError, "Invalid resource uri.", caller
       elsif response && response.body == "NotAuthorizedError"
         raise OAuthError, "Could not authorize OAuth credentials.", caller
+      elsif response.is_a? Net::HTTPForbidden
+          if JSON.parse(response.body)['error']['message'].start_with?("Rate limit")
+              raise RateLimitError, "Too many API requests per minute.", caller
+          elsif JSON.parse(response.body)['error']['message'].start_with?("Method requires access")
+              raise ForbiddenRequestError, "Method requires extended permissions.", caller
+          end
       end
     end
 
@@ -70,4 +76,4 @@ module AWeber
       @oauth
     end
   end
-end
+end

data/lib/aweber/collection.rb

@@ -60,7 +60,14 @@ module AWeber
     end
     
     def create(attrs={})
-      params   = attrs.merge("ws.op" => "create")
+      params = attrs.merge("ws.op" => "create")
+
+      if params.has_key?('custom_fields')
+        if params['custom_fields'].is_a?(Hash)
+            params['custom_fields'] = params['custom_fields'].to_json
+        end
+      end
+
       response = client.post(path, params)
 
       return false unless response.is_a? Net::HTTPCreated

data/spec/collection_spec.rb

@@ -5,7 +5,9 @@ describe AWeber::Collection do
     @oauth  = AWeber::OAuth.new("token", "secret")
     @aweber = AWeber::Base.new(@oauth)
     data    = JSON.parse(fixture("lists.json")).merge(:parent => @aweber.account)
+    sub_data = JSON.parse(fixture("subscriber.json")).merge(:parent => @aweber.account)
     @lists  = AWeber::Collection.new(@aweber, AWeber::Resources::List, data)
+    @subscribers = AWeber::Collection.new(@aweber, AWeber::Resources::Subscriber, data)
   end
   
   it "should create classes from the one passed into initialize" do
@@ -97,6 +99,13 @@ describe AWeber::Collection do
     it "should have the collection as a parent" do
       @lists.create(:name => "foo").parent.should == @lists
     end
+
+    it "should set operation to create when creating subscriber" do
+      expected = { "ws.op" => "create", :name => "foo", :custom_fields => {"Signature" => '1234'} }
+      @aweber.should_receive(:post).with(@subscribers.path, expected)
+      @subscribers.create(:name => "foo", :custom_fields => {"Signature" => '1234'})
+    end
+
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - AWeber Communications, Inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-16 00:00:00 -04:00
+date: 2012-08-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency