lux-fw 0.2.3 → 0.5.32

data/lib/lux/response/lib/header.rb

@@ -14,8 +14,21 @@ class Lux::Response::Header
     @data[key.downcase] = value
   end
 
+  def merge hash
+    for key, value in hash
+      @data[key.downcase] = value
+    end
+
+    @data
+  end
+
+  def delete name
+    @data.delete name.downcase
+  end
+
   def to_h
-    @data.to_h.sort.to_h
+    # data['Set-Cookie'] = data.delete('set-cookie') if data['set-cookie']
+    @data#.to_h.sort.to_h
   end
 
 end

data/lib/lux/response/response.rb

@@ -7,8 +7,7 @@ class Lux::Response
   # if defined, cache becomes public and can be cache by proxies
   # use with care.only for static resources and
   attr_reader :max_age
-
-  attr_accessor :body, :headers, :cookies, :content_type, :status, :cookie_multidomain, :cookie_domain
+  attr_accessor :headers, :cookies, :content_type, :status
 
   def initialize
     @render_start = Time.monotonic
@@ -29,6 +28,13 @@ class Lux::Response
     @max_age = age.to_i
   end
 
+  # http 103
+  def early_hints link=nil, type=nil
+    @early_hints ||= []
+    @early_hints.push [link, type] if type && !@early_hints.include?(link)
+    @early_hints
+  end
+
   def etag *args
     unless @headers['etag']
       args.push current.request.url
@@ -39,12 +45,9 @@ class Lux::Response
       @headers['etag'] = key
     end
 
-    if current.request.env['HTTP_IF_NONE_MATCH'] == @headers['etag']
-      @status = 304
-      @body   = 'not-modified'
-      true
-    else
-      false
+    if !@body && current.request.env['HTTP_IF_NONE_MATCH'] == @headers['etag']
+      status 304
+      body   'not-modified'
     end
   end
 
@@ -64,33 +67,30 @@ class Lux::Response
     throw :done
   end
 
-  def body what=nil
-    @body ||= what
-
-    if @body && block_given?
-      @body = yield @body
-      Lux.error 'Lux.current.response.body is not a string (bad current.response.body filter)' unless @body.is_a?(String)
-    end
-
+  def body body_data=nil, status=nil
+    @status = status      if status
+    @body   = body_data   if body_data
+    @body   = yield @body if block_given?
     @body
   end
-  alias :body= :body
 
-  def body! what
-    @body = what
+  def body?
+    !!@body
   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
+    if type.is_a?(Symbol)
+      case type
+      when :javascript then 'application/javascript'
+      when :json       then 'application/json'
+      when :text       then 'text/plain'
+      when :html       then 'text/html'
+      else
+        raise ArgumentError.new('Bad content type')
+      end
+    end
 
     @content_type = type
   end
@@ -105,16 +105,40 @@ class Lux::Response
     message ? @flash.error(message) : @flash
   end
 
-  def redirect where=nil, opts={}
-    return @headers['location'] unless where
+  def send_file file, opts={}
+    ::Lux::Response::File.new(file, opts).send
+  end
+
+  # redirect '/foo'
+  # redirect :back, info: 'bar ...'
+  def redirect where, opts={}
+    where  = current.request.env['HTTP_REFERER'].or('/') if where == :back
+    where  = "#{current.request.path}#{where}" if where[0,1] == '?'
+    where  = current.host + where unless where.include?('://')
+
+    # local redirect
+    if where.include?(current.host)
+      redirect_var = Lux.config.redirect_var || :_r
+
+      url = Url.new where
+      url[redirect_var] = current.request.params[redirect_var].to_i + 1
+
+      where =
+        if opts.delete(:silent)
+          url.delete redirect_var
+          url.to_s
+        else
+          url[redirect_var] > 3 ? '/' : url.to_s
+        end
+    end
 
     @status = opts.delete(:status) || 302
     opts.map { |k,v| flash.send(k, v) }
 
-    @headers['location']   = where.index('//') ? where : "#{current.host}#{where}"
-    @headers['access-control-expose-headers'] ||= 'Location'
+    @body = %[redirecting to #{where}\n\n#{opts.values.join("\n")}]
 
-    @body = %[redirecting to #{@headers['location']}\n\n#{opts.values.join("\n")}]
+    @headers['location'] = where
+    @headers['access-control-expose-headers'] ||= 'Location'
 
     throw :done
   end
@@ -132,15 +156,14 @@ class Lux::Response
 
     status 401
     header('WWW-Authenticate', 'Basic realm="%s"' % relam.or('default'))
-    body = ErrorCell.unauthorized('HTTP 401 Authorization needed')
-
-    false
+    body 'HTTP 401 Authorization needed'
+    throw :done
   end
 
   def write_response_body
     unless @body
-      @status = 404
-      @body = Lux.error 'Document not found'
+      @status = 204
+      @body = 'Lux HTTP ERROR 204: NO CONTENT'
     end
 
     # respond as JSON if we recive hash
@@ -164,13 +187,6 @@ class Lux::Response
   end
 
   def write_response_header
-    domain =
-      if cookie_multidomain && current.domain.index('.')
-        ".#{current.domain}"
-      else
-        cookie_domain || current.request.host
-      end
-
     # cache-control
     @headers['cache-control'] ||= Proc.new do
       cc = ['max-age=%d' % max_age]
@@ -182,18 +198,16 @@ class Lux::Response
 
     # dont annd cookies to public pages (images, etc..)
     unless @headers['cache-control'].index('public')
-      encrypted = Crypt.encrypt(current.session.to_json)
-
-      if current.cookies[Lux.config.session_cookie_name] != encrypted
-        @headers['set-cookie']  = "#{Lux.config.session_cookie_name}=#{encrypted}; Expires=#{(Time.now+1.month).utc}; Path=/; Domain=#{domain};"
-      end
+      cookie = current.session.generate_cookie
+      @headers['set-cookie'] = cookie if cookie
     end
 
     etag(@body) if current.request.request_method == 'GET'
 
     @headers['x-lux-speed']     = "#{((Time.monotonic - @render_start)*1000).round(1)} ms"
     @headers['content-type']  ||= "#{@content_type}; charset=utf-8"
-    @headers['content-length']  = @body.bytesize
+    @headers['content-length']  = @body.bytesize.to_s
+
     # if "no-store" is present then HTTP_IF_NONE_MATCH is not sent from browser
   end
 
@@ -204,12 +218,6 @@ class Lux::Response
     @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.to_h, [@body]]
   end
 

data/lib/lux/view/cell.rb

@@ -0,0 +1,102 @@
+require_relative 'view'
+
+class Lux::View::Cell
+  class Loader
+    def initialize parent
+      @parent = parent
+    end
+
+    def method_missing m, vars={}
+      ViewCell.get(m, @parent, vars)
+    end
+  end
+
+  class_callback :before
+
+  @@cache = {}
+
+  class << self
+    # CityCell.folder -> "./app/cells/city"
+    def base_folder
+      name = instance_methods(false).first || dir('Can not find method')
+      file = instance_method(name).source_location
+      File.dirname file.first
+    end
+
+    def get name, parent, vars={}
+      w = ('%sCell' % name.to_s.classify).constantize
+      w = w.new parent, vars
+      w
+    end
+  end
+
+  ###
+
+  define_method(:current) { Lux.current }
+  define_method(:request) { Lux.current.request }
+  define_method(:params)  { Lux.current.request.params }
+
+  def initialize parent, vars={}
+    @_parent = parent
+
+    Object.class_callback :before, self
+
+    vars.each { |k,v| instance_variable_set "@#{k}", v}
+
+    # add runtime file reference
+    if m = self.class.instance_methods(false).first
+      src = method(m).source_location[0].split(':').first
+      src = src.sub(Lux.root.to_s+'/', '')
+      Lux.log " #{src}" unless Lux.current.files_in_use.include?(src)
+      Lux.current.files_in_use src
+    end
+  end
+
+  def parent &block
+    if block_given?
+      @_parent.instance_exec &block
+    else
+      @_parent
+    end
+  end
+
+  # if block is passed, template render will be passed as an argument
+  def template name=:cellm, &block
+    tpl = 'cell-tpl-%s-%s' % [self.class, name]
+
+    tpl = Lux.ram_cache(tpl) do
+      file = '%s/%s.haml' % [self.class.base_folder, name]
+      file = file.sub(Lux.root.to_s+'/', '')
+
+      Lux.log ' ' + file unless Lux.current.files_in_use(file)
+
+      Tilt[:haml].new { File.read(file) }
+    end
+
+    data = tpl.render(self)
+    data = block.call(data) if block
+    data
+  end
+
+  # tag :div, { 'class'=>'iform' } do
+  def tag name=nil, opts={}, data=nil
+    return HtmlTagBuilder unless name
+
+    data = yield(opts) if block_given?
+    HtmlTagBuilder.tag name, opts, data
+  end
+
+  # execute block only once per page
+  def once id=nil
+    id ||= self.class
+    Lux.current.once('cell-once-%s' % id) { yield }
+  end
+
+  def cell name=nil
+    return parent.cell unless name
+
+    w = ('%sCell' % name.to_s.classify).constantize
+    w = w.new @_parent
+    w
+  end
+end

data/lib/lux/{helper → view}/helper.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class Lux::Helper
+require_relative 'view'
+
+class Lux::View::Helper
 
   # create helper object that cah be used in template render
   def initialize instance, *list
@@ -21,24 +23,36 @@ class Lux::Helper
     # helper.instance_exec &block if block
   end
 
+  define_method(:current) { Lux.current }
+  define_method(:request) { Lux.current.request }
+  define_method(:params)  { Lux.current.request.params }
+  define_method(:nav)     { Lux.current.nav }
+  define_method(:get)     { |name| instance_variable_get('@%s' % name) }
+
   def no_white_space
     yield.gsub(/>\s+</,'><')
   end
 
-  def current
-    Lux.current
-  end
-
-  def request
-    Lux.current.request
-  end
+  # - @foo = content do ...
+  # = @foo
+  # - content :foo do ...
+  # = content :foo
+  def content name=nil
+    ivar = '@content_%s' % name
 
-  def params
-    Lux.current.params
+    if block_given?
+      yield.tap do |data|
+        instance_variable_set(ivar, data) if name
+      end
+    else
+      name ? instance_variable_get(ivar) : nil
+    end
   end
 
-  def nav
-    Lux.current.nav
+  # foo = function do |list| ...
+  # foo.call @list
+  def function &block
+    block
   end
 
   # renders just template but it is called
@@ -48,7 +62,7 @@ class Lux::Helper
     if name.is_array?
       return name.map { |b| render(b) }.join("\n")
     elsif name.respond_to?(:db_schema)
-      path = Lux.thread[:last_template_path].split('/')[1]
+      path = Thread.current[:lux][:last_template_path].split('/')[1]
       table_name = name.class.name.tableize
       locals[table_name.singularize.to_sym] = name
       eval "@_#{table_name.singularize} = name"
@@ -58,6 +72,8 @@ class Lux::Helper
       name = "#{Thread.current[:lux][:last_template_path]}/#{name}" unless name.index('/')
     end
 
+    Lux.current.files_in_use name
+
     for k, v in locals
       instance_variable_set("@_#{k}", v)
     end
@@ -65,9 +81,9 @@ class Lux::Helper
     if block_given?
       name = "#{name}/layout" unless name.index('/')
 
-      Lux::Template.new(name, self).render_part { yield }
+      Lux::View.new(name, self).render_part { yield }
     else
-      Lux::Template.new(name, self).render_part
+      Lux::View.new(name, self).render_part
     end
   end
 
@@ -81,13 +97,6 @@ class Lux::Helper
     %[<pre style="color:red; background:#eee; padding:10px; font-family:'Lucida Console'; line-height:14pt; font-size:10pt;">#{msg}</pre>]
   end
 
-  # = render 'main/tag_list', klass:Link
-  # = cell Main::PartsCell, :tag_filter, klass
-  def cell name, action, *args
-    klass = name.is_string? ? "#{name}_cell".classify.constantize : name
-    klass.cell(action, *args) rescue error("#{klass}.#{action}()\n\n#{$!.message}")
-  end
-
   # tag :div, { 'class'=>'iform' } do
   def tag name=nil, opts={}, data=nil
     return HtmlTagBuilder unless name
@@ -98,7 +107,14 @@ class Lux::Helper
 
   # helper(:main).method
   def helper *names
-    Lux::Helper.new(self, *names)
+    Lux::View::Helper.new(self, *names)
+  end
+
+  def once id=nil
+    Lux.current.once("template-#{id || caller[0]}") do
+      block_given? ? yield : true
+    end
   end
 
 end
+

data/lib/lux/view/lib/cell_helpers.rb

@@ -0,0 +1,29 @@
+# make cell available in helpers
+
+require_relative 'helper_modules'
+
+class ViewCell < Lux::View::Cell
+end
+
+HtmlHelper.class_eval do
+  def cell name=nil, vars={}
+    if name
+      ViewCell.get(name, self, vars)
+    else
+      return @cell_base ||= ViewCell::Loader.new(self)
+    end
+  end
+end
+
+# make cell available in controllers
+Lux::Controller.class_eval do
+  def cell name=nil
+    name = if name
+      name.to_s.classify
+    else
+      self.class.to_s.split('::').last.sub('Controller')
+    end
+
+    name.constantize.new(self, vars)
+  end
+end

data/lib/lux/{helper/helpers/mailer_helper.rb → view/lib/helper_modules.rb}

@@ -6,6 +6,12 @@ module MailerHelper
   end
 
   def host
-    ENV.fetch('HOST')
+    Lux.config.host
   end
+end
+
+module ApplicationHelper
+end
+
+module HtmlHelper
 end

data/lib/lux/{template/template.rb → view/view.rb}

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 require 'thread'
 
-class Lux::Template
+class Lux::View
   @@template_cache = {}
 
   class << self
-    def render_with_layout template, helper={}
-      new(template, helper).render_with_layout
+    def render_with_layout layout, template, helper={}
+      part_data = new(template, helper).render_part
+      new(layout, helper).render_part { part_data }
     end
 
     def render_part template, helper={}
@@ -20,15 +21,16 @@ class Lux::Template
 
     @helper = if context.class == Hash
       # create helper class if only hash given
-      Lux::Helper.new(context)
+      Lux::View::Helper.new(context)
     else
       context
     end
 
     mutex = Mutex.new
 
-    if Lux.config(:auto_code_reload) && !Lux.thread[:template_cache]
-      Lux.thread[:template_cache] = true
+    # if auto_code_reload is on then clear only once per request
+    if Lux.config(:auto_code_reload) && !Thread.current[:lux][:template_cache]
+      Thread.current[:lux][:template_cache] = true
       mutex.synchronize { @@template_cache = {} }
     end
 
@@ -46,9 +48,11 @@ class Lux::Template
     end
 
     unless @template
-      err = caller.reject{ |l| l =~ %r{(/lux/|/gems/)} }.map{ |l| el=l.to_s.split(Lux.root.to_s); el[1] || l }.join("\n")
-      Lux.error %[Lux::Template "#{template}.{erb,haml}" not found\n\n#{err}]
-      raise
+      err  = caller.reject{ |l| l =~ %r{(/lux/|/gems/)} }.map{ |l| el=l.to_s.split(Lux.root.to_s); el[1] || l }.join("\n")
+      msg  = %[Lux::View "#{template}.{erb,haml}" not found]
+      msg += %[\n\n#{err}] if Lux.config(:dump_errors)
+
+      Lux.error msg
     end
 
     begin
@@ -65,34 +69,27 @@ class Lux::Template
   def render_part
     # global thread safe reference pointer to last temaplte rendered
     # we nned this for inline template render
-    Lux.thread[:last_template_path] = @template.sub('/app/views','').sub(/\/[^\/]+$/,'').sub(/^\./,'')
 
+    Thread.current[:lux][:last_template_path] = @template.sub('/app/views','').sub(/\/[^\/]+$/,'').sub(/^\./,'')
     Lux.current.files_in_use @template
 
     data = nil
+
     speed = Lux.speed do
-      data = Lux::Error.try %[Lux::Template "#{@template}" render error] do
-        @tilt.render(@helper) do
+      begin
+        data = @tilt.render(@helper) do
           yield if block_given?
         end
-      end rescue Lux::Error.inline
+      rescue => e
+        data = Lux::Error.inline %[Lux::View #{@template} render error], e
+      end
     end
 
-    Lux.log " #{@template.split('app/views/').last}, #{speed}"
+    Lux.log " app/views/#{@template.split('app/views/').last}, #{speed}"
 
     data
   end
 
-  def render_with_layout
-    @part_data = render_part
-
-    layout_path = "#{@original_template.split('/')[0]}/layout"
-
-    Lux::Template.new(layout_path, @helper).render_part do
-      @part_data
-    end
-  end
-
 end
 
 

data/lib/lux-fw.rb

@@ -13,7 +13,8 @@ require_relative './overload/object'
 Encoding.default_internal = Encoding.default_external = 'utf-8'
 
 Sequel.extension :inflector, :string_date_time
-Sequel::Model.plugin :after_initialize, :def_dataset_method
+Sequel::Model.plugin :after_initialize
+Sequel::Model.plugin :def_dataset_method
 
 Sequel.database_timezone = :utc
 Sequel.default_timezone  = +2
@@ -36,4 +37,5 @@ if Lux.root != Lux.fw_root
   ['./log', './tmp'].each { |d| `mkdir #{d}` unless Dir.exist?(d) }
 end
 
-Lux::Config.set_default_vars
+Lux::Config.init!
+

data/lib/overload/array.rb

@@ -1,5 +1,5 @@
 class Array
-
+  # convert list of lists to CSV
   def to_csv
     ret = []
     for row in self
@@ -12,15 +12,18 @@ class Array
     ret.join("\n")
   end
 
-  def wrap(name, opts={})
+  # wrap all list elements with a tag
+  def wrap name, opts={}
     map{ |el| opts.tag(name, opts) }
   end
 
-  def last=(what)
+  # set last element of an array
+  def last= what
     self[self.length-1] = what
   end
 
-  def to_sentence(opts={})
+  # convert list to sentence, Rails like
+  def to_sentence opts={}
     opts[:words_connector]     ||= ', '
     opts[:two_words_connector] ||= ' and '
     opts[:last_word_connector] ||= ', and '
@@ -36,10 +39,11 @@ class Array
     self.join(opts[:words_connector]) + opts[:last_word_connector] + last_word
   end
 
-  # toggle element in array and return true when added
-  def toggle(element)
+  # toggle existance of an element in array and return true when one added
+  def toggle element
     self.uniq!
     self.compact!
+
     if self.include?(element)
       self.delete(element)
       false
@@ -49,6 +53,7 @@ class Array
     end
   end
 
+  # for easier Sequel query
   def all
     self
   end
@@ -58,4 +63,5 @@ class Array
     i = string.split('').map{ |_| _.ord }.sum
     self[i % length]
   end
+
 end

data/lib/overload/blank.rb

@@ -61,7 +61,6 @@ class String
   def blank?
     return true if self.length == 0
 
-    # test = !!(self =~ /^\s*$/)
     !(self =~ /[^\s]/)
   end
 end

data/lib/overload/dir.rb

@@ -0,0 +1,18 @@
+class Dir
+  # get only folder list form a folder
+  def self.folders dir
+    dir = dir.to_s
+
+    Dir
+      .entries(dir)
+      .reject { |el| ['.', '..'].include?(el) }
+      .select { |el| File.directory?([dir, el].join('/')) }
+  end
+end
+
+class Pathname
+  # Lux.fw_root.join('plugins').folders do |folder| ...
+  def folders &block
+    Dir.folders(to_s, &block)
+  end
+end