lux-fw 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48df51990bdf390ef6f780d624e0bb1624f54dfc5721dee1c77749f02e2ec472
-  data.tar.gz: bde0c404e918b91825e90b9e7a183199266d225ece56c54b28e1366366350bc7
+  metadata.gz: 7f17bf48ba9c67072d7a9cba132b0c8c29fb25f79bc424e39f0d4bc39b16981e
+  data.tar.gz: ea0a19540ee7c21cebea07b6ea6ad27e967a448d1865a51097b7fe22f305e244
 SHA512:
-  metadata.gz: fc6c0f8bf80608399dac5afe4dd9f7d01d78fd99cbcf45e3cf746e986eabd8a08ba6650722569c6e0f64266fd202a27b44ec6e6e3cfdf8683951605bb03b030f
-  data.tar.gz: 106570f909cc6109a9d1f6f7f719d82e4b7514e4b214b62fcc81015590c7e607bf39fbb97c74fe2e1add9986ca260c840743c3f1121b751ef81372c789e32327
+  metadata.gz: a286aecb1572cb1b7929449c914f4bed7faae1b199c63e663300eae36a5a58d40cb3c8480a59974d8a74a1dbc2a3a2269130f070bd2e3eafc6cf5dc64e4729f0
+  data.tar.gz: 4490adeaa98e7ac83bf413511baa383f152ded339ee0fa8c97d29cab141653da1eea76059f210296b4c3e465259e484c68c20bd7d172fe94420c4c9863b688cd

data/.version

@@ -1 +1 @@
-0.2.1
+0.2.3

data/lib/common/class_callbacks.rb

@@ -21,34 +21,36 @@ module ClassCallbacks
   @@pointers = {}
 
   def add klass, unique_id, action, method
-    key = Crypt.md5(unique_id)
+    klass = klass.to_s
+    key   = Crypt.sha1(unique_id)
+
     @@pointers[key] = method
-    @@methods[klass.to_s] ||= {}
-    @@methods[klass.to_s][action] ||= []
-    @@methods[klass.to_s][action].push(key) unless @@methods[klass.to_s][action].index(key)
+
+    @@methods[klass] ||= {}
+    @@methods[klass][action] ||= []
+    @@methods[klass][action].tap { |it| it.push(key) unless it.include?(key) }
   end
 
   def execute instance_object, action, object=nil
     object ? instance_object.send(action, object) : instance_object.send(action)
 
-    # execute for self and parent
-    for name in instance_object.class.ancestors.reverse.map(&:to_s)
-      next if name == 'Object'
-
-      if @@methods[name] && @@methods[name][action]
-        for el in @@methods[name][action].map { |o| @@pointers[o] }
-          if el.kind_of?(Symbol)
-            object ? instance_object.send(el, object) : instance_object.send(el)
-          else
-            object ? instance_object.instance_exec(object, &el) : instance_object.instance_exec(&el)
-          end
+    # execute for self and parents
+    instance_object.class.ancestors.reverse.map(&:to_s).each do |name|
+      next if     name == 'Object'
+      next unless actions = @@methods.dig(name, action)
+
+      for el in actions.map { |o| @@pointers[o] }
+        if el.kind_of?(Symbol)
+          object ? instance_object.send(el, object) : instance_object.send(el)
+        else
+          object ? instance_object.instance_exec(object, &el) : instance_object.instance_exec(&el)
         end
       end
     end
   end
 
   def define(klass, *args)
-    for action in args
+    args.each do |action|
       klass.class_eval %[
         def #{action}(duck=nil)
         end

data/lib/lux/application/application.rb

@@ -8,7 +8,8 @@ class Lux::Application
 
   ###
 
-  def initialize
+  def initialize current
+    @current = current
     @route_test = Lux::Application::RouteTest.new self
   end
 
@@ -17,31 +18,32 @@ class Lux::Application
   end
 
   def body?
-    Lux.current.response.body ? true : false
+    @current.response.body ? true : false
   end
 
   def body data
-    Lux.current.response.body data
+    @current.response.body data
   end
 
   def current
-    Lux.current
+    # Lux.current
+    @current
   end
 
   def nav
-    Lux.current.nav
+    @current.nav
   end
 
   def params
-    Lux.current.params
+    @current.params
   end
 
   def redirect where, msgs={}
-    Lux.current.redirect where, msgs
+    @current.redirect where, msgs
   end
 
   def request
-    Lux.current.request
+    @current.request
   end
 
   # gets only root
@@ -55,15 +57,15 @@ class Lux::Application
   end
 
   def done?
-    throw :done if Lux.current.response.body
+    throw :done if @current.response.body
   end
 
   def get?
-    Lux.current.request.request_method == 'GET'
+    @current.request.request_method == 'GET'
   end
 
   def post?
-    Lux.current.request.request_method == 'POST'
+    @current.request.request_method == 'POST'
   end
 
   def plug name, &block
@@ -179,4 +181,14 @@ class Lux::Application
     end
   end
 
+  def render
+    Lux.log "\n#{current.request.request_method.white} #{current.request.path.white}"
+
+    Lux::Config.live_require_check! if Lux.config(:auto_code_reload)
+
+    main
+
+    current.response.render
+  end
+
 end

data/lib/lux/application/lib/render.rb

@@ -4,6 +4,16 @@
 # Hash :qs, Hash :post, String :method, Hash :cookies, Hash :session
 # https://github.com/rack/rack/blob/master/test/spec_request.rb
 
+# Lux.app.render('/admin') -> { status: 403, ... }
+# Lux.app.render('/admin', session: { user_id: User.is_admin.first.id })
+# {
+#   time: '1ms'
+#   status: 200,
+#   headers: {...},
+#   session: {...},
+#   body: '<html> ...'
+# }.h
+
 Lux::Application.class_eval do
   def self.render path='/mock', in_opts={}, &block
     allowed_opts = [:qs, :post, :method, :session, :cookies]
@@ -35,14 +45,14 @@ Lux::Application.class_eval do
       env[k.to_s.upcase] = v
     end
 
-    page = Lux::Current.new(env)
-    Lux.current.session.merge!(in_opts[:session]) if in_opts[:session]
+    current = Lux::Current.new(env)
+    current.session.merge!(in_opts[:session]) if in_opts[:session]
 
-    if block_given?
-      return Lux.app.new.instance_exec &block
-    end
+    app = new current
+
+    return app.instance_exec &block if block_given?
 
-    response = Lux.current.response.render
+    response = app.render
 
     body = response[2].join('')
     body = JSON.parse body if response[1]['content-type'].index('/json')
@@ -51,7 +61,7 @@ Lux::Application.class_eval do
       time: response[1]['x-lux-speed'],
       status: response[0],
       headers: response[1],
-      session: Lux.current.session,
+      session: current.session,
       body: body
     }.h
   end

data/lib/lux/current/lib/static_file.rb

@@ -55,6 +55,18 @@ class Lux::Current::StaticFile
     true
   end
 
+  def resolve_content_type
+    mimme = MIMME_TYPES[@ext.to_sym]
+
+    unless mimme
+      c.response.body('Mimme type not supported')
+      c.response.status(406)
+      return
+    end
+
+    c.response.content_type = mimme
+  end
+
   def deliver data=nil
     file = File.exist?(@file) ? @file : Lux.root.join("public#{@file}")
 
@@ -66,16 +78,9 @@ class Lux::Current::StaticFile
       end
     end
 
-    ext = file.to_s.split('.').last
-    mimme = MIMME_TYPES[ext.to_sym]
-
-    unless mimme
-      c.response.body('Mimme type not supported')
-      c.response.status(404)
-      return
-    end
+    @ext = file.to_s.split('.').last
 
-    c.response.content_type = mimme
+    resolve_content_type
 
     file_mtime = File.mtime(file).utc.to_s
     key        = Crypt.sha1(file+file_mtime.to_s)
@@ -91,10 +96,7 @@ class Lux::Current::StaticFile
       return
     end
 
-    # c.response.headers['X-Sendfile'] = file
-
-    data ||= File.read(file)
-    c.response.body(data)
+    c.response.body data || File.read(file)
 
     true
   end

data/lib/lux/lux.rb

@@ -25,11 +25,12 @@ module Lux
   define_method(:cache)  { Lux::Cache }
 
   # main rack response
-  def call  env=nil
-    req = Lux::Current.new env
-    req.response.render
-  rescue
-    raise $! if Lux.config(:show_server_errors)
+  def call env=nil
+    state  = Lux::Current.new env
+    app    = Lux::Application.new state
+    app.render
+  rescue => e
+    raise e if Lux.config(:show_server_errors)
 
     [500, {}, ['Lux server error']]
   end

data/lib/lux/response/response.rb

@@ -165,34 +165,23 @@ class Lux::Response
 
   def write_response_header
     domain =
-      if cookie_domain
-        cookie_domain
-      elsif cookie_multidomain && current.domain.index('.')
+      if cookie_multidomain && current.domain.index('.')
         ".#{current.domain}"
       else
-        current.request.host
+        cookie_domain || current.request.host
       end
 
     # cache-control
     @headers['cache-control'] ||= Proc.new do
-      cc      = ['max-age=%d' % max_age]
-
-      if max_age > 0
-        cc.push 'public, no-cache'
-      else
-        cc.push 'private, must-revalidate'
-      end
-
+      cc = ['max-age=%d' % max_age]
+      cc.push max_age > 0 ? 'public, no-cache' : 'private, must-revalidate'
       cc.join(', ')
     end.call
 
     current.session[:lux_flash] = flash.to_h
 
     # dont annd cookies to public pages (images, etc..)
-    add_cookies = true
-    add_cookies = false if @headers['cache-control'].index('public')
-
-    if add_cookies
+    unless @headers['cache-control'].index('public')
       encrypted = Crypt.encrypt(current.session.to_json)
 
       if current.cookies[Lux.config.session_cookie_name] != encrypted
@@ -208,7 +197,7 @@ class Lux::Response
     # if "no-store" is present then HTTP_IF_NONE_MATCH is not sent from browser
   end
 
-  def write_response
+  def render
     write_response_body
     write_response_header
 
@@ -224,14 +213,4 @@ class Lux::Response
     [@status, @headers.to_h, [@body]]
   end
 
-  def render
-    Lux.log "\n#{current.request.request_method.white} #{Lux.current.request.path.white}"
-
-    Lux::Config.live_require_check! if Lux.config(:auto_code_reload)
-
-    Lux::Application.new.main
-
-    write_response
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lux-fw
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Dino Reic