lws 7.2.3 → 7.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddef464d750e49d235fc28c11f209e9ac3fe6c8abb0ae605bbf5c3f61867e895
-  data.tar.gz: 20194be723ed5c15810a699723bef6d5de54562642bd7e25e80314cf92ed38a6
+  metadata.gz: 215d80612cb5ad547181deadb4a61244b8a108c3e1b6a24e52b288c9dcddc507
+  data.tar.gz: '0892759a406c54e49087e7e84ac6a0b433144c936ca8b74e8e3ab0d23a652933'
 SHA512:
-  metadata.gz: 6ec11d0269f6c9565832321d27548ff22565f7afc5361317be9862eb286c9681ee2268b70145dffa8f51ec35d71765087a67347ea216c85d4e590146d1bfdedb
-  data.tar.gz: 0c1ab92859fe42a6a6fd3f7be9cdb7d3edb0efd338890de8517bc4cc537552f1c5f8de1b0d53616e3098a2b89db94b7ecf7258a83fae6804c1d47e9c1e9aa6f1
+  metadata.gz: 76bb918ff504f80e6d7e65bce4eaa8a229cdbc9b6b52bced17aa600f87d1b5e1b5ab32adac0e28de00c0b0f1fa49d326962ceaeb80087aac8e5f82914915777e
+  data.tar.gz: e63b88135279e691f345911a249d46a56d20c90534f6759ba64a3830f7c7b3074b0a67bc1206f972637a8a3c3a12b69e221e82cb6464f6b42f16662168de8f99

data/bin/lwsconsole

@@ -36,7 +36,7 @@ EOB
     @options[:debug] = debug
   end
   opts.on("-e", "--environment=ENV", "select the LWS environment (default: production)") do |env|
-    @options[:environment] = env.to_sym
+    @options[:environment] = env
   end
   opts.on("-t", "--token=TOKEN", "the LWS API token necessary to gain access") do |token|
     @options[:token] = token

data/lib/lws.rb

@@ -81,7 +81,7 @@ module LWS
 
     # Override the environment if needed
     if ENV["LC_LWS_ENV"].present?
-      @@config.environment = ENV["LC_LWS_ENV"].to_sym
+      @@config.environment = ENV["LC_LWS_ENV"]
     end
 
     # Override the API token if needed (and no custom API token middleware

data/lib/lws/apps/generic.rb

@@ -203,11 +203,13 @@ module LWS::Generic
     def self.use_api(api)
       config = LWS.config
 
-      # A connection to Active Storage (with JSON request/response, but without
-      # token authentication and caching).
+      # An API connection to Active Storage (with JSON request/response, but
+      # without caching).
       @as_connection = Faraday.new(url: api.url_prefix) do |c|
         # Request
         c.request :json
+        c.use LWS::Middleware::RequestHeaders, config.api_token
+        c.use config.api_token_middleware if config.api_token_middleware.present?
 
         # Response
         c.use LWS::JSONLogger, config.logger if config.json_debug

data/lib/lws/config.rb

@@ -81,8 +81,29 @@ module LWS
     #    (setting this enables the default stubs)
     property :stubbing
 
-    # Supplements the configuration with settings from a config file.
+    # Sets the environment for the config.
+    #
+    # The provided environment can be a string in short and long format as well
+    # as a symbol.
+    #
+    # @param new_env [Symbol, String] the new environment to use
+    # @return [Symbol] the new environment
+    # @raise when an invalid environment is provided
+    def environment=(new_env)
+      real_env =
+        case new_env
+        when "prod", "production", :prod, :production
+          :production
+        when "dev", "development", :dev, :development
+          :development
+        else
+          raise "unsupported environment: #{new_env}"
+        end
+      self[:environment] = real_env
+    end
 
+    # Supplements the configuration with settings from a config file.
+    #
     # The configuration file has a section per environment that indicates
     # per property what to use if it is unset.
     #
@@ -123,12 +144,11 @@ module LWS
     def load_config_file(config_file, force_environment = nil)
       return false unless File.exist? config_file
       config_data = YAML.load_file(config_file)
-      environment = force_environment ||
-                    ENV["LC_LWS_ENV"] ||
-                    config_data.dig("default", "environment") ||
-                    self.environment
-      self.environment = environment.to_sym
-      config = config_data[environment.to_s] || {}
+      self.environment = force_environment ||
+                         ENV["LC_LWS_ENV"] ||
+                         config_data.dig("default", "environment") ||
+                         self.environment
+      config = config_data[self.environment.to_s] || {}
 
       config.each_pair do |key, value|
         unless VALID_FILE_PROPERTIES.include? key.to_sym

data/lib/lws/version.rb

@@ -13,6 +13,6 @@ module LWS
 
   # The LWS library version.
   # @note The major and minor version parts match the LWS API version!
-  VERSION = "7.2.3".freeze
+  VERSION = "7.2.4".freeze
 
 end

data/test/setup_test.rb

@@ -47,6 +47,26 @@ class TestSetup < MiniTest::Test
     assert_equal("test-token", LWS.config.api_token)
   end
 
+  def test_environment_writer
+    LWS.config.environment = "prod"
+    assert_equal(:production, LWS.config.environment)
+    LWS.config.environment = "production"
+    assert_equal(:production, LWS.config.environment)
+    LWS.config.environment = :production
+    assert_equal(:production, LWS.config.environment)
+
+    LWS.config.environment = "dev"
+    assert_equal(:development, LWS.config.environment)
+    LWS.config.environment = "development"
+    assert_equal(:development, LWS.config.environment)
+    LWS.config.environment = :development
+    assert_equal(:development, LWS.config.environment)
+
+    assert_raises do
+      LWS.config.environment = "doesnotexist"
+    end
+  end
+
   def test_http_logging_without_logger
     reconfigure(logger: nil,
                 http_debug: true,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lws
 version: !ruby/object:Gem::Version
-  version: 7.2.3
+  version: 7.2.4
 platform: ruby
 authors:
 - LeftClick B.V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
@@ -33,7 +33,7 @@ dependencies:
         version: 0.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 0.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement