phaedra 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c1b79ae715e83f3dd098fb9d0d29c5d89299f96c01d084f1cb44573f216022
-  data.tar.gz: e716ca8ef384fdeadd773485042099d7bf7840b007e636588ce6fb28e40ab4b3
+  metadata.gz: ed786e8ee4e64448d25817144069d17839cbae1416b6d55daec427f336183101
+  data.tar.gz: 8d436c4e1560ca6acda2a03c5c68a86c6d82909a78cef5c4b0052d132fa9438c
 SHA512:
-  metadata.gz: cf41193d15f6bc3678ebccd9239e7185479b3bd4029f593887202ca3e88b02529702688f64f2b373c90e54fed766b264a9f12c2a8a39e4c90039d0d708d9b89a
-  data.tar.gz: 23686c007d52d61763ac393ced71d6485dbf3b3c45cc153828950f6e9c1e8018934834a0dfb90a7908d3357334c3542b34e74629d9774663607f86b21080fb94
+  metadata.gz: 54debc72ff247af26e5414dd4684ac1fe543e4390a7ad96ed8f784ab8f8c32febb4b1b95076afb3aa62c6c72de6d9f7f6cacfaca9b9a39628fe2ba71cbe46de5
+  data.tar.gz: 7b1489588052128fd22902674ad41c3d28fb620ca1bdeefbf5d8131651aaa240478e6ee52d4d1f2f0758c64edb13f71edb02ceece474994eb3d18fdccf546fcf

data/example/api/simple.rb

@@ -1,9 +1,9 @@
-require "phaedra"
+require_relative "../phaedra/initializers"
 
 class PhaedraFunction < Phaedra::Base
   def get(params)
     response["Content-Type"] = "text/html; charset=utf-8"
-    "<p>This is Interesting. 😁</p>"
+    "<p>This is Interesting. 😁 #{Phaedra.the_time}</p>"
   end
 end
 

data/example/config.ru

@@ -1,3 +1,3 @@
-require "phaedra"
+require "phaedra/rack_app"
 
 run Phaedra::RackApp.new

data/example/phaedra/initializers.rb

@@ -0,0 +1,11 @@
+require "phaedra"
+
+module Phaedra
+  Initializers.register self do
+    the_time("123")
+  end
+
+  def self.the_time(init = nil)
+    @the_time ||= "#{Time.now} + #{init}"
+  end
+end

data/lib/phaedra.rb

@@ -1,7 +1,4 @@
 require "phaedra/version"
-
 require "webrick"
-require "rack"
-
+require "phaedra/initializers"
 require "phaedra/base"
-require "phaedra/rack_app"

data/lib/phaedra/base.rb

@@ -7,6 +7,10 @@ module Phaedra
   class Base
     include CallbacksActionable
 
+    before_action do
+      Initializers.run
+    end
+
     # Used by WEBrick
     def self.get_instance(server, *options)
       self.new(server, *options)
@@ -112,7 +116,7 @@ module Phaedra
 
     def set_initial_status
       @res.status = 200
-      @res["Content-Type"] = "application/json"
+      @res["Content-Type"] = "application/json; charset=utf-8"
     end
 
     def call_method_action(params)
@@ -123,7 +127,7 @@ module Phaedra
     def complete_response
       if @res.body.is_a?(String) && !@res["Content-Type"].start_with?("text/")
         @res["Content-Type"] = "text/plain; charset=utf-8"
-      elsif @res["Content-Type"] == "application/json"
+      elsif @res["Content-Type"].start_with? "application/json"
         @res.body = @res.body.to_json
       end
     end

data/lib/phaedra/concerns/callbacks_actionable.rb

@@ -11,14 +11,14 @@ module Phaedra
     end
 
     module ClassMethods
-      def before_action(*args)
-        set_callback :action, :before, *args
+      def before_action(*args, &block)
+        set_callback :action, :before, *args, &block
       end
-      def after_action(*args)
-        set_callback :action, :after, *args
+      def after_action(*args, &block)
+        set_callback :action, :after, *args, &block
       end
-      def around_action(*args)
-        set_callback :action, :around, *args
+      def around_action(*args, &block)
+        set_callback :action, :around, *args, &block
       end
     end
   end

data/lib/phaedra/initializers.rb

@@ -0,0 +1,69 @@
+module Phaedra
+  module Initializers
+    Registration = Struct.new(
+      :origin,
+      :priority,
+      :block,
+      keyword_init: true
+    ) do
+      def to_s
+        "#{owner}:#{priority} for #{block}"
+      end
+    end
+
+    DEFAULT_PRIORITY = 20
+
+    PRIORITY_MAP = {
+      low: 10,
+      normal: 20,
+      high: 30,
+    }.freeze
+
+    # initial empty hooks
+    @registry = []
+
+    NotAvailable = Class.new(RuntimeError)
+    Uncallable = Class.new(RuntimeError)
+
+    # Ensure the priority is a Fixnum
+    def self.priority_value(priority)
+      return priority if priority.is_a?(Integer)
+
+      PRIORITY_MAP[priority] || DEFAULT_PRIORITY
+    end
+
+    def self.register(origin, priority: DEFAULT_PRIORITY, &block)
+      raise Uncallable, "Initializers must respond to :call" unless block.respond_to? :call
+
+      @registry << Registration.new(
+        origin: origin,
+        priority: priority_value(priority),
+        block: block
+      )
+
+      block
+    end
+
+    def self.remove(origin)
+      @registry.delete_if { |item| item.origin == origin }
+    end
+
+    def self.run(force: false)
+      if !@initializers_ran || force
+        prioritized_initializers.each do |initializer|
+          initializer.block.call
+        end
+      end
+
+      @initializers_ran = true
+    end
+
+    def self.prioritized_initializers
+      # sort initializers according to priority and load order
+      grouped_initializers = @registry.group_by(&:priority)
+      grouped_initializers.keys.sort.reverse.map do |priority|
+        grouped_initializers[priority]
+      end.flatten
+    end
+  end
+end

data/lib/phaedra/rack_app.rb

@@ -1,3 +1,6 @@
+require "rack"
+require "phaedra"
+
 module Phaedra
   class Request < Rack::Request
     def query

data/lib/phaedra/rack_middleware.rb

@@ -0,0 +1,2 @@
+require "phaedra/rack_middleware/not_found"
+require "phaedra/rack_middleware/static"

data/lib/phaedra/version.rb

@@ -1,3 +1,3 @@
 module Phaedra
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phaedra
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Jared White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,13 +84,15 @@ files:
 - example/api/simple.rb
 - example/api/the-time.rb
 - example/config.ru
+- example/phaedra/initializers.rb
 - lib/phaedra.rb
 - lib/phaedra/base.rb
 - lib/phaedra/concerns/callbacks_actionable.rb
-- lib/phaedra/middleware.rb
-- lib/phaedra/middleware/not_found.rb
-- lib/phaedra/middleware/static.rb
+- lib/phaedra/initializers.rb
 - lib/phaedra/rack_app.rb
+- lib/phaedra/rack_middleware.rb
+- lib/phaedra/rack_middleware/not_found.rb
+- lib/phaedra/rack_middleware/static.rb
 - lib/phaedra/version.rb
 - phaedra.gemspec
 homepage: https://github.com/whitefusionhq/phaedra
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Write serverless Ruby functions via a REST-like microframework compatible

data/lib/phaedra/middleware.rb

@@ -1,2 +0,0 @@
-require "phaedra/middleware/not_found"
-require "phaedra/middleware/static"