vero 0.5.0 → 0.5.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vero (0.5.0)
+    vero (0.5.1)
       girl_friday
       json
       rest-client

data/README.markdown

@@ -92,6 +92,8 @@ Finally, you can track multiple properties stored in a Hash by doing the followi
         }
       end
     end
+    
+**Note:** You may choose to bypass extending the `User` model by calling the API directly. More information can be found below.
 
 ## Sending events
 
@@ -143,4 +145,25 @@ You may want to send additional data about an event:
           render 'new'
         end
       end
-    end
+    end
+
+## Calling the API directly
+
+To avoid having to extend the `User` model, we offer the option to call our API directly, as you would from the Javascript library.
+
+First, ensure you've correctly configured the gem following the instructions as outlined in Installation. Now you can call the API using the following methods:
+
+    # Tracking an event
+    Vero::Api::Events.track!({:event_name => "test_event", :data => {:date => "2013-02-12 16:17"}, :identity => {:email => "james@getvero.com"}})
+    
+    # Identifying a user
+    Vero::Api::Users.track!({:email => "james@getvero.com"})
+    
+    # Editing a user
+    Vero::Api::Users.edit_user!({:email => "james@getvero.com", :changes => {:age => 25}})
+    
+    # Editing a user tags
+    Vero::Api::Users.edit_user_tags!({:email => "james@getvero.com", :add => [], :remove => ["awesome"]})
+    
+    # Unsubscribe a user
+    Vero::Api::Users.unsubscribe!({:email => "james@getvero.com"})

data/lib/vero/api/base_api.rb

@@ -2,53 +2,55 @@ require 'json'
 require 'rest-client'
 
 module Vero
-  module API
-    class BaseAPI
-      attr_accessor :domain, :options
-
-      def self.perform(domain, options)
-        caller = self.new(domain, options)
-        caller.perform
-      end
+  module Api
+    module Workers
+      class BaseAPI
+        attr_accessor :domain, :options
+
+        def self.perform(domain, options)
+          caller = self.new(domain, options)
+          caller.perform
+        end
 
-      def initialize(domain, options)
-        @domain = domain
-        @options = options
-        setup_logging
-      end
+        def initialize(domain, options)
+          @domain = domain
+          @options = options
+          setup_logging
+        end
 
-      def perform
-        validate!
-        request
-      end
+        def perform
+          validate!
+          request
+        end
 
-      protected
-      def setup_logging
-        return unless Vero::App.logger
+        protected
+        def setup_logging
+          return unless Vero::App.logger
 
-        RestClient.log = Object.new.tap do |proxy|
-          def proxy.<<(message)
-            Vero::App.logger.info message
+          RestClient.log = Object.new.tap do |proxy|
+            def proxy.<<(message)
+              Vero::App.logger.info message
+            end
           end
         end
-      end
 
-      def url
-      end
+        def url
+        end
 
-      def validate!
-        raise "#{self.class.name}#validate! should be overridden"
-      end
+        def validate!
+          raise "#{self.class.name}#validate! should be overridden"
+        end
 
-      def request
-      end
+        def request
+        end
 
-      def request_content_type
-        {:content_type => :json, :accept => :json}
-      end
+        def request_content_type
+          {:content_type => :json, :accept => :json}
+        end
 
-      def request_params_as_json
-        JSON.dump(@options)
+        def request_params_as_json
+          JSON.dump(@options)
+        end
       end
     end
   end

data/lib/vero/api/events/track_api.rb

@@ -1,23 +1,25 @@
 module Vero
-  module API
-    module Events
-      class TrackAPI < BaseAPI
-        def url
-          "#{@domain}/api/v2/events/track.json"
-        end
-        
-        def request
-          RestClient.post(self.url, self.request_params_as_json, self.request_content_type)
-        end
+  module Api
+    module Workers
+      module Events
+        class TrackAPI < BaseAPI
+          def url
+            "#{@domain}/api/v2/events/track.json"
+          end
+          
+          def request
+            RestClient.post(self.url, self.request_params_as_json, self.request_content_type)
+          end
 
-        def validate!
-          result = true
-          result &&= options[:event_name].to_s.blank? == false
-          result &&= (options[:data].nil? || options[:data].is_a?(Hash))
+          def validate!
+            result = true
+            result &&= options[:event_name].to_s.blank? == false
+            result &&= (options[:data].nil? || options[:data].is_a?(Hash))
 
-          unless result
-            hash = {:data => options[:data], :event_name => options[:event_name]}
-            raise ArgumentError.new(JSON.dump(hash))
+            unless result
+              hash = {:data => options[:data], :event_name => options[:event_name]}
+              raise ArgumentError.new(JSON.dump(hash))
+            end
           end
         end
       end

data/lib/vero/api/users/edit_api.rb

@@ -1,22 +1,24 @@
 module Vero
-  module API
-    module Users
-      class EditAPI < BaseAPI
-        def url
-          "#{@domain}/api/v2/users/edit.json"
-        end
+  module Api
+    module Workers
+      module Users
+        class EditAPI < BaseAPI
+          def url
+            "#{@domain}/api/v2/users/edit.json"
+          end
 
-        def request
-          RestClient.put(url, self.request_params_as_json, self.request_content_type)
-        end
+          def request
+            RestClient.put(url, self.request_params_as_json, self.request_content_type)
+          end
 
-        def validate!
-          result = true
-          result &&= options[:email].to_s.blank? == false
-          result &&= options[:changes].is_a?(Hash)
+          def validate!
+            result = true
+            result &&= options[:email].to_s.blank? == false
+            result &&= options[:changes].is_a?(Hash)
 
-          unless result
-            raise ArgumentError.new(:email => options[:email], :changes => options[:changes])
+            unless result
+              raise ArgumentError.new(:email => options[:email], :changes => options[:changes])
+            end
           end
         end
       end

data/lib/vero/api/users/edit_tags_api.rb

@@ -1,22 +1,24 @@
 module Vero
-  module API
-    module Users
-      class EditTagsAPI < BaseAPI
-        def url
-          "#{@domain}/api/v2/users/tags/edit.json"
-        end
+  module Api
+    module Workers
+      module Users
+        class EditTagsAPI < BaseAPI
+          def url
+            "#{@domain}/api/v2/users/tags/edit.json"
+          end
 
-        def request
-          RestClient.put(url, self.request_params_as_json, self.request_content_type)
-        end
+          def request
+            RestClient.put(url, self.request_params_as_json, self.request_content_type)
+          end
 
-        def validate!
-          result = true
-          result &&= options[:email].to_s.blank? == false
-          result &&= (options[:add].is_a?(Array) || options[:remove].is_a?(Array))
+          def validate!
+            result = true
+            result &&= options[:email].to_s.blank? == false
+            result &&= (options[:add].is_a?(Array) || options[:remove].is_a?(Array))
 
-          unless result
-            raise ArgumentError.new(:email => options[:email], :add => options[:add], :remove => options[:remove])
+            unless result
+              raise ArgumentError.new(:email => options[:email], :add => options[:add], :remove => options[:remove])
+            end
           end
         end
       end

data/lib/vero/api/users/track_api.rb

@@ -1,22 +1,24 @@
 module Vero
-  module API
-    module Users
-      class TrackAPI < BaseAPI
-        def url
-          "#{@domain}/api/v2/users/track.json"
-        end
+  module Api
+    module Workers
+      module Users
+        class TrackAPI < BaseAPI
+          def url
+            "#{@domain}/api/v2/users/track.json"
+          end
 
-        def request
-          RestClient.post(url, self.request_params_as_json, self.request_content_type)
-        end
+          def request
+            RestClient.post(url, self.request_params_as_json, self.request_content_type)
+          end
 
-        def validate!
-          result = true
-          result &&= options[:email].to_s.blank? == false
-          result &&= (options[:data].nil? || options[:data].is_a?(Hash))
+          def validate!
+            result = true
+            result &&= options[:email].to_s.blank? == false
+            result &&= (options[:data].nil? || options[:data].is_a?(Hash))
 
-          unless result
-            raise ArgumentError.new(:email => options[:email], :data => options[:data])
+            unless result
+              raise ArgumentError.new(:email => options[:email], :data => options[:data])
+            end
           end
         end
       end

data/lib/vero/api/users/unsubscribe_api.rb

@@ -1,21 +1,23 @@
 module Vero
-  module API
-    module Users
-      class UnsubscribeAPI < BaseAPI
-        def url
-          "#{@domain}/api/v2/users/unsubscribe.json"
-        end
+  module Api
+    module Workers
+      module Users
+        class UnsubscribeAPI < BaseAPI
+          def url
+            "#{@domain}/api/v2/users/unsubscribe.json"
+          end
 
-        def request
-          RestClient.post(url, @options)
-        end
+          def request
+            RestClient.post(url, @options)
+          end
 
-        def validate!
-          result = true
-          result &&= options[:email].to_s.blank? == false
+          def validate!
+            result = true
+            result &&= options[:email].to_s.blank? == false
 
-          unless result
-            raise ArgumentError.new(:email => options[:email])
+            unless result
+              raise ArgumentError.new(:email => options[:email])
+            end
           end
         end
       end

data/lib/vero/api.rb

@@ -0,0 +1,93 @@
+module Vero
+  module Api
+    class Base
+      attr_accessor :context
+
+      def initialize(context)
+        self.context = context
+      end
+
+      def config
+        self.context.config
+      end
+
+      protected
+      def validate_configured!
+        unless config.configured?
+          raise "You must configure the 'vero' gem. Visit https://github.com/semblancesystems/vero for more details."
+        end
+      end
+    end
+
+    class Events < Base
+      def self.track!(options, context = Vero::App.default_context)
+        new(context).track!(options)
+      end
+
+      def track!(options)
+        validate_configured!
+
+        options.merge!(config.request_params)
+        unless config.disabled
+          Vero::Sender.send Vero::Api::Workers::Events::TrackAPI, config.async, config.domain, options
+        end
+      end
+    end
+
+    class Users < Base
+      def self.track!(options, context = Vero::App.default_context)
+        new(context).track!(options)
+      end
+
+      def self.edit_user!(options, context = Vero::App.default_context)
+        new(context).edit_user!(options)
+      end
+
+      def self.edit_user_tags!(options, context = Vero::App.default_context)
+        new(context).edit_user_tags!(options)
+      end
+
+      def self.unsubscribe!(options, context = Vero::App.default_context)
+        new(context).unsubscribe!(options)
+      end
+
+      def track!(options)
+        validate_configured!
+
+        options.merge!(config.request_params)
+        unless config.disabled
+          Vero::Sender.send Vero::Api::Workers::Users::TrackAPI, config.async, config.domain, options
+        end
+      end
+
+      def edit_user!(options)
+        validate_configured!
+        options.merge!(config.request_params)
+
+        unless config.disabled
+          Vero::Sender.send Vero::Api::Workers::Users::EditAPI, config.async, config.domain, options
+        end
+      end
+
+      def edit_user_tags!(options)
+        validate_configured!
+        
+        options.merge!(config.request_params)
+
+        unless config.disabled
+          Vero::Sender.send Vero::Api::Workers::Users::EditTagsAPI, config.async, config.domain, options
+        end
+      end
+
+      def unsubscribe!(options)
+        validate_configured!
+        
+        options.merge!(config.request_params)
+
+        unless config.disabled
+          Vero::Sender.send Vero::Api::Workers::Users::UnsubscribeAPI, config.async, config.domain, options
+        end
+      end
+    end
+  end
+end

data/lib/vero/context.rb

@@ -45,70 +45,37 @@ module Vero
     ### API methods
 
     def track!(event_name, event_data)
-      validate_configured!
+      options = {:data => event_data, :event_name => event_name, :identity => subject.to_vero}
       
-      identity = subject.to_vero
-      options = @config.request_params
-      options.merge!(:data => event_data, :event_name => event_name, :identity => identity)
-
-      unless @config.disabled
-        Vero::Sender.send Vero::API::Events::TrackAPI, @config.async, @config.domain, options
-      end
+      Vero::Api::Events.track!(options, self)
     end
 
     def identify!
-      validate_configured!
-      
-      data = subject.to_vero
-      options = @config.request_params
-      options.merge!(:email => data[:email], :data => data)
+      data    = subject.to_vero
+      options = {:email => data[:email], :data => data}
 
-      unless @config.disabled
-        Vero::Sender.send Vero::API::Users::TrackAPI, @config.async, @config.domain, options
-      end
+      Vero::Api::Users.track!(options, self)
     end
 
     def update_user!(email = nil)
-      validate_configured!
-      
       changes = subject.to_vero
