amaze_sns 2.0.0 → 2.1.0

data/lib/amaze_sns.rb

@@ -70,8 +70,8 @@ class AmazeSNS
       yield data
     end
     
-    request.errback do |resp|
-      puts "ERROR - #{resp.inspect}"
+    request.errback do |err|
+      #yield err
       EM.stop
     end
     

data/spec/amaze_sns_spec.rb

@@ -1,13 +1,11 @@
-#require File.dirname(__FILE__) + '/spec_helper.rb'
-require File.expand_path('../spec_helper', __FILE__)
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
-require 'em-http'
 
 describe AmazeSNS do
+  
   before :each do
-    EventMachine::MockHttpRequest.reset_registry!
-    EventMachine::MockHttpRequest.reset_counts!
-    EventMachine::MockHttpRequest.pass_through_requests = false
+    WebMock.reset!
+    WebMock.disable_net_connect!
   end
   
   
@@ -54,7 +52,7 @@ describe AmazeSNS do
       AmazeSNS.skey = '123456'
       @topic = AmazeSNS['Test']
     end
-    
+
     it 'should return a new topic object' do
       @topic.should be_kind_of(Topic)
       @topic.topic.should == 'Test'
@@ -63,115 +61,117 @@ describe AmazeSNS do
   
   describe 'making the api calls' do
     before :each do
-      @url = 'http://sns.us-east-1.amazonaws.com:80/?Action=ListTopics&Signature=ItTAjeexIPC43pHMZLCL7utnpK8j8AbTUZ3KGUSMzNc%3D&AWSAccessKeyId=123456&Timestamp=123&SignatureVersion=2&SignatureMethod=HmacSHA256'
-      EventMachine::MockHttpRequest.reset_registry!
-      EventMachine::MockHttpRequest.reset_counts!
-      EventMachine::MockHttpRequest.pass_through_requests = false #set to false to not hit the actual API endpoint
-      
-      @time_stub = stub("A")
+      AmazeSNS.akey = '123456'
+      AmazeSNS.skey = '123456'
     end
     
-    it 'should be able to access the API endpoint' do
-      @time_stub.should_receive(:iso8601).and_return(123)
-      Time.stub(:now).and_return(@time_stub)
-      
-      EventMachine::MockHttpRequest.use {
-        data = <<-RESPONSE.gsub(/^ +/, '')
-          HTTP/1.0 200 OK
-          Date: Mon, 16 Nov 2009 20:39:15 GMT
-          Expires: -1
-          Cache-Control: private, max-age=0
-          Content-Type: text/html; charset=ISO-8859-1
-          Via: 1.0 .:80 (squid)
-          Connection: close
-
-          This is my awesome content
-        RESPONSE
-        
-        EventMachine::MockHttpRequest.register(@url,:get,{},data)
-        
-        EM.run{
-          d = AmazeSNS.list_topics
-          d.callback{
-            EM::HttpRequest.count(@url, :get).should == 1
-            EM.stop
-          }
-          d.errback{|error|
-            EM.stop
-          }
-        }
+    it 'should be able to list topics' do
+      @data = <<-RESPONSE.gsub(/^ +/, '')
+        <ListTopicsResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+          <ListTopicsResult>
+            <Topics>
+              <member>
+                <TopicArn>arn:aws:sns:us-east-1:123456789012:My-Topic</TopicArn>
+              </member>
+             </Topics> 
+          </ListTopicsResult> 
+          <ResponseMetadata>
+            <RequestId>3f1478c7-33a9-11df-9540-99d0768312d3</RequestId>
+          </ResponseMetadata>
+        </ListTopicsResponse>
+      RESPONSE
 
-      } #end EM:MockHttpRequest block
-    end
-    
-    it 'should return a deferrable on fail' do
-      @time_stub.should_receive(:iso8601).and_return(123)
-      Time.stub(:now).and_return(@time_stub)
+      @regexp = %r{/?Action=ListTopics}
       
-      EventMachine::MockHttpRequest.use {
-        data = <<-RESPONSE.gsub(/^ +/, '')
-          HTTP/1.0 403 Unauthorized
-          Date: Mon, 16 Nov 2009 20:39:15 GMT
-          Expires: -1
-          Cache-Control: private, max-age=0
-          Content-Type: text/html; charset=ISO-8859-1
-          Via: 1.0 .:80 (squid)
-          Connection: close
-
-          403 UNAUTHORIZED: Some error
-        RESPONSE
-
-        EventMachine::MockHttpRequest.register(@url,:get,{},data)
-        
-        EM.run{
-           d= AmazeSNS.list_topics
-           d.callback{
-             fail
-           }
-           d.errback{|error|
-             EM::HttpRequest.count(@url, :get).should == 1
-             error.should be_kind_of(AuthorizationError)
-             EM.stop
-           }
-          
-        } 
-        
-      } #end EM:MockHttpRequest block
+      stub_http_request(:get, @regexp).to_return(:body => @data,
+                                                 :status => 200,
+                                                 :headers => {
+                                                   'Content-Type' => 'text/xml', 
+                                                   'Connection' => 'close'
+                                                  })
+      
+       AmazeSNS.should respond_to(:method_missing)
+       AmazeSNS.should respond_to(:process_query).with(1).argument
+       
+       EM.run_block{
+         AmazeSNS.list_topics do |x|
+           AmazeSNS.process_data(x)
+         end
+       }
+       
+       AmazeSNS.topics.has_key?('My-Topic').should == true
+       AmazeSNS['My-Topic'].should be_instance_of Topic
+       AmazeSNS['My-Topic'].topic.should == 'My-Topic'
+       AmazeSNS['My-Topic'].arn.should == 'arn:aws:sns:us-east-1:123456789012:My-Topic'
+       WebMock.should have_requested(:get, %r{http://sns.us-east-1.amazonaws.com:80})
     end
     
-    it 'should call method_missing and process_query' do
-      @time_stub.should_receive(:iso8601).and_return(123)
-      Time.stub(:now).and_return(@time_stub)
+    it 'should be able to list subscriptions' do
+      @data = <<-RESPONSE.gsub(/^ +/, '')
+        <ListSubscriptionsResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/"> 
+          <ListSubscriptionsResult>
+            <Subscriptions> 
+              <member>
+                <TopicArn>arn:aws:sns:us-east-1:698519295917:My-Topic</TopicArn> 
+                <Protocol>email</Protocol>
+                <SubscriptionArn>arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6- 0fd4-4079-afb4-ce8c8260f0ca</SubscriptionArn>
+                <Owner>123456789012</Owner>
+                <Endpoint>example@amazon.com</Endpoint>
+              </member>
+             </Subscriptions> 
+           </ListSubscriptionsResult> 
+          <ResponseMetadata>
+            <RequestId>384ac68d-3775-11df-8963-01868b7c937a</RequestId> 
+          </ResponseMetadata>
+        </ListSubscriptionsResponse>
+      RESPONSE
+
+      @regexp = %r{/?Action=ListSubscriptions}
+      
+      stub_http_request(:get, @regexp).to_return(:body => @data,
+                                                 :status => 200,
+                                                 :headers => {
+                                                   'Content-Type' => 'text/xml', 
+                                                   'Connection' => 'close'
+                                                  })
       
-      #rspec expectations matchers
       AmazeSNS.should respond_to(:method_missing)
       AmazeSNS.should respond_to(:process_query).with(1).argument
       
-      data = <<-RESPONSE.gsub(/^ +/, '')
-        HTTP/1.0 200 OK
-        Date: Mon, 16 Nov 2009 20:39:15 GMT
-        Expires: -1
-        Cache-Control: private, max-age=0
-        Content-Type: text/html; charset=ISO-8859-1
-        Via: 1.0 .:80 (squid)
-        Connection: close
-
-        This is my awesome content
-      RESPONSE
-      
-      EventMachine::MockHttpRequest.use{
-        EventMachine::MockHttpRequest.register(@url,:get,{},data)
-          
-          EM.run{
-            AmazeSNS.list_topics
-            EM.stop
-          }
-
-      } #end EM:MockHttpRequest block
+       EM.run_block{
+         AmazeSNS.list_subscriptions do |x|
+           AmazeSNS.process_data(x)
+           @subs = AmazeSNS.subscriptions
+         end
+       }
+       
+       @subs['My-Topic'].should be_instance_of Subscription
+       @subs['My-Topic'].owner.should == '123456789012'
+       @subs['My-Topic'].protocol.should == 'email'
+       @subs['My-Topic'].topicarn.should == 'arn:aws:sns:us-east-1:698519295917:My-Topic'
+       @subs['My-Topic'].endpoint.should == 'example@amazon.com'
+       @subs['My-Topic'].subarn.should == 'arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6- 0fd4-4079-afb4-ce8c8260f0ca'
+       WebMock.should have_requested(:get, %r{http://sns.us-east-1.amazonaws.com:80})
     end
     
+    it 'should respond with an error' do
+      @regexp = %r{/?Action=ListSubscriptions}
+      stub_http_request(:get, @regexp).to_return(:status => [500, "Internal Server Error"])
+      error_raised = nil
+      begin
+        EM.run{
+          AmazeSNS.list_subscriptions {|x| }
+        }
+      rescue => e
+        error_raised = e
+      end
+      
+      e.class.should == InternalError
+      e.message.should == 'An internal service error has occured on the Simple Notification Service'
+    end
     
-  end
+  end# end api tests
+  
   
   after do
     AmazeSNS.topics={}

data/spec/request_spec.rb

@@ -0,0 +1,69 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Request do
+  before :each do
+    AmazeSNS.akey = '123456'
+    AmazeSNS.skey = '123456'
+    
+    params={
+      'Action' => "ListTopics",
+      'SignatureMethod' => 'HmacSHA256',
+      'SignatureVersion' => 2,
+      'Timestamp' => Time.now.iso8601, #Time.now.iso8601 makes tests fail
+      'AWSAccessKeyId' => AmazeSNS.akey
+    }
+    
+    @data = <<-RESPONSE.gsub(/^ +/, '')
+      <ListTopicsResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/">
+        <ListTopicsResult>
+          <Topics>
+            <member>
+              <TopicArn>arn:aws:sns:us-east-1:123456789012:My-Topic</TopicArn>
+            </member>
+           </Topics> 
+        </ListTopicsResult> 
+        <ResponseMetadata>
+          <RequestId>3f1478c7-33a9-11df-9540-99d0768312d3</RequestId>
+        </ResponseMetadata>
+      </ListTopicsResponse>
+    RESPONSE
+    
+    @request = Request.new(params)
+  end
+  
+  it 'should make a request successfully' do
+    @regexp = %r{/?Action=ListTopics}
+    stub_http_request(:get, @regexp).to_return(:body => @data,
+                                               :status => 200,
+                                               :headers => {
+                                                 'Content-Type' => 'text/xml', 
+                                                 'Connection' => 'close'
+                                                })
+                                                
+    EM.run_block{ 
+      @request.process
+      @request.callback{|data|
+        data.response.should == @data
+      }
+    }
+    WebMock.should have_requested(:get, %r{http://sns.us-east-1.amazonaws.com:80})
+  end
+  
+  it 'should throw an error if the request is not successful' do
+    error_raised = nil
+    @regexp = %r{/?Action=ListTopics}
+    stub_http_request(:get, @regexp).to_return(:status => [500, "Internal Server Error"])
+    
+    begin
+      EM.run_block{
+        @request.process
+      }
+    rescue => e
+      error_raised = e
+    end
+    
+    e.class.should == InternalError
+    e.message.should == 'An internal service error has occured on the Simple Notification Service'
+  end
+  
+end

data/spec/spec_helper.rb

@@ -2,28 +2,16 @@ require 'rubygems'
 
 require 'rspec'
 require 'rspec/autorun'
-require 'em-http'
-require 'webmock'
+require 'em-http-request'
 require 'webmock/rspec'
-require 'vcr'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'amaze_sns'
 require 'eventmachine'
-#require 'support/vcr'
 
-VCR.config do |c|
-    c.cassette_library_dir     = 'fixtures/cassette_library'
-    c.stub_with :webmock
-    c.ignore_localhost         = true
-    c.default_cassette_options = { :record => :none }
-end
 
 RSpec.configure do |config|
-  config.include WebMock::API
-  config.extend VCR::RSpec::Macros
-
 end
 

data/spec/subscription_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Subscription do
+  before :each do
+    hsh = {
+      "Owner" => '123456789012',
+      "Protocol" => 'email',
+      "TopicArn" => 'arn:aws:sns:us-east-1:698519295917:My-Topic',
+      "Endpoint" => 'example@amazon.com',
+      "SubscriptionArn" => 'arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6- 0fd4-4079-afb4-ce8c8260f0ca'
+    }
+    @subscription = Subscription.new(hsh)  
+  end
+  
+  it 'should be an instance of subscription' do
+    @subscription.should be_instance_of Subscription
+  end
+  
+  it 'should have attributes that are accessible' do
+    @subscription.owner.should == '123456789012'
+    @subscription.protocol.should == 'email'
+    @subscription.topicarn.should == 'arn:aws:sns:us-east-1:698519295917:My-Topic'
+    @subscription.endpoint.should == 'example@amazon.com'
+    @subscription.subarn.should == 'arn:aws:sns:us-east-1:123456789012:My-Topic:80289ba6- 0fd4-4079-afb4-ce8c8260f0ca'
+  end
+      
+end

data/spec/topic_spec.rb

@@ -77,68 +77,7 @@ describe Topic do
       @arn.should == "arn:aws:sns:us-east-1:365155214602:MyTopic"
       WebMock.should have_requested(:get, %r{http://sns.us-east-1.amazonaws.com:80})
     end
-
-    it 'should return a deferrable' do
-      t = Topic.new('MyTopic')
-
-      @time_stub.should_receive(:iso8601).and_return(123)
-      Time.stub(:now).and_return(@time_stub)
-
-      stub_http_request(:get, @regexp).to_return(:body => @data, :status => 200)
-
-      params = {
-        'Name' => "MyTopic",
-        'Action' => 'CreateTopic',
-        'SignatureMethod' => 'HmacSHA256',
-        'SignatureVersion' => 2,
-        'Timestamp' => Time.now.iso8601,
-        'AWSAccessKeyId' => AmazeSNS.akey
-       }
-
-      EM.run{
-        d = t.generate_request(params)
-        d.callback{
-          WebMock.should have_requested(:get, @regexp)
-          EM.stop
-        }
-        d.errback{
-          fail
-          EM.stop
-        }
-      }
-    end
-
-    it 'should return a deferrable which fails if exception occurs' do
-      t = Topic.new('MyTopic')
-
-      @time_stub.should_receive(:iso8601).and_return(123)
-      Time.stub(:now).and_return(@time_stub)
-      AmazeSNS.akey = ''
-
-      stub_http_request(:get, @regexp).to_return(:body => @data, :status => 403)
-
-      params = {
-        'Name' => "MyTopic",
-        'Action' => 'CreateTopic',
-        'SignatureMethod' => 'HmacSHA256',
-        'SignatureVersion' => 2,
-        'Timestamp' => Time.now.iso8601,
-        'AWSAccessKeyId' => AmazeSNS.akey
-       }
-
-      EM.run{
-        d = t.generate_request(params)
-        d.callback{
-          fail
-        }
-        d.errback{|error|
-          WebMock.should have_requested(:get, @regexp)
-          error.should be_kind_of(AuthorizationError)
-          EM.stop
-        }
-      }
-    end
-      
+  
   end
 
   describe 'operations through the API' do
@@ -151,61 +90,6 @@ describe Topic do
       WebMock.disable_net_connect!
     end
     
-    context 'listing topics' do
-
-      before :each do
-        # store the request and response in webmock's own blocks for comparisons
-        WebMock.after_request do |request, response|
-          @response = response
-          @request = request
-        end
-          
-        @list_data = <<-RESPONSE.gsub(/^ +/, '')
-          <ListTopicsResponse xmlns="http://sns.amazonaws.com/doc/2010-03-31/"> 
-            <ListTopicsResult>
-              <Topics> 
-                <member>
-                  <TopicArn>arn:aws:sns:us-east-1:123456789012:My-Topic</TopicArn> 
-                </member>
-              </Topics> 
-            </ListTopicsResult> 
-            <ResponseMetadata>
-              <RequestId>3f1478c7-33a9-11df-9540-99d0768312d3</RequestId> 
-            </ResponseMetadata>
-        </ListTopicsResponse>
-        RESPONSE
-
-        @regexp = %r{/?Action=ListTopics}
-      end
-      
-      use_vcr_cassette "topic/list", {:record => :new_episodes, :match_requests_on => [:uri,:method,:body]}
-      
-      it 'should be able to get the data through the api' do
-        @time_stub.should_receive(:iso8601).and_return(123)
-        Time.stub(:now).and_return(@time_stub)
-        
-        stub_http_request(:get, @regexp).to_return(:body => @list_data,
-                                                    :status => 200,
-                                                    :headers => {'Content-Type' => 'text/xml', 'Connection' => 'close'})
-        
-        EM.run{
-         AmazeSNS.list_topics
-         EM.stop
-        }
-        
-        WebMock.should have_requested(:get, %r{/?Action=ListTopics}).once
-        WebMock.should have_requested(:get, %r{http://sns.us-east-1.amazonaws.com:80}).once
-
-        @request.to_s.split(" ")[1].should == "http://sns.us-east-1.amazonaws.com/?AWSAccessKeyId=123456&Action=ListTopics&Signature=ItTAjeexIPC43pHMZLCL7utnpK8j8AbTUZ3KGUSMzNc=&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=123"
-        @response.body.should == @list_data
-        @response.headers["Content-Type"].should == "text/xml"
-      end
-
-      it 'should populate the topics hash' do
-        AmazeSNS.topics.has_key?("My-Topic").should be_true
-      end
-      
-    end # end list topic spec
     
     context 'creating a topic' do
       before :each do
@@ -224,7 +108,6 @@ describe Topic do
         @regexp = %r{/?Action=CreateTopic&Name=MyTopic}
       end
       
-      use_vcr_cassette "topic/create", {:record => :new_episodes, :match_requests_on => [:uri,:method,:body]}
       
       it 'should send data to the API' do
         @time_stub.should_receive(:iso8601).and_return(123)
@@ -286,7 +169,6 @@ describe Topic do
         @regexp = %r{/?Action=GetTopicAttributes}
       end
       
-      use_vcr_cassette "topic/attrs", {:record => :new_episodes, :match_requests_on => [:uri,:method,:body]}
       
       it 'should make the API call' do
         @time_stub.should_receive(:iso8601).and_return(123)
@@ -334,7 +216,6 @@ describe Topic do
           @regexp = %r{/?Action=Subscribe}
       end
       
-      use_vcr_cassette "topic/subscribe", {:record => :new_episodes, :match_requests_on => [:uri,:method,:body]}
       
       it 'should recive a pending confirmation on subscription' do
         @time_stub.should_receive(:iso8601).and_return(123)
@@ -364,7 +245,6 @@ describe Topic do
         @regexp = %r{/?Action=SetTopicAttributes}
       end
       
-      use_vcr_cassette "topic/set_attrs", {:record => :new_episodes, :match_requests_on => [:uri,:method,:body]}
       
       it 'should set the topics attrs' do
          @time_stub.should_receive(:iso8601).and_return(123)
@@ -409,7 +289,6 @@ describe Topic do
         @regexp = %r{/?Action=ListSubscriptionsByTopic}
       end
       
-      use_vcr_cassette "topic/subscriptions", {:record => :new_episodes, :match_requests_on => [:uri,:method,:body]}
       
       it 'should list the subscriptions for this topic' do
         @time_stub.should_receive(:iso8601).and_return(123)
@@ -452,7 +331,6 @@ describe Topic do
         @regexp = %r{/?Action=Unsubscribe}
       end
       
-      use_vcr_cassette "topic/unsubscribe", {:record => :new_episodes, :match_requests_on => [:uri,:method,:body]}
       
       it 'should be able to remove the subscriber' do
         @time_stub.should_receive(:iso8601).and_return(123)
@@ -484,7 +362,6 @@ describe Topic do
         @regexp = %r{/?Action=DeleteTopic}
       end
       
-      use_vcr_cassette "topic/delete", {:record => :new_episodes, :match_requests_on => [:uri,:method,:body]}
       
       it 'should send data to the API' do
         @time_stub.should_receive(:iso8601).and_return(123)

metadata

@@ -2,7 +2,7 @@
 name: amaze_sns
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Chee Yeo
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 +01:00
-default_executable: 
+date: 2011-09-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -86,9 +85,9 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.6.0.pre
+        version: 1.7.6
   type: :development
   version_requirements: *id007
 description: Ruby gem to interface with the Amazon Simple Notification Service
@@ -110,17 +109,16 @@ files:
 - spec/amaze_sns_spec.rb
 - spec/em_http_request_spec_helper.rb
 - spec/request_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/subscription_spec.rb
 - spec/topic_spec.rb
-- spec/spec.opts
-has_rdoc: true
 homepage: http://29steps.co.uk
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -138,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Ruby gem for Amazon Simple Notification Service SNS
@@ -146,7 +144,7 @@ test_files:
 - spec/amaze_sns_spec.rb
 - spec/em_http_request_spec_helper.rb
 - spec/request_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/subscription_spec.rb
 - spec/topic_spec.rb
-- spec/spec.opts