vero 0.5.4 → 0.5.6

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    vero (0.5.3)
+    vero (0.5.6)
       girl_friday
       json
       rest-client
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.13)
       actionpack (= 3.2.13)

data/README.markdown

@@ -1,4 +1,5 @@
 # vero
+[![Build Status](https://travis-ci.org/getvero/vero.png?branch=master)](https://travis-ci.org/getvero/vero)
 
 vero makes it easy to interact with Vero's REST API from your Ruby app. Vero is a user lifecycle platform that allows you to engage and re-engage your customer base via email, based on the actions they perform in your software. 
 

data/lib/vero/api/base_api.rb

@@ -23,6 +23,10 @@ module Vero
           request
         end
 
+        def options=(val)
+          @options = options_with_symbolized_keys(val)
+        end
+
         protected
         def setup_logging
           return unless Vero::App.logger
@@ -51,6 +55,13 @@ module Vero
         def request_params_as_json
           JSON.dump(@options)
         end
+
+        def options_with_symbolized_keys(val)
+          val.inject({}) do |h,(k,v)|
+            h[k.to_sym] = v
+            h
+          end
+        end
       end
     end
   end

data/lib/vero/config.rb

@@ -32,7 +32,7 @@ module Vero
       if @domain.blank?
         'https://www.getvero.com'
       else
-        @domain =~ /http[s]?\:\/\/.+/ ? @domain : "http://#{@domain}" 
+        @domain =~ /http[s]?\:\/\/.+/ ? @domain : "http://#{@domain}"
       end
     end
 
@@ -49,6 +49,10 @@ module Vero
       auth_token?
     end
 
+    def disable_requests!
+      self.disabled = true
+    end
+
     def reset!
       self.disabled         = false
       self.development_mode = false

data/lib/vero/context/api.rb

@@ -0,0 +1,32 @@
+module Vero
+  module APIContext
+    def track!(event_name, event_data, extras = {})
+      options = {:data => event_data, :event_name => event_name, :identity => subject.to_vero, :extras => extras}
+      Vero::Api::Events.track!(options, self)
+    end
+
+    def identify!
+      data    = subject.to_vero
+      options = {:email => data[:email], :data => data}
+      Vero::Api::Users.track!(options, self)
+    end
+
+    def update_user!(email = nil)
+      changes = subject.to_vero
+      options = {:email => (email || changes[:email]), :changes => changes}
+      Vero::Api::Users.edit_user!(options, self)
+    end
+
+    def update_user_tags!(add = [], remove = [])
+      identity  = subject.to_vero
+      options   = {:email => identity[:email], :add => add, :remove => remove}
+      Vero::Api::Users.edit_user_tags!(options, self)
+    end
+
+    def unsubscribe!
+      identity  = subject.to_vero
+      options   = {:email => identity[:email]}
+      Vero::Api::Users.unsubscribe!(options, self)
+    end
+  end
+end

data/lib/vero/context.rb

@@ -1,10 +1,11 @@
 module Vero
   class Context
+    include Vero::APIContext
     attr_accessor :config, :subject
 
     def initialize(object = {})
       case object
-      when Hash 
+      when Hash
         #stub
       when Vero::Context
         @config = object.config
@@ -35,47 +36,11 @@ module Vero
     end
 
     def disable_requests!
-      @config.disabled = true
+      @config.disable_requests!
     end
 
     def configured?
       @config.configured?
     end
-
-    ### API methods
-
-    def track!(event_name, event_data)
-      options = {:data => event_data, :event_name => event_name, :identity => subject.to_vero}
-      
-      Vero::Api::Events.track!(options, self)
-    end
-
-    def identify!
-      data    = subject.to_vero
-      options = {:email => data[:email], :data => data}
-
-      Vero::Api::Users.track!(options, self)
-    end
-
-    def update_user!(email = nil)
-      changes = subject.to_vero
-      options = {:email => (email || changes[:email]), :changes => changes}
-
-      Vero::Api::Users.edit_user!(options, self)
-    end
-
-    def update_user_tags!(add = [], remove = [])
-      identity  = subject.to_vero
-      options   = {:email => identity[:email], :add => add, :remove => remove}
-      
-      Vero::Api::Users.edit_user_tags!(options, self)
-    end    
-
-    def unsubscribe!
-      identity  = subject.to_vero
-      options   = {:email => identity[:email]}
-
-      Vero::Api::Users.unsubscribe!(options, self)
-    end
   end
 end

data/lib/vero/sender.rb

@@ -7,31 +7,30 @@ module Vero
         super
       else
         klass_name = key.to_s.split("_").map(&:capitalize).join
-        eval("Vero::Senders::#{klass_name}")
+        Vero::Senders.const_get(klass_name)
       end
     end
   end
 
   class Sender
     def self.senders
-      @senders ||= begin
-        t = Vero::SenderHash.new
+      t = Vero::SenderHash.new
 
-        t.merge!({
-          true          => Vero::Senders::Invalid,
-          false         => Vero::Senders::Base,
-          :none         => Vero::Senders::Base,
-          :thread       => Vero::Senders::Invalid
-        })
+      t.merge!({
+        true          => Vero::Senders::Invalid,
+        false         => Vero::Senders::Base,
+        :none         => Vero::Senders::Base,
+        :thread       => Vero::Senders::Invalid
+      })
 
-        if RUBY_VERSION =~ /1\.9\./
-          t.merge!(
-            true        => Vero::Senders::Thread,
-            :thread     => Vero::Senders::Thread
-          )
-        end
-        t
+      if RUBY_VERSION !~ /1\.8\./
+        t.merge!(
+          true        => Vero::Senders::Thread,
+          :thread     => Vero::Senders::Thread
+        )
       end
+
+      t
     end
 
     def self.send(api_class, sender_strategy, domain, options)
@@ -47,4 +46,4 @@ module Vero
       raise e
     end
   end
-end
+end

data/lib/vero/version.rb

@@ -1,3 +1,3 @@
 module Vero
-  VERSION = '0.5.4'
+  VERSION = '0.5.6'
 end

data/lib/vero.rb

@@ -1,13 +1,16 @@
 require 'rest-client'
 require 'vero/utility/ext'
 
-module Vero 
-  autoload :Config,             'vero/config'
-  autoload :App,                'vero/app'
-  autoload :Context,            'vero/context'
-  autoload :Trackable,          'vero/trackable'
-  autoload :DSL,                'vero/dsl'
-  
+module Vero
+  autoload :Config,               'vero/config'
+  autoload :App,                  'vero/app'
+  autoload :Context,              'vero/context'
+  autoload :APIContext,           'vero/context/api'
+  autoload :Trackable,            'vero/trackable'
+  autoload :DSL,                  'vero/dsl'
+  autoload :Sender,               'vero/sender'
+  autoload :ResqueWorker,         'vero/senders/resque'
+
   module Api
     module Workers
       autoload :BaseAPI,          'vero/api/base_api'
@@ -27,20 +30,18 @@ module Vero
     autoload :Events,             'vero/api'
     autoload :Users,              'vero/api'
   end
-  
-  module Utility
-    autoload :Logger,           'vero/utility/logger'
-  end
 
   module Senders
-    autoload :Base,             'vero/senders/base'
-    autoload :DelayedJob,       'vero/senders/delayed_job'
-    autoload :Resque,           'vero/senders/resque'
-    autoload :Invalid,          'vero/senders/invalid'
-    autoload :Thread,           'vero/senders/thread'
+    autoload :Base,               'vero/senders/base'
+    autoload :DelayedJob,         'vero/senders/delayed_job'
+    autoload :Resque,             'vero/senders/resque'
+    autoload :Invalid,            'vero/senders/invalid'
+    autoload :Thread,             'vero/senders/thread'
+  end
+
+  module Utility
+    autoload :Logger,             'vero/utility/logger'
   end
-  autoload :Sender,             'vero/sender'
-  autoload :ResqueWorker,       'vero/senders/resque'
 end
 
 require 'vero/railtie' if defined?(Rails)

data/spec/lib/api/base_api_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe Vero::Api::Workers::BaseAPI do
+  let (:subject) { Vero::Api::Workers::BaseAPI.new("http://www.getvero.com", {}) }
+
+  describe :options_with_symbolized_keys do
+    it "should create a new options Hash with symbol keys (much like Hash#symbolize_keys in rails)" do
+      subject.options.should == {}
+
+      subject.options = {:abc => 123}
+      subject.options.should == {:abc => 123}
+
+      subject.options = {"abc" => 123}
+      subject.options.should == {:abc => 123}
+    end
+  end
+end

data/spec/lib/api/events/track_api_spec.rb

@@ -39,6 +39,12 @@ describe Vero::Api::Workers::Events::TrackAPI do
         subject.options = options
         expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
       end
+
+      it "should not raise an error when the keys are Strings" do
+        options = {"auth_token" => 'abcd', "identity" => {"email" => 'test@test.com'}, "event_name" => 'test_event', "data" => {}}
+        subject.options = options
+        expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
+      end
     end
     
     describe :request do

data/spec/lib/api/users/edit_api_spec.rb

@@ -12,6 +12,11 @@ describe Vero::Api::Workers::Users::EditAPI do
 
   subject { Vero::Api::Workers::Users::EditAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :email => 'test@test.com', :changes => { :email => 'test@test.com' }}) }
   describe :validate! do
