lux-fw 0.1.17 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cf39a83b84a57cdc4523101a880a856a274723a
-  data.tar.gz: 850600181673ff261e0180dd862993060d153b26
+  metadata.gz: 8da4e12f599558882464c2d4adaf26f4368c541d
+  data.tar.gz: cb2320787caf49b7b48308d5915fe2abf8945101
 SHA512:
-  metadata.gz: d47ecd1b0aac507cb33613bcdb2b2aaa1d8ff11952a5ae8a2bd40d54c8c60108d3b176a7db79c2108bbcb2cf74e1aaf52bc7b3a54139e15f09c44eab454df864
-  data.tar.gz: 5eb42b08476252ea35d45d06f7cc40702f9626e8f26a44b155c815b65417030ca68ddb05b93d493c66ae650208b1ddb2c9a9038fdd81500cd5f2588e3434870d
+  metadata.gz: 0c3f4d5c4cf8e072ec3559bd9b385454aab6dc914be9aa6a15b1d442e8ab255d548d0d0fb86285af9cdc6d489589a18e7a5baeaedeb7cb743d9ee52a8a43baaa
+  data.tar.gz: 0222f98dc1a343a2dd2077f0f88a077c8bd19bcb3c0ca0a08543d003a767bf3d7f816c69fdac95b68d4b7f60fe918c82001918c54b50d3f86b4c4437121392c7

data/.version

@@ -1 +1 @@
-0.1.17
+0.1.35

data/bin/cli/am

@@ -10,32 +10,27 @@ class AutoMigrate
   class << self
     def table(table_name)
       die "table [#{table_name}] not in plural -> expected [#{table_name.to_s.pluralize}]" unless table_name.to_s.pluralize == table_name.to_s
-      klass = table_name.to_s.classify
-      unless Object.const_defined?(klass)
-        puts "model #{klass} not defiend for table #{table_name}".red
-        exit
-      end
 
       unless DB.table_exists?(table_name.to_s)
         # http://sequel.jeremyevans.net/rdoc/files/doc/schema_modification_rdoc.html
         DB.create_table table_name do
           primary_key :id, Integer
-          index :id, :unique=>true
+          index :id, unique: true
         end
       end
 
-      t = new(table_name)
-      yield(t)
+      t = new table_name
+      yield t
       t.fix_fields
       t.update
     end
 
-    def migrate(&block)
-      instance_eval(&block)
+    def migrate &block
+      instance_eval &block
     end
 
-    def enable_extension(name)
-      DB.run "CREATE EXTENSION IF NOT EXISTS #{name};"
+    def enable_extension name
+      DB.run 'CREATE EXTENSION IF NOT EXISTS %s;' % name
     end
 
     def transaction_do text
@@ -51,13 +46,13 @@ class AutoMigrate
 
   ###
 
-  def initialize(table_name)
+  def initialize table_name
     @table_name = table_name
     @fields = {}
   end
 
-  def log_run(what)
-    puts " #{what.green}"
+  def log_run what
+    puts ' %s' % what.green
     self.class.transaction_do what
   end
 
@@ -76,16 +71,16 @@ class AutoMigrate
     end
   end
 
-  def get_db_column_type(field)
+  def get_db_column_type field
     type, opts = @fields[field]
     db_type = type
     db_type = :varchar if type == :string
     db_type = Time if type == :datetime
     if opts[:array]
-      db_type = "#{db_type}(#{opts[:limit]})" if type == :string
-      db_type = "#{db_type}[]"
+      db_type = '%s(%s)' % [db_type, opts[:limit]] if type == :string
+      db_type = '%s[]' % db_type
     else
-      db_type = "varchar(#{opts[:limit]})" if opts[:limit]
+      db_type = 'varchar(%s)' % opts[:limit] if opts[:limit]
     end
     db_type
   end
@@ -96,14 +91,13 @@ class AutoMigrate
       o = obj.new
     rescue
       puts "Object #{@table_name.to_s.classify.red} does not exist, yet table #{@table_name.to_s.red} exists!"
-      # puts $!.message
       return
     end
 
     # remove extra fields
     existing_fields = o.attributes.keys - ['id']
     for field in (existing_fields - @fields.keys.map(&:to_s))
-      print "Remove colum #{@table_name}.#{field} (y/N): ".blue
+      print "Remove colum #{@table_name}.#{field} (y/N): ".light_blue
       if STDIN.gets.chomp.downcase.index('y')
         DB.drop_column @table_name, field
         puts " drop_column #{field}".green
@@ -112,6 +106,7 @@ class AutoMigrate
 
     puts "Table #{@table_name.to_s.yellow}, #{@fields.keys.length} fields"
 
