quince 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f42655bc57603a51bd5231388dc7be387a51a8e912549f6a504fbaeb0e1dbb3e
-  data.tar.gz: ed87a57062ce7343b08409fd8126034a7dbf46e094b1741829fc63fdb9ab1f7d
+  metadata.gz: 8fa04a55360919ddbb5c4cbda37d050d6cceb7f0d18b322db647de52391e2aae
+  data.tar.gz: 42576df0afa49fdc03e1627825f6639b1c7ee78df6257e9a19e4bf1e7f70527d
 SHA512:
-  metadata.gz: 7c5358907ee716710a7c0f53c277ede1301ee16c31ab2304a63d33cdd91dff9f80a282f2832637d7b5ad14d4103d65a5f9ce16c4ed02cda14f9a148145263ee5
-  data.tar.gz: 0dc9bad86700382b48810bf70a2c0b0258c7e3383a4b73a37ea84fc46bf8ca174f2e20404c5070723512ffd2c1f0b1a61447bd9ce3da9eec6275e2dc8a003309
+  metadata.gz: c23ee9c623006fbaf2b27ead13c7fff34dd2527aba7ad618bd4a53d55105608805746ac56e3e7c6b853620801f14f956062005c6126e0c3f2b858112a02a575a
+  data.tar.gz: 18d1cca64addec79bef58f47b62006b3ba40ee94d318f74d29e633320aafb2146a9b4c2ff200be56b51177253e889b6e18d7697880ea5c0cd416bc1b42bb736a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quince (0.6.0)
+    quince (0.6.1)
       oj (~> 3.13)
       rack-contrib (~> 2.3)
       sinatra (~> 2.1)

data/lib/quince/component.rb

@@ -9,7 +9,7 @@ module Quince
       end
 
       def Props(**kw)
-        self.const_set "Props", TypedStruct.new(
+        self.const_set "Props", Quince::Config.props_struct_type.new(
           Quince::Component::PARENT_SELECTOR_ATTR => String,
           Quince::Component::SELF_SELECTOR => String,
           **kw,
@@ -17,7 +17,7 @@ module Quince
       end
 
       def State(**kw)
-        st = kw.empty? ? nil : TypedStruct.new(**kw)
+        st = kw.empty? ? nil : Quince::Config.state_struct_type.new(**kw)
         self.const_set "State", st
       end
 
@@ -99,7 +99,8 @@ module Quince
       Thread.current[:request_binding].receiver
     end
 
-    def_delegators :request_context, :attachment, :request, :response, :redirect, :halt
+    def_delegators :request_context,
+      :attachment, :request, :response, :redirect, :halt, :session, :cache_control, :send_file, :to, :status, :headers, :body
 
     private
 

data/lib/quince/config.rb

@@ -0,0 +1,39 @@
+module Quince
+  class Config
+    class << self
+      attr_reader :props_struct_type, :state_struct_type
+
+      def base
+        props typed: ENV["RACK_ENV"] != "production"
+        state typed: ENV["RACK_ENV"] != "production"
+        sinatra_config do
+          configure :development do
+            if Object.const_defined? "Sinatra::Reloader"
+              register Sinatra::Reloader
+              dont_reload __FILE__
+              also_reload $0
+            end
+          end
+          enable :logging
+          use Rack::JSONBodyParser
+          use Rack::Deflater
+          set :public_folder, File.join(File.dirname(File.expand_path($0)), "public")
+        end
+      end
+
+      private
+
+      def props(typed:)
+        @props_struct_type = typed ? Quince::TypedStruct : Quince::Struct
+      end
+
+      def state(typed:)
+        @state_struct_type = typed ? Quince::TypedStruct : Quince::Struct
+      end
+
+      def sinatra_config(&block)
+        Quince::SinatraApp.instance_exec &block
+      end
+    end
+  end
+end

data/lib/quince/sinatra.rb

@@ -1,24 +1,6 @@
 # frozen_string_literal: true
-
-ENV["RACK_ENV"] ||= "development"
-
-require "sinatra/base"
-require "sinatra/reloader" if ENV["RACK_ENV"] == "development"
-require "rack/contrib"
-
 module Quince
   class SinatraApp < Sinatra::Base
-    configure :development do
-      if Object.const_defined? "Sinatra::Reloader"
-        register Sinatra::Reloader
-        dont_reload __FILE__
-        also_reload $0
-      end
-    end
-    use Rack::JSONBodyParser
-    use Rack::Deflater
-    set :public_folder, File.join(File.dirname(File.expand_path($0)), "public")
-
     class << self
       def create_route_handler(verb:, route:, &blck)
         meth = case verb

data/lib/quince/struct/typed.rb

@@ -0,0 +1,4 @@
+module Quince
+  class TypedStruct < ::TypedStruct
+  end
+end

data/lib/quince/struct/untyped.rb

@@ -0,0 +1,7 @@
+module Quince
+  class Struct < ::Struct
+    def self.new(**attrs)
+      super *attrs.keys, keyword_init: true
+    end
+  end
+end

data/lib/quince/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quince
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/quince.rb

@@ -1,8 +1,35 @@
+ENV["RACK_ENV"] ||= "development"
+
+require "sinatra/base"
+require "sinatra/reloader" if ENV["RACK_ENV"] == "development"
+require "rack/contrib"
+
 require "securerandom"
 require "typed_struct"
 require "cgi"
+
+require_relative "quince/config"
+require_relative "quince/struct/typed"
+require_relative "quince/struct/untyped"
+require_relative "quince/sinatra"
+
+module Quince
+  def self.load_config!
+    Quince::Config.base
+    app_dir = File.dirname(File.expand_path($0))
+    conf = Pathname(File.join(app_dir, "config.rb"))
+    require conf.to_s if conf.exist?
+
+    rack_env = ENV["RACK_ENV"]
+    if Quince::Config.respond_to? rack_env
+      Quince::Config.send rack_env
+    end
+  end
+end
+
+Quince.load_config!
+
 require_relative "quince/singleton_methods"
 require_relative "quince/component"
 require_relative "quince/html_tag_components"
 require_relative "quince/version"
-require_relative "quince/sinatra"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quince
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Joseph Johansen
@@ -102,10 +102,13 @@ files:
 - lib/quince/callback.js.erb
 - lib/quince/callback.rb
 - lib/quince/component.rb
+- lib/quince/config.rb
 - lib/quince/html_tag_components.rb
 - lib/quince/serialiser.rb
 - lib/quince/sinatra.rb
 - lib/quince/singleton_methods.rb
+- lib/quince/struct/typed.rb
+- lib/quince/struct/untyped.rb
 - lib/quince/types.rb
 - lib/quince/version.rb
 - quince.gemspec