castle-rb 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a15270851803a5228a22931ccea95fc873bab7e1
-  data.tar.gz: 03741fc4fda242401a8e33e3ffab915e59ef0809
+SHA256:
+  metadata.gz: ef681fe4eea20aa8dacb69718809e49103e17060a5f2b0a57331982c9d36b59f
+  data.tar.gz: 6ab1e89bdefc563ce78ca7ae9666fb86f2b22ce0b740250a10f67fa3eaa1a98b
 SHA512:
-  metadata.gz: 26b1cb4d6eeee9fff4d11f51f2fd6a2ed4f562a44754355d041653b4730fe99e07883d3759f14ec40e6923f94be2325c537a69d8aa37be25e372ca857657f219
-  data.tar.gz: '089bd3ca463c5fccd1e62f7669fb18933e39bd83de93ad02c2a2bbe154a71135a488a33965b7a0184a9eaff5ce18e0434ee415192fad0aced90889ec8c0b716a'
+  metadata.gz: cbd67d2101f93caa9c3c793171759bdf0401313ff6c3dbccacc0843674a6ec36d8b0c63e1c705a54e7f27d0b10b59990b85131ad6f492f02ba1e8b2673679583
+  data.tar.gz: c56cbdb356049465687277a388d39c62fe41a90e8b02436c38568fd7d8e18e7f8fcd12ad37e5f87c6b6b2a0fce0651da1a2863d3f14034b90da41cc5a876cf6e

data/README.md

@@ -122,7 +122,7 @@ end
 
 ```ruby
 request_context = ::Castle::Client.to_context(request)
-track_options = {
+track_options = ::Castle::Client.to_options({
   event: '$login.succeeded',
   user_id: user.id,
   properties: {
@@ -131,6 +131,6 @@ track_options = {
   traits: {
     key: 'value'
   }
-}
+})
 CastleTrackingWorker.perform_async(request_context, track_options)
 ```

data/lib/castle.rb

@@ -3,6 +3,7 @@
 require 'openssl'
 require 'net/http'
 require 'json'
+require 'time'
 
 require 'castle/version'
 require 'castle/errors'
@@ -10,9 +11,10 @@ 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'
-require 'castle/commands/with_context'
 require 'castle/commands/identify'
 require 'castle/commands/authenticate'
 require 'castle/commands/track'

data/lib/castle/client.rb

@@ -4,19 +4,28 @@ module Castle
   class Client
     class << self
       def from_request(request, options = {})
-        new(to_context(request, options), options[:do_not_track])
+        new(
+          to_context(request, options),
+          to_options(options)
+        )
       end
 
       def to_context(request, options = {})
         default_context = Castle::DefaultContext.new(request, options[:cookies]).call
-        Castle::ContextMerger.new(default_context).call(options[:context] || {})
+        Castle::ContextMerger.call(default_context, options[:context])
+      end
+
+      def to_options(options = {})
+        options[:timestamp] ||= Castle::Utils::Timestamp.call
+        options
       end
     end
 
     attr_accessor :api
 
-    def initialize(context, do_not_track = false)
-      @do_not_track = do_not_track
+    def initialize(context, options = {})
+      @do_not_track = options[:do_not_track]
+      @timestamp = options[:timestamp]
       @context = context
       @api = API.new
     end
@@ -25,6 +34,7 @@ module Castle
       options = Castle::Utils.deep_symbolize_keys(options || {})
 
       if tracked?
+        options[:timestamp] ||= @timestamp if @timestamp
         command = Castle::Commands::Authenticate.new(@context).build(options)
         begin
           @api.request(command).merge(failover: false, failover_reason: nil)
@@ -40,6 +50,7 @@ module Castle
       options = Castle::Utils.deep_symbolize_keys(options || {})
 
       return unless tracked?
+      options[:timestamp] ||= @timestamp if @timestamp
 
       command = Castle::Commands::Identify.new(@context).build(options)
       @api.request(command)
@@ -49,6 +60,7 @@ module Castle
       options = Castle::Utils.deep_symbolize_keys(options || {})
 
       return unless tracked?
+      options[:timestamp] ||= @timestamp if @timestamp
 
       command = Castle::Commands::Track.new(@context).build(options)
       @api.request(command)
@@ -70,7 +82,7 @@ module Castle
 
     def setup_context(request, cookies, additional_context)
       default_context = Castle::DefaultContext.new(request, cookies).call
-      Castle::ContextMerger.new(default_context).call(additional_context || {})
+      Castle::ContextMerger.call(default_context, additional_context)
     end
 
     def failover_response_or_raise(failover_response, error)

data/lib/castle/commands/authenticate.rb

@@ -3,13 +3,19 @@
 module Castle
   module Commands
     class Authenticate
-      include WithContext
+      def initialize(context)
+        @context = context
+      end
 
       def build(options = {})
         validate!(options)
-        build_context!(options)
+        context = ContextMerger.call(@context, options[:context])
+        context = ContextSanitizer.call(context)
 
-        Castle::Command.new('authenticate', options, :post)
+        Castle::Command.new('authenticate',
+                            options.merge(context: context,
+                                          sent_at: Castle::Utils::Timestamp.call),
+                            :post)
       end
 
       private

data/lib/castle/commands/identify.rb

@@ -3,13 +3,19 @@
 module Castle
   module Commands
     class Identify
-      include WithContext
+      def initialize(context)
+        @context = context
+      end
 
       def build(options = {})
         validate!(options)
-        build_context!(options)
+        context = ContextMerger.call(@context, options[:context])
+        context = ContextSanitizer.call(context)
 
-        Castle::Command.new('identify', options, :post)
+        Castle::Command.new('identify',
+                            options.merge(context: context,
+                                          sent_at: Castle::Utils::Timestamp.call),
+                            :post)
       end
 
       private

data/lib/castle/commands/track.rb

@@ -3,13 +3,19 @@
 module Castle
   module Commands
     class Track
-      include WithContext
+      def initialize(context)
+        @context = context
+      end
 
       def build(options = {})
         validate!(options)
-        build_context!(options)
+        context = ContextMerger.call(@context, options[:context])
+        context = ContextSanitizer.call(context)
 
-        Castle::Command.new('track', options, :post)
+        Castle::Command.new('track',
+                            options.merge(context: context,
+                                          sent_at: Castle::Utils::Timestamp.call),
+                            :post)
       end
 
       private

data/lib/castle/context_merger.rb

@@ -2,12 +2,11 @@
 
 module Castle
   class ContextMerger
-    def initialize(context)
-      @main_context = Castle::Utils::Cloner.call(context)
-    end
-
-    def call(request_context)
-      Castle::Utils::Merger.call(@main_context, request_context)
+    class << self
+      def call(initial_context, request_context)
+        main_context = Castle::Utils::Cloner.call(initial_context)
+        Castle::Utils::Merger.call(main_context, request_context || {})
+      end
     end
   end
 end

data/lib/castle/context_sanitizer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Castle
+  # removes not proper active flag values
+  class ContextSanitizer
+    class << self
+      def call(context)
+        sanitized_active_mode(context) || {}
+      end
+
+      private
+
+      def sanitized_active_mode(context)
+        return context unless context && context.key?(:active)
+        return context if [true, false].include?(context[:active])
+        context.reject { |key| key == :active }
+      end
+    end
+  end
+end

data/lib/castle/utils/merger.rb

@@ -4,19 +4,19 @@ module Castle
   module Utils
     class Merger
       def self.call(first, second)
-        Castle::Utils.deep_symbolize_keys!(first)
-        Castle::Utils.deep_symbolize_keys!(second)
+        first_s = Castle::Utils.deep_symbolize_keys(first)
+        second_s = Castle::Utils.deep_symbolize_keys(second)
 
-        second.each do |name, value|
+        second_s.each do |name, value|
           if value.nil?
-            first.delete(name)
-          elsif value.is_a?(Hash) && first[name].is_a?(Hash)
-            call(first[name], value)
+            first_s.delete(name)
+          elsif value.is_a?(Hash) && first_s[name].is_a?(Hash)
+            first_s[name] = call(first_s[name], value)
           else
-            first[name] = value
+            first_s[name] = value
           end
         end
-        first
+        first_s
       end
     end
   end

data/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

data/lib/castle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Castle
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/spec/lib/castle/client_spec.rb

@@ -12,25 +12,40 @@ describe Castle::Client do
   end
   let(:request) { Rack::Request.new(env) }
   let(:client) { described_class.from_request(request) }
+  let(:request_to_context) { described_class.to_context(request) }
+  let(:client_with_user_timestamp) do
+    described_class.new(request_to_context, timestamp: time_user)
+  end
+  let(:client_with_no_timestamp) { described_class.new(request_to_context) }
+
   let(:headers) { { 'X-Forwarded-For' => ip.to_s } }
   let(:context) do
     {
       client_id: 'abcd',
       active: true,
       origin: 'web',
-      headers: headers,
+      headers: { 'X-Forwarded-For': ip.to_s },
       ip: ip,
       library: { name: 'castle-rb', version: '2.2.0' }
     }
   end
 
+  let(:time_now) { Time.now }
+  let(:time_auto) { time_now.utc.iso8601(3) }
+  let(:time_user) { (Time.now - 10_000).utc.iso8601(3) }
+
   before do
+    Timecop.freeze(time_now)
     stub_const('Castle::VERSION', '2.2.0')
     stub_request(:any, /api.castle.io/).with(
       basic_auth: ['', 'secret']
     ).to_return(status: 200, body: '{}', headers: {})
   end
 
+  after do
+    Timecop.return
+  end
+
   describe 'parses the request' do
     before do
       allow(Castle::API).to receive(:new).and_call_original
@@ -42,8 +57,26 @@ describe Castle::Client do
     end
   end
 
+  describe 'to_context' do
+    it do
+      expect(described_class.to_context(request)).to eql(context)
+    end
+  end
+
+  describe 'to_options' do
+    let(:options) { { user_id: '1234', traits: { name: 'Jo' } } }
+    let(:result) { { user_id: '1234', traits: { name: 'Jo' }, timestamp: time_auto } }
+
+    it do
+      expect(described_class.to_options(options)).to eql(result)
+    end
+  end
+
   describe 'identify' do
-    let(:request_body) { { user_id: '1234', context: context, traits: { name: 'Jo' } } }
+    let(:request_body) do
+      { user_id: '1234', timestamp: time_auto,
+        sent_at: time_auto, context: context, traits: { name: 'Jo' } }
+    end
 
     before { client.identify(options) }
 
@@ -55,6 +88,35 @@ describe Castle::Client do
           JSON.parse(req.body) == JSON.parse(request_body.to_json)
         end
       end
+
+      context 'when passed timestamp in options and no defined timestamp' do
+        let(:client) { client_with_no_timestamp }
+        let(:options) { { user_id: '1234', traits: { name: 'Jo' }, timestamp: time_user } }
+        let(:request_body) do
+          { user_id: '1234', traits: { name: 'Jo' }, context: context,
+            timestamp: time_user, sent_at: time_auto }
+        end
+
+        it do
+          assert_requested :post, 'https://api.castle.io/v1/identify', times: 1 do |req|
+            JSON.parse(req.body) == JSON.parse(request_body.to_json)
+          end
+        end
+      end
+
+      context 'with client initialized with timestamp' do
+        let(:client) { client_with_user_timestamp }
+        let(:request_body) do
+          { user_id: '1234', timestamp: time_user, sent_at: time_auto,
+            context: context, traits: { name: 'Jo' } }
+        end
+
+        it do
+          assert_requested :post, 'https://api.castle.io/v1/identify', times: 1 do |req|
+            JSON.parse(req.body) == JSON.parse(request_body.to_json)
+          end
+        end
+      end
     end
 
     context 'string keys' do
@@ -71,14 +133,46 @@ describe Castle::Client do
   describe 'authenticate' do
     let(:options) { { event: '$login.succeeded', user_id: '1234' } }
     let(:request_response) { client.authenticate(options) }
-    let(:request_body) { { event: '$login.succeeded', user_id: '1234', context: context } }
+    let(:request_body) do
+      { event: '$login.succeeded', user_id: '1234', context: context,
+        timestamp: time_auto, sent_at: time_auto }
+    end
 
     context 'symbol keys' do
       before { request_response }
 
       it do
         assert_requested :post, 'https://api.castle.io/v1/authenticate', times: 1 do |req|
-          req.body == request_body.to_json
+          JSON.parse(req.body) == JSON.parse(request_body.to_json)
+        end
+      end
+
+      context 'when passed timestamp in options and no defined timestamp' do
+        let(:client) { client_with_no_timestamp }
+        let(:options) { { event: '$login.succeeded', user_id: '1234', timestamp: time_user } }
+        let(:request_body) do
+          { event: '$login.succeeded', user_id: '1234', context: context,
+            timestamp: time_user, sent_at: time_auto }
+        end
+
+        it do
+          assert_requested :post, 'https://api.castle.io/v1/authenticate', times: 1 do |req|
+            JSON.parse(req.body) == JSON.parse(request_body.to_json)
+          end
+        end
+      end
+
+      context 'with client initialized with timestamp' do
+        let(:client) { client_with_user_timestamp }
+        let(:request_body) do
+          { event: '$login.succeeded', user_id: '1234', context: context,
+            timestamp: time_user, sent_at: time_auto }
+        end
+
+        it do
+          assert_requested :post, 'https://api.castle.io/v1/authenticate', times: 1 do |req|
+            JSON.parse(req.body) == JSON.parse(request_body.to_json)
+          end
         end
       end
     end
@@ -90,7 +184,7 @@ describe Castle::Client do
 
       it do
         assert_requested :post, 'https://api.castle.io/v1/authenticate', times: 1 do |req|
-          req.body == request_body.to_json
+          JSON.parse(req.body) == JSON.parse(request_body.to_json)
         end
       end
     end
@@ -100,7 +194,7 @@ describe Castle::Client do
 
       it do
         assert_requested :post, 'https://api.castle.io/v1/authenticate', times: 1 do |req|
-          req.body == request_body.to_json
+          JSON.parse(req.body) == JSON.parse(request_body.to_json)
         end
       end
 
@@ -159,7 +253,10 @@ describe Castle::Client do
   end
 
   describe 'track' do
-    let(:request_body) { { event: '$login.succeeded', context: context, user_id: '1234' } }
+    let(:request_body) do
+      { event: '$login.succeeded', context: context, user_id: '1234',
+        timestamp: time_auto, sent_at: time_auto }
+    end
 
     before { client.track(options) }
 
@@ -171,6 +268,35 @@ describe Castle::Client do
           JSON.parse(req.body) == JSON.parse(request_body.to_json)
         end
       end
+
+      context 'when passed timestamp in options and no defined timestamp' do
+        let(:client) { client_with_no_timestamp }
+        let(:options) { { event: '$login.succeeded', user_id: '1234', timestamp: time_user } }
+        let(:request_body) do
+          { event: '$login.succeeded', user_id: '1234', context: context,
+            timestamp: time_user, sent_at: time_auto }
+        end
+
+        it do
+          assert_requested :post, 'https://api.castle.io/v1/track', times: 1 do |req|
+            JSON.parse(req.body) == JSON.parse(request_body.to_json)
+          end
+        end
+      end
+
+      context 'with client initialized with timestamp' do
+        let(:client) { client_with_user_timestamp }
+        let(:request_body) do
+          { event: '$login.succeeded', context: context, user_id: '1234',
+            timestamp: time_user, sent_at: time_auto }
+        end
+
+        it do
+          assert_requested :post, 'https://api.castle.io/v1/track', times: 1 do |req|
+            JSON.parse(req.body) == JSON.parse(request_body.to_json)
+          end
+        end
+      end
     end
 
     context 'string keys' do

data/spec/lib/castle/commands/authenticate_spec.rb

@@ -4,7 +4,18 @@ describe Castle::Commands::Authenticate do
   subject(:instance) { described_class.new(context) }
 
   let(:context) { { test: { test1: '1' } } }
