metatron 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f35d76b66b19a7de1ec270afaaae2f76563016b5d7bee59c94dad86e1f4953ac
-  data.tar.gz: 21bc67ecabd1165246962d9d1af8b909ec678ca3045a3e89b484b512c9dfa6a4
+  metadata.gz: fe8d0dcac1a47b872ca203dea9ec4e816e07fdb2bb14fd01f6458ca4b7789cef
+  data.tar.gz: 255bc8c1efdd1c173455f3b28533ceffd70e34115aad86dba1f685dfceba1318
 SHA512:
-  metadata.gz: 38c3f0d3358541f4c6349b1729c43cedce6cf65ad087b7306ec37f8da3a9dfb57ee20e57c3568c08376eeede52ae59dc0d3a182a555cc84d000f3c3eb7e7f9de
-  data.tar.gz: 721166c1a9da7c2c16c7d84b27f10a18e8ea489eabe406c7063c2277cba6b5799f43dd8afdc7630593f9b1daacdfe8342fc4d86afd89af297c68e30bc8920f97
+  metadata.gz: ca1ba6ad7b4b5aa5677b6e7bbd30fe7b643f1f9459232a950d97684430fec3d3c7b710c327aa5a98e8d9324ebe457950df9acb1b50df0678eb875b2f869b6a8d
+  data.tar.gz: 1c7bc21979e3087dd5e55a381d7fddb9ade45159a72a105ba6d306dd60a8cb34828bad8d9a3ee7db6e1025f5b839e287a3bc21daaa834cb8aa49f31ade19943d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metatron (0.4.0)
+    metatron (0.4.2)
       json (~> 2.6)
       puma (~> 6.3)
       sinatra (~> 3.1)

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "metatron"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/lib/metatron/controller.rb

@@ -8,7 +8,7 @@ module Metatron
     configure do
       set :protection, except: :http_origin
       set :logging, true
-      set :logger, Metatron::LOGGER
+      set :logger, Metatron.logger
       set :show_exceptions, false
     end
 

data/lib/metatron/controllers/ping.rb

@@ -6,7 +6,7 @@ module Metatron
     class Ping < Sinatra::Application
       configure do
         set :logging, true
-        set :logger, Metatron::LOGGER
+        set :logger, Metatron.logger
       end
 
       before do

data/lib/metatron/railtie.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Metatron
+  # Extension point for integrating with Rails applications
+  class Railtie < ::Rails::Railtie
+    initializer "metatron.logger" do
+      Metatron.logger = Rails.logger
+    end
+  end
+end

data/lib/metatron/sync_controller.rb

@@ -9,15 +9,10 @@ module Metatron
     end
 
     post "/" do
-      # TODO: move this to Sinatra's `etag` helper when Metacontroller is RFC compliant
-      if (provided_etag = calculate_etag) &&
-         (match_header = request.env["HTTP_IF_NONE_MATCH"]) &&
-         match_header.split(/,\s?/).include?("\"#{provided_etag}\"")
-        halt 304
+      if (provided_etag = calculate_etag)
+        etag provided_etag
       end
 
-      # If the etag is available, use it, otherwise proceed with the sync
-      headers "ETag" => "\"#{provided_etag}\"" if provided_etag
       data = sync
       data[:children] = data[:children]&.map { |c| c.respond_to?(:render) ? c.render : c }
       halt(data.to_json)

data/lib/metatron/version.rb

@@ -4,6 +4,6 @@ module Metatron
   VERSION = [
     0, # major
     4, # minor
-    0  # patch
+    2  # patch
   ].join(".")
 end

data/lib/metatron.rb

@@ -16,10 +16,8 @@ module Metatron
   class Error < StandardError; end
   class ConfigError < Error; end
 
-  LOGGER = Logger.new($stdout)
-
-  # Set up log level
-  LOGGER.level = ENV.fetch("LOG_LEVEL", :warn)
+  singleton_class.attr_accessor :logger
+  self.logger = Logger.new($stdout, level: ENV.fetch("LOG_LEVEL", :warn))
 end
 
 # Internal requirements
@@ -50,3 +48,4 @@ require "metatron/templates/stateful_set"
 require "metatron/controller"
 require "metatron/sync_controller"
 require "metatron/controllers/ping"
+require "metatron/railtie" if defined? Rails::Railtie

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metatron
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Jonathan Gnagy
@@ -251,9 +251,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - lib/metatron.rb
 - lib/metatron/controller.rb
 - lib/metatron/controllers/ping.rb
+- lib/metatron/railtie.rb
 - lib/metatron/sync_controller.rb
 - lib/metatron/template.rb
 - lib/metatron/templates/cluster_role.rb