lux-fw 0.1.17 → 0.1.35

data/lib/lux/api/lib/dsl.rb

@@ -1,5 +1,4 @@
 class Lux::Api
-
   # name   'Show user data'
   # param  :email, type: :email, req: false
   # param  :pass
@@ -8,56 +7,41 @@ class Lux::Api
   #   @user.slice(:id, :name, :avatar, :email)
   # end
 
-  class << self
-    @@actions ||= {}
-
-    def method_added(m)
-      ClassMethodParams.add_method self, m
-    end
-
-    # helper for standard definition of parametars
-    # param :o_id
-    # param :o_id, Integer
-    # param :o_id, Integer, req: false
-    # param :o_id, req: false
-    def param(field, type=String, opts={})
-      opts = type.is_a?(Hash) ? type : opts.merge(type: type)
-      opts[:name] = field
-      opts[:req]  = opts[:req].class.name == 'FalseClass' ? false : true
-      opts[:type] ||= String
-
-      ClassMethodParams.add_param self, :param, opts
-    end
+  # helper for standard definition of parametars
+  # param :o_id
+  # param :o_id, Integer
+  # param :o_id, Integer, req: false
+  # param :o_id, req: false
+  method_attr :param do |field, type=String, opts={}|
+    opts = type.is_a?(Hash) ? type : opts.merge(type: type)
+    opts[:name] = field
+    opts[:req]  = true if opts[:req].nil?
+    opts[:type] ||= String
+    opts
+  end
 
-    # helper for standard definition of name
-    def name(name)
-      ClassMethodParams.add_param self, :name, name
-    end
+  # helper for standard definition of name
+  method_attr :name
 
-    # helper for standard definition of description
-    def description(data)
-      ClassMethodParams.add_param self, :description, name
-    end
-  end
+  # helper for standard definition of description
+  method_attr :data
 
   ###
 
   def check_params_and_mock_instance_variables action
-    opts = ClassMethodParams.params self.class, action
-
-    if opts && opts[:param]
-      local = opts[:param].inject({}) { |h, el| o=el.dup; h[o.delete(:name)] = o; h }
+    @method_attr = self.class.method_attr[action] || {}
 
-      rules = Typero.new local
+    # params check if framework default
+    if @method_attr[:param]
+      local  = @method_attr[:param].inject({}) { |h, el| o=el.dup; h[o.delete(:name)] = o; h }
+      rules  = Typero.new local
       errors = rules.validate(@params)
 
       if errors.keys.length > 0
         raise ArgumentError.new(errors.values.to_sentence) unless Lux.page
 
-        Lux.page.status(400)
-        @response[:error] = errors.values.to_sentence
-        @response[:errors] = errors
-        return false
+        Lux.page.status 400
+        return response.error errors.values.to_sentence
       end
 
       # define local prefixed @_ variables
@@ -66,8 +50,6 @@ class Lux::Api
         eval "@_#{key.downcase.gsub(/[^\w]/,'_')} = value" if key.length < 15 && value.present? && key =~ /^[\w]+$/
       end
     end
-
-    true
   end
 
 end

data/lib/lux/api/lib/error.rb

@@ -0,0 +1,3 @@
+class Lux::Api::Error < StandardError
+
+end

data/lib/lux/api/lib/model_api.rb

@@ -56,12 +56,12 @@ class ModelApi < ApplicationApi
     return if report_errros_if_any @object
 
     if @object.id
-      @message = "#{@class_name.capitalize} created"
+      message '%s created' % @class_name.capitalize
     else
       error 'object not created, error unknown'
     end
 
-    @response[:path] = (@object.path rescue nil)
+    response.meta :path, @object.path if @object.respond_to?(:path)
 
     @object.attributes
   end
@@ -76,8 +76,8 @@ class ModelApi < ApplicationApi
     can? :update, @object
     @object.save if @object.valid?
     report_errros_if_any @object
-    @message = "#{@class_name} updated"
-    @response[:path] = (@object.path rescue nil)
+    response.message '%s updated' % @class_name
+    response.meta :path, @object.path if @object.respond_to?(:path)
     @object.attributes
   end
 
@@ -88,15 +88,19 @@ class ModelApi < ApplicationApi
 
     if @object.respond_to?(:is_active)
       @object.update is_active: false
-      @message = 'Object deleted (exists in trashcan)'
+
+      message 'Object deleted (exists in trashcan)'
     elsif @object.respond_to?(:active)
       @object.update active: false
-      @message = 'Object deleted (exists in trashcan)'
+
+      message 'Object deleted (exists in trashcan)'
     else
       @object.destroy
-      @message = "#{@object.class.name} deleted"
+      message '%s deleted' % @object.class.name
     end
+
     report_errros_if_any @object
+
     @object.attributes
   end
 
@@ -112,26 +116,24 @@ class ModelApi < ApplicationApi
       error "No is_active, can't undelete"
     end
 
-    @message = 'Object raised from the dead.'
+    response.message = 'Object raised from the dead.'
   end
 
-  def report_errros_if_any(obj)
-    @response[:object] = obj.class.to_s.tableize.singularize
-    @response[:objects] = obj.class.to_s.tableize
-
+  def report_errros_if_any obj
     if obj.errors.count > 0
-      @response[:error] = ''
-      @response[:errors] = {}
-      for k,v in obj.errors
+      for k, v in obj.errors
         desc = v.join(', ')
-        desc = "#{k} #{desc}" if desc.starts_with?('is ')
-        @response[:errors][k] = desc
-        @response[:error] += ', ' unless @response[:error].blank?
-        @response[:error] += desc
+
+        response.error k, desc
+        response.error desc
+        # desc = "#{k} #{desc}" if desc.starts_with?('is ')
       end
-      Lux.page.status(400)
+
+      Lux.page.status 400
+
       return true
     end
+
     false
   end
 

data/lib/lux/api/lib/rescue.rb

@@ -1,18 +1,8 @@
-Lux::Api.class_eval do
+Lux::Api.rescue_from(:default) do |msg|
+  response.error msg
 
-  rescue_from(:default) do |msg|
-    Lux.page.status $!.class
-
-    data =  { error:msg }
-
-    if Lux.dev? && $!.class != StandardError
-      data[:backtrace] = $!.backtrace.reject{ |el| el.index('/gems/') }.map{ |el| el.sub(Lux.root.to_s, '') }
-      ap data[:backtrace]
-    end
-
-    ApplicationApi.new.decorate_response!(data)
-
-    Lux.page.body data
+  if Lux.dev? && $!.class != Lux::Api::Error
+    data[:backtrace] = $!.backtrace.reject{ |el| el.index('/gems/') }.map{ |el| el.sub(Lux.root.to_s, '') }
+    ap data[:backtrace]
   end
-
 end

data/lib/lux/api/lib/response.rb

@@ -0,0 +1,46 @@
+class Lux::Api::Response
+  attr_accessor :data
+  attr_accessor :message
+
+  def meta key, value
+    @meta ||= {}
+    @meta[key.to_s] = value
+  end
+
+  def error key, data=nil
+    if data
+      @error_hash ||= {}
+      @error_hash[key.to_s] = data
+      data
+    else
+      @errors ||= []
+      @errors.push key unless @errors.include?(key)
+      key
+    end
+  end
+
+  def message what
+    @message = what
+  end
+
+  def errors?
+    (@error_hash || @errors) ? true : false
+  end
+
+  def render
+    output = {}
+
+    output[:data]    = @data    if @data.present?
+    output[:meta]    = @meta    if @meta.present?
+    output[:message] = @message if @message.present?
+
+    if errors?
+      output[:error] ||= {}
+      output[:error][:messages] = @errors if @errors
+      output[:error][:hash] = @error_hash if @error_hash
+    end
+
+    output
+  end
+  alias :to_hash :render
+end

data/lib/lux/cache/cache.rb

@@ -35,14 +35,21 @@ module Lux::Cache
     @@server.delete(key)
   end
 
-  def fetch key, ttl=nil, log=true
-    ttl = ttl.to_i if ttl
-    @@server.delete key if Lux.page && Lux.page.no_cache?
+  def fetch key, opts={}
+    opts = { ttl: opts } unless opts.is_a?(Hash)
+    opts = opts.to_opts!(:ttl, :log, :force)
+
+    opts.ttl     = opts.ttl.to_i if opts.ttl
+    opts.log   ||= true if opts.log.nil?
+    opts.force ||= true if opts.force.nil?
+
+    @@server.delete key if Lux.page && opts.force && Lux.page.no_cache?
+
+    Lux.log " Cache.fetch.get #{key} (ttl: #{opts.ttl.or(:nil)})".green if opts.log
 
-    Lux.log " Cache.fetch.get #{key} (ttl: #{ttl.or(:nil)})" if log
-    data = @@server.fetch key, ttl do
+    data = @@server.fetch key, opts.ttl do
       data = yield
-      Lux.log " Cache.fetch.SET #{key} len:#{data.to_s.length}" if log
+      Lux.log " Cache.fetch.SET #{key} len:#{data.to_s.length}" if opts.log
       data
     end
 

data/lib/lux/cell/cell.rb

@@ -61,6 +61,8 @@ class Lux::Cell
 
   ### INSTANCE METHODS
 
+  attr_reader :cell_action
+
   def initialize
     # before and after should be exected only once
     @executed_filters = {}
@@ -91,7 +93,7 @@ class Lux::Cell
 
     method_name = method_name.to_s.gsub('-', '_').gsub(/[^\w]/, '')
 
-    Lux.log " #{self.class.to_s}(:#{method_name})".blue
+    Lux.log " #{self.class.to_s}(:#{method_name})".light_blue
     Lux.page.files_in_use.push "app/cells/#{self.class.to_s.underscore}.rb"
 
     @cell_action = method_name
@@ -137,19 +139,6 @@ class Lux::Cell
 
     opts[:template] = name if name
 
-    # etag and cache string are same things, one is client based, other one is server based
-    if opts[:cache]
-      opts[:cache] = Lux.cache.generate_key(opts[:cache] )
-      opts[:etag] ||= opts[:cache]
-    end
-
-    return if opts[:etag] && Lux.page.etag(opts[:etag])
-
-    if opts[:cache]
-      data = Lux.cache.get(opts[:cache])
-      return Lux.page.body(data) if data
-    end
-
     render_resolve_body(opts)
     Lux.cache.set(opts[:cache], Lux.page.body) if opts[:cache]
   end

data/lib/lux/config/config.rb

@@ -74,11 +74,12 @@ module Lux::Config
     speed = ((Time.now - load_start)*1000).round.to_s.sub(/(\d)(\d{3})$/,'\1s \2')+'ms'
     ram   = `ps -o rss -p #{$$}`.chomp.split("\n").last.to_i / 1000
     opts  = []
-    opts.push Lux.verbose? ? 'verbose'.yellow : 'non-verbose'.green
-    opts.push Lux.config(:auto_code_reload) ? 'code-reload'.yellow : 'no-code-reload'.green
+    opts.push Lux.verbose? ? 'verbose'.yellow : 'no-verbose'.green
+    opts.push Lux.config(:auto_code_reload) ? 'auto-code-reload'.yellow : 'no-code-reload'.green
 
-    "* #{'Lux'.blue} loaded #{Lux.env('RACK_ENV').green} (#{opts.join(', ')}) mode in #{speed.to_s.white}, uses #{ram.to_s.white} MB RAM with total of #{Gem.loaded_specs.keys.length.to_s.white} gems in spec"
+    "* #{'Lux'.white} loaded #{Lux.env('RACK_ENV').green} (#{opts.join(', ')}) mode in #{speed.to_s.white}, uses #{ram.to_s.white} MB RAM with total of #{Gem.loaded_specs.keys.length.to_s.white} gems in spec"
   end
+
 end
 
 class Object

data/lib/lux/controller/controller.rb

@@ -66,7 +66,7 @@ class Lux::Controller
 
   def rescued_main
     if respond_to?(:main)
-      @@rescue_from_ivar.call { main }
+      @@rescue_from_ivar.call(self) { main }
     else
       Lux.error %[No instance method "main" in Lux::Controller defiend]
     end
@@ -81,7 +81,7 @@ class Lux::Controller
       when nil
         '/'.ljust(20).green
       else
-        @route.to_s.ljust(20).blue
+        @route.to_s.ljust(20).light_blue
     end
 
     route_target = case @route_target
@@ -169,7 +169,7 @@ class Lux::Controller
 
     object, action = object if object.is_a? Array
 
-    Lux.log ' %s %s # %s' % [object.to_s.blue, nav.path, @route_object]
+    Lux.log ' %s %s # %s' % [object.to_s.light_blue, nav.path, @route_object]
 
     if action
       object.action action

data/lib/lux/controller/lib/nav.rb

@@ -7,7 +7,7 @@ class Lux::Controller::Nav
   # acepts path as a string
   def initialize request
     @path = request.path.split('/').slice(1, 100) || []
-    @root = @path.shift if @path.first
+    shift_to_root if @path.first
 
     @subdomain = request.host.split('.')
     @domain    = @subdomain.pop(2).join('.')
@@ -22,7 +22,7 @@ class Lux::Controller::Nav
 
   def shift_to_root
     @root.tap do