-  let(:default_payload) { { event: '$login.authenticate', user_id: '1234' } }
+  let(:default_payload) { { event: '$login.authenticate', user_id: '1234', sent_at: time_auto } }
+
+  let(:time_now) { Time.now }
+  let(:time_auto) { time_now.utc.iso8601(3) }
+
+  before do
+    Timecop.freeze(time_now)
+  end
+
+  after do
+    Timecop.return
+  end
 
   describe '.build' do
     subject(:command) { instance.build(payload) }

data/spec/lib/castle/commands/identify_spec.rb

@@ -4,7 +4,18 @@ describe Castle::Commands::Identify do
   subject(:instance) { described_class.new(context) }
 
   let(:context) { { test: { test1: '1' } } }
-  let(:default_payload) { { user_id: '1234' } }
+  let(:default_payload) { { user_id: '1234', sent_at: time_auto } }
+
+  let(:time_now) { Time.now }
+  let(:time_auto) { time_now.utc.iso8601(3) }
+
+  before do
+    Timecop.freeze(time_now)
+  end
+
+  after do
+    Timecop.return
+  end
 
   describe '.build' do
     subject(:command) { instance.build(payload) }

data/spec/lib/castle/commands/track_spec.rb

@@ -4,7 +4,18 @@ describe Castle::Commands::Track do
   subject(:instance) { described_class.new(context) }
 
   let(:context) { { test: { test1: '1' } } }
-  let(:default_payload) { { event: '$login.track' } }
+  let(:default_payload) { { event: '$login.track', sent_at: time_auto } }
+
+  let(:time_now) { Time.now }
+  let(:time_auto) { time_now.utc.iso8601(3) }
+
+  before do
+    Timecop.freeze(time_now)
+  end
+
+  after do
+    Timecop.return
+  end
 
   describe '#build' do
     subject(:command) { instance.build(payload) }

data/spec/lib/castle/context_merger_spec.rb

@@ -1,21 +1,10 @@
 # frozen_string_literal: true
 
 describe Castle::ContextMerger do
-  subject(:command) { described_class.new('go', { id: '1' }, :post) }
-
   let(:first) { { test: { test1: { c: '4' } } } }
 
-  context '.new' do
-    subject(:instance) { described_class.new(first) }
-
-    it { expect(instance.instance_variable_get(:@main_context)).to eq(first) }
-    it do
-      expect(instance.instance_variable_get(:@main_context).object_id).not_to eq(first.object_id)
-    end
-  end
-
   context '#call' do
-    subject { described_class.new(first).call(second) }
+    subject { described_class.call(first, second) }
 
     let(:result) { { test: { test1: { c: '4', d: '5' } } } }
 

data/spec/lib/castle/context_sanitizer_spec.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+describe Castle::ContextSanitizer do
+  let(:paylod) { { test: 'test' } }
+
+  describe '#call' do
+    subject { described_class.call(context) }
+
+    context 'when active true' do
+      let(:context) { paylod.merge(active: true) }
+
+      it { is_expected.to eql(context) }
+    end
+
+    context 'when active false' do
+      let(:context) { paylod.merge(active: false) }
+
+      it { is_expected.to eql(context) }
+    end
+
+    context 'when active string' do
+      let(:context) { paylod.merge(active: 'uknown') }
+
+      it { is_expected.to eql(paylod) }
+    end
+  end
+end

data/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

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'bundler/setup'
 require 'rack'
 require 'webmock/rspec'
 require 'byebug'
+require 'timecop'
 
 require 'coveralls'
 Coveralls.wear!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: castle-rb
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Johan Brissmyr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies: []
 description: Castle protects your users from account compromise
 email: johan@castle.io
@@ -26,9 +26,9 @@ files:
 - lib/castle/commands/identify.rb
 - lib/castle/commands/review.rb
 - lib/castle/commands/track.rb
-- lib/castle/commands/with_context.rb
 - lib/castle/configuration.rb
 - lib/castle/context_merger.rb
+- lib/castle/context_sanitizer.rb
 - lib/castle/default_context.rb
 - lib/castle/errors.rb
 - lib/castle/extractors/client_id.rb
@@ -47,6 +47,7 @@ files:
 - lib/castle/utils.rb
 - lib/castle/utils/cloner.rb
 - lib/castle/utils/merger.rb
