lux-fw 0.1.17 → 0.1.35

data/lib/overload/r.rb

@@ -0,0 +1,53 @@
+class LocalRaiseError < StandardError
+end
+
+class Object
+  # raise object
+  def r what
+    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")
+
+    # unique_methods = what.methods - what.class.ancestors[0].instance_methods
+    # raise unique_methods
+
+    raise LocalRaiseError.new out
+  end
+
+  # better console log dump
+  def rr what
+    ap ['--- START (%s) ---' % what.class, what, '--- END ---']
+  end
+
+  # unique methods for object
+  # includes methods from modules
+  def rm object
+    dump = []
+
+    dump.push ['Class', object.class]
+
+    instance_unique = object.methods - object.class.ancestors[0].instance_methods
+    class_unique    = object.methods
+
+    object.class.ancestors.drop(1).each do |_|
+      class_unique -= _.instance_methods
+
+      if _.class != Module
+        dump.push ['Parent Class', _]
+        break
+      end
+    end
+
+    dump.push ['Instance uniqe', instance_unique.sort] if instance_unique[0]
+    dump.push ['Uniqe from parent', class_unique.sort]
+    dump.push ['Uniqe from parent simple', object.class.instance_methods(false)]
+
+    r dump
+  end
+
+  def instance_variables_hash
+    Hash[instance_variables.map { |name| [name, instance_variable_get(name)] } ]
+  end
+end

data/lib/overload/string.rb

@@ -1,9 +1,7 @@
 class String
   # simple markdown
   def as_html
-    ret = self
-    ret = ret.gsub(/([\w\.])\n(\w)/,"\\1<br/>\\2")
-    ret
+    self.gsub($/, '<br />')
   end
 
   # convert escaped strings, remove scritpts
@@ -46,10 +44,11 @@ class String
   end
 
   def to_url
-    # str_from = 'šđč枊ĐČĆŽäÄéeöÖüüÜß'
-    # str_to   = 'sdcczSDCCZaAeeoOuuUs'
+    str_from = 'šđč枊ĐČĆŽäÄéeöÖüüÜß'
+    str_to   = 'sdcczSDCCZaAeeoOuuUs'
+    str      = self.downcase.gsub(/\s+/,'-').tr(str_from, str_to)
     # self.downcase.gsub(/\s+/,'-').tr(str_from, str_to).gsub(/[^\w\-]/,'')
-    self.gsub('&',' and ').gsub('.',' dot ').parameterize.gsub('-dot-','.').downcase[0, 50]
+    str.sub(/\.$/, '').gsub('&',' and ').gsub('.',' dot ').parameterize.gsub('-dot-','.').downcase[0, 50].sub(/[\.\-]$/,'')
   end
 
   def css_to_hash

data/lib/overload/string_inflections.rb

@@ -1,7 +1,8 @@
 # http://sequel.jeremyevans.net/rdoc/classes/Sequel/Inflections.html
 
 String.inflections do |inflect|
-  inflect.plural 'bonus', 'bonuses'
-  inflect.plural 'clothing', 'clothes'
-  inflect.plural 'people', 'people'
+  inflect.plural   'bonus', 'bonuses'
+  inflect.plural   'clothing', 'clothes'
+  inflect.plural   'people', 'people'
+  inflect.singular /news$/, 'news'
 end

data/lib/plugins/assets/assets_plug.rb

@@ -5,17 +5,22 @@ class Lux::Controller
   def lux_assets_plug
 
     # only allow clear in dev
+    # clear assets every 4 seconds max
     if Lux.page.no_cache?
-      puts '* Clearing assets from ./tmp/assets'
-      `rm -rf ./tmp/assets`
+      Lux.cache.fetch('lux-clear-assets', ttl: 4, log: false, force: false) do
+        puts '* Clearing assets from ./tmp/assets'.yellow
+        `rm -rf ./tmp/assets && mkdir ./tmp/assets`
+        true
+      end
     end
 
     path = nav.path.join('/')
 
     if nav.root == 'compiled_asset'
-      asset = MiniAsset.create(path)
+      asset = MiniAssets::Asset.call(path)
       page.content_type asset.content_type
-      page.body asset.compiled_data
+      page.body asset.render
+
     elsif nav.root == 'raw_asset'
       Lux.error "You can watch raw files only in development" unless Lux.dev?
 

data/lib/plugins/assets/helper_module_adapter.rb

@@ -32,14 +32,16 @@ module DefaultHelper
 
     # return asset link in production or faile unless able
     unless Lux.config(:compile_assets)
-      mfile = MiniAsset.manifest['files'][file]
+      @@__asset_menifest ||= MiniAssets::Manifest.new
+      mfile = @@__asset_menifest.get(file)
       raise 'Compiled asset link for "%s" not found in manifest.json' % file if mfile.empty?
       return asset_include Lux.config.assets_root.to_s + mfile
     end
 
     # try to create list of incuded files and show every one of them
     data = []
