vero 0.5.8 → 0.5.9

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    vero (0.5.8)
-      girl_friday (~> 0.11.2)
+    vero (0.5.9)
+      girl_friday (>= 0.11.2)
       json
       rest-client
 
@@ -134,7 +134,7 @@ PLATFORMS
 DEPENDENCIES
   delayed_job
   delayed_job_active_record
-  rails (> 3)
+  rails (>= 3)
   resque
   rspec
   vero!

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

@@ -12,7 +12,7 @@ module Vero
           end
 
           def validate!
-            raise ArgumentError.new("Missing :email") if options[:email].to_s.blank?
+            raise ArgumentError.new("Missing :id or :email") if options[:id].to_s.blank? && options[:email].to_s.blank?
             raise ArgumentError.new(":changes must be a Hash") unless options[:changes].is_a?(Hash)
           end
         end

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

@@ -12,7 +12,7 @@ module Vero
           end
 
           def validate!
-            raise ArgumentError.new("Missing :email") if options[:email].to_s.blank?
+            raise ArgumentError.new("Missing :id or :email") if options[:id].to_s.blank? && options[:email].to_s.blank?
             raise ArgumentError.new(":add must an Array if present") unless options[:add].nil? || options[:add].is_a?(Array)
             raise ArgumentError.new(":remove must an Array if present") unless options[:remove].nil? || options[:remove].is_a?(Array)
             raise ArgumentError.new("Either :add or :remove must be present") if (options[:remove].nil? && options[:add].nil?)

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

@@ -12,7 +12,7 @@ module Vero
           end
 
           def validate!
-            raise ArgumentError.new("Missing :email") if options[:email].to_s.blank?
+            raise ArgumentError.new("Missing :id or :email") if options[:id].to_s.blank? && options[:email].to_s.blank?
             raise ArgumentError.new(":data must be either nil or a Hash") unless (options[:data].nil? || options[:data].is_a?(Hash))
           end
         end

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

@@ -12,7 +12,7 @@ module Vero
           end
 
           def validate!
-            raise ArgumentError.new("Missing :email") if options[:email].to_s.blank?
+            raise ArgumentError.new("Missing :id or :email") if options[:id].to_s.blank? && options[:email].to_s.blank?
           end
         end
       end

data/lib/vero/version.rb

@@ -1,3 +1,3 @@
 module Vero
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 end

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

@@ -16,7 +16,7 @@ describe Vero::Api::Workers::Events::TrackAPI do
   context "request with properties" do
     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
+      it "should raise an error if event_name 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)
@@ -46,7 +46,7 @@ describe Vero::Api::Workers::Events::TrackAPI do
         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})

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

@@ -12,12 +12,20 @@ describe Vero::Api::Workers::Users::TrackAPI do
 
   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}
+    it "should raise an error if email and id are are blank String" do
+      options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :id => nil, :email => nil}
       subject.options = options
       expect { subject.send(:validate!) }.to raise_error(ArgumentError)
 
-      options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :email => 'test@test.com'}
+      options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :id => nil, :email => 'test@test.com'}
+      subject.options = options
+      expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
+
+      options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :id => "", :email => nil}
+      subject.options = options
+      expect { subject.send(:validate!) }.to raise_error(ArgumentError)
+
+      options = {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :id => "user123", :email => nil}
       subject.options = options
       expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
     end
@@ -42,7 +50,7 @@ describe Vero::Api::Workers::Users::TrackAPI do
       expect { subject.send(:validate!) }.to_not raise_error(ArgumentError)
     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/users/track.json", {:auth_token => 'abcd', :identity => {:email => 'test@test.com'}, :email => 'test@test.com'}.to_json, {:content_type => :json, :accept => :json})

data/vero.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |s|
   s.authors  = ['James Lamont']
 
   dependencies = [
-    [:development, 'rails', "> 3"],
+    [:development, 'rails', ">= 3"],
     [:development, 'rspec'],
     [:development, 'delayed_job'],
     [:development, 'delayed_job_active_record'],
     [:development, 'resque'],
-    [:runtime, 'json'],
-    [:runtime, 'rest-client'],
-    [:runtime, 'girl_friday', "~> 0.11.2"]
+    [:runtime,     'json'],
+    [:runtime,     'rest-client'],
+    [:runtime,     'girl_friday', ">= 0.11.2"]
   ]
 
   s.files         = Dir['**/*']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vero
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - James Lamont
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-29 00:00:00 +10:00
+date: 2013-05-08 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
@@ -122,7 +122,7 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 55
         segments: