added Castle::Utils::Timestamp + small corrections

lib/castle.rb

@@ -3,13 +3,15 @@
 require 'openssl'
 require 'net/http'
 require 'json'
+require 'time'
 
 require 'castle/version'
 require 'castle/errors'
 require 'castle/command'
 require 'castle/utils'
 require 'castle/utils/merger'
 require 'castle/utils/cloner'
+require 'castle/utils/timestamp'
 require 'castle/context_merger'
 require 'castle/context_sanitizer'
 require 'castle/default_context'

lib/castle/client.rb

@@ -10,13 +10,13 @@ def from_request(request, options = {})
         )
       end
 
-      def to_context(request, context_options = {})
-        default_context = Castle::DefaultContext.new(request, context_options[:cookies]).call
-        Castle::ContextMerger.call(default_context, context_options[:context])
+      def to_context(request, options = {})
+        default_context = Castle::DefaultContext.new(request, options[:cookies]).call
+        Castle::ContextMerger.call(default_context, options[:context])
       end
 
       def to_options(options = {})
-        options[:timestamp] ||= Time.now.iso8601
+        options[:timestamp] ||= Castle::Utils::Timestamp.call
         options
       end
     end
@@ -34,7 +34,7 @@ def authenticate(options = {})
       options = Castle::Utils.deep_symbolize_keys(options || {})
 
       if tracked?
-        options[:timestamp] = @timestamp if @timestamp
+        options[:timestamp] ||= @timestamp if @timestamp
         command = Castle::Commands::Authenticate.new(@context).build(options)
         begin
           @api.request(command).merge(failover: false, failover_reason: nil)
@@ -50,7 +50,7 @@ def identify(options = {})
       options = Castle::Utils.deep_symbolize_keys(options || {})
 
       return unless tracked?
-      options[:timestamp] = @timestamp if @timestamp
+      options[:timestamp] ||= @timestamp if @timestamp
 
       command = Castle::Commands::Identify.new(@context).build(options)
       @api.request(command)
@@ -60,7 +60,7 @@ def track(options = {})
       options = Castle::Utils.deep_symbolize_keys(options || {})
 
       return unless tracked?
-      options[:timestamp] = @timestamp if @timestamp
+      options[:timestamp] ||= @timestamp if @timestamp
 
       command = Castle::Commands::Track.new(@context).build(options)
       @api.request(command)

lib/castle/commands/authenticate.rb

@@ -13,7 +13,8 @@ def build(options = {})
         context = ContextSanitizer.call(context)
 
         Castle::Command.new('authenticate',
-                            options.merge(context: context, sent_at: Time.now.iso8601),
+                            options.merge(context: context,
+                                          sent_at: Castle::Utils::Timestamp.call),
                             :post)
       end
 

lib/castle/commands/identify.rb

@@ -13,7 +13,8 @@ def build(options = {})
         context = ContextSanitizer.call(context)
 
         Castle::Command.new('identify',
-                            options.merge(context: context, sent_at: Time.now.iso8601),
+                            options.merge(context: context,
+                                          sent_at: Castle::Utils::Timestamp.call),
                             :post)
       end
 

lib/castle/commands/track.rb

@@ -13,7 +13,8 @@ def build(options = {})
         context = ContextSanitizer.call(context)
 
         Castle::Command.new('track',
-                            options.merge(context: context, sent_at: Time.now.iso8601),
+                            options.merge(context: context,
+                                          sent_at: Castle::Utils::Timestamp.call),
                             :post)
       end
 

lib/castle/context_sanitizer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Castle
+  # removes not proper active flag values
   class ContextSanitizer
     class << self
       def call(context)

lib/castle/utils/timestamp.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Castle
+  module Utils
+    # generates proper timestamp
+    class Timestamp
+      def self.call
+        Time.now.utc.iso8601(3)
+      end
+    end
+  end
+end

spec/lib/castle/client_spec.rb

@@ -31,8 +31,8 @@
   end
 
   let(:time_now) { Time.now }
-  let(:time_auto) { time_now.iso8601 }
-  let(:time_user) { (Time.now - 10_000).iso8601 }
+  let(:time_auto) { time_now.utc.iso8601(3) }
+  let(:time_user) { (Time.now - 10_000).utc.iso8601(3) }
 
   before do
     Timecop.freeze(time_now)

spec/lib/castle/commands/authenticate_spec.rb

@@ -7,7 +7,7 @@
   let(:default_payload) { { event: '$login.authenticate', user_id: '1234', sent_at: time_auto } }
 
   let(:time_now) { Time.now }
-  let(:time_auto) { time_now.iso8601 }
+  let(:time_auto) { time_now.utc.iso8601(3) }
 
   before do
     Timecop.freeze(time_now)

spec/lib/castle/commands/identify_spec.rb

@@ -7,7 +7,7 @@
   let(:default_payload) { { user_id: '1234', sent_at: time_auto } }
 
   let(:time_now) { Time.now }
-  let(:time_auto) { time_now.iso8601 }
+  let(:time_auto) { time_now.utc.iso8601(3) }
 
   before do
     Timecop.freeze(time_now)

spec/lib/castle/commands/track_spec.rb

@@ -7,7 +7,7 @@
   let(:default_payload) { { event: '$login.track', sent_at: time_auto } }
 
   let(:time_now) { Time.now }
-  let(:time_auto) { time_now.iso8601 }
+  let(:time_auto) { time_now.utc.iso8601(3) }
 
   before do
     Timecop.freeze(time_now)

spec/lib/castle/utils/timestamp_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+describe Castle::Utils::Timestamp do
+  subject { described_class.call }
+
+  let(:time_string) { '2018-01-10T14:14:24.407Z' }
+  let(:time) { Time.parse(time_string) }
+
+  before do
+    Timecop.freeze(time)
+  end
+
+  after do
+    Timecop.return
+  end
+
+  describe '#call' do
+    it do
+      is_expected.to eql(time_string)
+    end
+  end
+end