-      options = @config.request_params
-      options.merge!(:email => (email || changes[:email]), :changes => changes)
+      options = {:email => (email || changes[:email]), :changes => changes}
 
-      unless @config.disabled
-        Vero::Sender.send Vero::API::Users::EditAPI, @config.async, @config.domain, options
-      end
+      Vero::Api::Users.edit_user!(options, self)
     end
 
     def update_user_tags!(add = [], remove = [])
-      validate_configured!
+      identity  = subject.to_vero
+      options   = {:email => identity[:email], :add => add, :remove => remove}
       
-      identity = subject.to_vero
-      options = @config.request_params
-      options.merge!(:email => identity[:email], :add => add, :remove => remove)
-
-      unless @config.disabled
-        Vero::Sender.send Vero::API::Users::EditTagsAPI, @config.async, @config.domain, options
-      end
+      Vero::Api::Users.edit_user_tags!(options, self)
     end    
 
     def unsubscribe!
-      validate_configured!
-      
-      identity = subject.to_vero
-      options = @config.request_params
-      options.merge!(:email => identity[:email])
-
-      unless @config.disabled
-        Vero::Sender.send Vero::API::Users::UnsubscribeAPI, @config.async, @config.domain, options
-      end
-    end
+      identity  = subject.to_vero
+      options   = {:email => identity[:email]}
 
-    private
-    def validate_configured!
-      unless @config.configured?
-        raise "You must configure the 'vero' gem. Visit https://github.com/semblancesystems/vero for more details."
-      end
+      Vero::Api::Users.unsubscribe!(options, self)
     end
   end
 end

data/lib/vero/version.rb

@@ -1,3 +1,3 @@
 module Vero
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/vero.rb

@@ -7,19 +7,24 @@ module Vero
   autoload :Context,            'vero/context'
   autoload :Trackable,          'vero/trackable'
   
-  module API
-    autoload :BaseAPI,          'vero/api/base_api'
+  module Api
+    module Workers
+      autoload :BaseAPI,          'vero/api/base_api'
 
-    module Events
-      autoload :TrackAPI,       'vero/api/events/track_api'
-    end
+      module Events
+        autoload :TrackAPI,       'vero/api/events/track_api'
+      end
 
-    module Users
-      autoload :TrackAPI,       'vero/api/users/track_api'
-      autoload :EditAPI,        'vero/api/users/edit_api'
-      autoload :EditTagsAPI,    'vero/api/users/edit_tags_api'
-      autoload :UnsubscribeAPI, 'vero/api/users/unsubscribe_api'
+      module Users
+        autoload :TrackAPI,       'vero/api/users/track_api'
+        autoload :EditAPI,        'vero/api/users/edit_api'
+        autoload :EditTagsAPI,    'vero/api/users/edit_tags_api'
+        autoload :UnsubscribeAPI, 'vero/api/users/unsubscribe_api'
+      end
     end
+
+    autoload :Events,             'vero/api'
+    autoload :Users,              'vero/api'
   end
   
   module Utility

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

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Vero::API::Events::TrackAPI do
+describe Vero::Api::Workers::Events::TrackAPI do
 
   context "request without properties" do
-    subject { Vero::API::Events::TrackAPI.new('https://www.getvero.com', {}) }
-    it "should inherit from Vero::API::BaseCaller" do
-      subject.should be_a(Vero::API::BaseAPI)
+    subject { Vero::Api::Workers::Events::TrackAPI.new('https://www.getvero.com', {}) }
+    it "should inherit from Vero::Api::Workers::BaseCaller" do
+      subject.should be_a(Vero::Api::Workers::BaseAPI)
     end
 
     it "should map to current version of Vero API" do
@@ -14,7 +14,7 @@ describe Vero::API::Events::TrackAPI do
   end
 
   context "request with properties" do
