vero 0.4.3 → 0.4.5

data/Gemfile.lock

@@ -1,9 +1,7 @@
 PATH
   remote: .
   specs:
-    vero (0.4.2)
-      delayed_job
-      delayed_job_active_record
+    vero (0.4.5)
       girl_friday
       rest-client
 
@@ -114,6 +112,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  delayed_job
+  delayed_job_active_record
   rails
   rspec
   vero!

data/lib/vero/api/base_api.rb

@@ -43,6 +43,14 @@ module Vero
 
       def request
       end
+
+      def request_content_type
+        {:content_type => :json, :accept => :json}
+      end
+
+      def request_params_as_json
+        @options.to_json
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Vero
         end
         
         def request
-          RestClient.post(self.url, @options)
+          RestClient.post(self.url, self.request_params_as_json, self.request_content_type)
         end
 
         def validate!

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

@@ -7,7 +7,7 @@ module Vero
         end
 
         def request
-          RestClient.put(url, @options)
+          RestClient.put(url, self.request_params_as_json, self.request_content_type)
         end
 
         def validate!

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

@@ -7,7 +7,7 @@ module Vero
         end
 
         def request
-          RestClient.put(url, @options)
+          RestClient.put(url, self.request_params_as_json, self.request_content_type)
         end
 
         def validate!

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

@@ -7,7 +7,7 @@ module Vero
         end
 
         def request
-          RestClient.post(url, @options)
+          RestClient.post(url, self.request_params_as_json, self.request_content_type)
         end
 
         def validate!

data/lib/vero/sender.rb

@@ -1,14 +1,26 @@
 module Vero
+  class SenderHash < ::Hash
+    def [](key)
+      if self.has_key?(key)
+        super
+      else
+        klass_name = key.to_s.split("_").map(&:capitalize).join
+        eval("Vero::Senders::#{klass_name}")
+      end
+    end
+  end
+
   class Sender
     def self.senders
       @senders ||= begin
-        t = {
+        t = Vero::SenderHash.new
+
+        t.merge!({
           true          => Vero::Senders::Invalid,
           false         => Vero::Senders::Base,
           :none         => Vero::Senders::Base,
-          :thread       => Vero::Senders::Invalid,
-          :delayed_job  => Vero::Senders::DelayedJob
-        }
+          :thread       => Vero::Senders::Invalid
+        })
 
         if RUBY_VERSION =~ /1\.9\./
           t.merge!(

data/lib/vero/utility/logger.rb

@@ -7,7 +7,7 @@ module Vero
 
       module ClassMethods
         def log(object, message)
-          return unless Vero::App.default_context.config.logging
+          return unless Vero::App.default_context.config.logging && !defined?(RSpec)
 
           message = "#{object.class.name}: #{message}"
 

data/lib/vero/version.rb

@@ -1,3 +1,3 @@
 module Vero
-  VERSION = '0.4.3'
+  VERSION = '0.4.5'
 end

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

@@ -1,54 +1,61 @@
 require 'spec_helper'
 
 describe Vero::API::Events::TrackAPI 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)
-  end
-
-  it "should map to current version of Vero API" do
-    subject.send(:url).should == "https://www.getvero.com/api/v2/events/track.json"
-  end
 
-  subject { Vero::API::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}
-      subject.options = options
-      expect { subject.send(:validate!) }.to raise_error(ArgumentError)
-
-      options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event'}
-      subject.options = options
-      expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
+  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)
     end
 
-    it "should raise an error if data is not either nil or a Hash" do
-      options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event', :data => []}
-      subject.options = options
-      expect { subject.send(:validate!) }.to raise_error(ArgumentError)
-
-      options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event', :data => nil}
-      subject.options = options
-      expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
-
-      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)
+    it "should map to current version of Vero API" do
+      subject.send(:url).should == "https://www.getvero.com/api/v2/events/track.json"
     end
   end