+    # loop trough defined fileds in schema
     for field, opts_in in @fields
       type = opts_in[0]
       opts = opts_in[1]
@@ -133,7 +128,12 @@ class AutoMigrate
       end
 
       if current = obj.db_schema[field.to_sym]
-        # limit changed
+        # unhandled db schema changes will not happen
+        # ---
+        # field   - field name
+        # current - current db_schema
+        # type    - new proposed type in schema
+        # opts    - new proposed types
 
         # if we have type set as array and in db it is not array, fix that
         if opts[:array] && !current[:db_type].include?('[]')
@@ -159,12 +159,13 @@ class AutoMigrate
           puts " Coverted #{@table_name}.#{field}[] to non array type".red
         end
 
-        # ap "#{@table_name}, #{field}, #{db_type}, #{current[:max_length]}, #{opts[:limit]}" if field == 'description'
+        # if varchar limit size has changed
         if type == :string && current[:max_length] != opts[:limit]
           self.class.transaction_do "ALTER TABLE #{@table_name} ALTER COLUMN #{field} TYPE varchar(#{opts[:limit]});"
           puts " #{field} limit, #{current[:max_length]}-> #{opts[:limit]}".green
         end
 
+        # covert from varchar to text
         if type == :text && current[:max_length]
           self.class.transaction_do "ALTER TABLE #{@table_name} ALTER COLUMN #{field} SET DATA TYPE text"
           puts " #{field} limit from  #{current[:max_length]} to no limit (text type)".green
@@ -176,6 +177,13 @@ class AutoMigrate
           log_run "ALTER TABLE #{@table_name} ALTER COLUMN #{to_run}"
         end
 
+        # covert string to date
+        if current[:type] == :string && [:date, :datetime].include?(type)
+          log_run "ALTER TABLE #{@table_name} ALTER COLUMN #{field} TYPE #{type.to_s.upcase} using #{field}::#{type};"
+        end
+
+        #ap [current, field, type, opts] if current[:type] == :string && @table_name == :informators
+
         # field default changed
         if current[:default].to_s != opts[:default].to_s
           # skip for arrays
@@ -198,9 +206,8 @@ class AutoMigrate
 
   end
 
-  def add_index(field)
+  def add_index field
     type = @table_name.to_s.classify.constantize.new.db_schema[field][:db_type] rescue nil
-    # puts "#{field.to_s.yellow} (#{type})"
 
     begin
       if type.index('[]')
@@ -213,9 +220,10 @@ class AutoMigrate
     rescue; end
   end
 
-  def rename(field_old, field_new)
+  def rename field_old, field_new
     existing_fields = @table_name.to_s.classify.constantize.new.attributes.keys.map(&:to_sym)
-    if existing_fields.index(field_old) && ! existing_fields.index(field_new)
+
+    if existing_fields.index(field_old.to_sym) && ! existing_fields.index(field_new.to_sym)
       DB.rename_column(@table_name, field_old, field_new)
       puts " * renamed #{@table_name}.#{field_old} to #{@table_name}.#{field_new}"
       puts ' * please run auto migration again'
@@ -223,9 +231,10 @@ class AutoMigrate
     end
   end
 
-  def method_missing(type, *args)
+  def method_missing type, *args
     name = args[0]
     opts = args[1] || {}
+
     if [:string, :integer, :text, :boolean, :datetime, :date, :jsonb].index(type)
       @fields[name] = [type, opts]
     elsif [:decimal].index(type)
@@ -235,7 +244,7 @@ class AutoMigrate
     elsif type == :timestamps
       opts[:null] ||= false
       @fields[:created_at] = [:datetime, opts]
-      @fields[:created_by] = [:integer, opts.merge(index: true)]
+      @fields[:created_by] = [:integer, opts]
       @fields[:updated_at] = [:datetime, opts]
       @fields[:updated_by] = [:integer, opts]
     elsif type == :polymorphic

data/bin/cli/assets

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+ENV['RACK_ENV'] = 'production'
+
 if ARGV[0] == 'help'
   puts 'lux assets rm gzip s3://assets'
   puts ' rm        - remove local cached folder for assets'
@@ -15,7 +17,7 @@ end
 
 require './config/application'
 
-assets = Dir['./app/assets/*/index.*'].map { |el| el.sub('./app/assets/','') }
+assets = Dir['./app/assets/**/index.*'].map { |el| el.sub('./app/assets/','') }
 
 Lux.config.assets_precompile = true
 
@@ -23,9 +25,11 @@ speed = Lux.speed do
   # tpool is not showing compile errors
   # tpool(assets) do |file|
   for file in assets
