streamsend 1.0.0.rc6 → 1.0.0.rc7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGViNzRmM2I3M2NjODk3NTlkZDgzMTc3MTljMTkxMGRhY2YxODZkYg==
+    MWNhNDU5ZTliYzI2ZWE2ZWRmNzNiMGQ5OTE0MWE4ZTE2NWMwMTg5OQ==
   data.tar.gz: !binary |-
-    MDQ3NjJmYzVhNWQ3ZGI5OWFkN2ZjN2Q4YjlmMTAxZmRiM2VmOTBmZg==
+    MjVmMGRmNjEzNDFlNjVmY2E3YWQxN2YxZDQ2NGUyNTQzOGVjMDJjOQ==
 SHA512:
   metadata.gz: !binary |-
-    NjFmZmIzNTE2MmYyMWI0MGYyYzZiMDgxOGFhN2I3YjYyOWYwZjZiOTdjMjA4
-    YWE3ZWUxY2Y0YWNlNTdmM2I0YzdjYzkyYTY5ZTIwMzQ3NjMwMTg3ZmQ0OWUx
-    ZTM4ZmFkODE3MDMzZTQyY2M4ZjE4MDY3NzY3NjcwYzkzNWI1OTc=
+    ZWJjZGEwZWIzYWIxZTQ5ZjI1NzllOGI4ODJiNmIwZmNmNzRiMzc1NjgxYzA5
+    YmY0MTMzM2NiMjRlNTJiNzlhNDQ0NDY4NjBiNzY4MTQ4NjNjZDcwYTc3YzAw
+    ZWZhYzc3MGJkMjU3NzY2YjE0NjAwNDcxYTdhM2YyZDNhZWVhMGQ=
   data.tar.gz: !binary |-
-    ODYyYjNhMzlhMWU5MzlkOWZkY2E0ZDc1NDAyNzQyODlkOTE3MzhlZjZmNmMz
-    ZmYwOTk3YzhkMDAxNDk0ZTM1MzYwNDc1ODNlZmJjYmUzODE0ODFlNGM4ZDY5
-    NmJkYWJhOWU3MTY1OTkzOWIwZjgyOWNhOGNhOTRmMjU0ZDJiZGI=
+    ZTUyOGQwNGM2NDFiYjIxNTI2NzZlZTRmZTE2ZGRjNWYyNTkyMDc2MWU5N2U4
+    ZTMxNGRmNTEwYzUyOTU3YzU2ZWQ5N2VlNzM0NmMxOGQyMDQwM2I0NzhhNmE3
+    MTRkNmY3NjRjNTM1ZGNlMjczN2U4ZTE5ZDAwNWE2OWY1MjQ2OTA=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    streamsend (1.0.0.rc6)
+    streamsend (1.0.0.rc7)
       activesupport (~> 3.2)
       builder
       httmultiparty

data/lib/streamsend/api/base/destroy.rb

@@ -2,9 +2,9 @@ module StreamSend
   module Api
     module Call
       class Destroy < StreamSend::Api::Call::BaseCall
-        def execute(object_id)
+        def execute(object_id, options = {})
           @id = object_id
-          response = session.delete(uri)
+          response = session.delete(uri, options)
           case response.code
           when 200
             true

data/lib/streamsend/api/base/update.rb

@@ -2,9 +2,9 @@ module StreamSend
   module Api
     module Call
       class Update < StreamSend::Api::Call::BaseCall
-        def execute(object_id, object_hash)
+        def execute(object_id, object_hash, options = {})
           @id = object_id
-          response = session.put(uri, :body => object_hash)
+          response = session.put(uri, options.merge(:body => object_hash))
           case response.code
           when 200 then true
           when 401 then raise StreamSend::Api::UnauthorizedException

data/lib/streamsend/api/{trigger.rb → rss_trigger.rb}

@@ -1,10 +1,16 @@
 module StreamSend
   module Api
-    module Trigger
-      class Index < StreamSend::Api::Call::Index
-      end
+    module RssTrigger
+      # No Index action
 
       class Show < StreamSend::Api::Call::Show
+        def base_uri
+          "#{session.base_uri}/rss_triggers"
+        end
+
+        def namespace
+          "trigger"
+        end
       end
 
       class Update < StreamSend::Api::Call::Update

data/lib/streamsend/version.rb

@@ -1,3 +1,3 @@
 module StreamSend
-  VERSION = "1.0.0.rc6"
+  VERSION = "1.0.0.rc7"
 end

data/lib/streamsend.rb