-  
-  describe :request do
-    it "should send a request to the Vero API" do
-      RestClient.should_receive(:post).with("https://www.getvero.com/api/v2/events/track.json", {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event'})
-      RestClient.stub(:post).and_return(200)
-      subject.send(:request)
+
+  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'}) }
+    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}
+        subject.options = options
+        expect { subject.send(:validate!) }.to raise_error(ArgumentError)
+
+        options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event'}
+        subject.options = options
+        expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
+      end
+
+      it "should raise an error if data is not either nil or a Hash" do
+        options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event', :data => []}
+        subject.options = options
+        expect { subject.send(:validate!) }.to raise_error(ArgumentError)
+
+        options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event', :data => nil}
+        subject.options = options
+        expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
+
+        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
+      it "should send a JSON request to the Vero API" do
+        RestClient.should_receive(:post).with("https://www.getvero.com/api/v2/events/track.json", {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :event_name => 'test_event'}.to_json, {:content_type => :json, :accept => :json})
+        RestClient.stub(:post).and_return(200)
+        subject.send(:request)
+      end
     end
   end
 
   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'})
+
       RestClient.stub(:post).and_return(200)
-      expect { subject.perform }.to_not raise_error
+      expect { obj.perform }.to_not raise_error
     end
   end
 end

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

@@ -16,7 +16,7 @@ describe Vero::API::Users::EditAPI do
 
   describe :request do
     it "should send a request to the Vero API" do
-      RestClient.should_receive(:put).with("https://www.getvero.com/api/v2/users/edit.json", {:auth_token => 'abcd', :email => 'test@test.com', :changes => { :email => 'test@test.com' }})
+      RestClient.should_receive(:put).with("https://www.getvero.com/api/v2/users/edit.json", {:auth_token => 'abcd', :email => 'test@test.com', :changes => { :email => 'test@test.com' }}.to_json, {:content_type => :json, :accept => :json})
       RestClient.stub(:put).and_return(200)
       subject.send(:request)
     end

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

@@ -16,7 +16,7 @@ describe Vero::API::Users::EditTagsAPI do
 
   describe :request do
     it "should send a request to the Vero API" do
-      RestClient.should_receive(:put).with("https://www.getvero.com/api/v2/users/tags/edit.json", {:auth_token => 'abcd', :email => 'test@test.com', :add => ["test"]})
+      RestClient.should_receive(:put).with("https://www.getvero.com/api/v2/users/tags/edit.json", {:auth_token => 'abcd', :email => 'test@test.com', :add => ["test"]}.to_json, {:content_type => :json, :accept => :json})
       RestClient.stub(:put).and_return(200)
       subject.send(:request)
     end

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

@@ -39,7 +39,7 @@ describe Vero::API::Users::TrackAPI do
   
   describe :request do
     it "should send a request to the Vero API" do
-      RestClient.should_receive(:post).with("https://www.getvero.com/api/v2/users/track.json", {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :email => 'test@test.com'})
+      RestClient.should_receive(:post).with("https://www.getvero.com/api/v2/users/track.json", {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :email => 'test@test.com'}.to_json, {:content_type => :json, :accept => :json})
       RestClient.stub(:post).and_return(200)
       subject.send(:request)
     end

data/spec/lib/sender_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Vero::Sender do
+  subject { Vero::Sender }
+  describe "self.senders" do
+    it "should be a Hash" do
+      subject.senders.should be_a(Hash)
+    end
+
+    # context "< Ruby 1.9" do
+    #   before :all do
+    #     Object.const_set :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
+
+    context "~> Ruby 1.9" do
+      # before :all do
+      #   Object.const_set :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
+
+    it "should automatically find senders that are not defined" do
+      subject.senders[:delayed_job].should  == Vero::Senders::DelayedJob
+      subject.senders[:invalid].should      == Vero::Senders::Invalid
+      subject.senders[:none].should         == Vero::Senders::Base
+    end
+  end
+end

data/spec/lib/trackable_spec.rb

@@ -11,6 +11,8 @@ describe Vero::Trackable do
     }
     @url = "https://www.getvero.com/api/v1/track.json"
     @user = User.new
+
+    @content_type_params = {:content_type => :json, :accept => :json}
   end
 
   context "the gem has not been configured" do
@@ -68,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"}})
+        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)
         @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"}})
+        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)
         @user.track!(@request_params[:event_name]).should == 200
       end
 
@@ -106,9 +108,9 @@ describe Vero::Trackable do
       before do
         @request_params = {
           :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :data => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"},
           :development_mode => true,
-          :email => 'durkster@gmail.com'
+          :email => 'durkster@gmail.com',
+          :data => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"}
         }
         @url = "https://www.getvero.com/api/v2/users/track.json"
       end
@@ -120,7 +122,7 @@ 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.should_receive(:post).with(@url, @request_params.to_json, @content_type_params)
         
         @user.identify!.should == 200
       end
@@ -144,9 +146,9 @@ describe Vero::Trackable do
       before do
         @request_params = {
           :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :changes => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"},
+          :development_mode => true,
           :email => 'durkster@gmail.com',
-          :development_mode => true
+          :changes => {:email => 'durkster@gmail.com', :age => 20, :_user_type => "User"}
         }
         @url = "https://www.getvero.com/api/v2/users/edit.json"
       end
@@ -158,7 +160,7 @@ 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"))
+        RestClient.should_receive(:put).with(@url, @request_params.merge(:email => "durkster1@gmail.com").to_json, @content_type_params)
         
         @user.with_vero_context.update_user!("durkster1@gmail.com").should == 200
       end
@@ -170,7 +172,7 @@ 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)
+        RestClient.should_receive(:put).with(@url, @request_params.to_json, @content_type_params)
         
         @user.with_vero_context.update_user!.should == 200
       end
@@ -194,10 +196,10 @@ describe Vero::Trackable do
       before do
         @request_params = {
           :auth_token => 'YWJjZDEyMzQ6ZWZnaDU2Nzg=',
-          :add => [],
-          :remove => [],
+          :development_mode => true,
           :email => 'durkster@gmail.com',
-          :development_mode => true
+          :add => [],
+          :remove => []
         }
         @url = "https://www.getvero.com/api/v2/users/tags/edit.json"
       end
@@ -210,7 +212,7 @@ 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)
+        RestClient.should_receive(:put).with(@url, @request_params.to_json, @content_type_params)
         
         @user.with_vero_context.update_user_tags!.should == 200
       end

data/spec/spec_helper.rb

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

data/vero.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   dependencies = [
     [:development, 'rails'],
     [:development, 'rspec'],
+    [:development, 'delayed_job'],
+    [:development, 'delayed_job_active_record'],
     [:runtime, 'rest-client'],
-    [:runtime, 'delayed_job'],
-    [:runtime, 'delayed_job_active_record'],
     [:runtime, 'girl_friday']
   ]
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vero
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: delayed_job
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -60,14 +60,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job
+  name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -149,6 +149,7 @@ files:
 - spec/lib/app_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/context_spec.rb
+- spec/lib/sender_spec.rb
 - spec/lib/trackable_spec.rb
 - spec/lib/view_helpers_spec.rb
 - spec/spec_helper.rb
@@ -188,6 +189,7 @@ test_files:
 - spec/lib/app_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/context_spec.rb
+- spec/lib/sender_spec.rb
 - spec/lib/trackable_spec.rb
 - spec/lib/view_helpers_spec.rb
 - spec/spec_helper.rb