apollo-ruby 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8109a5c40706105f9e14020da6983533eb9cbcaf562a44ca0e9707e52cfe527
-  data.tar.gz: 22672ddec88c105940dc3ffdf9c3841496a3cc56df24dbdb3ed04b7d597a2fff
+  metadata.gz: fa906b6533d57f7c1955a74a9203a95461b2bfdf7a3e2ce21431a7ffd75bbf33
+  data.tar.gz: e755a001930a5108182c95dacc89a3e5b5bc48cb7215e6636f45b843759c1777
 SHA512:
-  metadata.gz: 2da4e8aaedfbcc6d77687335cbb68be0af333c8f297b13cd1af6975f0e4ae84d8222c976cbc804c72b2cf8c193256b07f52fe84b1a37272d5c5382055fc15d12
-  data.tar.gz: a9498cbac9a9b8d535404de27d895299ab0ac941bb8902416253e837298246fd05770af61ab750cdc80aea11d219b40a48569f14f3e48e577ad475dfbe58a72d
+  metadata.gz: 4529548f583cf9830a6df51d07ca94e52020e6bd71d8df51f08ec5bdbc46f9e316ea280fcd554925e2fe0267d94111a1ff7d1f2e800426dae2b8277d6f3d44f6
+  data.tar.gz: 0f8df44eaf1841473ea8f642937ce737aff7c50aae37f096ce9d629b64d649d3d55cde2a1b3fb0c129b9542d3e34391968b7240601fcff0d0d7a26a909eafac6

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## [Released]
 
+## [1.0.5] - 2023-07-10
 ## [1.0.2] - 2023-04-17
 
 - Initial release

data/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in apollo.gemspec
+# Specify dependencies in apollo.gemspec
 gemspec
 
 gem "rake", "~> 13.0"
@@ -10,5 +10,3 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "rubocop", "~> 1.21"
-
-gem "rest-client"

data/Gemfile.lock

@@ -1,36 +1,20 @@
 PATH
   remote: .
   specs:
-    apollo-ruby (1.0.4)
-      json
-      rest-client
+    apollo-ruby (1.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    http-accept (1.7.0)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
     json (2.6.2)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
-    netrc (0.11.0)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.6.0)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -58,9 +42,6 @@ GEM
     rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.3.0)
 
 PLATFORMS
@@ -70,7 +51,6 @@ DEPENDENCIES
   apollo-ruby!
   bundler
   rake (~> 13.0)
-  rest-client
   rspec (~> 3.0)
   rubocop (~> 1.21)
 

data/lib/apollo/auth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "base64"
 require "openssl"
 

data/lib/apollo/client.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Apollo
   # Get configuration data from Apollo server.
   class Client
-
     attr_accessor :configuration
 
     def initialize(configuration)
@@ -9,11 +10,9 @@ module Apollo
     end
 
     def fetch(key, disable_cache)
-      if disable_cache
-        uncached_http_get(key)
-      else
-        cached_http_get(key)
-      end
+      return nil if [configuration.server, configuration.appid, configuration.secret].any?(&:nil?)
+
+      disable_cache ? uncached_http_get(key) : cached_http_get(key)
     end
 
     def cached_http_get(key)

data/lib/apollo/configuration.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Apollo
   # Set Apollo application configuration.
   class Configuration
-
     # Cluster name of Apollo application.
     attr_reader :cluster
 

data/lib/apollo/http.rb

@@ -1,4 +1,6 @@
-require "rest-client"
+# frozen_string_literal: true
+
+require "net/http"
 
 module Apollo
   # HTTP Client.
@@ -9,12 +11,17 @@ module Apollo
       end
 
       def get(url, headers, _opts = {})
-        response = RestClient.get(url, headers)
-        [response.code.to_i, response.body, response.raw_headers]
+        uri = URI(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = (uri.scheme == "https")
+        request = Net::HTTP::Get.new(uri)
+        request.initialize_http_header(headers)
+        response = http.request(request)
+        [response.code.to_i, response.body, response.to_hash]
       rescue StandardError => e
-        Log.logger.warn "#{e.message} => Apollo::HTTP.get('#{url}')"
+        Apollo.logger.warn "#{e.message} => Apollo::HTTP.get('#{url}')"
         if e.respond_to?(:response) && e.response.respond_to?(:code)
-          return e.response.code, e.response.body, e.response.raw_headers
+          return e.response.code.to_i, e.response.body, e.response.to_hash
         end
 
         [nil, nil, nil]
@@ -22,4 +29,3 @@ module Apollo
     end
   end
 end
-

data/lib/apollo/instance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Apollo
   # A copy of Apollo's base module class methods.
   class Instance
@@ -17,13 +19,17 @@ module Apollo
 
     def configure
       yield(configuration) if block_given?
-      self.client = Client.new(configuration)
-      client
+      self.client = @client || Client.new(configuration)
     end
 
-    def fetch(key, opts = {})
+    def fetch(key, default = nil, opts = {}, &block)
       opts[:disable_cache] = false unless opts.key?(:disable_cache)
-      client.fetch(key, opts[:disable_cache])
+      value = client.fetch(key, opts[:disable_cache])
+      value || (block_given? ? block.call(key) : default)
+    end
+
+    def [](key)
+      fetch(key)
     end
   end
 end

data/lib/apollo/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "json"
 require "uri"
 

data/lib/apollo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apollo
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/apollo-ruby.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "apollo"

data/lib/apollo.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
+require "logger"
 require "apollo/auth"
 require "apollo/client"
 require "apollo/configuration"
 require "apollo/http"
 require "apollo/instance"
-require "apollo/log"
 require "apollo/utils"
 require "apollo/version"
 
@@ -16,6 +18,10 @@ module Apollo
       @instance ||= Apollo::Instance.new
     end
 
-    def_delegators :instance, :client=, :configuration=, :configuration, :client, :configure, :fetch
+    def logger
+      @logger ||= ::Logger.new($stderr)
+    end
+
+    def_delegators :instance, :client=, :configuration=, :configuration, :client, :configure, :fetch, :[]
   end
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: apollo-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kervin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +63,6 @@ files:
 - lib/apollo/configuration.rb
 - lib/apollo/http.rb
 - lib/apollo/instance.rb
-- lib/apollo/log.rb
 - lib/apollo/utils.rb
 - lib/apollo/version.rb
 - sig/apollo.rbs

data/lib/apollo/log.rb

@@ -1,12 +0,0 @@
-require "logger"
-
-module Apollo
-  # Log.
-  module Log
-    class << self
-      def logger
-        @logger ||= ::Logger.new($stderr)
-      end
-    end
-  end
-end