@@ -31,7 +31,7 @@ require "streamsend/api/list"
 require "streamsend/api/import"
 require "streamsend/api/membership"
 require "streamsend/api/person"
-require "streamsend/api/trigger"
+require "streamsend/api/rss_trigger"
 require "streamsend/api/unsubscribe"
 require "streamsend/api/upload"
 require "streamsend/api/view"

data/spec/lib/streamsend/api/unit/{trigger_spec.rb → rss_trigger_spec.rb}

@@ -2,10 +2,9 @@ require "spec_helper"
 
 module StreamSend
   module Api
-    module Trigger
+    module RssTrigger
       describe "Trigger calls" do
         let(:session){ StreamSend::Api::Session.new("test", "password", "https://default.base") }
-        let(:index_request){ Index.new(session) }
         let(:show_request){ Show.new(session) }
         let(:create_request){ Create.new(session) }
         let(:update_request){ Update.new(session) }
@@ -25,39 +24,30 @@ module StreamSend
         let(:trigger_id){ 1234 }
         let(:xml){ "<?xml version=\"1.0\" encoding=\"UTF-8\"?><triggers type=\"array\"><trigger><test type=\"integer\">1</test></trigger></triggers>" }
 
-        describe Index do
-          it "creates a uri for getting an index of triggers" do
-            stub_request(:get, "https://test:password@default.base/triggers.xml").
-              to_return(:status => 200, :body => xml, :headers => {'Content-Type' => 'text/xml'})
-            index_request.execute
-            expect(index_request.uri).to eq("https://default.base/triggers.xml")
-          end
-        end
-
         describe Show do
           it "creates a uri for getting a specific trigger" do
-            stub_request(:get, "https://test:password@default.base/triggers/#{trigger_id}.xml").
+            stub_request(:get, "https://test:password@default.base/rss_triggers/#{trigger_id}.xml").
               to_return(:status => 200, :body => xml, :headers => {'Content-Type' => 'text/xml'})
             show_request.execute(trigger_id)
-            expect(show_request.uri).to eq("https://default.base/triggers/#{trigger_id}.xml")
+            expect(show_request.uri).to eq("https://default.base/rss_triggers/#{trigger_id}.xml")
           end
         end
 
         describe Create do
           it "creates a uri for creating a trigger" do
-            stub_request(:post, "https://test:password@default.base/triggers.xml").
+            stub_request(:post, "https://test:password@default.base/rss_triggers.xml").
               to_return(:status => 201, :body => "", :headers => {'Location' => 'something/something/101'})
             create_request.execute(trigger_hash)
-            expect(create_request.uri).to eq("https://default.base/triggers.xml")
+            expect(create_request.uri).to eq("https://default.base/rss_triggers.xml")
           end
         end
 
         describe Update do
           it "creates a uri for updating a trigger" do
-            stub_request(:put, "https://test:password@default.base/triggers/#{trigger_id}.xml").
+            stub_request(:put, "https://test:password@default.base/rss_triggers/#{trigger_id}.xml").
             to_return(:status => 200, :body => "")
             update_request.execute(trigger_id, trigger_hash)
-            expect(update_request.uri).to eq("https://default.base/triggers/#{trigger_id}.xml")
+            expect(update_request.uri).to eq("https://default.base/rss_triggers/#{trigger_id}.xml")
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: streamsend
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc6
+  version: 1.0.0.rc7
 platform: ruby
 authors:
 - Bob Yeo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httmultiparty
@@ -177,8 +177,8 @@ files:
 - lib/streamsend/api/membership.rb
 - lib/streamsend/api/person.rb
 - lib/streamsend/api/result.rb
+- lib/streamsend/api/rss_trigger.rb
 - lib/streamsend/api/session.rb
-- lib/streamsend/api/trigger.rb
 - lib/streamsend/api/unsubscribe.rb
 - lib/streamsend/api/upload.rb
 - lib/streamsend/api/user.rb
@@ -200,7 +200,6 @@ files:
 - spec/lib/streamsend/api/integration/list_spec.rb
 - spec/lib/streamsend/api/integration/membership_spec.rb
 - spec/lib/streamsend/api/integration/person_spec.rb
-- spec/lib/streamsend/api/integration/trigger_spec.rb
 - spec/lib/streamsend/api/integration/unsubscribe_spec.rb
 - spec/lib/streamsend/api/integration/upload_spec.rb
 - spec/lib/streamsend/api/integration/user_spec.rb
@@ -221,8 +220,8 @@ files:
 - spec/lib/streamsend/api/unit/membership_spec.rb
 - spec/lib/streamsend/api/unit/person_spec.rb
 - spec/lib/streamsend/api/unit/result_spec.rb
