swrve 0.0.4 → 0.0.5

data/.coveralls.yml

@@ -0,0 +1,2 @@
+repo_token: zB3skKYGsJ4tILoEEsIEAa7TLRWfJz6y7
+service_name: travis-ci

data/README.md

@@ -32,7 +32,7 @@ Swrve.session_end('user uuid')
 
 ### Resources 
 ```ruby
-json_resource = Swrve.resource(UniqueUserIdentifier, "ab_test_name")
+json_resource = Swrve.resource('user uuid', "ab_test_name")
 ```
 
 [Usage Examples]: #usage-examples

data/lib/swrve.rb

@@ -13,9 +13,13 @@ module Swrve
 
     def_delegators :@resource_getter, :resources, :resources_diff, :resource
     def_delegators :@event_sender, :session_start, :session_end, :create_event, :purchase, :buy_in, :currency_given, :update_user 
+    def_delegators :@event_sender, :session_start, :session_end, :create_event, :purchase, :buy_in, :currency_given, :update_user 
+    def_delegators :@config, :build_endpoints, :validate!
 
     def configure
       yield(config) if block_given?
+      validate!
+      build_endpoints
       @event_sender    = Swrve::Api::Events.new
       @resource_getter = Swrve::Api::Resources.new
     end

data/lib/swrve/api/events.rb

@@ -11,9 +11,9 @@ module Swrve
       def_instance_delegator :@api_endpoint, :post
 
       def initialize
-        @api_endpoint    = Swrve::Middleware::Http.new(Swrve.config.api_url + "/#{Swrve.config.api_version}")
-        @web_app_version = Swrve.config.web_app_version
-        @api_key         = Swrve.config.api_key
+        @api_endpoint = Swrve::Middleware::Http.new(Swrve.config.api_url + "/#{Swrve.config.api_version}")
+        @app_version  = Swrve.config.app_version
+        @api_key      = Swrve.config.api_key
       end
 
       # Starts the user game session
@@ -87,7 +87,7 @@ module Swrve
       end
 
       def query_options(uuid, payload = {})
-        { api_key: @api_key, app_version: @web_app_version, user: uuid }.merge(payload) 
+        { api_key: @api_key, app_version: @app_version, user: uuid }.merge(payload) 
       end
 
       #The swrve api does not accept nul JSON values

data/lib/swrve/api/resources.rb

@@ -49,7 +49,7 @@ module Swrve
         {
           user:        uuid,
           api_key:     Swrve.config.api_key,
-          app_version: Swrve.config.web_app_version,
+          app_version: Swrve.config.app_version,
           joined:      (created_at || Time.now).to_i * 1000
         }
       end

data/lib/swrve/configuration.rb

@@ -2,17 +2,31 @@ require 'faraday'
 
 module Swrve
   class Configuration
-    attr_accessor :ab_test_url, :api_url, :web_app_version, :api_key, :local_resource_path, :game_id, :debug_url,
+    attr_accessor :ab_test_url, :api_url, :app_version, :api_key, :local_resource_path, :game_id,
                   :load_local_resources, :debug, :http_adapter, :api_version, :resource_timeout
+    DEFAULT_API_ENDPOINT = 'api.swrve.com'
+    DEFAULT_ABTEST_ENDPOINT = 'abtest.swrve.com'
 
     def initialize
-      @ab_test_url = 'https://abtest.swrve.com'
-      @api_url = 'https://api.swrve.com'
-      @web_app_version = '1.0'
-      @debug_url = 'https://debug.api.swrve.com'
-      @http_adapter = Faraday.default_adapter
-      @api_version  = 1
+      @app_version      = '0.0'
+      @http_adapter     = Faraday.default_adapter
+      @api_version      = 1
       @resource_timeout = 4
     end
+
+    def build_endpoints
+      return if @api_url && @ab_test_url
+      @api_url, @ab_test_url = [ "https://#{game_id}.#{DEFAULT_API_ENDPOINT}", 
+                                 "https://#{game_id}.#{DEFAULT_ABTEST_ENDPOINT}" ]
+    end
+
+    def validate!
+      [:game_id, :api_key].each do |check_valid|
+        raise ConfigurationError, "#{check_valid} is a required configuration setting" if self.send(check_valid).nil?
+      end
+      warn 'app_version is a highly recommended configuration setting, defaulting to 0.0' if app_version == '0.0'
+    end
   end
+
+  class ConfigurationError < Exception; end
 end

data/lib/swrve/version.rb

@@ -1,3 +1,3 @@
 module Swrve
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/api/events_spec.rb

@@ -7,7 +7,7 @@ module Swrve
       subject { Events.new }
 
       let(:http_middleware) { mock('http_middleware') }
-      let(:config) { stub_everything('config', web_app_version: '1', api_version: 1, api_key: 'KEY', api_url: 'http://api_url') }
+      let(:config) { stub_everything('config', app_version: '1', api_version: 1, api_key: 'KEY', api_url: 'http://api_url') }
 
       before do
         Swrve.stubs(config: config)
@@ -23,7 +23,7 @@ module Swrve
         before { Swrve::Middleware::Http.stubs(new: http_middleware) }
 
         it 'sets the correct app_version' do
-          config.expects(:web_app_version)
+          config.expects(:app_version)
           
           subject
         end

data/spec/api/resources_spec.rb

@@ -3,16 +3,14 @@ require 'swrve/middleware/http'
 module Swrve
   module Api
     describe Resources do
-      
+
       subject { Resources.new }
-      
-      describe '.new' do       
-        let(:config) { stub_everything('config', ab_test_url: 'http://ab_test_url', api_version: 1) }
 
-        before do
-          Swrve.stubs(config: config)
-        end
+      let(:config) { stub_everything('config', ab_test_url: 'http://ab_test_url', api_version: 1) }
 
+      before { Swrve.stubs(config: config) }
+
+      describe '.new' do       
         it 'Creates a resources endpoint' do
           Middleware::Http.expects(:new).with([config.ab_test_url, 'api', config.api_version].join('/'))
 
@@ -27,7 +25,7 @@ module Swrve
 
         it 'delegates it to the resources endpoint' do
           resources_endpoint.expects(:get)
-          
+
           subject.send(:get)
         end
       end

data/spec/swrve_spec.rb

@@ -9,7 +9,11 @@ describe Swrve do
   before do
     Swrve::Api::Events.stubs(new: event_sender)
     Swrve::Api::Resources.stubs(new: resource_getter)
-    Swrve.configure 
+    Swrve.configure do |config|
+      config.game_id = 1
+      config.api_key = 'key'
+      config.app_version = '9.9'
+    end
   end
 
   describe ".config" do
@@ -18,7 +22,7 @@ describe Swrve do
     end
 
     it 'responds to required configurations' do
-      [:ab_test_url, :api_url, :web_app_version, :api_key, :local_resource_path, :game_id, :debug_url,
+      [:ab_test_url, :api_url, :app_version, :api_key, :local_resource_path, :game_id,
        :load_local_resources, :debug, :http_adapter].map do |value|
         Swrve.config.respond_to?(value)
       end.uniq.should == [true]
@@ -27,10 +31,10 @@ describe Swrve do
 
   describe '.configure' do
 
-    before { Swrve.configure { |config| config.web_app_version = '11' }}
+    before { Swrve.configure { |config| config.app_version = '11' }}
 
     it 'should be configurable' do
-      Swrve.config.web_app_version.should == '11'
+      Swrve.config.app_version.should == '11'
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swrve
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -254,6 +254,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - Gemfile