-    subject { Vero::API::Events::TrackAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event'}) }
+    subject { Vero::Api::Workers::Events::TrackAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event'}) }
     describe :validate! do
       it "should raise an error if test_event is a blank String" do
         options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => nil}
@@ -52,7 +52,7 @@ describe Vero::API::Events::TrackAPI do
 
   describe "integration test" do
     it "should not raise any errors" do
-      obj = Vero::API::Events::TrackAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event'})
+      obj = Vero::Api::Workers::Events::TrackAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event'})
 
       RestClient.stub(:post).and_return(200)
       expect { obj.perform }.to_not raise_error

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

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Vero::API::Users::EditAPI do
-  subject { Vero::API::Users::EditAPI.new('https://www.getvero.com', {}) }
-  it "should inherit from Vero::API::BaseCaller" do
-    subject.should be_a(Vero::API::BaseAPI)
+describe Vero::Api::Workers::Users::EditAPI do
+  subject { Vero::Api::Workers::Users::EditAPI.new('https://www.getvero.com', {}) }
+  it "should inherit from Vero::Api::Workers::BaseCaller" do
+    subject.should be_a(Vero::Api::Workers::BaseAPI)
   end
 
   it "should map to current version of Vero API" do
     subject.send(:url).should == "https://www.getvero.com/api/v2/users/edit.json"
   end
 
-  subject { Vero::API::Users::EditAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :email => 'test@test.com', :changes => { :email => 'test@test.com' }}) }
+  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
   end
 

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

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Vero::API::Users::EditTagsAPI do
-  subject { Vero::API::Users::EditTagsAPI.new('https://www.getvero.com', {}) }
-  it "should inherit from Vero::API::BaseCaller" do
-    subject.should be_a(Vero::API::BaseAPI)
+describe Vero::Api::Workers::Users::EditTagsAPI do
+  subject { Vero::Api::Workers::Users::EditTagsAPI.new('https://www.getvero.com', {}) }
+  it "should inherit from Vero::Api::Workers::BaseCaller" do
+    subject.should be_a(Vero::Api::Workers::BaseAPI)
   end
 
   it "should map to current version of Vero API" do
     subject.send(:url).should == "https://www.getvero.com/api/v2/users/tags/edit.json"
   end
 
-  subject { Vero::API::Users::EditTagsAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :email => 'test@test.com', :add => ["test"]}) }
+  subject { Vero::Api::Workers::Users::EditTagsAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :email => 'test@test.com', :add => ["test"]}) }
   describe :validate! do
   end
 

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

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Vero::API::Users::TrackAPI do
-  subject { Vero::API::Users::TrackAPI.new('https://www.getvero.com', {}) }
-  it "should inherit from Vero::API::BaseCaller" do
-    subject.should be_a(Vero::API::BaseAPI)
+describe Vero::Api::Workers::Users::TrackAPI do
+  subject { Vero::Api::Workers::Users::TrackAPI.new('https://www.getvero.com', {}) }
+  it "should inherit from Vero::Api::Workers::BaseCaller" do
+    subject.should be_a(Vero::Api::Workers::BaseAPI)
   end
 
   it "should map to current version of Vero API" do
     subject.send(:url).should == "https://www.getvero.com/api/v2/users/track.json"
   end
 
-  subject { Vero::API::Users::TrackAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :email => 'test@test.com'}) }
+  subject { Vero::Api::Workers::Users::TrackAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :email => 'test@test.com'}) }
   describe :validate! do
     it "should raise an error if email is a blank String" do
       options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :email => nil}

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

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Vero::API::Users::UnsubscribeAPI do
-  subject { Vero::API::Users::UnsubscribeAPI.new('https://www.getvero.com', {}) }
-  it "should inherit from Vero::API::BaseCaller" do
-    subject.should be_a(Vero::API::BaseAPI)
+describe Vero::Api::Workers::Users::UnsubscribeAPI do
+  subject { Vero::Api::Workers::Users::UnsubscribeAPI.new('https://www.getvero.com', {}) }
+  it "should inherit from Vero::Api::Workers::BaseCaller" do
+    subject.should be_a(Vero::Api::Workers::BaseAPI)
   end
 
   it "should map to current version of Vero API" do
     subject.send(:url).should == "https://www.getvero.com/api/v2/users/unsubscribe.json"
   end
 
-  subject { Vero::API::Users::UnsubscribeAPI.new('https://www.getvero.com', {:auth_token => 'abcd', :email => 'test@test.com', :changes => { :email => 'test@test.com' }}) }
+  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
   end
 

