adjust 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea93c8799fff1c88cc738596e945187354965c01
-  data.tar.gz: a46542aea7d375d383d338bd5daf8bedb087c558
+  metadata.gz: 394b43447458b304090b06fbc93ebf860f94949f
+  data.tar.gz: 3176c978c5b815e5e92db9be77b3b2717e733e72
 SHA512:
-  metadata.gz: 35a4de163640fb0f1005239bb0e64a09a75e9f1a7dbc9078fbe8797f0c2ca9edb386ae7c7e5dba13c621e975854a66d75985d1501c9ef74629f96e4a4f19bdea
-  data.tar.gz: 1c74755f03d5ff97656a4e734a1a4c03daa9de830c6896f18ccefe109c8d871dcc698289fd7e34e88d7b234a98b49dce703c07aa1c48c21bd7392d97d8ecbeb6
+  metadata.gz: d3a95181c80beb4fe83913ee6b2adb472b1733eecefe8b69a76d2b234dbb072f94a00319e55191613d8334a1483cc669d1b8bc4e164a1f32ce2684b044f543ec
+  data.tar.gz: 4230cf55d66d62c0066cb7393a2f9fa8f5d4e8d6a7416041c24f5bae70cdb6c5d0b54a3758f3700ac3b3688a43a5167fb40aeb90040bf2ac4b25eacd976207ed

data/.rubocop.yml

@@ -1,2 +1,5 @@
 Documentation:
   Enabled: false
+
+Metrics/ParameterLists:
+  CountKeywordArgs: false

data/.travis.yml

@@ -5,3 +5,6 @@ rvm:
   - rbx-2
   - ruby-head
   - jruby-head
+
+notifications:
+  email: false

data/README.md

@@ -20,11 +20,37 @@ This gem is meant for use with server to server integration with Adjust. More in
 
 ##### Configuration
 
+By default the configurations will be read from `config/adjust.yml`. Also of note the environment loaded will be that of RACK_ENV, RAILS_ENV or as a last resort default of 'development'.
+
+Example config:
+```yaml
+development:
+  environment: sandbox
+  dev_app:
+    app_token: app_token
+    event1:
+      event_token: event_token
+```
+
+We would then be able to refer to the token using the key given in the config:
+
+```ruby
+Adjust.event(app: :dev_app, event: :event1, idfa: :idfa).track!
+```
+
+Or by their tokens
+
+```ruby
+Adjust.event(app: :app_token, event: :event_token, idfa: :idfa).track!
+```
+
+Loading the configurations
+
 ```ruby
-Adjust.configure do |config|
-  config.app_token = '<YOUR_ADJUST_APP_TOKEN>'
-  config.environment = '<production|sandbox>'
-end
+Adjust.load(environment: 'test') # => {...}
+Adjust.load('path/to/adjust.yml')  # => {...}
+Adjust.load('path/to/adjust.yml', environment: 'staging') # => {...}
+
 ```
 
 ##### Event tracking
@@ -32,7 +58,7 @@ end
 *`idfa` can also be any other values such as `android_id` or `gps_adid` check Adjust's documentation for details.*
 
 ```ruby
-Adjust.event(token: :token, idfa: :idfa).track!
+Adjust.event(app: :app, event: :event, idfa: :idfa).track!
 ```
 
 
@@ -41,7 +67,7 @@ Adjust.event(token: :token, idfa: :idfa).track!
 *`idfa` can also be any other values such as `android_id` or `gps_adid` check Adjust's documentation for details.*
 
 ```ruby
-Adjust.revenue(token: :token, revenue: 1.25, currency: 'USD|CAD|EUR', idfa: :idfa).track!
+Adjust.revenue(app: :app, event: :event, revenue: 1.25, currency: 'USD|CAD|EUR', idfa: :idfa).track!
 ```
 
 ## Contributing

data/lib/adjust/core/configurable.rb

@@ -1,10 +1,8 @@
 module Adjust
   module Core
     module Configurable
-      extend Forwardable
-
-      def configure
-        yield configuration
+      def load(path = 'config/adjust.yml', environment: nil)
+        configuration.load path, environment: environment
       end
 
       def configuration
@@ -13,7 +11,13 @@ module Adjust
 
       private
 
-      def_delegators :configuration, :app_token, :environment
+      def environment
+        configuration.active_environment
+      end
+
+      def tokens(app, event)
+        configuration.tokens(app, event)
+      end
     end
   end
 end

data/lib/adjust/core/configuration.rb

@@ -1,25 +1,50 @@
-require 'forwardable'
+require 'yaml'
+require 'erb'
 
 module Adjust
   module Core
     class Configuration
-      attr_accessor :app_token, :environment
+      def load(path, environment: nil)
+        @environment = environment || default_environment
+        @configurations = read_configurations path
+      end
 
       def environment
-        @environment ||= :sandbox
+        @environment ||= default_environment
+      end
+
+      def configurations
+        @configurations ||= read_configurations
+      end
+
+      def active
+        configurations[environment]
+      end
+
+      def active_environment
+        active['environment']
       end
 
-      def app_token
-        fail MissingAppTokenError unless @app_token
+      def tokens(app, event)
+        Tokens.new(app, event, active).find
+      end
+
+      private
+
+      def default_environment
+        ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
+      end
+
+      def read_configurations(path = 'config/adjust.yml')
+        YAML.load parse read path
+      end
 
-        @app_token
+      def read(path)
+        File.read path
       end
 
-      def to_hash
-        {
-          environment: environment,
-          app_token: app_token
-        }
+      def parse(file)
+        ERB.new(file).result
       end
     end
   end

data/lib/adjust/core/tokens.rb

@@ -0,0 +1,35 @@
+module Adjust
+  module Core
+    class Tokens
+      def initialize(app, event, config)
+        @app = app.to_s
+        @event = event.to_s
+        @config = config[@app]
+      end
+
+      def find
+        { app_token: app_token, event_token: event_token }
+      end
+
+      private
+
+      attr_reader :app, :event, :config
+
+      def app_token
+        return app unless config
+
+        config.fetch('app_token') { app }
+      end
+
+      def event_token
+        return event unless config
+
+        if config.include?(event)
+          config[event].fetch('event_token') { event }
+        else
+          event
+        end
+      end
+    end
+  end
+end

data/lib/adjust/core.rb

@@ -1,3 +1,3 @@
-require 'adjust/core/errors'
+require 'adjust/core/tokens'
 require 'adjust/core/configurable'
 require 'adjust/core/configuration'

data/lib/adjust/version.rb

@@ -1,3 +1,3 @@
 module Adjust
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/adjust.rb

@@ -9,24 +9,22 @@ module Adjust
   class << self
     include Core::Configurable
 
-    def event(token:, time: current_time, **device)
-      Clients::Event.new \
-        event_token: token,
-        app_token: app_token,
+    def event(app:, event:, time: current_time, **device)
+      Clients::Event.new(
+        **tokens(app, event),
         environment: environment,
         created_at: time,
-        **device
+        **device)
     end
 
-    def revenue(token:, revenue:, currency:, time: current_time, **device)
-      Clients::Revenue.new \
-        event_token: token,
-        app_token: app_token,
+    def revenue(app:, event:, revenue:, currency:, time: current_time, **device)
+      Clients::Revenue.new(
+        **tokens(app, event),
         environment: environment,
         created_at: time,
         revenue: revenue,
         currency: currency,
-        **device
+        **device)
     end
 
     def current_time

data/spec/core/configuration_spec.rb

@@ -3,37 +3,55 @@ require 'spec_helper'
 module Adjust
   module Core
     describe Configuration do
-      context '#environment' do
-        it 'defaults to sandbox' do
-          expect(subject.environment).to eq :sandbox
-        end
+      let(:path) { 'spec/fixtures/config/adjust.yml' }
+      subject(:config) { Configuration.new }
 
-        it 'can be overriden' do
-          subject.environment = :production
+      context 'with an explicit environment' do
+        subject(:load!) { config.load(path, environment: 'test') }
+        before { expect { load! }.to_not raise_error }
 
-          expect(subject.environment).to eq :production
+        describe '#load' do
+          it 'sets an environment' do
+            expect(config.environment).to eq 'test'
+          end
         end
-      end
 
-      context '#app_token' do
-        it 'raises an exception if not set' do
-          expect { subject.app_token }.to raise_error(MissingAppTokenError)
+        describe '#configurations' do
+          it 'caches the configurations' do
+            expect(config.configurations).to include 'test'
+          end
         end
 
-        it 'can be set' do
-          subject.app_token = :app_token
-
-          expect(subject.app_token).to eq :app_token
+        describe '#active' do
+          it 'contains the configuration for current env' do
+            expect(config.active).to include 'test_app'
+          end
         end
-      end
 
-      context '#to_hash' do
-        before { subject.app_token = :app_token }
+        describe '#active_environment' do
+          it 'returns the adjust environment for current env' do
+            expect(config.active_environment).to eq 'sandbox'
+          end
+        end
 
-        it 'returns configs as a hash' do
-          expect(subject.to_hash).to eq \
-            environment: :sandbox,
-            app_token: :app_token
+        describe '#active_tokens' do
+          it 'returns arguments if app was not matched' do
+            expect(config.tokens('foo', 'bar')).to eq \
+              app_token: 'foo',
+              event_token: 'bar'
+          end
+
+          it 'returns app_token if app matched and event not matched' do
+            expect(config.tokens('test_app', 'bar')).to eq \
+              app_token: 'app_token',
+              event_token: 'bar'
+          end
+
+          it 'returns tokens if app matched and event matched' do
+            expect(config.tokens('test_app', 'event1')).to eq \
+              app_token: 'app_token',
+              event_token: 'event_token'
+          end
         end
       end
     end

data/spec/fixtures/config/adjust.yml

@@ -0,0 +1,33 @@
+development:
+  environment: 'sandbox'
+
+  dev_app:
+    app_token: 'app_token'
+    event1:
+      event_token: 'event_token'
+
+test:
+  environment: 'sandbox'
+
+  test_app:
+    app_token: 'app_token'
+    event1:
+      event_token: 'event_token'
+
+integration:
+  environment: 'sandbox'
+
+  test_app:
+    app_token: <%= ENV['ADJUST_APP_TOKEN'] %>
+    event1:
+      event_token: 'tawmb9'
+    event2:
+      event_token: 'fbv8to'
+
+production:
+  environment: 'production'
+
+  prod_app:
+    app_token: 'app_token'
+    event1:
+      event_token: 'event_token'

data/spec/integration/sending_a_revenue_spec.rb

@@ -4,7 +4,8 @@ describe 'Sending a revenue' do
   context 'with success', vcr: { cassette_name: :revenue_success }  do
     subject do
       Adjust.revenue \
-        token: 'fbv8to',
+        app: :test_app,
+        event: :event2,
         revenue: 2.0,
         currency: 'CAD',
         idfa: ENV['ADJUST_TEST_IDFA']

data/spec/integration/sending_an_event_spec.rb

@@ -2,7 +2,12 @@ require 'spec_helper'
 
 describe 'Sending an event' do
   context 'with success', vcr: { cassette_name: :event_success }  do
-    subject { Adjust.event(token: 'tawmb9', idfa: ENV['ADJUST_TEST_IDFA']) }
+    subject do
+      Adjust.event \
+        app: :test_app,
+        event: :event1,
+        idfa: ENV['ADJUST_TEST_IDFA']
+    end
 
     it 'succeeds' do
       expect(subject.track!).to be_success

data/spec/spec_helper.rb

@@ -10,6 +10,4 @@ Dotenv.load
 require 'adjust'
 require 'support/vcr'
 
-Adjust.configure do |config|
-  config.app_token = ENV['ADJUST_APP_TOKEN']
-end
+Adjust.load('spec/fixtures/config/adjust.yml', environment: 'integration')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adjust
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Hugo Bastien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -189,7 +189,7 @@ files:
 - lib/adjust/core.rb
 - lib/adjust/core/configurable.rb
 - lib/adjust/core/configuration.rb
-- lib/adjust/core/errors.rb
+- lib/adjust/core/tokens.rb
 - lib/adjust/representers.rb
 - lib/adjust/representers/event_representer.rb
 - lib/adjust/transport/faraday.rb
@@ -197,6 +197,7 @@ files:
 - spec/clients/event_spec.rb
 - spec/clients/revenue_spec.rb
 - spec/core/configuration_spec.rb
+- spec/fixtures/config/adjust.yml
 - spec/fixtures/responses/event_success.yml
 - spec/fixtures/responses/revenue_success.yml
 - spec/integration/sending_a_revenue_spec.rb
@@ -231,6 +232,7 @@ test_files:
 - spec/clients/event_spec.rb
 - spec/clients/revenue_spec.rb
 - spec/core/configuration_spec.rb
+- spec/fixtures/config/adjust.yml
 - spec/fixtures/responses/event_success.yml
 - spec/fixtures/responses/revenue_success.yml
 - spec/integration/sending_a_revenue_spec.rb

data/lib/adjust/core/errors.rb

@@ -1,6 +0,0 @@
-module Adjust
-  module Core
-    class MissingAppTokenError < StandardError
-    end
-  end
-end