unleash 0.1.6 → 3.2.0

data/lib/unleash/strategy/application_hostname.rb

@@ -4,7 +4,7 @@ module Unleash
   module Strategy
     class ApplicationHostname < Base
       attr_accessor :hostname
-      PARAM = 'hostnames'
+      PARAM = 'hostnames'.freeze
 
       def initialize
         self.hostname = Socket.gethostname || 'undefined'
@@ -18,7 +18,7 @@ module Unleash
       def is_enabled?(params = {}, _context = nil)
         return false unless params.is_a?(Hash) && params.has_key?(PARAM)
 
-        params[PARAM].split(",").map(&:strip).map{ |h| h.downcase }.include?(self.hostname)
+        params[PARAM].split(",").map(&:strip).map(&:downcase).include?(self.hostname)
       end
     end
   end

data/lib/unleash/strategy/base.rb

@@ -1,6 +1,6 @@
 module Unleash
   module Strategy
-    class NotImplemented < Exception
+    class NotImplemented < RuntimeError
     end
 
     class Base
@@ -8,7 +8,7 @@ module Unleash
         raise NotImplemented, "Strategy is not implemented"
       end
 
-      def is_enabled?(params = {}, context = nil)
+      def is_enabled?(_params = {}, _context = nil)
         raise NotImplemented, "Strategy is not implemented"
       end
     end

data/lib/unleash/strategy/default.rb

@@ -5,7 +5,7 @@ module Unleash
         'default'
       end
 
-      def is_enabled?(params = {}, context = nil)
+      def is_enabled?(_params = {}, _context = nil)
         true
       end
     end

data/lib/unleash/strategy/gradual_rollout_random.rb

@@ -13,7 +13,7 @@ module Unleash
 
         begin
           percentage = Integer(params['percentage'] || 0)
-        rescue ArgumentError => e
+        rescue ArgumentError
           return false
         end
 

data/lib/unleash/strategy/gradual_rollout_sessionid.rb

@@ -8,13 +8,13 @@ module Unleash
       end
 
       # need: params['percentage'], params['groupId'], context.user_id,
-      def is_enabled?(params = {}, context)
+      def is_enabled?(params = {}, context = nil)
         return false unless params.is_a?(Hash) && params.has_key?('percentage')
         return false unless context.class.name == 'Unleash::Context'
         return false if context.session_id.empty?
 
         percentage = Integer(params['percentage'] || 0)
-        (percentage > 0 && Util.get_normalized_number(context.session_id, params['groupId'] || "") <= percentage)
+        (percentage.positive? && Util.get_normalized_number(context.session_id, params['groupId'] || "") <= percentage)
       end
     end
   end

data/lib/unleash/strategy/gradual_rollout_userid.rb

@@ -8,13 +8,13 @@ module Unleash
       end
 
       # need: params['percentage'], params['groupId'], context.user_id,
-      def is_enabled?(params = {}, context)
+      def is_enabled?(params = {}, context = nil)
         return false unless params.is_a?(Hash) && params.has_key?('percentage')
         return false unless context.class.name == 'Unleash::Context'
         return false if context.user_id.empty?
 
         percentage = Integer(params['percentage'] || 0)
-        (percentage > 0 && Util.get_normalized_number(context.user_id, params['groupId'] || "") <= percentage)
+        (percentage.positive? && Util.get_normalized_number(context.user_id, params['groupId'] || "") <= percentage)
       end
     end
   end

data/lib/unleash/strategy/remote_address.rb

@@ -1,7 +1,7 @@
 module Unleash
   module Strategy
     class RemoteAddress < Base
-      PARAM = 'IPs'
+      PARAM = 'IPs'.freeze
 
       def name
         'remoteAddress'

data/lib/unleash/strategy/user_with_id.rb

@@ -1,7 +1,7 @@
 module Unleash
   module Strategy
     class UserWithId < Base
-      PARAM = 'userIds'
+      PARAM = 'userIds'.freeze
 
       def name
         'userWithId'

data/lib/unleash/toggle_fetcher.rb

@@ -1,10 +1,8 @@
 require 'unleash/configuration'
 require 'net/http'
 require 'json'
-require 'thread'
 
 module Unleash
-
   class ToggleFetcher
     attr_accessor :toggle_cache, :toggle_lock, :toggle_resource, :etag, :retry_count
 
@@ -18,7 +16,7 @@ module Unleash
       # start by fetching synchronously, and failing back to reading the backup file.
       begin
         fetch
-      rescue Exception => e
+      rescue StandardError => e
         Unleash.logger.warn "ToggleFetcher was unable to fetch from the network, attempting to read from backup file."
         Unleash.logger.debug "Exception Caught: #{e}"
         read!
@@ -36,29 +34,16 @@ module Unleash
     end
 
     # rename to refresh_from_server!  ??
-    # TODO: should simplify by moving uri / http initialization elsewhere
     def fetch
       Unleash.logger.debug "fetch()"
-      Unleash.logger.debug "ETag: #{self.etag}" unless self.etag.nil?
-
-      uri = URI(Unleash.configuration.fetch_toggles_url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true if uri.scheme == 'https'
-      http.open_timeout = Unleash.configuration.timeout # in seconds
-      http.read_timeout = Unleash.configuration.timeout # in seconds
-
-      headers = (Unleash.configuration.get_http_headers || {}).dup
-      headers['Content-Type'] = 'application/json'
-      headers['If-None-Match'] = self.etag unless self.etag.nil?
-
-      request = Net::HTTP::Get.new(uri.request_uri, headers)
+      response = Unleash::Util::Http.get(Unleash.configuration.fetch_toggles_url, etag)
 
-      response = http.request(request)
-
-      Unleash.logger.debug "No changes according to the unleash server, nothing to do." if response.code == '304'
-      return if response.code == '304'
-
-      raise IOError, "Unleash server returned a non 200/304 HTTP result." if response.code != '200'
+      if response.code == '304'
+        Unleash.logger.debug "No changes according to the unleash server, nothing to do."
+        return
+      elsif response.code != '200'
+        raise IOError, "Unleash server returned a non 200/304 HTTP result."
+      end
 
       self.etag = response['ETag']
       response_hash = JSON.parse(response.body)
@@ -73,14 +58,12 @@ module Unleash
       # always synchronize with the local cache when fetching:
       synchronize_with_local_cache!(features)
 
-      Unleash.logger.info "Flush changes to running client variable"
-      update_client!
-
-      Unleash.logger.info "Saved to toggle cache, will save to disk now"
+      update_running_client!
       save!
     end
 
     def save!
+      Unleash.logger.debug "Will save toggles to disk now"
       begin
         backup_file = Unleash.configuration.backup_file
         backup_file_tmp = "#{backup_file}.tmp"
@@ -90,12 +73,12 @@ module Unleash
           file.write(self.toggle_cache.to_json)
           File.rename(backup_file_tmp, backup_file)
         end
-      rescue Exception => e
+      rescue StandardError => e
         # This is not really the end of the world. Swallowing the exception.
         Unleash.logger.error "Unable to save backup file. Exception thrown #{e.class}:'#{e}'"
         Unleash.logger.error "stacktrace: #{e.backtrace}"
       ensure
-        file.close if defined?(file) && ! file.nil?
+        file&.close if defined?(file)
         self.toggle_lock.unlock if self.toggle_lock.locked?
       end
     end
@@ -113,7 +96,7 @@ module Unleash
       end
     end
 
-    def update_client!
+    def update_running_client!
       if Unleash.toggles != self.toggles
         Unleash.logger.info "Updating toggles to main client, there has been a change in the server."
         Unleash.toggles = self.toggles
@@ -130,15 +113,15 @@ module Unleash
 
         backup_as_hash = JSON.parse(file_content)
         synchronize_with_local_cache!(backup_as_hash)
-        update_client!
+        update_running_client!
       rescue IOError => e
-        Unleash.logger.error "Unable to read the backup_file."
+        Unleash.logger.error "Unable to read the backup_file: #{e}"
       rescue JSON::ParserError => e
-        Unleash.logger.error "Unable to parse JSON from existing backup_file."
-      rescue Exception => e
-        Unleash.logger.error "Unable to extract valid data from backup_file. Exception thrown", e
+        Unleash.logger.error "Unable to parse JSON from existing backup_file: #{e}"
+      rescue StandardError => e
+        Unleash.logger.error "Unable to extract valid data from backup_file. Exception thrown: #{e}"
       ensure
-        file.close unless file.nil?
+        file&.close
       end
     end
   end

data/lib/unleash/util/http.rb

@@ -0,0 +1,48 @@
+require 'net/http'
+require 'uri'
+
+module Unleash
+  module Util
+    module Http
+      def self.get(url, etag = nil)
+        uri = URI(url)
+        http = http_connection(uri)
+
+        request = Net::HTTP::Get.new(uri.request_uri, http_headers(etag))
+
+        http.request(request)
+      end
+
+      def self.post(url, body)
+        uri = URI(url)
+        http = http_connection(uri)
+
+        request = Net::HTTP::Post.new(uri.request_uri, http_headers)
+        request.body = body
+
+        http.request(request)
+      end
+
+      def self.http_connection(uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true if uri.scheme == 'https'
+        http.open_timeout = Unleash.configuration.timeout # in seconds
+        http.read_timeout = Unleash.configuration.timeout # in seconds
+
+        http
+      end
+
+      def self.http_headers(etag = nil)
+        Unleash.logger.debug "ETag: #{etag}" unless etag.nil?
+
+        headers = (Unleash.configuration.http_headers || {}).dup
+        headers['Content-Type'] = 'application/json'
+        headers['If-None-Match'] = etag unless etag.nil?
+
+        headers
+      end
+
+      private_class_method :http_connection, :http_headers
+    end
+  end
+end

data/lib/unleash/variant.rb

@@ -1,5 +1,3 @@
-
-
 module Unleash
   class Variant
     attr_accessor :name, :enabled, :payload
@@ -18,9 +16,8 @@ module Unleash
       "<Variant: name=#{self.name},enabled=#{self.enabled},payload=#{self.payload}>"
     end
 
-    def ==(v)
-      self.name == v.name && self.enabled == v.enabled && self.payload == v.payload
+    def ==(other)
+      self.name == other.name && self.enabled == other.enabled && self.payload == other.payload
     end
-
   end
 end

data/lib/unleash/variant_definition.rb

@@ -1,6 +1,5 @@
 require 'unleash/variant_override'
 
-
 module Unleash
   class VariantDefinition
     attr_accessor :name, :weight, :payload, :overrides
@@ -11,7 +10,7 @@ module Unleash
       self.payload = payload
       # self.overrides = overrides
       self.overrides = (overrides || [])
-        .select{ |v| v.is_a?(Hash) && v.key?('contextName') }
+        .select{ |v| v.is_a?(Hash) && v.has_key?('contextName') }
         .map{ |v| VariantOverride.new(v.fetch('contextName', ''), v.fetch('values', [])) } || []
     end
 

data/lib/unleash/version.rb

@@ -1,3 +1,3 @@
 module Unleash
-  VERSION = "0.1.6"
+  VERSION = "3.2.0".freeze
 end

data/unleash-client.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'unleash/version'
 
@@ -10,19 +9,19 @@ Gem::Specification.new do |spec|
   spec.email         = ["rarruda@rarruda.org"]
   spec.licenses      = ["Apache-2.0"]
 
-  spec.summary       = %q{Unleash feature toggle client.}
-  spec.description   = %q{This is the ruby client for Unleash, a powerful feature toggle system
-    that gives you a great overview over all feature toggles across all your applications and services.}
+  spec.summary       = "Unleash feature toggle client."
+  spec.description   = "This is the ruby client for Unleash, a powerful feature toggle system
+    that gives you a great overview over all feature toggles across all your applications and services."
 
   spec.homepage      = "https://github.com/unleash/unleash-client-ruby"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = 'bin'
+  spec.executables   = spec.files.grep(%r{^bin/unleash}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = "~> 2.2"
+  spec.required_ruby_version = "~> 2.4"
 
   spec.add_dependency "murmurhash3", "~> 0.1.6"
 
@@ -31,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-json_expectations", "~> 2.1"
   spec.add_development_dependency "webmock", "~> 3.0"
-  spec.add_development_dependency "coveralls"
 
+  spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency "rubocop", "~> 0.72"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unleash
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 3.2.0
 platform: ruby
 authors:
 - Renato Arruda
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: murmurhash3
@@ -98,22 +98,37 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.72'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.72'
 description: |-
   This is the ruby client for Unleash, a powerful feature toggle system
       that gives you a great overview over all feature toggles across all your applications and services.
 email:
 - rarruda@rarruda.org
-executables: []
+executables:
+- unleash-client
 extensions: []
 extra_rdoc_files: []
 files:
@@ -125,7 +140,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- TODO.md
 - bin/console
 - bin/setup
 - bin/unleash-client
@@ -149,6 +163,7 @@ files:
 - lib/unleash/strategy/user_with_id.rb
 - lib/unleash/strategy/util.rb
 - lib/unleash/toggle_fetcher.rb
+- lib/unleash/util/http.rb
 - lib/unleash/variant.rb
 - lib/unleash/variant_definition.rb
 - lib/unleash/variant_override.rb
@@ -166,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Unleash feature toggle client.