lux-fw 0.1.17 → 0.1.35

data/lib/lux/lux.rb

@@ -41,7 +41,7 @@ module Lux
   end
 
   def page
-    Thread.current[:lux][:page]
+    Thread.current[:lux][:page] ||= Lux::Page.prepare('/mock')
   end
 
   def page=(what)
@@ -61,6 +61,7 @@ module Lux
   end
 
   def error data
+    page.status 500
     Lux::Error.show(data)
   end
 
@@ -101,64 +102,16 @@ module Lux
   end
 
   def speed loops=1
-    render_start = Time.now
+    render_start = Time.now.to_f
     loops.times { yield }
-    num = ((Time.now-render_start)*1000).to_i.to_s
-    num = num.sub(/(\d)(\d{3})$/,'\1s \2')
-    num = "#{num}ms"
+    num = ((Time.now.to_f - render_start)*1_000_000).to_i.to_s
+    num = "#{num} ms"
     loops == 1 ? num : "Done #{loops.to_s.sub(/(\d)(\d{3})$/,'\1s \2')} loops in #{num}"
   end
 
   def consumed_memory
     `ps -o rss -p #{$$}`.chomp.split("\n").last.to_i / 1000
   end
-
-end
-
-# handy :)
-# renders full pages and exposes page object (req, res) in yiled
-# for easy and powerful testing
-# Hash :qs, Hash :post, String :method, Hash :cookies, Hash :session
-# https://github.com/rack/rack/blob/master/test/spec_request.rb
-def Lux(path, in_opts={}, &block)
-  allowed_opts = [:qs, :post, :method, :session, :cookies]
-  in_opts.keys.each { |k| die "#{k} is not allowed as opts param. allowed are #{allowed_opts}" unless allowed_opts.index(k) }
-
-  opts = {}
-
-  if in_opts[:post]
-    opts[:query_string] = in_opts[:post]
-    opts[:request_method] = :post
-  else
-    opts[:query_string] = in_opts[:qs] || {}
-    opts[:request_method] ||= in_opts[:method] || :get
-  end
-  opts[:request_method] = opts[:request_method].to_s.upcase
-  opts[:query_string] = opts[:query_string].to_query if opts[:query_string].class.to_s == 'Hash'
-
-  if path[0,4] == 'http'
-    parsed = URI.parse(path)
-    opts[:server_name] = parsed.host
-    opts[:server_port] = parsed.port
-    path = '/'+path.split('/', 4).last
-  end
-
-  env = Rack::MockRequest.env_for(path)
-  env[:input] = opts[:post] if opts[:post]
-  for k,v in opts
-    env[k.to_s.upcase] = v
-  end
-
-  page = Lux::Page.prepare(env)
-  page.session = in_opts[:session] if in_opts[:session]
-
-  return page.instance_exec &block if block_given?
-
-  response = page.render
-  body = response[2].join('')
-  body = JSON.parse body if response[1]['content-type'].index('/json')
-
-  { status: response[0], headers: response[1], body: body }.h
 end
 
 require_relative 'config/config'

data/lib/lux/page/lib/response.rb

@@ -0,0 +1,178 @@
+# class Lux::Page::Response
+#   attr_accessor :body, :headers, :cookies, :content_type, :status
+
+#   def initialize request
+#     @render_start = Time.now
+#     @headers = {}
+#     @cookies = {}
+#     @request = request
+
+#     for cookie in request.env['HTTP_COOKIE'].to_s.split(/;\s*/).map{ |el| el.split('=',2) }
+#       @cookies[cookie[0]] = cookie[1]
+#     end
+#   end
+
+#   def header name, value=:_
+#     name = name.downcase
+#     @headers[name] = value if value != :_
+#     @headers[name]
+#   end
+
+#   def cache_control value=nil
+#     raise ArgumentError.new('Vrong value') unless [:private, :public].include?(value)
+
+#     # if "no-store" is present then HTTP_IF_NONE_MATCH is not sent from browser
+#     @headers['cache-control'] = 'must-revalidate, %s, max-age=0' % value
+#   end
+
+#   def etag *args
+#     @headers['etag'] ||= 'W/"%s"' % Lux.cache.generate_key(args)
+
+#     if @request.env['HTTP_IF_NONE_MATCH'] == @headers['etag']
+#       @status = 304
+#       @body   = 'not-modified'
+#       true
+#     else
+#       false
+#     end
+#   end
+
+#   def status num=nil
+#     Lux.log caller if num == 500
+#     return @status if @status
+#     if num
+#       if num.is_numeric?
+#         @status ||= num.to_i
+#       else
+#         @status = case num.to_s
+#           when 'StandardError';     400
+#           when 'BadRequestError';   400
+#           when 'UnauthorizedError'; 401
+#           when 'ForbidenError';     403
+#           when 'NotFoundError';     404
+#           when 'RateLimitError';    503
+#           else; 500
+#         end
+#       end
+#     end
+
+#     @status
+#   end
+
+#   def body what=nil
+#     @body ||= what
+
+#     if @body && block_given?
+#       @body = yield @body
+#       Lux.error 'Lux.page.body is not a string (bad page.body filter)' unless @body.is_a?(String)
+#     end
+
+#     @body
+#   end
+
+#   def body= what
+#     body(what)
+#   end
+
+#   def body! what
+#     @body = what
+#   end
+
+#   def content_type type=nil
+#     return @content_type unless type
+
+#     # can be set only once
+#     return @content_type if @content_type
+
+#     type = 'application/json' if type == :json
+#     type = 'text/plain' if type == :text
+#     type = 'text/html' if type == :html
+
+#     raise 'Invalid page content-type %s' % type if type === Symbol
+
+#     @content_type = type
+#   end
+
+#   def content_type= type
+#     content_type type
+#   end
+
+#   def redirect where=nil, opts={}
+#     return @headers['location'] unless where
+
+#     @status = opts.delete(:status) || 302
+#     opts.map { |k,v| flash.send(k, v) }
+
+#     @headers['location'] = where.index('//') ? where : "#{host}#{where}"
+#     @body = %[redirecting to #{@headers['location']}\n\n#{opts.values.join("\n")}]
+#   end
+
+#   def permanent_redirect where
+#     redirect where, status:301
+#   end
+
+#   def write_response_body
+#     # if @body is not set, this is error now
+#     unless @body
+#       @status = 500
+#       @body = 'Page BODY not defined. Maybe you did not call cell action but method instad.'
+#     end
+
+#     # respond as JSON if we recive hash
+#     if @body.kind_of?(Hash)
+#       @body = Lux.dev? ? JSON.pretty_generate(@body) : JSON.generate(@body)
+
+#       if Lux.page.request.params[:callback]
+#         @body = "#{@request.params[:callback]}(#{ret})"
+#         @content_type ||= 'text/javascript'
+#       else
+#         @content_type ||= 'application/json'
+#       end
+
+#       @body += "\n"
+#     else
+#       # if somebody sets @content_type, respect that
+#       @body = @body.to_s unless @body.kind_of?(String)
+#       @content_type ||= 'text/plain' if @body[0,1] != '<'
+#       @content_type ||= 'text/html'
+#     end
+#   end
+
+#   def write_response_header
+#     domain =
+#       if request.host =~ %r{^[\d\.]+$} # if request is IP
+#          request.host
+#       else
+#         base_domain.index('.') ? ".#{base_domain}" : base_domain
+#       end
+
+#     @session[:lux_flash] = flash.to_h
+
+#     # skip adding of cookies and time to strong etag parameters
+#     if !@headers['etag'] || @headers['etag'].index('/')
+#       @headers['set-cookie']  = "__luxs=#{Crypt.encrypt(@session.to_json)}; Expires=#{(Time.now+1.month).utc}; Path=/; Domain=#{domain};"
+#       @headers['x-lux-speed'] = "#{((Time.now-@render_start)*1000).round(1)}ms"
+#     end
+
+#     @headers['content-type']  ||= "#{@content_type}; charset=utf-8"
+
+#     Lux.page.etag(@body) if Lux.page.request.request_method == 'GET'
+#   end
+
+#   def write_response
+#     write_response_body
+#     write_response_header
+
+#     @status ||= 200
+#     Lux.log " #{@status}, #{@headers['x-lux-speed']}"
+
+#     if ENV['LUX_PRINT_ROUTES']
+#       print '* Finished route print '
+#       puts @status == 404 ? 'without a match'.red : 'with a match'.green
+#       exit
+#     end
+
+#     [@status, @headers, [@body]]
+#   end
+
+# end

data/lib/lux/page/page.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 # we need this for command line
-Thread.current[:lux] ||= {}
-Thread.current[:lux][:cache] ||= {}
+Thread.current[:lux] ||= { cache: {} }
 
 class Lux::Page
   attr_accessor :headers, :cookies, :session, :files_in_use
@@ -38,13 +37,14 @@ class Lux::Page
 
   ###
 
-  def initialize(request)
-    @render_start = Time.now
+  def initialize request
     @files_in_use = []
-    @request = request
-    @headers = {}
-    @cookies = {}
-    @session = {}
+    @request  = request
+    @headers  = {}
+    @cookies  = {}
+    @session  = {}
+
+    @render_start = Time.now
 
     for cookie in request.env['HTTP_COOKIE'].to_s.split(/;\s*/).map{ |el| el.split('=',2) }
       @cookies[cookie[0]] = cookie[1]
@@ -57,8 +57,16 @@ class Lux::Page
       puts "ERROR: There is no session set!".red
     end
 
+    # hard sec, bind session to user agent and IP
+    check = get_client_unique_hash
+    @session = {} if @session['_c'] && @session['_c'] != check
+    @session['_c'] = check
+
     @session = HashWithIndifferentAccess.new(@session)
-    @session['_junk'] = Crypt.uid
+
+    if request.post? && Lux.config(:log_to_stdout)
+      ap request.params
+    end
 
     @params = request.params.h_wia
     Lux::Page::EncryptParams.decrypt @params
@@ -66,6 +74,10 @@ class Lux::Page
     @nav = Lux::Controller::Nav.new request
   end
 
+  def get_client_unique_hash
+    Crypt.md5(@request.ip.to_s+@request.env['HTTP_USER_AGENT'].to_s)
+  end
+
   def status num=nil
     Lux.log caller if num == 500
     return @status if @status
@@ -108,7 +120,7 @@ class Lux::Page
   end
 
   def flash message=nil
-    @flash ||= Flash.new(@session[:lux_flash])
+    @flash ||= Flash.new @session[:lux_flash]
 
     message ? @flash.error(message) : @flash
   end
@@ -125,31 +137,37 @@ class Lux::Page
   end
 
   def host
-    "#{request.env['rack.url_scheme']}://#{request.host}:#{request.port}".sub(':80','') rescue 'http://locahost:3000'
+    "#{request.env['rack.url_scheme']}://#{request.host}:#{request.port}".sub(':80','')# rescue 'http://locahost:3000'
   end
 
   def no_cache? force=nil
     return false if !force && Lux.prod?
-    Lux.page.request.env['HTTP_CACHE_CONTROL'] == 'no-cache' ? true : false
+    @request.env['HTTP_CACHE_CONTROL'] == 'no-cache' ? true : false
   rescue
     false
   end
 
-  def redirect(where=nil, opts={})
+  def header name, value=:_
+    name = name.downcase
+    @headers[name] = value if value != :_
+    @headers[name]
+  end
+
+  def redirect where=nil, opts={}
     return @headers['location'] unless where
 
     @status = opts.delete(:status) || 302
     opts.map { |k,v| flash.send(k, v) }
 