-    asset = MiniAsset.create file
-    asset.compile ARGV
-    puts "Generated #{file.green} -> #{asset.production_file}"
+    assets = MiniAssets.new file
+
+    # asset = MiniAsset.create file
+    # asset.compile ARGV
+    puts "Generated #{file.green} -> #{assets.render}"
   end
 end
 

data/bin/cli/exceptions

@@ -22,13 +22,13 @@ show = ARGV[0] ? ARGV[0].to_i : nil
 error_folders = Dir['%s/*' % ERROR_FOLDER].sort_by { |x| File.mtime(x) }
 
 if error_folders.length == 0
-  puts 'Nothing found in %s'.blue % ERROR_FOLDER
+  puts 'Nothing found in %s'.light_blue % ERROR_FOLDER
   exit
 end
 
 cnt = 0
 
-puts 'Add error number as last argument to show full erros'.blue
+puts 'Add error number as last argument to show full erros'.light_blue
 
 error_folders.each do |error_folder|
   cnt += 1
@@ -41,13 +41,13 @@ error_folders.each do |error_folder|
   last_update = (Time.now - File.mtime(file)).to_i
 
   if last_update < 60
-    print '%s sec ago - ' % last_update.to_s.blue
+    print '%s sec ago - ' % last_update.to_s.light_blue
   elsif last_update < 60*60
-    print '%s mins ago - ' % (last_update/60).to_i.to_s.blue
+    print '%s mins ago - ' % (last_update/60).to_i.to_s.light_blue
   elsif last_update < 60*60*24
-    print '%s hours ago - ' % (last_update/(60*60)).to_i.to_s.blue
+    print '%s hours ago - ' % (last_update/(60*60)).to_i.to_s.light_blue
   else
-    print '%s days ago - ' % (last_update/(60*60*24)).to_i.to_s.blue
+    print '%s days ago - ' % (last_update/(60*60*24)).to_i.to_s.light_blue
   end
 
   puts file.split('/').last

data/bin/cli/nginx

@@ -2,15 +2,21 @@
 
 command = ARGV[0]
 
-@local_conf = './config/nginx.conf'
-@nginx_conf = '/etc/nginx/sites-enabled/%s.conf' % Dir.pwd.split('/').last
+ROOT   = Dir.pwd
+FOLDER = Dir.pwd.split('/').last
+
+@local_conf  = './config/nginx.conf'
+@target_conf = '/etc/nginx/sites-enabled/%s.conf' % FOLDER
 
 def build_conf
   conf = File.read(@local_conf) rescue LuxCli.die('Local conf %s not found' % @local_conf)
 
   LuxCli.die('$ROOT not found in config') unless conf.include?('$ROOT')
 
-  conf.gsub('$ROOT', Dir.pwd)
+  conf = conf.gsub(/`([^`]+)`/) { `#{$1}`.chomp }
+  conf = conf.gsub('$ROOT', ROOT)
+  conf = conf.gsub('$FOLDER', FOLDER)
+  conf
 end
 
 case command
@@ -20,9 +26,9 @@ case command
     File.write './tmp/nginx.conf', build_conf
     puts '# run this manualy'
     puts
-    puts 'sudo cp ./tmp/nginx.conf %s && sudo nginx -t' % @nginx_conf
+    puts 'sudo cp ./tmp/nginx.conf %s && sudo nginx -t' % @target_conf
   else
     puts ' show      # show rendered config'
-    puts ' install   # install config/nginx.conf to %s' % @nginx_conf
+    puts ' install   # install config/nginx.conf to %s' % @target_conf
 end
 

data/bin/cli/systemd

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+ROOT   = Dir.pwd
+FOLDER = Dir.pwd.split('/').last.split('.').first
+
+command = ARGV[0]
+
+@local_conf = './config/systemd.service'
+@target_conf = '/etc/systemd/system/%s.service' % FOLDER
+
+def build_conf
+  conf = File.read(@local_conf) rescue LuxCli.die('Local conf %s not found' % @local_conf)
+
+  LuxCli.die('$ROOT not found in config') unless conf.include?('$ROOT')
+
+  conf = conf.gsub(/`([^`]+)`/) { `#{$1}`.chomp }
+  conf = conf.gsub('$ROOT', ROOT)
+  conf = conf.gsub('$FOLDER', FOLDER)
+  conf
+end
+
+case command
+  when 'show'
+    puts build_conf
+  when 'install'
+    File.write './tmp/systemd.conf', build_conf
+    puts '# run this manualy'
+    puts
+    puts 'sudo cp ./tmp/systemd.conf %s && sudo systemd -t' % @target_conf
+  else
+    puts ' show      # show rendered config'
+    puts ' install   # install %s to %s' % [@local_conf, @target_conf]
+    puts ' ---'
+    puts ' sudo service %s start/stop/restart'.yellow % FOLDER
+end
+

