lws 0.1.3 → 0.1.4

data/README.rdoc

@@ -42,7 +42,7 @@ ORM's:
 The following example uses a much more elaborate setup:
 
   LWS.setup do |config|
-    config.api_token = "…"
+    config.api_token = proc { "token" + Time.now.to_s }
     config.caching_object = MyRedisCache.new
     config.environment = :development
     config.endponts = { maps: "https://maps.leftclick.eu" }
@@ -54,6 +54,7 @@ In this setup, a caching object is used that follows the
 +FaradayMiddleWare::Caching+ API.  It uses all development API endpoints,
 except for maps, which is overriden to use the production endpoint.  Also
 HTTP request and JSON data debug logging is enabled.
+Also tokens are dynamically determined at runtime by the given proc block.
 
 The +LC_LWS_ENV+  is supported to override the LWS environment.
 Allowed values are "production" (default) and "development".

data/lib/lws/version.rb

@@ -2,6 +2,6 @@ module LWS
 
   # The LWS library version.
   # @note This is not the API version!
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 
 end

data/lib/lws.rb

@@ -59,7 +59,11 @@ module LWS
     end
 
     def call(env)
-      env[:request_headers]["X-Token"] = @token
+      env[:request_headers]["X-Token"] = if @token.is_a? Proc
+                                           @token.call
+                                         else
+                                           @token
+                                         end.to_s
       env[:request_headers]["Accept"] = "application/json"
       @app.call(env)
     end
@@ -72,7 +76,8 @@ module LWS
   # = The API configuration class
   class Config < Hashie::Dash
     #@!attribute api_token
-    #  @return [String] the API token necessary to gain access
+    #  @return [String, Proc] the API token necessary to gain access or
+    #     a proc block that returns it
     property :api_token
 
     #@!attribute caching_object
@@ -84,7 +89,7 @@ module LWS
     #    overrides
     property :endpoints, default: {}
 
-    #@!attribte environment
+    #@!attribute environment
     #  @return [Symbol] the (default) API environment
     property :environment, default: :production
 

data/test/test_caching.rb

@@ -31,9 +31,7 @@ class TestCaching < MiniTest::Unit::TestCase
         config.http_debug = true
         config.json_debug = true
       end
-      config.endpoints = { auth: "https://auth-dev.leftclick.eu",
-                           maps: "https://maps-dev.leftclick.eu",
-                           presence: "https://presence-dev.leftclick.eu" }
+      config.environment = :development
     end
   end
 

data/test/test_proc_token.rb

@@ -0,0 +1,35 @@
+require "test_helper"
+
+class TestProcToken < MiniTest::Unit::TestCase
+
+  def test_working_proc_token
+    # Redo the LWS setup with a proc block as token
+    LWS.setup do |config|
+      config.api_token = proc { ENV["LC_LWS_TEST_TOKEN"] }
+      if ENV["LC_LWS_TEST_DEBUG"].present?
+        config.http_debug = true
+        config.json_debug = true
+      end
+      config.environment = :development
+    end
+
+    task = LWS::Auth::Task.all.first
+    refute_nil(task)
+  end
+
+  def test_failing_proc
+    # Redo the LWS setup with a proc block as token
+    LWS.setup do |config|
+      config.api_token = proc { nil }
+      if ENV["LC_LWS_TEST_DEBUG"].present?
+        config.http_debug = true
+        config.json_debug = true
+      end
+      config.environment = :development
+    end
+
+    task = LWS::Auth::Task.all.first
+    assert_nil(task)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lws
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &10903360 !ruby/object:Gem::Requirement
+  requirement: &6510360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10903360
+  version_requirements: *6510360
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &10902460 !ruby/object:Gem::Requirement
+  requirement: &6509420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10902460
+  version_requirements: *6509420
 - !ruby/object:Gem::Dependency
   name: her
-  requirement: &10901740 !ruby/object:Gem::Requirement
+  requirement: &6508740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *10901740
+  version_requirements: *6508740
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &10901140 !ruby/object:Gem::Requirement
+  requirement: &6508140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10901140
+  version_requirements: *6508140
 - !ruby/object:Gem::Dependency
   name: her
-  requirement: &10900440 !ruby/object:Gem::Requirement
+  requirement: &6507420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 0.8.1
   type: :development
   prerelease: false
-  version_requirements: *10900440
+  version_requirements: *6507420
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &10899860 !ruby/object:Gem::Requirement
+  requirement: &6506840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10899860
+  version_requirements: *6506840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10915620 !ruby/object:Gem::Requirement
+  requirement: &6522620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,7 +90,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *10915620
+  version_requirements: *6522620
 description: ! "This library for Ruby provides access to the LeftClick\n web services/applications
   using a model-based structure that abstracts from API calls\n using the available
   REST interfaces."
@@ -119,6 +119,7 @@ files:
 - test/test_helper.rb
 - test/test_maps.rb
 - test/test_presence.rb
+- test/test_proc_token.rb
 homepage: https://leftclick.eu/
 licenses: []
 post_install_message: 
@@ -150,4 +151,5 @@ test_files:
 - test/test_helper.rb
 - test/test_maps.rb
 - test/test_presence.rb
+- test/test_proc_token.rb
 has_rdoc: