lux-fw 0.1.35 → 0.2.1

data/lib/lux/template/template.rb

@@ -5,20 +5,25 @@ class Lux::Template
   @@template_cache = {}
 
   class << self
-    def render_with_layout template, opts={}, helper=nil
-      new(template, opts, helper).render_with_layout
+    def render_with_layout template, helper={}
+      new(template, helper).render_with_layout
     end
 
-    def render_part template, opts={}, helper=nil
-      new(template, opts, helper).render_part
+    def render_part template, helper={}
+      new(template, helper).render_part
     end
   end
 
-  def initialize template, opts={}, helper=nil
-    template = template.sub(/^[^\w]+/, '')
+  def initialize template, context={}
+    template           = template.sub(/^[^\w]+/, '')
     @original_template = template
-    @opts   = opts
-    @helper = helper
+
+    @helper = if context.class == Hash
+      # create helper class if only hash given
+      Lux::Helper.new(context)
+    else
+      context
+    end
 
     mutex = Mutex.new
 
@@ -33,7 +38,7 @@ class Lux::Template
     end
 
     for dir in ['./app/views']
-      for ext in ['haml', 'erb']
+      for ext in Tilt.default_mapping.template_map.keys
         next if @template
         test = "#{dir}/#{template}.#{ext}"
         @template = test if File.exists?(test)
@@ -58,24 +63,19 @@ class Lux::Template
   end
 
   def render_part
-    base_class = @helper ? @helper.to_s : @template.split('/')[3]
-    base_class = nil if base_class.index('.')
-    base_class ||= Module.new
-
     # 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(/^\./,'')
 
-    Lux.page.files_in_use.push @template
+    Lux.current.files_in_use @template
 
-    helper = Lux::Helper.for(base_class, @opts)
     data = nil
     speed = Lux.speed do
       data = Lux::Error.try %[Lux::Template "#{@template}" render error] do
-        @tilt.render(helper) do
+        @tilt.render(@helper) do
           yield if block_given?
         end
-      end
+      end rescue Lux::Error.inline
     end
 
     Lux.log " #{@template.split('app/views/').last}, #{speed}"
@@ -85,8 +85,10 @@ class Lux::Template
 
   def render_with_layout
     @part_data = render_part
+
     layout_path = "#{@original_template.split('/')[0]}/layout"
-    Lux::Template.new(layout_path, @opts).render_part do
+
+    Lux::Template.new(layout_path, @helper).render_part do
       @part_data
     end
   end

data/lib/overload/array.rb

@@ -53,4 +53,9 @@ class Array
     self
   end
 
+  # will return fixed element for any random string
+  def random_by_string string
+    i = string.split('').map{ |_| _.ord }.sum
+    self[i % length]
+  end
 end

data/lib/overload/auto_loader.rb

@@ -0,0 +1,27 @@
+class String
+  def constantize
+    Object.const_get('::'+self)
+  end
+end
+
+class Object
+  def self.const_missing klass
+    file  = klass.to_s.tableize.singularize
+    paths = [
+      'models',
+      'lib',
+      'vendor',
+      file.split('_').last.pluralize
+    ].map  { |it| './app/%s/%s.rb' % [it, file] }
+
+    klass_file = paths.find { |it| File.exist?(it) } or
+      raise NameError.new('Can not find and autoload class "%s", looked in %s' % [klass, paths.map{ |it| "\n#{it}" }.join('')])
+
+    # puts '* autoload: %s from %s' % [file, klass_file]
+
+    require klass_file
+
+    Object.const_get(klass)
+  end
+end
+

data/lib/overload/blank.rb

@@ -58,5 +58,11 @@ class Time
 end
 
 class String
-  # gem 'fast_blank'
-end
+  def blank?
+    return true if self.length == 0
+
+    # test = !!(self =~ /^\s*$/)
+    !(self =~ /[^\s]/)
+  end
+end
+

data/lib/overload/float.rb

@@ -0,0 +1,10 @@
+class Float
+
+  def as_currency
+    out = '%.2f' % self
+    out = out.sub('.', ',')
+    out = out.sub(/(\d)(\d{3})/, '\1.\2')
+    out
+  end
+
+end

data/lib/overload/hash.rb

@@ -10,7 +10,7 @@ class Hash
   end
 
 	def tag node=nil, text=nil
-		Lux::Helper::HtmlTag.build self, node, text
+		HtmlTagBuilder.build self, node, text
 	end
 
   def to_struct name=nil
@@ -74,22 +74,15 @@ class 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
+
+  def pretty_generate
+    JSON.pretty_generate(self).gsub(/"([\w\-]+)":/) { %["#{$1.yellow}":] }
+  end
 end
 

data/lib/overload/integer.rb

@@ -10,10 +10,6 @@ class Integer
   end
 
   def dotted
-    data = self.to_s
-    while data.sub!(/(\d)(\d{3})$/, "\\1.\\2")
-      1
-    end
-    data
+    self.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1.').reverse
   end
 end

data/lib/overload/nil.rb

@@ -2,7 +2,12 @@ class NilClass
   def empty?
     true
   end
+
   def present?
     false
   end
+
+  def dup
+    nil
+  end
 end

data/lib/overload/object.rb

@@ -12,6 +12,7 @@ class Object
   def die desc=nil, exp_object=nil
     desc ||= 'died without desc'
     desc = '%s: %s' % [exp_object.class, desc] if exp_object
+    puts desc.red
     raise desc
   end
 

data/lib/overload/r.rb

@@ -47,6 +47,11 @@ class Object
     r dump
   end
 
+  def rr! what
+    print "\e[H\e[2J\e[3J" # clear osx screen :)
+    rr what
+  end
+
   def instance_variables_hash
     Hash[instance_variables.map { |name| [name, instance_variable_get(name)] } ]
   end

data/lib/overload/string.rb

@@ -5,7 +5,7 @@ class String
   end
 
   # convert escaped strings, remove scritpts
-  def to_html(opts={})
+  def to_html opts={}
     value = self.gsub(/&lt;/, '<').gsub(/&gt;/, '>').gsub(/&amp;/,'&')
     value = value.gsub(/<script/,'&lt;script') unless opts[:script]
     value = value.gsub(/<link/,'&lt;link') unless opts[:link]
@@ -80,9 +80,8 @@ class String
     %[<span style="color: #800;">#{self}</span>]
   end
 
-  def constantize
-    klass = self
-    obj = Object.const_get(klass)
-    obj.to_s == klass.sub(/^::/,'') ? obj : raise(NameError, 'Cant find class %s' % klass)
+  # remomove colorize gem string colors
+  def decolorize
+    self.gsub(/\[0;\d\d;\d\dm([^\[]*)\[0m/) { $1 }
   end
 end

data/lib/overload/{date.rb → time.rb}

@@ -12,10 +12,9 @@ class Time
   include TimeOptions
 
   class << self
-
     # humanize_seconds(61)   -> 1min 1sec
     # humanize_seconds(1111) -> 18min 31sec
-    def humanize_seconds(secs)
+    def humanize_seconds secs
       return '-' unless secs
       secs = secs.to_i
       [[60, :sec], [60, :min], [24, :hrs], [356, :days], [1000, :years]].map{ |count, name|
@@ -26,7 +25,7 @@ class Time
       }.compact.reverse.slice(0,2).join(' ')
     end
 
-    def ago(start_time, end_time=nil)
+    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
@@ -52,6 +51,27 @@ class Time
       return template % d_months.pluralize('month') if d_months < 12
       return template % d_years.pluralize('year')
     end
+
+    def monotonic
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+
+    # Generates a Time object from the given value.
+    # Used by #expires and #last_modified.
+    # extracted from Sinatra
+    def for(value)
+      if value.is_a? Numeric
+        Time.at value
+      elsif value.respond_to? :to_s
+        Time.parse value.to_s
+      else
+        value.to_time
+      end
+    rescue ArgumentError => boom
+      raise boom
+    rescue Exception
+      raise ArgumentError, "unable to convert #{value.inspect} to a Time object"
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux-fw
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.2.1
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: fast_blank
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: hamlit
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Ruby framework optimized for speed and linghtness
 email: rejotl@gmail.com
 executables:
@@ -210,45 +210,47 @@ files:
 - "./bin/cli/get"
 - "./bin/cli/nginx"
 - "./bin/cli/production"
+- "./bin/cli/render"
 - "./bin/cli/routes"
 - "./bin/cli/server"
 - "./bin/cli/stat"
 - "./bin/cli/systemd"
-- "./bin/forever"
-- "./bin/job_que"
 - "./bin/lux"
 - "./bin/txt/nginx.conf"
 - "./bin/txt/siege-and-puma.txt"
 - "./lib/common/base32.rb"
-- "./lib/common/before_and_after.rb"
 - "./lib/common/class_attributes.rb"
+- "./lib/common/class_callbacks.rb"
 - "./lib/common/crypt.rb"
 - "./lib/common/dynamic_class.rb"
 - "./lib/common/folder_model.rb"
 - "./lib/common/generic_model.rb"
 - "./lib/common/hash_with_indifferent_access.rb"
+- "./lib/common/html_tag_builder.rb"
 - "./lib/common/method_attr.rb"
 - "./lib/common/policy.rb"
 - "./lib/common/string_base.rb"
 - "./lib/common/url.rb"
 - "./lib/lux-fw.rb"
 - "./lib/lux/api/api.rb"
-- "./lib/lux/api/lib/application_api.rb"
-- "./lib/lux/api/lib/doc_builder.rb"
 - "./lib/lux/api/lib/dsl.rb"
 - "./lib/lux/api/lib/error.rb"
 - "./lib/lux/api/lib/model_api.rb"
-- "./lib/lux/api/lib/rescue.rb"
 - "./lib/lux/api/lib/response.rb"
+- "./lib/lux/application/application.rb"
+- "./lib/lux/application/lib/nav.rb"
+- "./lib/lux/application/lib/plugs.rb"
+- "./lib/lux/application/lib/render.rb"
+- "./lib/lux/application/lib/route_test.rb"
 - "./lib/lux/cache/cache.rb"
 - "./lib/lux/cache/lib/memcached.rb"
 - "./lib/lux/cache/lib/null.rb"
 - "./lib/lux/cache/lib/ram.rb"
 - "./lib/lux/cell/cell.rb"
 - "./lib/lux/config/config.rb"
-- "./lib/lux/controller/controller.rb"
-- "./lib/lux/controller/lib/nav.rb"
-- "./lib/lux/controller/lib/plugs.rb"
+- "./lib/lux/current/current.rb"
+- "./lib/lux/current/lib/encrypt_params.rb"
+- "./lib/lux/current/lib/static_file.rb"
 - "./lib/lux/delayed_job/delayed_job.rb"
 - "./lib/lux/delayed_job/lib/memory.rb"
 - "./lib/lux/delayed_job/lib/nsq.rb"
@@ -256,25 +258,20 @@ files:
 - "./lib/lux/delayed_job/lib/redis.rb"
 - "./lib/lux/error/error.rb"
 - "./lib/lux/helper/helper.rb"
-- "./lib/lux/helper/lib/html_tag.rb"
-- "./lib/lux/html/html.rb"
-- "./lib/lux/html/lib/form.rb"
-- "./lib/lux/html/lib/input.rb"
-- "./lib/lux/html/lib/input_types.rb"
-- "./lib/lux/lib/lux.rb"
+- "./lib/lux/helper/helpers/application_helper.rb"
+- "./lib/lux/helper/helpers/html_helper.rb"
+- "./lib/lux/helper/helpers/mailer_helper.rb"
 - "./lib/lux/lux.rb"
 - "./lib/lux/mailer/mailer.rb"
-- "./lib/lux/page/lib/encrypt_params.rb"
-- "./lib/lux/page/lib/flash.rb"
-- "./lib/lux/page/lib/response.rb"
-- "./lib/lux/page/lib/static_file.rb"
-- "./lib/lux/page/page.rb"
-- "./lib/lux/rescue_from/rescue_from.rb"
+- "./lib/lux/response/lib/flash.rb"
+- "./lib/lux/response/lib/header.rb"
+- "./lib/lux/response/response.rb"
 - "./lib/lux/template/template.rb"
 - "./lib/overload/array.rb"
+- "./lib/overload/auto_loader.rb"
 - "./lib/overload/blank.rb"
-- "./lib/overload/date.rb"
 - "./lib/overload/file.rb"
+- "./lib/overload/float.rb"
 - "./lib/overload/hash.rb"
 - "./lib/overload/integer.rb"
 - "./lib/overload/it.rb"
@@ -285,40 +282,7 @@ files:
 - "./lib/overload/string.rb"
 - "./lib/overload/string_inflections.rb"
 - "./lib/overload/struct.rb"
-- "./lib/plugins/assets/assets_plug.rb"
-- "./lib/plugins/assets/helper_module_adapter.rb"
-- "./lib/plugins/assets/init.rb"
-- "./lib/plugins/db_helpers/array_and_hstore.rb"
-- "./lib/plugins/db_helpers/arrays_and_tags.rb"
-- "./lib/plugins/db_helpers/before_save.rb"
-- "./lib/plugins/db_helpers/cached_find_by.rb"
-- "./lib/plugins/db_helpers/class_and_instance.rb"
-- "./lib/plugins/db_helpers/dataset_plugin.rb"
-- "./lib/plugins/db_helpers/filter_wrappers.rb"
-- "./lib/plugins/db_helpers/link_plugin.rb"
-- "./lib/plugins/db_helpers/localize_plugin.rb"
-- "./lib/plugins/db_helpers/primary_keys.rb"
-- "./lib/plugins/db_helpers/typero_attributes.rb"
-- "./lib/plugins/db_logger/init.rb"
-- "./lib/plugins/db_logger/lux_response_adapter.rb"
-- "./lib/plugins/paginate/helper.rb"
-- "./lib/plugins/paginate/sequel_adapter.rb"
-- "./lib/vendor/mini_assets/lib/asset.rb"
-- "./lib/vendor/mini_assets/lib/asset/css.rb"
-- "./lib/vendor/mini_assets/lib/asset/js.rb"
-- "./lib/vendor/mini_assets/lib/base.rb"
-- "./lib/vendor/mini_assets/lib/base/javascript.rb"
-- "./lib/vendor/mini_assets/lib/base/stylesheet.rb"
-- "./lib/vendor/mini_assets/lib/manifest.rb"
-- "./lib/vendor/mini_assets/lib/opts.rb"
-- "./lib/vendor/mini_assets/mini_assets.rb"
-- "./lib/vendor/oauth/lib/facebook.rb"
-- "./lib/vendor/oauth/lib/github.rb"
-- "./lib/vendor/oauth/lib/google.rb"
-- "./lib/vendor/oauth/lib/linkedin.rb"
-- "./lib/vendor/oauth/lib/stackexchange.rb"
-- "./lib/vendor/oauth/lib/twitter.rb"
-- "./lib/vendor/oauth/oauth.rb"
+- "./lib/overload/time.rb"
 - bin/lux
 homepage: http://trifolium.hr/lux
 licenses:
@@ -340,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Lux - the ruby framework