-      @root = @path.shift
+      @root = @path.shift.to_s.gsub('-', '_')
       build_full
     end
   end
@@ -48,6 +48,10 @@ class Lux::Controller::Nav
     @path.first
   end
 
+  def first= data
+    @path[0] = data
+  end
+
   def second
     @path[1]
   end

data/lib/lux/error/error.rb

@@ -16,14 +16,13 @@ NotFoundError     ||= Class.new(StandardError)
 RateLimitError    ||= Class.new(StandardError)
 
 module Lux::Error
-  OUT_OF_PROCESS_ERROR_PATH = Lux.root.join('tmp/request-error.txt')
-
   extend self
 
   def try(name)
     begin
       yield
     rescue
+      Lux.page.status 500
       log($!)
       inline('%s (%s)' % [name, $!.class])
     end
@@ -41,9 +40,20 @@ module Lux::Error
 
   def inline(name=nil, o=nil)
     o ||= $!
-    trace = o.backtrace.select{ |el| el.index(Lux.root.to_s) }.map{ |el| el.split(Lux.root.to_s, 2)[1] }.map{ |el| "- #{el}" }.join("\n")
-    msg   = $!.to_s.gsub('","',%[",\n "]).gsub('<','&lt;')
-    %[<pre style="color:red; background:#eee; padding:10px; font-family:'Lucida Console'; line-height:14pt; font-size:10pt;"><b style="font-size:110%;">#{name || 'Undefined name'}</b>\n\n<b>#{msg}</b>\n\n#{trace}</pre>]
+
+    dmp = [[], []]
+
+    o.backtrace.each do |line|
+      line = line.sub(Lux.root.to_s, '.')
+      dmp[line.include?('/app/') ? 0 : 1].push line
+    end
+
+    dmp[0] = dmp[0].map { |_| _ = _.split(':', 3); '<b>%s</b> - %s - %s' % _ }
+
+    name ||= 'Undefined name'
+    msg    = $!.to_s.gsub('","',%[",\n "]).gsub('<','&lt;')
+
+    %[<pre style="color:red; background:#eee; padding:10px; font-family:'Lucida Console'; line-height:15pt; font-size:11pt;"><b style="font-size:110%;">#{name}</b>\n\n<b>#{msg}</b>\n\n#{dmp[0].join("\n")}\n\n#{dmp[1].join("\n")}</pre>]
   end
 
   def log(exception)
@@ -63,13 +73,4 @@ module Lux::Error
 
     File.write("#{folder}/#{key}.txt", data)
   end
-
-
-  # if some other process as asset complation raises error
-  # use this method to show errors
-  def log_out_of_process_error(data)
-    return unless Lux.config(:show_server_errors)
-    File.write OUT_OF_PROCESS_ERROR_PATH, data
-  end
-
 end

data/lib/lux/helper/helper.rb

@@ -99,11 +99,11 @@ class Lux::Helper
   end
 
   # tag :div, { 'class'=>'iform' } do
-  def tag name, opts={}, data=nil
-    data = block_given? ? yield(opts) : data
-    data = data.join('') if data.is_a?(Array)
-    opts.tag name, data
+  def tag name=nil, opts={}, data=nil
+    return Lux::Helper::HtmlTag unless name
+
+    data = yield(opts) if block_given?
+    Lux::Helper::HtmlTag.tag name, opts, data
   end
 
 end
-

data/lib/lux/helper/lib/html_tag.rb

@@ -0,0 +1,67 @@
+# tag.ul do |n|
+#   1.upto(3) do |num|
+#     n.li do |n|
+#       n.i '.arrow'
+#       n.span num
+#     end
+#   end
+# end
+
+class Lux::Helper::HtmlTag
+  class << self
+    # tag.div -> tag.tag :div
+    def method_missing tag_name, *args, &block
+      tag tag_name, args[0], args[1], &block
+    end
+
+    # tag :div, { 'class'=>'iform' } do
+    def tag name=nil, opts={}, data=nil
+      # covert tag.a '.foo.bar' to class names
+      if opts.class == String && opts[0,1] == '.'
+        opts = { class: opts.sub('.', '').gsub('.', ' ') }
+      end
+
+      # fix data and opts unless opts is Hash
+      data, opts = opts, {} unless opts.class == Hash
+
+      if block_given?
+        inline = new
+        data = yield(inline, opts)
+
+        # if data is pushed to passed node, use that data
+        data = inline.data if inline.data.first
+      end
+
+      data = data.join('') if data.is_a?(Array)
+
+      build opts, name, data
+    end
+
+    # build html node
+    def build attrs, node=nil, text=nil
+      opts = ''
+      attrs.each do |k,v|
+        opts += ' '+k.to_s.gsub(/_/,'-')+'="'+v.to_s.gsub(/"/,'&quot;')+'"' 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} />}
+    end
+  end
+
+  ###
+
+  attr_reader :data
+
+  def initialize
+    @data = []
+  end
+
+  # forward to class
+  def method_missing tag_name, *args, &block
+    @data.push self.class.tag(tag_name, args[0], args[1], &block)
+  end
+end

data/lib/lux/html/lib/input_types.rb

@@ -62,12 +62,15 @@ class Lux::Html::Input
   def as_select
     body = []
     collection = @opts.delete(:collection)
+
     if nullval = @opts.delete(:null)
       body.push %[<option value="">#{nullval}</option>] if nullval
     end
+
     for el in prepare_collection(collection)
       body.push(%[<option value="#{el[0]}"#{@opts[:value].to_s == el[0].to_s ? ' selected=""' : nil}>#{el[1]}</option>])
     end
+
     body = body.join("\n")
     @opts.tag(:select, body)
   end
@@ -94,25 +97,32 @@ class Lux::Html::Input
   end
 
   def as_date
-    @opts[:type]   = 'text'
-    @opts[:style]  = 'width: 120px; display: inline;'
-    @opts[:value]  = @opts[:value].to_s.split(' +').first.to_s.sub(/:\d{2}$/,'')
-    @opts[:hint]   ||= 'YEAR - MONTH - DAY'
-    ret = @opts.tag(:input)
-    ret += ' &bull; %s' % Time.ago(Time.parse(@opts[:value])) if @opts[:value].present?
-    ret += ' &bull; <small>%s</small>' % @opts[:hint]
-    ret + %[<script>new Pikaday({ field: document.getElementById('#{@opts [:id]}'), format: "YYYY-MM-DD" }); </script>]
+    @opts[:type]  = :date
+    @opts[:style] = 'width: 160px; display: inline;'
+
+    value      = @opts[:value] || nil
+    desc       = value ? '&mdash;' + Time.ago(value) : ''
+
+    [@opts.tag(:input), desc].join(' ')
   end
 
   def as_datetime
-    @opts[:type]  = 'text'
-    @opts[:style] ||= 'width: 170px;'
-    @opts[:value] = @opts[:value].to_s.split(' +').first.sub(/:\d{2}$/,'') if @opts[:value].present?
-    ret = @opts.tag(:input)
-    hint = []
-    hint.push Time.ago(Time.parse(@opts[:value]))+'. ' if @opts[:value].present?
-    hint.push %[<span class="btn btn-xs" onclick="$('##{@opts[:id]}').val('#{(Time.now-1.minute).to_s.split(' +').first.sub(/:\d{2}$/,'')}')">Now!</span>]
-    ret + {class:'hint'}.tag(:p, hint.join(''))
+    value = @opts[:value]
+    id    = @opts[:id]
+
+    value_day  = value ? value.strftime('%Y-%m-%d') : ''
+    value_time = value ? value.strftime('%H:%M') : ''
+    value_all  = value ? value.strftime('%H:%M') : ''
+
+    base = { class: 'form-control', onchange: "datetime_set('#{id}');", style: 'width: 160px; display: inline;'  }
+
+    input_day  = base.merge({ type: :date, id: '%s_day' % id, value: value_day }).tag :input
+    input_time = base.merge({ style: 'width: 110px; display: inline;', type: :time, id: '%s_time' % id, value: value_time }).tag :input
+    input_all  = base.merge({ style: 'width: 150px; display: inline;', type: :text, id: id, name: @opts[:name], onfocus: 'blur();' }).tag :input
+    script     = %[<script>window.datetime_set = function(id) { $('#'+id).val($('#'+id+'_day').val()+' '+$('#'+id+'_time').val()); }; datetime_set('#{id}');</script>]
+    desc       = value ? '&mdash;' + Time.ago(value) : ''
+
+    [input_day, input_time, input_all, script, desc].join(' ')
   end
 
   def as_datebuttons

data/lib/lux/lib/lux.rb

@@ -0,0 +1,51 @@
+# 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 = nil
+  time_ms = Lux.speed { 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')
+
+  {
+    time: time_ms,
+    status: response[0],
+    headers: response[1],
+    body: body
+  }.h
+end