+    it "should not raise an error when the keys are Strings" do
+      options = {"auth_token" => 'abcd', "email" => 'test@test.com', "changes" => { "email" => 'test@test.com' }}
+      subject.options = options
+      expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
+    end
   end
 
   describe :request do

data/spec/lib/api/users/edit_tags_api_spec.rb

@@ -50,6 +50,12 @@ describe Vero::Api::Workers::Users::EditTagsAPI do
       subject.options = options
       expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
     end
+
+    it "should not raise an error when the keys are Strings" do
+      options = {"auth_token" => 'abcd', "identity" => {"email" => 'test@test.com'}, "email" => 'test@test.com', "remove" => [ "Hi" ] }
+      subject.options = options
+      expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
+    end
   end
 
   describe :request do

data/spec/lib/api/users/track_api_spec.rb

@@ -35,6 +35,12 @@ describe Vero::Api::Workers::Users::TrackAPI do
       subject.options = options
       expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
     end
+
+    it "should not raise an error when the keys are Strings" do
+      options = {"auth_token" => 'abcd', "identity" => {"email" => 'test@test.com'}, "email" => 'test@test.com', "data" => {}}
+      subject.options = options
+      expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
+    end
   end
   
   describe :request do

data/spec/lib/api/users/unsubscribe_api_spec.rb

