prefab-cloud-ruby 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fdeb9c1e8651a918fb7700a921e23843374ee9d5f3904a09d076e4be3b3669
-  data.tar.gz: bd1cd6750f66a4e1f1940010fdaef01596de605f84ec80034747c906203aa8fc
+  metadata.gz: 65817a93520de402bf25dd2ac468d3c28fe0a1a2244080f7d6e3a1b77a3aa9b7
+  data.tar.gz: 7853f5a5576aaf02c6d55589f8008987645c82951cc10e645e83c5e121fa988f
 SHA512:
-  metadata.gz: 47cd4f946a8ed79956d5b7f9822eb6b4d666db234bab4767990aa9fd79402acfbe569f4708d2ce08c57b65dedeafa374d6c9f97460ded8c6307d71293ee812fa
-  data.tar.gz: 5078a253a71a7166a00f45a325d3f5b1f3435d99f2011ad197ebeb0af8be38699caecdba18fb36d019b13b92992f6c7cef82ae14ef672cda4ae8a3ca199c7236
+  metadata.gz: 3ecd82c82287d357dcebc2e264873ac2046323b55aa0125dbcf0175b52c3bdd66ac39cdf71f5cfabd8ba64252bacd9ff7c07473a2e74d92bfbbff43711eef950
+  data.tar.gz: 61d6de1e9b218f5211dc9e18b1640583a9fcc83785665dad58e201f75f50ff63d6ea8ea0d765d23af87173bde9aca715beb2f534a957241445b3514aedb9d8d6

data/.ruby-version

@@ -0,0 +1 @@
+2.4.2

data/Gemfile

@@ -2,20 +2,13 @@ source "https://rubygems.org"
 
 gem 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
 gem 'faraday'
-gem 'ld-eventsource'
-gem 'grpc', :platforms => :ruby
-gem 'google-protobuf', :platforms => :ruby
-gem 'googleapis-common-protos-types', :platforms => :ruby
+gem 'grpc'
 
 group :development do
-  gem 'grpc-tools', :platforms => :ruby
+  gem 'grpc-tools', '~> 1.17.1'
+  gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
-  gem "bundler"
+  gem "bundler", "~> 1.0"
   gem "juwelier", "~> 2.4.9"
   gem "simplecov", ">= 0"
-  gem 'thin'
-end
-
-group :test do
-  gem "minitest"
 end

data/Gemfile.lock

@@ -1,27 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
+    activesupport (5.2.4.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
-    daemons (1.4.1)
+    concurrent-ruby (1.1.8)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.5)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    eventmachine (1.2.7)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-net_http (1.0.1)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    git (1.11.0)
+    git (1.8.1)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -29,23 +26,17 @@ GEM
       faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    google-protobuf (3.21.4)
-    googleapis-common-protos-types (1.3.0)
+    google-protobuf (3.15.6)
+    googleapis-common-protos-types (1.0.6)
+      google-protobuf (~> 3.14)
+    grpc (1.36.0)
       google-protobuf (~> 3.14)
-    grpc (1.43.1)
-      google-protobuf (~> 3.18)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.43.1)
+    grpc-tools (1.17.1)
     hashie (3.6.0)
     highline (2.0.3)
-    http (5.0.1)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.3.0)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    http-form_data (2.3.0)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
     json (1.8.6)
     juwelier (2.4.9)
       builder
@@ -62,20 +53,13 @@ GEM
     jwt (2.2.2)
     kamelcase (0.0.2)
       semver2 (~> 3)
-    ld-eventsource (2.2.0)
-      concurrent-ruby (~> 1.0)
-      http (>= 4.4.1, < 6.0.0)
-    llhttp-ffi (0.3.1)
-      ffi-compiler (~> 1.0)
-      rake (~> 13.0)
-    mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
@@ -84,44 +68,40 @@ GEM
       rack (>= 1.2, < 3)
     psych (3.3.1)
     public_suffix (4.0.6)
-    racc (1.6.0)
-    rack (2.2.4)
+    rack (2.2.3)
     rake (13.0.3)
     rchardet (1.8.0)
     rdoc (3.12.2)
       json (~> 1.4)
     ruby2_keywords (0.0.4)
     semver2 (3.4.2)