-    @headers['location'] = where.index('//') ? where : "#{Lux.page.host}#{where}"
+    @headers['location'] = where.index('//') ? where : "#{host}#{where}"
     @body = %[redirecting to #{@headers['location']}\n\n#{opts.values.join("\n")}]
   end
 
-  def permanent_redirect(where)
-    redirect(where, status:301)
+  def permanent_redirect where
+    redirect where, status:301
   end
 
-  def content_type(type=nil)
+  def content_type type=nil
     return @content_type unless type
 
     # can be set only once
@@ -159,36 +177,38 @@ class Lux::Page
     type = 'text/plain' if type == :text
     type = 'text/html' if type == :html
 
+    raise 'Invalid page content-type %s' % type if type === Symbol
+
     @content_type = type
   end
 
-  def content_type=(type)
-    content_type(type)
+  def content_type= type
+    content_type type
   end
 
-  def etag(*args)
-    @headers['etag'] ||= %[W/"#{Lux.cache.generate_key(args)}"]
+  def etag *args
+    @headers['etag'] ||= 'W/"%s"' % Lux.cache.generate_key(args)
 
-    if Lux.page.request.env['HTTP_IF_NONE_MATCH'] == @headers['etag']
-      if Lux.config(:perform_caching)
-        Lux.page.status(304)
-        Lux.page.body 'not-modified'
-        return true
-      else
-        print ' 304>' if Lux.page.status != 304 && Lux.verbose?
-      end
+    if @request.env['HTTP_IF_NONE_MATCH'] == @headers['etag']
+      @status = 304
+      body! 'not-modified'
+      # print ' %s>' % Lux.page.status if Lux.config(:log_to_stdout)
+      true
+    else
+      false
     end
-    false
   end
 
-  def once(id, data=nil)
+  # execute action once per page
+  def once id, data=nil
     @once_hash ||= {}
-    return if @once_hash[id]
+    return false if @once_hash[id]
     @once_hash[id] = true
-    data || yield
+    yield if block_given?
+    data || true
   end
 
-  def process_body
+  def write_response_body
     # if @body is not set, this is error now
     unless @body
       @status = 500
@@ -198,12 +218,14 @@ class Lux::Page
     # respond as JSON if we recive hash
     if @body.kind_of?(Hash)
       @body = Lux.dev? ? JSON.pretty_generate(@body) : JSON.generate(@body)
+
       if Lux.page.request.params[:callback]
         @body = "#{@request.params[:callback]}(#{ret})"
         @content_type ||= 'text/javascript'
       else
         @content_type ||= 'application/json'
       end
+
       @body += "\n"
     else
       # if somebody sets @content_type, respect that
@@ -211,22 +233,15 @@ class Lux::Page
       @content_type ||= 'text/plain' if @body[0,1] != '<'
       @content_type ||= 'text/html'
     end
+  end
 
-    # show out of process errors if enables and if is html page
-    # becasue for eaxmple we dont want to show error page instead of image
-    # we want user to see it
-    if Lux.config(:show_server_errors) && @content_type == 'text/html' && File.exist?(Lux::Error::OUT_OF_PROCESS_ERROR_PATH)
-      data = File.read(Lux::Error::OUT_OF_PROCESS_ERROR_PATH)
-      File.unlink(Lux::Error::OUT_OF_PROCESS_ERROR_PATH)
-      @body = Lux::Error::render data
-    end
-
-    if request.host =~ %r{^[\d\.]+$} # if request is IP
-      domain = request.host
-    else
-      domain = base_domain
-      domain = domain.index('.') ? ".#{domain}" : domain
-    end
+  def write_response_header
+    domain =
+      if request.host =~ %r{^[\d\.]+$} # if request is IP
+         request.host
+      else
+        base_domain.index('.') ? ".#{base_domain}" : base_domain
+      end
 
     @session[:lux_flash] = flash.to_h
 
@@ -239,9 +254,15 @@ class Lux::Page
     @headers['content-type']  ||= "#{@content_type}; charset=utf-8"
 
     # if "no-store" is present then HTTP_IF_NONE_MATCH is not sent from browser
-    @headers['cache-control'] ||= 'must-revalidate, %s, max-age=0' % Lux.page.var.user ? :private : :public
+    @headers['cache-control'] ||= 'must-revalidate, %s, max-age=0' % (Lux.page.var.user ? :private : :public)
 
     Lux.page.etag(@body) if Lux.page.request.request_method == 'GET'
+  end
+
+  def write_response
+    write_response_body
+    write_response_header
+
     @status ||= 200
     Lux.log " #{@status}, #{@headers['x-lux-speed']}"
 
@@ -263,7 +284,7 @@ class Lux::Page
     Lux::Controller.new.rescued_main
     BeforeAndAfter.execute(self, :after)
 
-    process_body
+    write_response
   end
 
 end

data/lib/lux/rescue_from/rescue_from.rb

@@ -14,7 +14,7 @@
 class Lux::RescueFrom
 
   class << self
-    def define(klass)
+    def define klass
       ClassAttributes.define klass, :rescue_from_hash
 
       klass.class_eval %[
@@ -32,12 +32,13 @@ class Lux::RescueFrom
     @rescues = {}
   end
 
-  def add(name, &block)
+  def add name, &block
     die ":#{name} is not allowed rescue name, only allowed are :default and :allways" if name.is_symbol? && ![:default, :allways].index(name)
     @rescues[name.to_s] = block
   end
 
-  def call
+  # we pass context so we can execute errors it object context
+  def call context
     begin
       yield
     rescue Exception => e
@@ -47,13 +48,14 @@ class Lux::RescueFrom
 
       if proc = @rescues[e.class.to_s]
         proc.call(e.message)
-      elsif @rescues['default'] # catch them all
-        @rescues['default'].call(e.message)
+        context.instance_exec e.message, &proc
+      elsif proc = @rescues['default'] # catch them all
+        context.instance_exec e.message, &proc
       else
         raise e
       end
 
-      @rescues['allways'].call(e.message) if @rescues['allways']
+      context.instance_exec e.message, &@rescues['allways'] if @rescues['allways']
 
       Lux.page.status e.class
     end

data/lib/lux/template/template.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'thread'
 
 class Lux::Template
   @@template_cache = {}

data/lib/lux-fw.rb

@@ -26,7 +26,9 @@ Encoding.default_internal = Encoding.default_external = 'utf-8'
 
 Sequel.extension :inflector, :string_date_time
 Sequel::Model.plugin :after_initialize, :def_dataset_method
+
 Sequel.database_timezone = :utc
+Sequel.default_timezone  = +2
 
 # load basic lux libs
 require_relative './lux/lux'

data/lib/overload/array.rb

@@ -49,4 +49,8 @@ class Array
     end
   end
 
+  def all
+    self
+  end
+
 end

data/lib/overload/date.rb

@@ -27,6 +27,8 @@ class Time
     end
 
     def ago(start_time, end_time=nil)
+      start_time = Time.new(start_time.year, start_time.month, start_time.day) if start_time.class == Date
+
       end_time ||= Time.now
       time_diff = end_time.to_i - start_time.to_i
 

data/lib/overload/hash.rb

@@ -10,16 +10,7 @@ class Hash
   end
 
 	def tag node=nil, text=nil
-		opts = ''
-		self.each do |k,v|
-      opts += ' '+k.to_s.gsub(/_/,'-')+'="'+v.to_s.gsub(/"/,'"')+'"' if v.present?
-    end
-
-    return opts unless node
-
-    text = yield opts if block_given?
-    text ||= '' unless ['input', 'img', 'meta', 'link', 'hr', 'br'].include?(node.to_s)
-    text ? %{<#{node}#{opts}>#{text}</#{node}>} : %{<#{node}#{opts} />}
+		Lux::Helper::HtmlTag.build self, node, text
 	end
 
   def to_struct name=nil
@@ -82,5 +73,23 @@ class Hash
     replace(hash)
     omit
   end
+
+  # full dinmaic option, slow
+  # def to_opts! *keys
+  #   self.keys.each { |key| raise 'Hash key :%s is not allowed!' % key unless keys.include?(key) }
+
+  #   template = Class.new
+  #   keys.each { |key| template.send(:attr_accessor,  key) }
+
+  #   klass = template.new
+  #   keys.map { |key| klass.send '%s=' % key, self[key] }
+  #   klass
+  # end
+  def to_opts! *keys
+    self.keys.each { |key| raise 'Hash key :%s is not allowed!' % key unless keys.include?(key) }
+
+    DynamicClass.new keys
+      .inject({}) { |_, key| _[key] = self[key]; _ }
+  end
 end
 

data/lib/overload/it.rb

@@ -0,0 +1,29 @@
+# class Array
+#   # list.xeach { it.foo }
+#   def xeach &block
+#     define_singleton_method(:it) { @_it } unless respond_to?(:it)
+#     each do |_|
+#       @_it = _
+#       instance_eval &block
+#     end
+#   end
+
+#   # list.xmap { it * 2 }
+#   def xmap &block
+#     define_singleton_method(:it) { @_it } unless respond_to?(:it)
+#     map do |_|
+#       @_it = _
+#       instance_eval &block
+#     end
+#   end
+
+#   # list.xselect { it.class != Module }
+#   def xselect &block
+#     define_singleton_method(:it) { @_it } unless respond_to?(:it)
+#     select do |_|
+#       @_it = _
+#       instance_eval &block
+#     end
+#   end
+
+# end

data/lib/overload/object.rb

@@ -1,31 +1,15 @@
-class LocalRaiseError < StandardError
-end
-
 class Object
-  def r(what=nil)
-    opath = what.class.ancestors
-    out   = opath.join("\n> ")
-
-    data = what.is_a?(Hash) ? JSON.pretty_generate(what) : what.ai(plain:true)
-    out = [data, out, ''].join("\n\n-\n\n")
-
-    raise LocalRaiseError.new out
-  end
-
-  def instance_variables_hash
-    Hash[instance_variables.map { |name| [name, instance_variable_get(name)] } ]
-  end
 
-  def or(_or)
+  def or _or
     self.blank? || self == 0 ? _or : self
   end
 
-  def try(*args)
+  def try *args
     return nil if self.class == NilClass
     self.send(*args)
   end
 
-  def die(desc=nil, exp_object=nil)
+  def die desc=nil, exp_object=nil
     desc ||= 'died without desc'
     desc = '%s: %s' % [exp_object.class, desc] if exp_object
     raise desc