data/spec/lib/api_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+describe Vero::Api::Events do
+  let (:subject) { Vero::Api::Events }
+  
+  describe :track! do
+    it "should call the TrackAPI object via the configured sender" do
+      input = {:event_name => "test_event", :identity => {:email => "james@getvero.com"}, :data => {:test => "test"}}
+      expected = input.merge(:auth_token => "abc123", :development_mode => true)
+
+      mock_context = Vero::Context.new
+      mock_context.config.stub(:configured?).and_return(true)
+      mock_context.config.stub(:auth_token).and_return("abc123")
+
+      Vero::App.stub(:default_context).and_return(mock_context)
+
+      Vero::Sender.should_receive(:send).with(Vero::Api::Workers::Events::TrackAPI, true, "https://www.getvero.com", expected)
+
+      subject.track!(input)
+    end
+  end
+end
+
+describe Vero::Api::Users do
+  let (:subject) { Vero::Api::Users }
+  
+  describe :track! do
+    it "should call the TrackAPI object via the configured sender" do
+      input = {:email => "james@getvero.com", :data => {:age => 25}}
+      expected = input.merge(:auth_token => "abc123", :development_mode => true)
+
+      mock_context = Vero::Context.new
+      mock_context.config.stub(:configured?).and_return(true)
+      mock_context.config.stub(:auth_token).and_return("abc123")
+
+      Vero::App.stub(:default_context).and_return(mock_context)
+
+      Vero::Sender.should_receive(:send).with(Vero::Api::Workers::Users::TrackAPI, true, "https://www.getvero.com", expected)
+
+      subject.track!(input)
+    end
+  end
+
+  describe :edit_user! do
+    it "should call the TrackAPI object via the configured sender" do
+      input = {:email => "james@getvero.com", :changes => {:age => 25}}
+      expected = input.merge(:auth_token => "abc123", :development_mode => true)
+
+      mock_context = Vero::Context.new
+      mock_context.config.stub(:configured?).and_return(true)
+      mock_context.config.stub(:auth_token).and_return("abc123")
+
+      Vero::App.stub(:default_context).and_return(mock_context)
+
+      Vero::Sender.should_receive(:send).with(Vero::Api::Workers::Users::EditAPI, true, "https://www.getvero.com", expected)
+
+      subject.edit_user!(input)
+    end
+  end
+
+  describe :edit_user_tags! do
+    it "should call the TrackAPI object via the configured sender" do
+      input = {:add => ["boom"], :remove => ["tish"]}
+      expected = input.merge(:auth_token => "abc123", :development_mode => true)
+
+      mock_context = Vero::Context.new
+      mock_context.config.stub(:configured?).and_return(true)
+      mock_context.config.stub(:auth_token).and_return("abc123")
+
+      Vero::App.stub(:default_context).and_return(mock_context)
+
+      Vero::Sender.should_receive(:send).with(Vero::Api::Workers::Users::EditTagsAPI, true, "https://www.getvero.com", expected)
+
+      subject.edit_user_tags!(input)
+    end
+  end
+
+  describe :unsubscribe! do
+    it "should call the TrackAPI object via the configured sender" do
+      input = {:email => "james@getvero"}
+      expected = input.merge(:auth_token => "abc123", :development_mode => true)
+
+      mock_context = Vero::Context.new
+      mock_context.config.stub(:configured?).and_return(true)
+      mock_context.config.stub(:auth_token).and_return("abc123")
+
+      Vero::App.stub(:default_context).and_return(mock_context)
+
+      Vero::Sender.should_receive(:send).with(Vero::Api::Workers::Users::UnsubscribeAPI, true, "https://www.getvero.com", expected)
+
+      subject.unsubscribe!(input)
+    end
+  end
+end

data/spec/lib/trackable_spec.rb

@@ -47,9 +47,9 @@ describe Vero::Trackable do
       before do
         @request_params = {
           :event_name => 'test_event',
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
           :identity => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"},
           :data => { :test => 1 },
+          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
           :development_mode => true
         }
         @url = "https://www.getvero.com/api/v1/track.json"
@@ -70,10 +70,10 @@ describe Vero::Trackable do
 
         RestClient.stub(:post).and_return(200)
 
-        RestClient.should_receive(:post).with("https://www.getvero.com/api/v2/events/track.json", {:auth_token=>"YWJjZDEyMzQ6ZWZnaDU2Nzg=", :development_mode=>true, :data=>{:test=>1}, :event_name=>"test_event", :identity=>{:email=>"durkster@gmail.com", :age=>20, :_user_type=>"User"}}.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)
         @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", {:auth_token=>"YWJjZDEyMzQ6ZWZnaDU2Nzg=", :development_mode=>true, :data=>{}, :event_name=>"test_event", :identity=>{:email=>"durkster@gmail.com", :age=>20, :_user_type=>"User"}}.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)
         @user.track!(@request_params[:event_name]).should == 200
       end
 
