configcat 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a763908060912e846143f8b486c77b0eac1c3438cb49f52bc60dbb3d282c871
-  data.tar.gz: 1969cdef03d2d57ee1c12c3d6ff24f4ec2db0e853a5da07cc01e1179c898aeb7
+  metadata.gz: 805c9d54b6d9b24a12dfb2da3fdb8f7f9c22ee07a37c0be1c08e800a79fcee99
+  data.tar.gz: 5cfccd8b9225f636d2c8d5f4fb24d92658f13612fa091d8b30593a5569261891
 SHA512:
-  metadata.gz: f6234c399e25efe60c3735baf1f96c2d28aa8bd9b90e4e65001cd21ccdd2a49965a09d1311303003ef00691dcf9078743a6f6fafe2317c73977f8e3a62b5cdf0
-  data.tar.gz: 3759554dc40d9ad8e5ef86da9c80acf1eeaebeef18daf86d27328a8a0a1f52b91df02ad5f0677b6e10f6667f20496bed3d0b6377d02771e4899b3bda3ec5951a
+  metadata.gz: 06bbc69993cc02cf6912ca7e6518910ac1154049d78636597ae1431f761aa887b1ecafb665b3b93a4d1bca51ec0177dc2e59ee746ed768496dc35e31d3369bdd
+  data.tar.gz: 1bf9ca51425faf2c2a5b1346e09dfa87c8f382e7dfe0d828016607597fe28b7c29174696da41a4bb13e69befd58708c78e51fe57305bfdb79fabdb507d558d0a

data/lib/configcat/autopollingcachepolicy.rb

@@ -48,7 +48,7 @@ module ConfigCat
 
     def force_refresh()
       begin
-        configuration = @_config_fetcher.get_configuration_json()
+        configuration_response = @_config_fetcher.get_configuration_json()
 
         begin
           @_lock.acquire_read_lock()
@@ -57,20 +57,23 @@ module ConfigCat
           @_lock.release_read_lock()
         end
 
-        if configuration != old_configuration
-          begin
-            @_lock.acquire_write_lock()
-            @_config_cache.set(configuration)
-            @_initialized = true
-          ensure
-            @_lock.release_write_lock()
-          end
-          begin
-            if !@_on_configuration_changed_callback.equal?(nil)
-              @_on_configuration_changed_callback.()
+        if configuration_response.is_fetched()
+          configuration = configuration_response.json()
+          if configuration != old_configuration
+            begin
+              @_lock.acquire_write_lock()
+              @_config_cache.set(configuration)
+              @_initialized = true
+            ensure
+              @_lock.release_write_lock()
+            end
+            begin
+              if !@_on_configuration_changed_callback.equal?(nil)
+                @_on_configuration_changed_callback.()
+              end
+            rescue Exception => e
+              ConfigCat.logger.error("Exception in on_configuration_changed_callback: #{e.class}:'#{e}'")
             end
-          rescue Exception => e
-            ConfigCat.logger.error("Exception in on_configuration_changed_callback: #{e.class}:'#{e}'")
           end
         end
 

data/lib/configcat/configfetcher.rb

@@ -9,10 +9,32 @@ module ConfigCat
   BASE_PATH = "configuration-files/"
   BASE_EXTENSION = "/config_v4.json"
 
+  class FetchResponse
+    def initialize(response)
+      @_response = response
+    end
+
+    # Returns the json-encoded content of a response, if any
+    def json()
+      return JSON.parse(@_response.body)
+    end
+
+    # Gets whether a new configuration value was fetched or not
+    def is_fetched()
+      code = @_response.code.to_i
+      return 200 <= code && code < 300
+    end
+
+    # Gets whether the fetch resulted a '304 Not Modified' or not
+    def is_not_modified()
+      return @_response.code == "304"
+    end
+  end
+
   class CacheControlConfigFetcher < ConfigFetcher
     def initialize(api_key, mode, base_url=nil, proxy_address=nil, proxy_port=nil, proxy_user=nil, proxy_pass=nil)
       @_api_key = api_key
-      @_etag = nil
+      @_etag = ""
       @_headers = {"User-Agent" => ((("ConfigCat-Ruby/") + mode) + ("-")) + VERSION, "X-ConfigCat-UserAgent" => ((("ConfigCat-Ruby/") + mode) + ("-")) + VERSION, "Content-Type" => "application/json"}
       if !base_url.equal?(nil)
         @_base_url = base_url.chomp("/")
@@ -26,16 +48,18 @@ module ConfigCat
       @_http.read_timeout = 30 # in seconds
     end
 
+    # Returns the FetchResponse object contains configuration json Dictionary
     def get_configuration_json()
       ConfigCat.logger.debug "Fetching configuration from ConfigCat"
       uri = URI.parse((((@_base_url + ("/")) + BASE_PATH) + @_api_key) + BASE_EXTENSION)
-      @_headers["If-None-Match"] = @_etag unless @_etag.nil?
-      request = Net::HTTP::Get.new(uri.request_uri, @_headers)
+      headers = @_headers
+      headers["If-None-Match"] = @_etag unless @_etag.empty?
+      request = Net::HTTP::Get.new(uri.request_uri, headers)
       response = @_http.request(request)
-      json = JSON.parse(response.body)
-      @_etag = response["ETag"]
+      etag = response["ETag"]
+      @_etag = etag unless etag.nil? || etag.empty?
       ConfigCat.logger.debug "ConfigCat configuration json fetch response code:#{response.code} Cached:#{response['ETag']}"
-      return json
+      return FetchResponse.new(response)
     end
 
     def close()

data/lib/configcat/lazyloadingcachepolicy.rb

@@ -40,13 +40,16 @@ module ConfigCat
 
     def force_refresh()
       begin
-        configuration = @_config_fetcher.get_configuration_json()
-        begin
-          @_lock.acquire_write_lock()
-          @_config_cache.set(configuration)
-          @_last_updated = Time.now.utc
-        ensure
-          @_lock.release_write_lock()
+        configuration_response = @_config_fetcher.get_configuration_json()
+        if configuration_response.is_fetched()
+          configuration = configuration_response.json()
+          begin
+            @_lock.acquire_write_lock()
+            @_config_cache.set(configuration)
+            @_last_updated = Time.now.utc
+          ensure
+            @_lock.release_write_lock()
+          end
         end
       rescue StandardError => e
         ConfigCat.logger.error("Double-check your API KEY at https://app.configcat.com/apikey.")

data/lib/configcat/manualpollingcachepolicy.rb

@@ -21,12 +21,15 @@ module ConfigCat
 
     def force_refresh()
       begin
-        configuration = @_config_fetcher.get_configuration_json()
-        begin
-          @_lock.acquire_write_lock()
-          @_config_cache.set(configuration)
-        ensure
-          @_lock.release_write_lock()
+        configuration_response = @_config_fetcher.get_configuration_json()
+        if configuration_response.is_fetched()
+          configuration = configuration_response.json()
+          begin
+            @_lock.acquire_write_lock()
+            @_config_cache.set(configuration)
+          ensure
+            @_lock.release_write_lock()
+          end
         end
       rescue StandardError => e
         ConfigCat.logger.error("Double-check your API KEY at https://app.configcat.com/apikey.")

data/lib/configcat/version.rb

@@ -1,3 +1,3 @@
 module ConfigCat
-  VERSION = "2.0.3"
+  VERSION = "2.0.5"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: configcat
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - ConfigCat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +56,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Feature Flags created by developers for developers with ❤️. ConfigCat
   lets you manage feature flags across frontend, backend, mobile, and desktop apps
   without (re)deploying code. % rollouts, user targeting, segmentation. Feature toggle
@@ -112,7 +126,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement