analytics-ruby 2.0.3 → 2.0.5

data/Gemfile.lock

@@ -1,12 +1,19 @@
 PATH
   remote: .
   specs:
-    analytics-ruby (2.0.2)
+    analytics-ruby (2.0.5)
+      json (~> 1.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.18)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     diff-lcs (1.2.5)
+    i18n (0.6.9)
+    json (1.8.1)
+    multi_json (1.10.1)
     predicated (0.2.6)
     rake (10.3.1)
     rspec (2.14.1)
@@ -23,6 +30,10 @@ GEM
     ruby_parser (3.6.1)
       sexp_processor (~> 4.1)
     sexp_processor (4.4.3)
+    thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
     wrong (0.7.1)
       diff-lcs (~> 1.2.5)
       predicated (~> 0.2.6)
@@ -41,7 +52,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 3.0.0, < 4.0.0)
   analytics-ruby!
   rake (~> 10.3)
   rspec (~> 2.0)
+  tzinfo (= 1.2.1)
   wrong (~> 0.0)

data/History.md

@@ -1,3 +1,7 @@
+2.0.4 / 2014-06-11
+==================
+* fix: isofying trait dates in #group
+
 2.0.3 / 2014-06-04
 ==================
 * fix: undefined method `is_requesting?' for nil:NilClass when calling flush (#51)

data/analytics-ruby.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'wrong', '~> 0.0'
   spec.add_development_dependency 'rspec', '~> 2.0'
+  spec.add_development_dependency 'tzinfo', '1.2.1'
+  spec.add_development_dependency 'activesupport', '>= 3.0.0', '<4.0.0'
 end

data/lib/segment/analytics/client.rb

@@ -162,6 +162,7 @@ module Segment
         context = options[:context] || {}
 
         fail ArgumentError, '.traits must be a hash' unless traits.is_a? Hash
+        isoify_dates! traits
 
         check_presence! group_id, 'group_id'
         check_timestamp! timestamp

data/lib/segment/analytics/utils.rb

@@ -49,10 +49,11 @@ module Segment
       end
 
       def datetime_in_iso8601 datetime
-        if datetime.is_a? Date
+        case datetime
+        when Time, DateTime
+            time_in_iso8601 datetime
+        when Date
           date_in_iso8601 datetime
-        elsif datetime.is_a? Time
-          time_in_iso8601 datetime
         else
           datetime
         end

data/lib/segment/analytics/version.rb

@@ -1,5 +1,5 @@
 module Segment
   class Analytics
-    VERSION = '2.0.3'
+    VERSION = '2.0.5'
   end
 end

data/spec/segment/analytics/client_spec.rb

@@ -65,17 +65,23 @@ module Segment
           @queue.pop
         end
 
-        it 'should convert Time properties into iso8601 format' do
+        it 'should convert time and date traits into iso8601 format' do
           @client.track({
             :user_id => 'user',
             :event => 'Event',
             :properties => {
               :time => Time.utc(2013),
+              :time_with_zone =>  Time.zone.parse('2013-01-01'),
+              :date_time => DateTime.new(2013,1,1),
+              :date => Date.new(2013,1,1),
               :nottime => 'x'
             }
           })
           message = @queue.pop
           message[:properties][:time].should == '2013-01-01T00:00:00Z'
+          message[:properties][:time_with_zone].should == '2013-01-01T00:00:00Z'
+          message[:properties][:date_time].should == '2013-01-01T00:00:00Z'
+          message[:properties][:date].should == '2013-01-01'
           message[:properties][:nottime].should == 'x'
         end
       end
@@ -101,16 +107,22 @@ module Segment
           @queue.pop
         end
 
-        it 'should convert Time traits into iso8601 format' do
+        it 'should convert time and date traits into iso8601 format' do
           @client.identify({
             :user_id => 'user',
             :traits => {
               :time => Time.utc(2013),
+              :time_with_zone =>  Time.zone.parse('2013-01-01'),
+              :date_time => DateTime.new(2013,1,1),
+              :date => Date.new(2013,1,1),
               :nottime => 'x'
             }
           })
           message = @queue.pop
           message[:traits][:time].should == '2013-01-01T00:00:00Z'
+          message[:traits][:time_with_zone].should == '2013-01-01T00:00:00Z'
+          message[:traits][:date_time].should == '2013-01-01T00:00:00Z'
+          message[:traits][:date].should == '2013-01-01'
           message[:traits][:nottime].should == 'x'
         end
       end
@@ -140,6 +152,11 @@ module Segment
       describe '#group' do
         before :all do
           @client = Client.new :write_key => WRITE_KEY
+          @queue = @client.instance_variable_get :@queue
+        end
+
+        after :each do
+          @client.flush
         end
 
         it 'should error without group_id' do
@@ -157,6 +174,26 @@ module Segment
         it 'should not error with the required options as strings' do
           @client.group Utils.stringify_keys(Queued::GROUP)
         end
+
+        it 'should convert time and date traits into iso8601 format' do
+          @client.identify({
+            :user_id => 'user',
+            :group_id => 'group',
+            :traits => {
+              :time => Time.utc(2013),
+              :time_with_zone =>  Time.zone.parse('2013-01-01'),
+              :date_time => DateTime.new(2013,1,1),
+              :date => Date.new(2013,1,1),
+              :nottime => 'x'
+            }
+          })
+          message = @queue.pop
+          message[:traits][:time].should == '2013-01-01T00:00:00Z'
+          message[:traits][:time_with_zone].should == '2013-01-01T00:00:00Z'
+          message[:traits][:date_time].should == '2013-01-01T00:00:00Z'
+          message[:traits][:date].should == '2013-01-01'
+          message[:traits][:nottime].should == 'x'
+        end
       end
 
       describe '#page' do

data/spec/spec_helper.rb

@@ -1,8 +1,12 @@
 require 'segment/analytics'
 require 'wrong'
+require 'active_support/time'
 
 include Wrong
 
+# Setting timezone for ActiveSupport::TimeWithZone to UTC
+Time.zone = 'UTC'
+
 module Segment
   class Analytics
     WRITE_KEY = 'testsecret'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: analytics-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13866940 !ruby/object:Gem::Requirement
+  requirement: &18470280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '10.3'
   type: :development
   prerelease: false
-  version_requirements: *13866940
+  version_requirements: *18470280
 - !ruby/object:Gem::Dependency
   name: wrong
-  requirement: &13866440 !ruby/object:Gem::Requirement
+  requirement: &18469780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.0'
   type: :development
   prerelease: false
-  version_requirements: *13866440
+  version_requirements: *18469780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13865980 !ruby/object:Gem::Requirement
+  requirement: &18469320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,14 +43,39 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *13865980
+  version_requirements: *18469320
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &18468860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :development
+  prerelease: false
+  version_requirements: *18468860
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &18468380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *18468380
 description: The Segment.io ruby analytics library
 email: friends@segment.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- analytics-ruby-2.0.3.gem
+- analytics-ruby-2.0.5.gem
 - analytics-ruby.gemspec
 - Gemfile
 - Gemfile.lock