+    shoulda (4.0.0)
+      shoulda-context (~> 2.0)
+      shoulda-matchers (~> 4.0)
+    shoulda-context (2.0.0)
+    shoulda-matchers (4.5.1)
+      activesupport (>= 4.2.0)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.3)
-    thin (1.8.1)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
     thread_safe (0.3.6)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
+  bundler (~> 1.0)
   concurrent-ruby (~> 1.0, >= 1.0.5)
   faraday
-  google-protobuf
-  googleapis-common-protos-types
   grpc
-  grpc-tools
+  grpc-tools (~> 1.17.1)
   juwelier (~> 2.4.9)
-  ld-eventsource
-  minitest
   rdoc (~> 3.12)
+  shoulda
   simplecov
-  thin
 
 BUNDLED WITH
-   2.3.5
+   1.16.0

data/README.md

@@ -43,15 +43,6 @@ on_worker_boot do
 end
 ```
 
-## Logging & Debugging
-In classpath or ~/.prefab.overrides.config.yaml set
-```log_level.prefab: debug```
-
-To debug issues before this config file has been read, set env var
-```
-PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL = debug
-```
-
 ## Contributing to prefab-cloud-ruby
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
@@ -62,16 +53,7 @@ PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL = debug
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-## Release
-
-```shell
-update VERSION
-bundle exec rake gemspec:generate
-git commit & push
-REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake release
-```
-
 ## Copyright
 
-Copyright (c) 2022 Jeff Dwyer. See LICENSE.txt for
+Copyright (c) 2018 Jeff Dwyer. See LICENSE.txt for
 further details.

data/Rakefile

@@ -1,5 +1,4 @@
 # encoding: utf-8
-# frozen_string_literal: true
 
 require 'rubygems'
 require 'bundler'

data/VERSION

@@ -1 +1 @@
-0.13.0
+0.13.1

data/compile_protos.sh

@@ -1,5 +1,2 @@
 #!/usr/bin/env bash
 grpc_tools_ruby_protoc -I ../prefab-cloud/ --ruby_out=lib --grpc_out=lib prefab.proto
-# on M1 you need to
-# 1. run in rosetta
-# 2. mv gems/2.6.0/gems/grpc-tools-1.43.1/bin/x86_64-macos x86-macos

data/lib/prefab/auth_interceptor.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module Prefab
   class AuthInterceptor < GRPC::ClientInterceptor
     def initialize(api_key)

data/lib/prefab/cancellable_interceptor.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module Prefab
   class CancellableInterceptor < GRPC::ClientInterceptor
     WAIT_SEC = 3

data/lib/prefab/client.rb

@@ -1,39 +1,44 @@
-# frozen_string_literal: true
 module Prefab
   class Client
+
     MAX_SLEEP_SEC = 10
     BASE_SLEEP_SEC = 0.5
-    NO_DEFAULT_PROVIDED = :no_default_provided
-
-    attr_reader :project_id, :shared_cache, :stats, :namespace, :interceptor, :api_key, :prefab_api_url, :options
-
-    def initialize(options = Prefab::Options.new)
-      @options = options
-      @shared_cache = @options.shared_cache
-      @stats = @options.stats
-      @namespace = @options.namespace
+    DEFAULT_LOG_FORMATTER = proc {|severity, datetime, progname, msg|
+      "#{severity.ljust(5)} #{datetime}: #{progname} #{msg}\n"
+    }
+
+
+    attr_reader :account_id, :shared_cache, :stats, :namespace, :interceptor, :api_key
+
+    def initialize(api_key: ENV['PREFAB_API_KEY'],
+                   logdev: nil,
+                   stats: nil, # receives increment("prefab.limitcheck", {:tags=>["policy_group:page_view", "pass:true"]})
+                   shared_cache: nil, # Something that quacks like Rails.cache ideally memcached
+                   local: false,
+                   namespace: "",
+                   log_formatter: DEFAULT_LOG_FORMATTER
+    )
+      raise "No API key. Set PREFAB_API_KEY env var" if api_key.nil? || api_key.empty?
+      @logdev = (logdev || $stdout)
+      @log_formatter = log_formatter
+      @local = local
+      @stats = (stats || NoopStats.new)
+      @shared_cache = (shared_cache || NoopCache.new)
+      @api_key = api_key
+      @account_id = api_key.split("|")[0].to_i
+      @namespace = namespace
+      @interceptor = Prefab::AuthInterceptor.new(api_key)
       @stubs = {}
 
-      if @options.local_only?
-        @project_id = 0
-        log_internal Logger::INFO, "Prefab Running in Local Mode"
-      else
-        @api_key = @options.api_key
-        raise Prefab::Errors::InvalidApiKeyError.new(@api_key) if @api_key.nil? || @api_key.empty? || api_key.count("-") != 3
-        @project_id = @api_key.split("-")[0].to_i # unvalidated, but that's ok. APIs only listen to the actual passwd
-        @interceptor = Prefab::AuthInterceptor.new(@api_key)
-        @prefab_api_url = @options.prefab_api_url
-        @prefab_grpc_url = @options.prefab_grpc_url
-        log_internal Logger::INFO, "Prefab Connecting to: #{@prefab_api_url} and #{@prefab_grpc_url} Secure: #{http_secure?}"
-        at_exit do
-          channel.destroy
-        end
+      at_exit do
+        channel.destroy
       end
     end
 
     def channel
-      credentials = http_secure? ? creds : :this_channel_is_insecure
-      @_channel ||= GRPC::Core::Channel.new(@prefab_grpc_url, nil, credentials)
+      credentials = ENV["PREFAB_CLOUD_HTTP"] == "true" ? :this_channel_is_insecure : creds
+      url = ENV["PREFAB_API_URL"] || 'api.prefab.cloud:443'
+      @_channel ||= GRPC::Core::Channel.new(url, nil, credentials)
     end
 
     def config_client(timeout: 5.0)
@@ -49,11 +54,11 @@ module Prefab
     end
 
     def log
-      @logger_client ||= Prefab::LoggerClient.new(@options.logdev, formatter: @options.log_formatter)
+      @logger_client ||= Prefab::LoggerClient.new(@logdev, formatter: @log_formatter)
     end
 
-    def log_internal(level, msg, path = "prefab")
-      log.log_internal msg, path, nil, level
+    def log_internal(level, msg)
+      log.log_internal msg, "prefab", nil, level
     end
 
     def request(service, method, req_options: {}, params: {})
@@ -83,7 +88,7 @@ module Prefab
     end
 
     def cache_key(post_fix)
-      "prefab:#{project_id}:#{post_fix}"
+      "prefab:#{account_id}:#{post_fix}"
     end
 
     def reset!
@@ -91,26 +96,8 @@ module Prefab
       @_channel = nil
     end
 
-    def enabled?(feature_name, lookup_key=nil, attributes={})
-      feature_flag_client.feature_is_on_for?(feature_name, lookup_key, attributes: attributes)
-    end
-
-    def get(key, default_or_lookup_key=NO_DEFAULT_PROVIDED, attributes={}, ff_default=NO_DEFAULT_PROVIDED)
-      result = config_client.get(key, default_or_lookup_key)
-
-      if result.is_a?(Prefab::FeatureFlag)
-        feature_flag_client.get(key, default_or_lookup_key, attributes, default: ff_default)
-      else
-        result
-      end
-    end
-
     private
 
-    def http_secure?
-      ENV["PREFAB_CLOUD_HTTP"] != "true"
-    end
-
     def stub_for(service, timeout)
       @stubs["#{service}_#{timeout}"] ||= service::Stub.new(nil,
                                                             nil,
@@ -128,7 +115,7 @@ module Prefab
       Dir["#{OpenSSL::X509::DEFAULT_CERT_DIR}/*.pem"].each do |cert|
         ssl_certs << File.open(cert).read
       end
-      if OpenSSL::X509::DEFAULT_CERT_FILE && File.exist?(OpenSSL::X509::DEFAULT_CERT_FILE)
+      if OpenSSL::X509::DEFAULT_CERT_FILE && File.exists?(OpenSSL::X509::DEFAULT_CERT_FILE)
         ssl_certs << File.open(OpenSSL::X509::DEFAULT_CERT_FILE).read
       end
       ssl_certs