-    asset = MiniAsset.create file
+    asset = MiniAssets.new file
+
     for file in asset.files
       data.push asset_include file
     end

data/lib/plugins/db_helpers/link_plugin.rb

@@ -19,7 +19,7 @@ module Sequel::Plugins::LuxLink
     # link :genders, collection: { 1=>'male', 2=>'Female' }
     # Object.genders
     # @object.gender
-    def link(name, opts={})
+    def link name, opts={}
       name_s = name.to_s.singularize
       name_p = name.to_s.pluralize
 
@@ -64,7 +64,7 @@ module Sequel::Plugins::LuxLink
         # puts "* #{to_s}.link :#{name} -> inline #{name_s}_ids".yellow
         class_eval %[
           def #{name_p}
-            return [] if #{name_s}_ids.blank?
+            return if #{name_s}_ids.blank?
             ids = #{name_s}_ids.join(',')
             #{klass}.where(Sequel.lit('id in ('+ids+')'))
           end

data/lib/plugins/db_logger/init.rb

@@ -10,7 +10,7 @@ logger.formatter = proc { |severity, datetime, progname, msg|
     Thread.current[:db_q][:cnt] += 1
 
     # append debug=true as query-string to see database queries
-    Lux.log(" #{Thread.current[:db_q][:cnt].to_s.rjust(2)}. #{time} : #{elms[2].cyan}\n") if Thread.current[:db_q]
+    Lux.log(" #{Thread.current[:db_q][:cnt].to_s.rjust(2)}. #{time} : #{elms[2].to_s.cyan}\n") if Thread.current[:db_q]
   end
 }
 

data/lib/vendor/mini_assets/lib/asset/css.rb

@@ -0,0 +1,19 @@
+class MiniAssets::Asset::Css < MiniAssets::Asset
+  def content_type
+    'text/css'
+  end
+
+  def environment_prefix?
+    true
+  end
+
+  def compile_scss
+    compile_sass
+  end
+
+  def compile_sass
+    node_sass = './node_modules/node-sass/bin/node-sass'
+    node_opts = opts.production? ? '--output-style compressed' : '--source-comments'
+    run! "#{node_sass} #{node_opts} '#{@source}' '#{@cache}'"
+  end
+end

data/lib/vendor/mini_assets/lib/asset/js.rb

@@ -0,0 +1,17 @@
+class MiniAssets::Asset::Js < MiniAssets::Asset
+  def content_type
+    'text/javascript'
+  end
+
+  def compile_coffee
+    coffee_path = './node_modules/coffee-script/bin/coffee'
+    coffee_opts = opts.production? ? '-cp' : '-Mcp --no-header'
+
+    run! "#{coffee_path} #{coffee_opts} '#{@source}' > '#{@cache}'"
+
+    data = @cache.read
+    data = data.gsub(%r{//#\ssourceURL=[\w\-\.\/]+/app/assets/}, '//# sourceURL=/raw_asset/')
+
+    @cache.write data
+  end
+end

data/lib/vendor/mini_assets/lib/asset.rb

@@ -0,0 +1,71 @@
+class MiniAssets::Asset
+  def self.call source
+    ext  = source.split('.').last
+    base = ['css', 'sass', 'scss'].include?(ext) ? MiniAssets::Asset::Css : MiniAssets::Asset::Js
+    base.new source
+  end
+
+  def initialize source
+    @ext    = source.split('.').last.to_sym
+    @source = opts.app_root.join source
+    @target = opts.public_root.join source
+
+    cache_file = source.gsub('/', '-')
+
+    if environment_prefix?
+      prefix     = opts.production? ? :p : :d
+      cache_file = '%s-%s' % [prefix, cache_file]
+    end
+
+    @cache     = opts.tmp_root.join cache_file
+  end
+
+  def opts
+    MiniAssets::Opts
+  end
+
+  def environment_prefix?
+    false
+  end
+
+  def run! what
+    puts what.yellow
+
+    stdin, stdout, stderr, wait_thread = Open3.popen3(what)
+
+    error = stderr.gets
+    while line = stderr.gets do
+      error += line
+    end
+
+    # node-sass prints to stderror on complete
+    error = nil if error && error.index('Rendering Complete, saving .css file...')
+
+    if error
+      @cache.unlink if @cache.exist?
+      @error = error
+    end
+  end
+
+  def comment text
+    '/* %s */' % text
+  end
+
+  def cached?
+    @cache.exist? && @cache.ctime > @source.ctime
+  end
+
+  def render
+    func = 'compile_%s' % @ext
+
+    # if custom method exists, execute it and return cache
+    # othervise just read source
+    if respond_to?(func)
+      send func unless cached?
+      @cache.read
+    else
+      @source.read
+    end
+  end
+end
+

data/lib/vendor/mini_assets/lib/base/javascript.rb

@@ -0,0 +1,13 @@
+class MiniAssets::Base::JavaScript < MiniAssets::Base
+  def asset_class
+    MiniAssets::Asset::Js
+  end
+
+  def join_string
+    ";\n"
+  end
+
+  def render_production
+    run! './node_modules/minifier/index.js --no-comments -o "%{file}" "%{file}"' % { file: @target }
+  end
+end

data/lib/vendor/mini_assets/lib/base/stylesheet.rb

@@ -0,0 +1,5 @@
+class MiniAssets::Base::StyleSheet < MiniAssets::Base
+  def asset_class
+    MiniAssets::Asset::Css
+  end
+end

data/lib/vendor/mini_assets/lib/base.rb

@@ -0,0 +1,69 @@
+# base class for production rendering
+# MiniAssets.call('js/main/index.coffee').render
+# MiniAssets::Base::JavasScript.new sorurce, files
+
+class MiniAssets::Base
+  attr_reader   :files
+
+  def initialize source, files
+    @source = source
+    @files  = files
+  end
+
+  def join_string
+    "\n"
+  end
+
+  def render_production
+    nil
+  end
+
+  def gzip
+    run! 'gzip -k %s' % @target
+  end
+
+  def run! what
+    puts what.yellow
+    system what
+  end
+
+  def opts
+    MiniAssets::Opts
+  end
+
+  # this should only be called in builder for production "lux assets"
+  def render
+    data = []
+
+    @files.each do |file|
+      asset = asset_class.new file
+      data.push asset.comment 'Source: %s' % file unless opts.production?
+      data.push asset.render
+    end
+
+    data = data.join(join_string)
+    type = asset_class.to_s.split('::').last.downcase
+
+    @target = opts.public_root.join '%s-%s.%s' % [@source.to_s.gsub(/[^\w]+/,'-'), Digest::SHA1.hexdigest(data), type]
+
+    # unless target exists, build it and minify it
+    unless @target.exist?
+      @target.write data
+
+      render_production
+      gzip
+
+      # force old time stamp
+      run! 'touch -t 201001010101 %s' % @target
+      run! 'touch -t 201001010101 %s.gz' % @target
+    end
+
+    # update manifest (if needed)
+    target   = @target.to_s.split('/public').last
+    manifest = MiniAssets::Manifest.new
+    manifest.add @source, target
+
+    target
+  end
+end
+

data/lib/vendor/mini_assets/lib/manifest.rb

@@ -0,0 +1,18 @@
+class MiniAssets::Manifest
+  def initialize
+    @manifest = MiniAssets::Opts.public_root.join('./manifest.json')
+    @manifest.write '{"files":{}}' unless @manifest.exist?
+    @json     = JSON.load @manifest.read
+  end
+
+  def add name, target
+    return if @json['files'][name] == target
+
+    @json['files'][name] = target
+    @manifest.write JSON.pretty_generate(@json)
+  end
+
+  def get file
+    @json['files'][file]
+  end
+end

data/lib/vendor/mini_assets/lib/opts.rb

@@ -0,0 +1,16 @@
+module MiniAssets::Opts
+  extend self
+
+  [:app, :tmp, :public].each do |folder|
+    name  = '%s_root' % folder
+    path  = Pathname.new './%s/assets' % folder
+
+    Dir.mkdir(path) unless path.exist?
+
+    define_method(name) { path }
+  end
+
+  def production?
+    ENV['RACK_ENV'] == 'production'
+  end
+end

data/lib/vendor/mini_assets/mini_assets.rb

@@ -0,0 +1,74 @@
+# app/assets/main/js.assets
+# ---
+# add 'js_vendor/*'
+# add 'js/*'
+# add 'index.coffee'
+
+# render production asset
+# ---
+# MiniAssets.call('js/main/index.coffee').render
+
+# render single asset
+# ---
+# asset = MiniAssets::Asset.call(path)
+# asset.content_type
+# asset.render
+
+require 'json'
+require 'pathname'
+require 'awesome_print'
+require 'open3'
+require 'digest'
+
+# calls base classes
+class MiniAssets
+  attr_reader :files
+
+  def initialize source
+    @files   = []
+    @fsource = source
+
+    @source = MiniAssets::Opts.app_root.join source
+
+    # fill @files, via dsl or direct
+    if source.split('.').last == 'assets'
+      # add './js/*'
+      eval @source.read
+    else
+      @source.read.split($/).each do |line|
+        test = line.split(/^[\/#]+=\s*req\w*\s+/)
+        add test[1] if test[1]
+      end
+
+      @files.push source
+    end
+
+    # figure out type unless defined
+    unless @type
+      ext = @files.first.split('.').last
+      @type = ['css', 'sass', 'scss'].include?(ext) ? :css : :js
+    end
+  end
+
+  def type name
+    @type = name
+  end
+
+  def add files
+    files  = files.sub(/^\.\//,'')
+    files += '/*' unless files.include?('*')
+    path   = @source.dirname.join files
+
+    @files += Dir[path].sort.map{ |f| f.split(MiniAssets::Opts.app_root.to_s+'/', 2).last }
+  end
+
+  # render production file
+  def render
+    # load right base class
+    base_class = @type == :css ?
+      MiniAssets::Base::StyleSheet
+      : MiniAssets::Base::JavaScript
+
+    base_class.new(@fsource, @files).render
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux-fw
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.35
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -213,6 +213,7 @@ files:
 - "./bin/cli/routes"
 - "./bin/cli/server"
 - "./bin/cli/stat"
+- "./bin/cli/systemd"
 - "./bin/forever"
 - "./bin/job_que"
 - "./bin/lux"
@@ -221,10 +222,12 @@ files:
 - "./lib/common/base32.rb"
 - "./lib/common/before_and_after.rb"
 - "./lib/common/class_attributes.rb"
-- "./lib/common/class_method_params.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/method_attr.rb"
 - "./lib/common/policy.rb"
 - "./lib/common/string_base.rb"
 - "./lib/common/url.rb"
@@ -233,8 +236,10 @@ files:
 - "./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/cache/cache.rb"
 - "./lib/lux/cache/lib/memcached.rb"
 - "./lib/lux/cache/lib/null.rb"
@@ -251,14 +256,17 @@ 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/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"
@@ -268,12 +276,12 @@ files:
 - "./lib/overload/date.rb"
 - "./lib/overload/file.rb"
 - "./lib/overload/hash.rb"
-- "./lib/overload/hash_wia.rb"
-- "./lib/overload/inflections.rb"
 - "./lib/overload/integer.rb"
+- "./lib/overload/it.rb"
 - "./lib/overload/module.rb"
 - "./lib/overload/nil.rb"
 - "./lib/overload/object.rb"
+- "./lib/overload/r.rb"
 - "./lib/overload/string.rb"
 - "./lib/overload/string_inflections.rb"
 - "./lib/overload/struct.rb"
@@ -295,10 +303,15 @@ files:
 - "./lib/plugins/db_logger/lux_response_adapter.rb"
 - "./lib/plugins/paginate/helper.rb"
 - "./lib/plugins/paginate/sequel_adapter.rb"
-- "./lib/vendor/mini_assets/mini_asset.rb"
-- "./lib/vendor/mini_assets/mini_asset/base.rb"
-- "./lib/vendor/mini_assets/mini_asset/css.rb"
-- "./lib/vendor/mini_assets/mini_asset/js.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"
@@ -327,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Lux - the ruby framework

data/lib/common/class_method_params.rb

@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-# allows adding of params to methods
-# used in Lux::Api
-#
-#   param :model_id, type: :integer
-#   param :age, max: 120
-#   def show
-#   end
-
-# class ModelApi
-#   class << self
-#     def param *args
-#       ClassMethodParams.add_param self, args
-#     end
-
-#     def method_added(m)
-#       ClassMethodParams.add_method self, m
-#     end
-#   end
-
-#   ###
-
-#   param :id
-#   param :user_id, Integer
-#   param :model_id, type: :integer
-#   param :age, max: 120
-#   def show
-
-#   end
-
-# end
-
-# class UserApi < ModelApi
-
-#   param :name
-#   def edit
-
-#   end
-
-# end
-
-# ap ClassMethodParams.params
-# ap ClassMethodParams.params UserApi, :show
-# ap ClassMethodParams.all UserApi
-
-module ClassMethodParams
-  extend self
-
-  @params = {}
-  @cache  = {}
-
-  def add_param klass, param, args
-    @cache[klass.to_s] ||= {}
-    @cache[klass.to_s][param] ||= []
-    @cache[klass.to_s][param].push args
-  end
-
-  def add_method klass, m
-    k = klass.to_s
-    @params[k] ||= {}
-    @params[k][m] = @cache[k] ? @cache[k].dup : {}
-    @cache = {}
-  end
-
-  def all_params
-    @params
-  end
-
-  # return all params method in a class
-  def params klass, m
-    return @params unless m
-
-    klass.ancestors.map(&:to_s).each do |klass|
-      return if klass == 'Object'
-      data = @params[klass]
-      return data[m] if data && data[m]
-    end
-
-    nil
-  end
-
-  # return all methos and all parameters for all methods in a class
-  def all klass
-    data = {}
-    all_methods = klass.instance_methods - Object.instance_methods
-    all_methods.each do |m|
-      data[m] = ClassMethodParams.params(klass, m)
-    end
-    data
-  end
-
-end
-