@@ -107,10 +107,10 @@ describe Vero::Trackable do
     describe :identify! do
       before do
         @request_params = {
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :development_mode => true,
           :email => 'durkster@gmail.com',
-          :data => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"}
+          :data => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"},
+          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
+          :development_mode => true
         }
         @url = "https://www.getvero.com/api/v2/users/track.json"
       end
@@ -145,10 +145,10 @@ describe Vero::Trackable do
     describe :update_user! do
       before do
         @request_params = {
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :development_mode => true,
           :email => 'durkster@gmail.com',
-          :changes => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"}
+          :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
@@ -195,11 +195,11 @@ describe Vero::Trackable do
     describe :update_user_tags! do
       before do
         @request_params = {
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :development_mode => true,
           :email => 'durkster@gmail.com',
           :add => [],
-          :remove => []
+          :remove => [],
+          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
+          :development_mode => true
         }
         @url = "https://www.getvero.com/api/v2/users/tags/edit.json"
       end
@@ -233,8 +233,8 @@ describe Vero::Trackable do
     describe :unsubscribe! do
       before do
         @request_params = {
-          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
           :email => 'durkster@gmail.com',
+          :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
           :development_mode => true
         }
         @url = "https://www.getvero.com/api/v2/users/unsubscribe.json"
@@ -312,6 +312,19 @@ describe Vero::Trackable do
 
       it "should take into account any defined extras" do
         user = UserWithExtras.new
+        user.properties = nil
+        user.to_vero.should == {:email => 'durkster@gmail.com', :_user_type => "UserWithExtras"}
+
+        user.properties = "test"
+        user.to_vero.should == {:email => 'durkster@gmail.com', :_user_type => "UserWithExtras"}
+
+        user.properties = {}
+        user.to_vero.should == {:email => 'durkster@gmail.com', :_user_type => "UserWithExtras"}
+
+        user.properties = {
+          :age => 20,
+          :gender => "female"
+        }
         user.to_vero.should == {:email => 'durkster@gmail.com', :age => 20, :gender => "female", :_user_type => "UserWithExtras"}
       end
     end

data/spec/support/user_support.rb

@@ -72,14 +72,9 @@ class UserWithExtras
   include Vero::Trackable
   trackable :email, {:extras => :properties}
 
+  attr_accessor :properties
+
   def email
     'durkster@gmail.com'
   end
-
-  def properties
-    {
-      :age => 20,
-      :gender => "female"
-    }
-  end
 end

metadata

@@ -1,134 +1,130 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vero
-version: !ruby/object:Gem::Version
-  version: 0.5.0
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
-authors:
+authors: 
 - James Lamont
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-12 00:00:00 +11:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !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'
+    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
+  requirement: &id003 !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'
+    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
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !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
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id005
+- !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
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: girl_friday
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: 
 email: support@getvero.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Gemfile
 - Gemfile.lock
 - lib/generators/vero_generator.rb
@@ -138,6 +134,7 @@ files:
 - lib/vero/api/users/edit_tags_api.rb
 - lib/vero/api/users/track_api.rb
 - lib/vero/api/users/unsubscribe_api.rb
+- lib/vero/api.rb
 - lib/vero/app.rb
 - lib/vero/config.rb
 - lib/vero/context.rb
@@ -161,6 +158,7 @@ files:
 - spec/lib/api/users/edit_tags_api_spec.rb
 - spec/lib/api/users/track_api_spec.rb
 - spec/lib/api/users/unsubscribe_api_spec.rb
+- spec/lib/api_spec.rb
 - spec/lib/app_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/context_spec.rb
@@ -171,36 +169,47 @@ 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/events/track_api_spec.rb
 - spec/lib/api/users/edit_api_spec.rb
 - spec/lib/api/users/edit_tags_api_spec.rb
 - spec/lib/api/users/track_api_spec.rb
 - spec/lib/api/users/unsubscribe_api_spec.rb
+- spec/lib/api_spec.rb
 - spec/lib/app_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/context_spec.rb