@@ -12,6 +12,11 @@ describe Vero::Api::Workers::Users::UnsubscribeAPI do
 
   subject { Vero::Api::Workers::Users::UnsubscribeAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :email => 'test@test.com', :changes => { :email => 'test@test.com' }}) }
   describe :validate! do
+    it "should not raise an error when the keys are Strings" do
+      options = {"auth_token" => 'abcd', "email" => 'test@test.com', "changes" => { "email" => 'test@test.com' }}
+      subject.options = options
+      expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
+    end
   end
 
   describe :request do

data/spec/lib/sender_spec.rb

@@ -2,34 +2,39 @@ require 'spec_helper'
 
 describe Vero::Sender do
   subject { Vero::Sender }
-  describe "self.senders" do
+
+  describe ".senders" do
     it "should be a Hash" do
       subject.senders.should be_a(Hash)
     end
-    
-    unless RUBY_VERSION =~ /1\.9\./
-      context "< Ruby 1.9" do
-        it "should have a default set of senders (true, false, none, thread)" do
-          subject.senders.should == {
-            true          => Vero::Senders::Invalid,
-            false         => Vero::Senders::Base,
-            :none         => Vero::Senders::Base,
-            :thread       => Vero::Senders::Invalid,
-          }
-        end
+
+    context 'when using Ruby 1.8' do
+      before do
+        stub_const('RUBY_VERSION', '1.8.7')
+      end
+
+      it "should have a default set of senders (true, false, none, thread)" do
+        subject.senders.should == {
+          true          => Vero::Senders::Invalid,
+          false         => Vero::Senders::Base,
+          :none         => Vero::Senders::Base,
+          :thread       => Vero::Senders::Invalid,
+        }
       end
     end
 
-    if RUBY_VERSION =~ /1\.9\./
-      context "~> Ruby 1.9" do
-        it "should have a default set of senders (true, false, none, thread)" do
-          subject.senders.should == {
-            true          => Vero::Senders::Thread,
-            false         => Vero::Senders::Base,
-            :none         => Vero::Senders::Base,
-            :thread       => Vero::Senders::Thread,
-          }
-        end
+    context 'when using Ruby with verion greater than 1.8.7' do
+      before do
+        stub_const('RUBY_VERSION', '1.9.3')
+      end
+
+      it "should have a default set of senders (true, false, none, thread)" do
+        subject.senders.should == {
+          true          => Vero::Senders::Thread,
+          false         => Vero::Senders::Base,
+          :none         => Vero::Senders::Base,
+          :thread       => Vero::Senders::Thread,
+        }
       end
     end
 
@@ -40,4 +45,4 @@ describe Vero::Sender do
       subject.senders[:none].should         == Vero::Senders::Base
     end
   end
-end
+end

data/spec/lib/trackable_spec.rb

@@ -49,8 +49,7 @@ describe Vero::Trackable do
           :event_name => 'test_event',
           :identity => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"},
           :data => { :test => 1 },
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :development_mode => true
+          :extras => {}
         }
         @url = "https://www.getvero.com/api/v1/track.json"
       end
@@ -70,47 +69,59 @@ describe Vero::Trackable do
 
         RestClient.stub(:post).and_return(200)
 
-        RestClient.should_receive(:post).with("https://www.getvero.com/api/v2/events/track.json", {:data=>{:test=>1}, :event_name=>"test_event", :identity=>{:email=>"durkster@gmail.com", :age=>20, :_user_type=>"User"}, :auth_token=>"YWJjZDEyMzQ6ZWZnaDU2Nzg=", :development_mode=>true}.to_json, @content_type_params)
+        # RestClient.should_receive(:post).with("https://www.getvero.com/api/v2/events/track.json", {:data=>{:test=>1}, :event_name=>"test_event", :identity=>{:email=>"durkster@gmail.com", :age=>20, :_user_type=>"User"}, :auth_token=>"YWJjZDEyMzQ6ZWZnaDU2Nzg=", :development_mode=>true}.to_json, @content_type_params)
+
+        Vero::Api::Events.stub(:track!).and_return(200)
+        Vero::Api::Events.should_receive(:track!).with(@request_params, context)
         @user.track!(@request_params[:event_name], @request_params[:data]).should == 200
 
-        RestClient.should_receive(:post).with("https://www.getvero.com/api/v2/events/track.json", {:data=>{}, :event_name=>"test_event", :identity=>{:email=>"durkster@gmail.com", :age=>20, :_user_type=>"User"}, :auth_token=>"YWJjZDEyMzQ6ZWZnaDU2Nzg=", :development_mode=>true}.to_json, @content_type_params)
+        # RestClient.should_receive(:post).with("https://www.getvero.com/api/v2/events/track.json", {:data=>{}, :event_name=>"test_event", :identity=>{:email=>"durkster@gmail.com", :age=>20, :_user_type=>"User"}, :auth_token=>"YWJjZDEyMzQ6ZWZnaDU2Nzg=", :development_mode=>true}.to_json, @content_type_params)
+
+        Vero::Api::Events.stub(:track!).and_return(200)
+        Vero::Api::Events.should_receive(:track!).with(@request_params.merge(:data => {}), context)
         @user.track!(@request_params[:event_name]).should == 200
       end
 
-      it "should send using another thread when async is set to true" do
-        context = Vero::Context.new(Vero::App.default_context)
-        context.config.logging = true
-        context.subject = @user
-        context.config.async = true
+      context 'when set to be async' do
+        let(:my_context) { Vero::Context.new(Vero::App.default_context) }
 
-        @user.stub(:with_vero_context).and_return(context)
+        before do
+          my_context.config.logging = true
+          my_context.subject = @user
+          my_context.config.async = true
 
-        if RUBY_VERSION =~ /1\.9\./
-          @user.track!(@request_params[:event_name], @request_params[:data]).should be_true
-          @user.track!(@request_params[:event_name]).should be_true
-        else
-          expect { @user.track!(@request_params[:event_name], @request_params[:data]) }.to raise_error
-          expect { @user.track!(@request_params[:event_name]) }.to raise_error
+          @user.stub(:with_vero_context).and_return(my_context)
         end
-      end
 
-      # it "should raise an error when async is set to false and the request times out" do
-      #   Rails.stub(:logger).and_return(Logger.new('info'))
-      #   context = Vero::App.default_context
-      #   context.config.async = false
-      #   context.config.domain = "200.200.200.200"
+        context 'using Ruby 1.8.7' do
+          before do
+            stub_const('RUBY_VERSION', '1.8.7')
+          end
 
-      #   expect { @user.track(@request_params[:event_name], @request_params[:data]) }.to raise_error
-      # end
+          it 'raises an error' do
+            expect { @user.track!(@request_params[:event_name], @request_params[:data]) }.to raise_error
+            expect { @user.track!(@request_params[:event_name]) }.to raise_error
+          end
+        end
+
+        context 'not using Ruby 1.8.7' do
+          before do
+            stub_const('RUBY_VERSION', '1.9.3')
+          end
+
+          it 'sends' do
+            @user.track!(@request_params[:event_name], @request_params[:data]).should be_true
+            @user.track!(@request_params[:event_name]).should be_true
+          end
+        end
+      end
     end
 
     describe :identify! do
       before do
         @request_params = {
           :email => 'durkster@gmail.com',
-          :data => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"},
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :development_mode => true
+          :data => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"}
         }
         @url = "https://www.getvero.com/api/v2/users/track.json"
       end
@@ -121,23 +132,41 @@ describe Vero::Trackable do
 
         @user.stub(:with_vero_context).and_return(context)
 
-        RestClient.stub(:post).and_return(200)
-        RestClient.should_receive(:post).with(@url, @request_params.to_json, @content_type_params)
-        
+        # RestClient.stub(:post).and_return(200)
+        # RestClient.should_receive(:post).with(@url, @request_params.to_json, @content_type_params)
+
+        Vero::Api::Users.stub(:track!).and_return(200)
+        Vero::Api::Users.should_receive(:track!).with(@request_params, context)
+
         @user.identify!.should == 200
       end
 
-      it "should send using another thread when async is set to true" do
-        context = Vero::Context.new(Vero::App.default_context)
-        context.subject = @user
-        context.config.async = true
+      context 'when set to use async' do
+        let(:my_context) { Vero::Context.new(Vero::App.default_context) }
 
-        @user.stub(:with_vero_context).and_return(context)
+        before do
+          my_context.subject = @user
+          my_context.config.async = true
+        end
+
+        context 'and using Ruby 1.8.7' do
+          before do
+            stub_const('RUBY_VERSION', '1.8.7')
+          end
+
+          it 'raises an error' do
+            expect { @user.identify! }.to raise_error
+          end
+        end
+
+        context 'and not using Ruby 1.8.7' do
+          before do
+            stub_const('RUBY_VERSION', '1.9.3')
+          end
 
-        if RUBY_VERSION =~ /1\.9\./
-          @user.identify!.should be_true
-        else
-          expect { @user.identify! }.to raise_error
+          it 'sends' do
+            @user.identify!.should be_true
+          end
         end
       end
     end
@@ -147,8 +176,6 @@ describe Vero::Trackable do
         @request_params = {
           :email => 'durkster@gmail.com',
           :changes => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"},
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :development_mode => true
         }
         @url = "https://www.getvero.com/api/v2/users/edit.json"
       end
