lux-fw 0.1.35 → 0.2.1

data/lib/{lux/helper/lib/html_tag.rb → common/html_tag_builder.rb}

@@ -7,7 +7,7 @@
 #   end
 # end
 
-class Lux::Helper::HtmlTag
+class HtmlTagBuilder
   class << self
     # tag.div -> tag.tag :div
     def method_missing tag_name, *args, &block

data/lib/common/policy.rb

@@ -2,10 +2,10 @@
 
 # base caller
 # UserPolicy.new(model: @model, user: User.current).can?(:update) -> can current user update @user
-# ApplicationPolicy.new(user: Lux.page.var.user).can?(:admin_login?) -> can current user login to admin
+# ApplicationPolicy.new(user: Lux.current.var.user).can?(:admin_login?) -> can current user login to admin
 
 # block will capture error message and be triggered only if error is present
-# ApplicationPolicy.can?(:login) { |msg| http_error 401, "Err: #{msg}".red; return 'no access' }
+# User.can?(:login) { |msg| http_error 401, "Err: #{msg}".red; return 'no access' }
 
 class Policy
 

data/lib/common/url.rb

@@ -13,13 +13,15 @@ class Url
 
   class << self
     def current
-      new Lux.page.request.url
+      new Lux.current.request.url
     end
 
     def force_locale loc
-      u = current
-      u.locale loc
-      u.relative
+      # u = current
+      # u.locale loc
+      # u.relative
+
+      '/' + loc.to_s + Lux.current.nav.full
     end
 
     def subdomain name,  in_path=nil

data/lib/lux-fw.rb

@@ -1,16 +1,7 @@
-# Gem.loaded_specs['lux-fw'].runtime_dependencies.each do |dep|
-#   require case dep.name
-#     when 'sequel_pg';    'sequel'
-#     when 'hamlit-block'; 'hamlit/block'
-#     else dep.name
-#   end
-# end
-
 require 'awesome_print'
 require 'as-duration'
 require 'colorize'
 require 'jwt'
-require 'fast_blank'
 require 'hamlit'
 require 'hamlit/block'
 require 'hashie'
@@ -19,9 +10,6 @@ require 'sequel'
 
 require_relative './overload/object'
 
-die 'Lux error: RACK_ENV is not defined' unless ENV['RACK_ENV']
-die "Unsupported RACK_ENV [#{ENV['RACK_ENV']}]" unless ['production', 'development', 'test'].index(ENV['RACK_ENV'])
-
 Encoding.default_internal = Encoding.default_external = 'utf-8'
 
 Sequel.extension :inflector, :string_date_time
@@ -39,7 +27,7 @@ require_relative './lux/lux'
 end
 
 # load Tilt parsers
-Tilt.register Tilt::ERBTemplate,  'erb'
+Tilt.register Tilt::ERBTemplate,       'erb'
 Tilt.register Hamlit::Block::Template, 'haml'
 
 # ensure we are not loading lux in lux folder
@@ -48,3 +36,4 @@ if Lux.root != Lux.fw_root
   ['./log', './tmp'].each { |d| `mkdir #{d}` unless Dir.exist?(d) }
 end
 
+Lux::Config.set_default_vars

data/lib/lux/api/api.rb

@@ -12,22 +12,21 @@
 class Lux::Api
   attr_accessor :message, :response
 
-  BeforeAndAfter.define self, :before, :after
-  Lux::RescueFrom.define(self)
+  ClassCallbacks.define self, :before, :after, :on_error
 
   class << self
     # public mount method for router
     def call path
       return 'Unsupported API call' if !path[1] || path[3]
 
-      opts = Lux.page.params # Lux.page.request.post? ? Rack::Utils.parse_nested_query(Lux.page.request.body.read).h : Lux.page.params
+      opts = Lux.current.params # Lux.current.request.post? ? Rack::Utils.parse_nested_query(Lux.current.request.body.read).h : Lux.current.params
 
       if path[2]
         opts[:_id] = path[1]
         path[1] = path[2]
       end
 
-      Lux.page.body run(path[0], path[1], opts)
+      Lux.current.response.body run(path[0], path[1], opts)
     end
 
     # public method for running actions on global class
@@ -55,7 +54,7 @@ class Lux::Api
       begin
         klass = (klass.singularize.camelize+'Api').constantize
       rescue
-        return Lux.page.body({ error:"API #{klass} not found" })
+        return Lux.current.response.body({ error:"API #{klass} not found" })
       end
 
       klass.new.call(action.to_sym, params)
@@ -65,9 +64,17 @@ class Lux::Api
   ###
 
   def call action, params={}
-    @@rescue_from_ivar.call(self) { rescued_call action, params }
+    begin
+      rescued_call action, params
+    rescue Lux::Api::Error => e
+      response.error e.message if e.message.to_s != 'false'
+    rescue => e
+      rr [e.message, e.backtrace] if Lux.config(:log_to_stdout)
 
-    BeforeAndAfter.execute(self, :after)
+      ClassCallbacks.execute self, :on_error, e
+
+      response.error e.message
+    end
 
     response.render
   end
@@ -76,7 +83,7 @@ class Lux::Api
   # UserApi.new.call(:login, { email:'', pass:'' })
   def rescued_call action, params={}
     raise ForbidenError, "Protected action call" if [:call, :rescued_call, :params, :error].index action
-    raise NotFoundError, "Action #{action} not found in #{self.class.to_s}" unless respond_to? action
+    error("Action #{action} not found in #{self.class.to_s}") unless respond_to? action
 
     @response   = Lux::Api::Response.new
     @params     = params
@@ -86,64 +93,44 @@ class Lux::Api
     if @params[:_id]
       eval "@object = @#{@class_name.underscore} = #{@class_name}[@params[:_id].to_i]"
       @params.delete(:_id)
-      @response.meta :path, @object.path if @object.respond_to?(:path)
     end
 
     check_params_and_mock_instance_variables action
+
     return if response.errors?
 
     # execte api call and verify params if possible
-    BeforeAndAfter.execute(self, :before)
+    ClassCallbacks.execute(self, :before)
 
-    api_data = send action
+    response.data = send(action)
 
-    format_response! api_data
+    ClassCallbacks.execute(self, :after)
+
+    puts response.render.pretty_generate if Lux.config.log_to_stdout
   end
 
   def params
     @params
   end
 
-  def error what
-    raise Lux::Api::Error.new(what)
+  def error what=nil
+    raise Lux::Api::Error.new(what || 'false')
   end
 
-  def format_response! api_data=nil
-    if api_data
-      # api_data = instance_eval(&res) if api_data.kind_of?(Proc)
-      api_data = api_data.all.map{ |el| el.attributes } if api_data.class.name == 'ActiveRecord::Relation'
-
-      # sequel array of objects returned
-      if api_data.kind_of?(Array) && api_data[0] && api_data[0].respond_to?(:columns)
-        api_data = api_data.map(&:to_h)
-      end
-
-      # object given
-      if api_data.respond_to?(:attributes)
-        @response[:path] = api_data.path if api_data.id && api_data.respond_to?(:path)
-        api_data = api_data.attributes.reject{ |f| ['updated_by', 'updated_at', 'created_by', 'created_at'].index(f) }
-      end
-
-      response.data = api_data
-
-      # if we define _redirect then we will be redirected to exact page
-      # useful for file uploads
-      if @params[:_redirect]
-        if response.errors
-          Lux.page.flash.error @response[:errors].join(', ')
-        elsif response.message
-          Lux.page.flash.info @response[:message]
-        end
-        Lux.page.redirect(@params[:_redirect])
-      end
-    end
-
-    ap response.render if Lux.config.log_to_stdout
+  def message what
+    response.message = what
   end
 
-  def message(what)
-    response.message = what
+  # default after block, can be overloaded
+  def after
+    return unless Lux.current
+
+    response.meta :ip, Lux.current.request.ip
+    response.meta :user, Lux.current.var.user ? Lux.current.var.user.email : nil
+    response.meta :http_status, Lux.current.response.status(200)
   end
 
 end
 
+ApplicationApi = Class.new Lux::Api
+

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

@@ -38,9 +38,9 @@ class Lux::Api
       errors = rules.validate(@params)
 
       if errors.keys.length > 0
-        raise ArgumentError.new(errors.values.to_sentence) unless Lux.page
+        raise ArgumentError.new(errors.values.to_sentence) unless Lux.current
 
-        Lux.page.status 400
+        Lux.current.response.status 400
         return response.error errors.values.to_sentence
       end
 

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

@@ -36,7 +36,8 @@ class ModelApi < ApplicationApi
     error "Object not found" unless @object
 
     can? :read, @object
-    @object.attributes
+
+    attributes
   end
 
   def create
@@ -61,9 +62,9 @@ class ModelApi < ApplicationApi
       error 'object not created, error unknown'
     end
 
-    response.meta :path, @object.path if @object.respond_to?(:path)
+    add_response_object_path
 
-    @object.attributes
+    attributes
   end
 
   def update
@@ -74,23 +75,29 @@ class ModelApi < ApplicationApi
     end
 
     can? :update, @object
+
+    @object.updated_at = Time.now.utc if @object.respond_to?(:updated_at)
     @object.save if @object.valid?
+
     report_errros_if_any @object
+
     response.message '%s updated' % @class_name
-    response.meta :path, @object.path if @object.respond_to?(:path)
-    @object.attributes
+
+    add_response_object_path
+
+    attributes
   end
 
   # if you put active boolean field to objects, then they will be unactivated on destroy
-  def destroy
+  def destroy force: false
     error "Object not found" unless @object
     can? :delete, @object
 
-    if @object.respond_to?(:is_active)
+    if !force && @object.respond_to?(:is_active)
       @object.update is_active: false
 
       message 'Object deleted (exists in trashcan)'
-    elsif @object.respond_to?(:active)
+    elsif !force && @object.respond_to?(:active)
       @object.update active: false
 
       message 'Object deleted (exists in trashcan)'
@@ -101,7 +108,7 @@ class ModelApi < ApplicationApi
 
     report_errros_if_any @object
 
-    @object.attributes
+    attributes
   end
 
   def undelete
@@ -119,29 +126,39 @@ class ModelApi < ApplicationApi
     response.message = 'Object raised from the dead.'
   end
 
-  def report_errros_if_any obj
-    if obj.errors.count > 0
-      for k, v in obj.errors
-        desc = v.join(', ')
+  private
 
-        response.error k, desc
-        response.error desc
-        # desc = "#{k} #{desc}" if desc.starts_with?('is ')
-      end
+  def report_errros_if_any obj
+    return if obj.errors.count == 0
 
-      Lux.page.status 400
+    for k, v in obj.errors
+      desc = v.join(', ')
 
-      return true
+      response.error k, desc
+      response.error desc
     end
 
-    false
+    error
   end
 
-  def can?(action, object)
-    ModelPolicy.can?(action: action, model: object, user: Lux.page.var.user) do |err|
-      msg  = 'No %s permission for %s' % [action.to_s.sub('?',''), Lux.page.var.user ? Lux.page.var.user.email : :guests]
+  def can? action, object
+    object.can?(action) do |err|
+      msg  = 'No %s permission for %s' % [action.to_s.sub('?',''), Lux.current.var.user ? Lux.current.var.user.email : :guests]
       msg += ' on %s' % object.class.name if object
       error msg
     end
   end
+
+  def add_response_object_path
+    begin
+      response.meta :path, @object.path if @object.respond_to?(:path)
+    rescue
+      nil
+    end
+  end
+
+  def attributes
+    @object.attributes.pluck(:id, :name, :email)
+  end
+
 end

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

@@ -1,9 +1,26 @@
 class Lux::Api::Response
+  def self.error text
+    response = new
+    response.error text
+    response.render
+  end
+
+  ###
+
   attr_accessor :data
   attr_accessor :message
 
+  def initialize
+    @meta = {}
+  end
+
+  def status num=nil
+    meta 'http_status', num.to_i if num && !@meta['http_status']
+    @meta['http_status']
+  end
+
   def meta key, value
-    @meta ||= {}
+    value = value.to_i if key == :status
     @meta[key.to_s] = value
   end
 
@@ -23,6 +40,10 @@ class Lux::Api::Response
     @message = what
   end
 
+  def redirect url
+    @meta['location'] = url
+  end
+
   def errors?
     (@error_hash || @errors) ? true : false
   end
@@ -30,16 +51,20 @@ class Lux::Api::Response
   def render
     output = {}
 
-    output[:data]    = @data    if @data.present?
-    output[:meta]    = @meta    if @meta.present?
-    output[:message] = @message if @message.present?
-
     if errors?
+      status 400
+
       output[:error] ||= {}
       output[:error][:messages] = @errors if @errors
       output[:error][:hash] = @error_hash if @error_hash
     end
 
+    Lux.current.response.status status
+
+    output[:data]    = @data    if @data.present?
+    output[:meta]    = @meta    if @meta.present?
+    output[:message] = @message if @message.present?
+
     output
   end
   alias :to_hash :render

data/lib/lux/application/application.rb

@@ -0,0 +1,182 @@
+class Lux::Application
+  ClassCallbacks.define self, :before, :after, :routes, :on_error
+
+  attr_reader :route_target
+
+  # define common http methods as constants
+  [:get, :head, :post, :delete, :put, :patch].map(&:to_s).map(&:upcase).each { |m| eval "#{m} ||= '#{m}'" }
+
+  ###
+
+  def initialize
+    @route_test = Lux::Application::RouteTest.new self
+  end
+
+  def debug
+    { :@locale=>@locale, :@nav=>nav, :@subdomain=>@subdomain, :@domain=>@domain }
+  end
+
+  def body?
+    Lux.current.response.body ? true : false
+  end
+
+  def body data
+    Lux.current.response.body data
+  end
+
+  def current
+    Lux.current
+  end
+
+  def nav
+    Lux.current.nav
+  end
+
+  def params
+    Lux.current.params
+  end
+
+  def redirect where, msgs={}
+    Lux.current.redirect where, msgs
+  end
+
+  def request
+    Lux.current.request
+  end
+
+  # gets only root
+  def root cell
+    if RouteTest::LUX_PRINT_ROUTES
+      @route_target = cell
+      @route_test.print_route ''
+    end
+
+    call cell unless nav.root
+  end
+
+  def done?
+    throw :done if Lux.current.response.body
+  end
+
+  def get?
+    Lux.current.request.request_method == 'GET'
+  end
+
+  def post?
+    Lux.current.request.request_method == 'POST'
+  end
+
+  def plug name, &block
+    done?
+
+    m = "#{name}_plug".to_sym
+    return Lux.error(%[Method "#{m}" not defined in #{self.class}]) unless respond_to?(m)
+    send m, &block
+
+    done?
+  end
+
+  # map Main::RootCell do
+  #   action :about
+  #   action '/verified-user'
+  # end
+  # map api: ApiCell
+  def map route_object, &block
+    done?
+
+    if route_object.class == Hash
+      @route_name   = route_object.keys.first
+      @route_target = route_object.values.first
+    else
+      @route_name   = nav.root
+      @route_target = route_object
+
+      if block_given?
+        # map :dashboard do
+        #   map o: DashboardOrgsCell
+        #   root DashboardCell
+        # end
+        if route_object.class == Symbol
+          if test?(route_object)
+            current.nav.shift_to_root
+            instance_exec &block
+            raise NotFoundError.new %[Route "#{route_object}" matched but nothing is called]
+          end
+
+          return
+        end
+      else
+        @route_test.print_route '*'
+        return route_object.call
+      end
+    end
+
+    if block_given?
+      @route_test.instance_exec &block
+      return
+    end
+
+    @route_test.print_route '%s/*' % @route_name
+
+    call @route_target if test? @route_name
+  end
+
+  def action route_object
+    map route_object.values.first do
+      action route_object.keys.first
+    end
+  end
+
+  def test? route
+    @route_test.test? route
+  end
+
+  # call :api_router
+  # call Main::UsersCell
+  # call Main::UsersCell, :index
+  # call 'main/orgs#show'
+  def call object=nil, action=nil
+    done?
+
+    case object
+      when Symbol
+        return send(object)
+      when Hash
+        object = [object.keys.first, object.values.first]
+      when String
+        if object.include?('#')
+          object = object.split('#')
+          object[0] = ('%s_cell' % object[0]).classify.constantize
+        else
+          object = ('%s_cell' % object).classify.constantize
+        end
+    end
+
+    object, action = object if object.is_a? Array
+
+    if action
+      object.action action
+    else
+      object.call
+    end
+
+    if body?
+      done?
+    else
+      Lux.error 'Lux cell "%s" called via route "%s" but page body is not set' % [object, nav.root]
+    end
+  end
+
+  def main
+    catch(:done) do
+      begin
+        ClassCallbacks.execute self, :before
+        ClassCallbacks.execute self, :routes
+        ClassCallbacks.execute self, :after
+      rescue => e
+        ClassCallbacks.execute self, :on_error, e
+      end
+    end
+  end
+
+end