data/bin/lux

@@ -56,6 +56,7 @@ commands['nginx']      = 'parse and install config/nginx.conf'
 commands['production'] = 'run puma in production mode'
 commands['routes']     = 'list routes'
 commands['server']     = 'run puma development server'
+commands['systemd']    = 'parse and install config/systemd.conf'
 commands['stat']       = 'goaccess stat to public/goaccess.html'
 
 command = ARGV.shift

data/lib/common/class_attributes.rb

@@ -35,17 +35,18 @@ module ClassAttributes
 
     ::ClassAttributes::CA_DEFAULTS[name] = { 'Object'=>default }
 
-    klass.class.send(:define_method, name) do |*args|
+    klass.define_singleton_method('%s=' % name) { |*args| send name, *args}
+    klass.define_singleton_method(name) do |*args|
       root = ::ClassAttributes::CA_DEFAULTS[name]
 
       # set and return if argument defined
-      return root[self.to_s] = args[0] if args.length > 0
+      return root[to_s] = args[0] if args.length > 0
 
       # find value and return
-      self.ancestors.map(&:to_s).each do |el|
+      ancestors.map(&:to_s).each do |el|
         value = root[el]
         if value || el == 'Object'
-          value = self.instance_exec(&value) if value.is_a?(Proc)
+          value = instance_exec(&value) if value.is_a?(Proc)
           return value
         end
       end
@@ -53,8 +54,10 @@ module ClassAttributes
   end
 
   # defines class variable in current lux thread
+  # User.current = @user
   def current klass, name
     klass.class.send(:define_method, name) do |*args|
+      Thread.current[:lux] ||= {}
       Thread.current[:lux]['%s-%s' % [klass, name]]
     end
 
@@ -64,3 +67,9 @@ module ClassAttributes
     end
   end
 end
+
+class Object
+  def class_attribute name, default=nil, &block
+    ClassAttributes.define self, name, default, &block
+  end
+end

data/lib/common/crypt.rb

@@ -41,25 +41,21 @@ module Crypt
   # Crypt.encrypt('secret')
   # Crypt.encrypt('secret', ttl:1.hour, password:'pa$$w0rd')
   def encrypt(data, opts={})
-    diff = opts.keys - [:ttl, :password]
-    raise 'Unallowed key(s) found %s' % diff.join(', ') if diff.length > 0
+    opts = opts.to_opts!(:ttl, :password)
 
     payload = { data:data }
-    payload[:ttl] = Time.now.to_i + opts[:ttl] if opts[:ttl]
-    hmac_secret = "#{secret}#{opts.delete(:password)}"
-    JWT.encode payload, hmac_secret, ALGORITHM
+    payload[:ttl] = Time.now.to_i + opts.ttl if opts.ttl
+    JWT.encode payload, secret+opts.password.to_s, ALGORITHM
   end
 
   # Crypt.decrypt('secret')
   # Crypt.decrypt('secret', password:'pa$$w0rd')
   def decrypt(token, opts={})
-    diff = opts.keys - [:password]
-    raise 'Unallowed key(s) found %s' % diff.join(', ') if diff.length > 0
+    opts = opts.to_opts!(:password)
 
-    hmac_secret = "#{secret}#{opts.delete(:password)}"
-    token_data = JWT.decode token, hmac_secret, true, { :algorithm => ALGORITHM }
+    token_data = JWT.decode token, secret+opts.password.to_s, true, { :algorithm => ALGORITHM }
     data = token_data[0]
-    raise "Crpted data expired before #{Time.now.to_i - data['ttl']} seconds" if data['ttl'] && data['ttl'] < Time.now.to_i
+    raise "Crypted data expired before #{Time.now.to_i - data.ttl} seconds" if data['ttl'] && data['ttl'] < Time.now.to_i
     data['data']
   end
 

data/lib/common/dynamic_class.rb

@@ -0,0 +1,23 @@
+# o = DynamicClass.new a: 'b'
+# o.a -> 'b'
+# o.b -> raises error
+class DynamicClass
+  def initialize data, &block
+    @data  = data
+    @block = block if block
+  end
+
+  def method_missing m, *args, &block
+    key = m.to_s.sub('=','').to_sym
+
+    unless @data.has_key?(key)
+      raise ArgumentError.new('Key :%s not found in DynamicOptions' % key)
+    end
+
+    if m.to_s.include?('=')
+      @data[key] = args[0]
+    else
+      @data[key]
+    end
+  end
+end