+- spec/lib/streamsend/api/unit/rss_trigger_spec.rb
 - spec/lib/streamsend/api/unit/session_spec.rb
-- spec/lib/streamsend/api/unit/trigger_spec.rb
 - spec/lib/streamsend/api/unit/unsubscribe_spec.rb
 - spec/lib/streamsend/api/unit/user_spec.rb
 - spec/spec_helper.rb
@@ -267,7 +266,6 @@ test_files:
 - spec/lib/streamsend/api/integration/list_spec.rb
 - spec/lib/streamsend/api/integration/membership_spec.rb
 - spec/lib/streamsend/api/integration/person_spec.rb
-- spec/lib/streamsend/api/integration/trigger_spec.rb
 - spec/lib/streamsend/api/integration/unsubscribe_spec.rb
 - spec/lib/streamsend/api/integration/upload_spec.rb
 - spec/lib/streamsend/api/integration/user_spec.rb
@@ -288,8 +286,8 @@ test_files:
 - spec/lib/streamsend/api/unit/membership_spec.rb
 - spec/lib/streamsend/api/unit/person_spec.rb
 - spec/lib/streamsend/api/unit/result_spec.rb
+- spec/lib/streamsend/api/unit/rss_trigger_spec.rb
 - spec/lib/streamsend/api/unit/session_spec.rb
-- spec/lib/streamsend/api/unit/trigger_spec.rb
 - spec/lib/streamsend/api/unit/unsubscribe_spec.rb
 - spec/lib/streamsend/api/unit/user_spec.rb
 - spec/spec_helper.rb

data/spec/lib/streamsend/api/integration/trigger_spec.rb

@@ -1,89 +0,0 @@
-require "spec_helper"
-
-module StreamSend
-  module Api
-    module Trigger
-      describe "Trigger calls" do
-        let(:session){ StreamSend::Api::Session.new() }
-        let(:create_request){ Create.new(session) }
-        let(:destroy_request){ Destroy.new(session) }
-        let(:from_addy){ "jo@yo.yoyo" }
-
-        before do
-          WebMock.disable!
-          emails = StreamSend::Api::Email::Index.new(session).execute
-          email_id = emails[0].id
-          from_emails = StreamSend::Api::FromEmailAddress::Index.new(session).execute
-          @from_email = from_emails.select{|email| email.activated == true}.first
-          @trigger = { :trigger => { :name => "test trigs",
-                                   :enabled => true,
-                                   :subject => "testing this yo!",
-                                   :email_id => email_id,
-                                   :start_date => "2013-05-27",
-                                   :time => "T03:44:55Z",
-                                   :frequency => "weekly",
-                                   :interval => 2,
-                                   :days => 1,
-                                   :from => {:name => "jo", :email_address => @from_email.email_address },
-                                   :reply_to => {:name => "jack", :email_address => @from_email.email_address },
-                                   :to => {:audience_id => 1 },
-                                   :options => {:track_views => true}}}
-
-        end
-
-        after do
-          WebMock.enable!
-        end
-
-        describe Index do
-          it "returns an array of triggers" do
-            pending "No activated from email addresses for this account" if !@from_email
-            id = create_request.execute(@trigger)
-
-            index_request = Index.new(session)
-            triggers = index_request.execute
-            expect(triggers.count).to be > 0
-
-            destroy_request.execute(id)
-          end
-        end
-
-        describe Show do
-          it "returns a specific trigger by id" do
-            pending "No activated from email addresses for this account" if !@from_email
-            id = create_request.execute(@trigger)
-
-            show_request = Show.new(session)
-            trigger = show_request.execute(id)
-            expect(trigger.name).to eq(@trigger[:trigger][:name])
-
-            destroy_request.execute(id)
-          end
-        end
-
-        describe Create do
-          it "creates a trigger" do
-            pending "No activated from email addresses for this account" if !@from_email
-            id = create_request.execute(@trigger)
-
-            expect(id).to_not be nil
-            destroy_request.execute(id)
-          end
-        end
-
-        describe Destroy do
-          it "destroys a trigger" do
-            pending "No activated from email addresses for this account" if !@from_email
-            id = create_request.execute(@trigger)
-            expect(id).to_not be nil
-            destroy_request.execute(id)
-            expect do
-              show_request = Show.new(session)
-              user = show_request.execute(id)
-            end.to raise_exception(StreamSend::Api::Exception, "Could not find any triggers with the specified id. (404)")
-          end
-        end
-      end
-    end
-  end
-end