@@ -159,9 +186,12 @@ describe Vero::Trackable do
 
         @user.stub(:with_vero_context).and_return(context)
 
-        RestClient.stub(:put).and_return(200)
-        RestClient.should_receive(:put).with(@url, @request_params.merge(:email => "durkster1@gmail.com").to_json, @content_type_params)
-        
+        # RestClient.stub(:put).and_return(200)
+        # RestClient.should_receive(:put).with(@url, @request_params.merge(:email => "durkster1@gmail.com").to_json, @content_type_params)
+
+        Vero::Api::Users.stub(:edit_user!).and_return(200)
+        Vero::Api::Users.should_receive(:edit_user!).with(@request_params.merge(:email => "durkster1@gmail.com"), context)
+
         @user.with_vero_context.update_user!("durkster1@gmail.com").should == 200
       end
 
@@ -171,23 +201,43 @@ describe Vero::Trackable do
 
         @user.stub(:with_vero_context).and_return(context)
 
-        RestClient.stub(:put).and_return(200)
-        RestClient.should_receive(:put).with(@url, @request_params.to_json, @content_type_params)
-        
+        # RestClient.stub(:put).and_return(200)
+        # RestClient.should_receive(:put).with(@url, @request_params.to_json, @content_type_params)
+
+        Vero::Api::Users.stub(:edit_user!).and_return(200)
+        Vero::Api::Users.should_receive(:edit_user!).with(@request_params, context)
+
         @user.with_vero_context.update_user!.should == 200
       end
 
-      it "should send using another thread when async is set to true" do
-        context = Vero::Context.new(Vero::App.default_context)
-        context.subject = @user
-        context.config.async = true
+      context 'when set to use async' do
+        let(:my_context) { Vero::Context.new(Vero::App.default_context) }
 
-        @user.stub(:with_vero_context).and_return(context)
+        before do
+          my_context.subject = @user
+          my_context.config.async = true
+
+          @user.stub(:with_vero_context).and_return(my_context)
+        end
+
+        context 'and using Ruby 1.8.7' do
+          before do
+            stub_const('RUBY_VERSION', '1.8.7')
+          end
+
+          it 'raises an error' do
+            expect { @user.with_vero_context.update_user! }.to raise_error
+          end
+        end
 
-        if RUBY_VERSION =~ /1\.9\./
-          @user.with_vero_context.update_user!.should be_true
-        else
-          expect { @user.with_vero_context.update_user! }.to raise_error
+        context 'and not using Ruby 1.8.7' do
+          before do
+            stub_const('RUBY_VERSION', '1.9.3')
+          end
+
+          it 'sends' do
+            @user.with_vero_context.update_user!.should be_true
+          end
         end
       end
     end
@@ -197,9 +247,7 @@ describe Vero::Trackable do
         @request_params = {
           :email => 'durkster@gmail.com',
           :add => [],
-          :remove => [],
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :development_mode => true
+          :remove => []
         }
         @url = "https://www.getvero.com/api/v2/users/tags/edit.json"
       end
@@ -211,9 +259,12 @@ describe Vero::Trackable do
 
         @user.stub(:with_vero_context).and_return(context)
 
-        RestClient.stub(:put).and_return(200)
-        RestClient.should_receive(:put).with(@url, @request_params.to_json, @content_type_params)
-        
+        # RestClient.stub(:put).and_return(200)
+        # RestClient.should_receive(:put).with(@url, @request_params.to_json, @content_type_params)
+
+        Vero::Api::Users.stub(:edit_user_tags!).and_return(200)
+        Vero::Api::Users.should_receive(:edit_user_tags!).with(@request_params, context)
+
         @user.with_vero_context.update_user_tags!.should == 200
       end
 
@@ -233,9 +284,7 @@ describe Vero::Trackable do
     describe :unsubscribe! do
       before do
         @request_params = {
-          :email => 'durkster@gmail.com',
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :development_mode => true
+          :email => 'durkster@gmail.com'
         }
         @url = "https://www.getvero.com/api/v2/users/unsubscribe.json"
       end
@@ -247,21 +296,43 @@ describe Vero::Trackable do
 
         @user.stub(:with_vero_context).and_return(context)
 
-        RestClient.stub(:post).and_return(200)
-        RestClient.should_receive(:post).with(@url, @request_params)
-        
+        # RestClient.stub(:post).and_return(200)
+        # RestClient.should_receive(:post).with(@url, @request_params)
+
+        Vero::Api::Users.stub(:unsubscribe!).and_return(200)
+        Vero::Api::Users.should_receive(:unsubscribe!).with(@request_params, context)
+
         @user.with_vero_context.unsubscribe!.should == 200
       end
 
-      if RUBY_VERSION =~ /1\.9\./
-        it "should send using another thread when async is set to true" do
-          context = Vero::Context.new(Vero::App.default_context)
-          context.subject = @user
-          context.config.async = true
+      context 'when using async' do
+        let(:my_context) { Vero::Context.new(Vero::App.default_context) }
 
-          @user.stub(:with_vero_context).and_return(context)
+        before do
+          my_context.subject = @user
+          my_context.config.async = true
 
-          @user.with_vero_context.unsubscribe!.should be_true
+          @user.stub(:with_vero_context).and_return(my_context)
+        end
+
+        context 'and using Ruby 1.8.7' do
+          before do
+            stub_const('RUBY_VERSION', '1.8.7')
+          end
+
+          it 'raises an error' do
+            expect { @user.with_vero_context.unsubscribe! }.to raise_error
+          end
+        end
+
+        context 'and using Ruby 1.9.3' do
+          before do
+            stub_const('RUBY_VERSION', '1.9.3')
+          end
+
+          it 'sends' do
+            @user.with_vero_context.unsubscribe!.should be_true
+          end
         end
       end
     end
@@ -336,7 +407,7 @@ describe Vero::Trackable do
         user.with_vero_context({:api_key => "boom", :secret => "tish"}).config.config_params.should == {:api_key=>"boom", :secret=>"tish"}
       end
     end
-    
+
     it "should work when Vero::Trackable::Interface is not included" do
       user = UserWithoutInterface.new
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'vero'
+require 'json'
 
 Dir[::File.expand_path('../support/**/*.rb',  __FILE__)].each { |f| require f }
 

metadata

@@ -1,150 +1,144 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vero
-version: !ruby/object:Gem::Version
-  version: 0.5.4
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 6
+  version: 0.5.6
 platform: ruby
-authors:
+authors: 
 - James Lamont
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-16 00:00:00 +10:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: delayed_job
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: delayed_job
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: delayed_job_active_record
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: resque
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rest-client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: girl_friday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: girl_friday
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: 
 email: support@getvero.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Gemfile
 - Gemfile.lock
 - lib/generators/vero_generator.rb
@@ -157,6 +151,7 @@ files:
 - lib/vero/api.rb
 - lib/vero/app.rb
 - lib/vero/config.rb
+- lib/vero/context/api.rb
 - lib/vero/context.rb
 - lib/vero/dsl.rb
 - lib/vero/railtie.rb
@@ -175,6 +170,7 @@ files:
 - lib/vero/view_helpers/javascript.rb
 - lib/vero.rb
 - README.markdown
+- spec/lib/api/base_api_spec.rb
 - spec/lib/api/events/track_api_spec.rb
 - spec/lib/api/users/edit_api_spec.rb
 - spec/lib/api/users/edit_tags_api_spec.rb
@@ -192,31 +188,42 @@ files:
 - spec/support/user_support.rb
 - spec/support/vero_user_support.rb
 - vero.gemspec
+has_rdoc: true
 homepage: http://www.getvero.com/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby gem for Vero
-test_files:
+test_files: 
+- spec/lib/api/base_api_spec.rb
 - spec/lib/api/events/track_api_spec.rb
 - spec/lib/api/users/edit_api_spec.rb
 - spec/lib/api/users/edit_tags_api_spec.rb