+- lib/castle/utils/timestamp.rb
 - lib/castle/version.rb
 - spec/lib/castle/api_spec.rb
 - spec/lib/castle/client_spec.rb
@@ -57,6 +58,7 @@ files:
 - spec/lib/castle/commands/track_spec.rb
 - spec/lib/castle/configuration_spec.rb
 - spec/lib/castle/context_merger_spec.rb
+- spec/lib/castle/context_sanitizer_spec.rb
 - spec/lib/castle/default_context_spec.rb
 - spec/lib/castle/extractors/client_id_spec.rb
 - spec/lib/castle/extractors/headers_spec.rb
@@ -68,6 +70,7 @@ files:
 - spec/lib/castle/secure_mode_spec.rb
 - spec/lib/castle/utils/cloner_spec.rb
 - spec/lib/castle/utils/merger_spec.rb
+- spec/lib/castle/utils/timestamp_spec.rb
 - spec/lib/castle/utils_spec.rb
 - spec/lib/castle/version_spec.rb
 - spec/lib/castle_spec.rb
@@ -92,32 +95,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Castle
 test_files:
-- spec/lib/castle/api_spec.rb
+- spec/spec_helper.rb
+- spec/lib/castle_spec.rb
+- spec/lib/castle/context_sanitizer_spec.rb
+- spec/lib/castle/review_spec.rb
 - spec/lib/castle/client_spec.rb
-- spec/lib/castle/command_spec.rb
-- spec/lib/castle/commands/authenticate_spec.rb
-- spec/lib/castle/commands/identify_spec.rb
-- spec/lib/castle/commands/review_spec.rb
-- spec/lib/castle/commands/track_spec.rb
+- spec/lib/castle/api_spec.rb
 - spec/lib/castle/configuration_spec.rb
-- spec/lib/castle/context_merger_spec.rb
+- spec/lib/castle/version_spec.rb
 - spec/lib/castle/default_context_spec.rb
-- spec/lib/castle/extractors/client_id_spec.rb
-- spec/lib/castle/extractors/headers_spec.rb
-- spec/lib/castle/extractors/ip_spec.rb
 - spec/lib/castle/header_formatter_spec.rb
-- spec/lib/castle/request_spec.rb
-- spec/lib/castle/response_spec.rb
-- spec/lib/castle/review_spec.rb
-- spec/lib/castle/secure_mode_spec.rb
 - spec/lib/castle/utils/cloner_spec.rb
+- spec/lib/castle/utils/timestamp_spec.rb
 - spec/lib/castle/utils/merger_spec.rb
+- spec/lib/castle/command_spec.rb
+- spec/lib/castle/request_spec.rb
+- spec/lib/castle/response_spec.rb
+- spec/lib/castle/commands/review_spec.rb
+- spec/lib/castle/commands/authenticate_spec.rb
+- spec/lib/castle/commands/track_spec.rb
+- spec/lib/castle/commands/identify_spec.rb
+- spec/lib/castle/context_merger_spec.rb
+- spec/lib/castle/extractors/ip_spec.rb
+- spec/lib/castle/extractors/headers_spec.rb
+- spec/lib/castle/extractors/client_id_spec.rb
 - spec/lib/castle/utils_spec.rb
-- spec/lib/castle/version_spec.rb
-- spec/lib/castle_spec.rb
-- spec/spec_helper.rb
+- spec/lib/castle/secure_mode_spec.rb

data/lib/castle/commands/with_context.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Castle
-  module Commands
-    module WithContext
-      def initialize(context)
-        @context_merger = ContextMerger.new(context)
-      end
-
-      private
-
-      def build_context!(options)
-        sanitize_active_mode!(options)
-        options[:context] = merge_context(options[:context])
-      end
-
-      def sanitize_active_mode!(options)
-        return unless options[:context] && options[:context].key?(:active)
-        return if [true, false].include?(options[:context][:active])
-        options[:context].delete(:active)
-      end
-
-      def merge_context(request_context)
-        @context_merger.call(request_context || {})
-      end
-    end
-  end
-end