lux-fw 0.1.35 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8da4e12f599558882464c2d4adaf26f4368c541d
-  data.tar.gz: cb2320787caf49b7b48308d5915fe2abf8945101
+SHA256:
+  metadata.gz: 48df51990bdf390ef6f780d624e0bb1624f54dfc5721dee1c77749f02e2ec472
+  data.tar.gz: bde0c404e918b91825e90b9e7a183199266d225ece56c54b28e1366366350bc7
 SHA512:
-  metadata.gz: 0c3f4d5c4cf8e072ec3559bd9b385454aab6dc914be9aa6a15b1d442e8ab255d548d0d0fb86285af9cdc6d489589a18e7a5baeaedeb7cb743d9ee52a8a43baaa
-  data.tar.gz: 0222f98dc1a343a2dd2077f0f88a077c8bd19bcb3c0ca0a08543d003a767bf3d7f816c69fdac95b68d4b7f60fe918c82001918c54b50d3f86b4c4437121392c7
+  metadata.gz: fc6c0f8bf80608399dac5afe4dd9f7d01d78fd99cbcf45e3cf746e986eabd8a08ba6650722569c6e0f64266fd202a27b44ec6e6e3cfdf8683951605bb03b030f
+  data.tar.gz: 106570f909cc6109a9d1f6f7f719d82e4b7514e4b214b62fcc81015590c7e607bf39fbb97c74fe2e1add9986ca260c840743c3f1121b751ef81372c789e32327

data/.version

@@ -1 +1 @@
-0.1.35
+0.2.1

data/bin/cli/am

@@ -1,15 +1,30 @@
 #!/usr/bin/env ruby
 
-ENV['DB_NAME'] = ARGV[0] if ARGV[0]
+require 'bundler/setup'
+require 'dotenv'
 
-require './config/application'
+Dotenv.load
+Bundler.require(:default)
+
+# load app config
+require './config/db'
+
+# Sequel extension and plugin test
+DB.run %[DROP TABLE IF EXISTS lux_tests;]
+DB.run %[CREATE TABLE lux_tests (int_array integer[] default '{}', text_array text[] default '{}');]
+class LuxTest < Sequel::Model; end;
+LuxTest.new.save
+die('"DB.extension :pg_array" not loaded') unless LuxTest.first.int_array.class == Sequel::Postgres::PGArray
+DB.run %[DROP TABLE IF EXISTS lux_tests;]
 
 class AutoMigrate
   attr_accessor :fields
 
   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
+    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
+
+      die 'Table name "%s" is not permited' % table_name if [:categories].include?(table_name)
 
       unless DB.table_exists?(table_name.to_s)
         # http://sequel.jeremyevans.net/rdoc/files/doc/schema_modification_rdoc.html
@@ -49,6 +64,20 @@ class AutoMigrate
   def initialize table_name
     @table_name = table_name
     @fields = {}
+
+    klass = @table_name.to_s.classify
+
+    if Object.const_defined?(klass)
+      puts 'Table name "%s" is not allowed - class "%s" is allready defined'.red % [table_name, klass]
+      exit
+    end
+
+    eval %[class ::%s < Sequel::Model; end;] % klass
+    @object = klass.constantize.new
+  end
+
+  def transaction_do text
+    self.class.transaction_do text
   end
 
   def log_run what
@@ -61,13 +90,12 @@ class AutoMigrate
       type = vals[0]
       opts = vals[1]
 
-      opts[:limit] ||= 255 if type == :string
+      opts[:limit]   ||= 255 if type == :string
       opts[:default] ||= false if type == :boolean
-
-      opts[:null] = true unless opts[:null].class.name == 'FalseClass'
-      opts[:array] ||= false
-      opts[:unique] ||= false
-      opts[:default] = [] if opts[:array]
+      opts[:null]      = true unless opts[:null].class.name == 'FalseClass'
+      opts[:array]   ||= false
+      opts[:unique]  ||= false
+      opts[:default]   = [] if opts[:array]
     end
   end
 
@@ -76,27 +104,22 @@ class AutoMigrate
     db_type = type
     db_type = :varchar if type == :string
     db_type = Time if type == :datetime
+
     if opts[:array]
       db_type = '%s(%s)' % [db_type, opts[:limit]] if type == :string
       db_type = '%s[]' % db_type
     else
       db_type = 'varchar(%s)' % opts[:limit] if opts[:limit]
     end
+
     db_type
   end
 
   def update
-    begin
-      obj = @table_name.to_s.classify.constantize
-      o = obj.new
-    rescue
-      puts "Object #{@table_name.to_s.classify.red} does not exist, yet table #{@table_name.to_s.red} exists!"
-      return
-    end
+    puts "Table #{@table_name.to_s.yellow}, #{@fields.keys.length} fields"
 
     # remove extra fields
-    existing_fields = o.attributes.keys - ['id']
-    for field in (existing_fields - @fields.keys.map(&:to_s))
+    for field in (@object.columns - @fields.keys - [:id])
       print "Remove colum #{@table_name}.#{field} (y/N): ".light_blue
       if STDIN.gets.chomp.downcase.index('y')
         DB.drop_column @table_name, field
@@ -104,8 +127,6 @@ class AutoMigrate
       end
     end
 
-    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]
@@ -114,20 +135,19 @@ class AutoMigrate
       db_type = get_db_column_type(field)
 
       # create missing columns
-      unless obj.columns.index(field.to_sym)
+      unless @object.columns.index(field.to_sym)
         DB.add_column @table_name, field, db_type, opts
 
         if opts[:array]
           default = type == :string ? "ARRAY[]::character varying[]" : "ARRAY[]::integer[]"
-
-          self.class.transaction_do "ALTER TABLE #{@table_name} ALTER COLUMN #{field} SET DEFAULT #{default};"
+          transaction_do "ALTER TABLE #{@table_name} ALTER COLUMN #{field} SET DEFAULT #{default};"
         end
 
         puts " add_column #{field}, #{db_type}, #{opts.to_json}".green
         next
       end
 
-      if current = obj.db_schema[field.to_sym]
+      if current = @object.db_schema[field]
         # unhandled db schema changes will not happen
         # ---
         # field   - field name
@@ -136,22 +156,28 @@ class AutoMigrate
         # 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?('[]')
-
-          self.class.transaction_do %[
-            alter table #{@table_name} alter #{field} drop default;
-            alter table #{@table_name} alter #{field} type #{current[:db_type]}[] using array[#{field}];
-            alter table #{@table_name} alter #{field} set default '{}';
-          ]
-
-          puts " Coverted #{@table_name}.#{field} to array type".green
+        if opts[:array]
+          # covert to array unless is array
+          if !current[:db_type].include?('[]')
+            transaction_do %[
+              alter table #{@table_name} alter #{field} drop default;
+              alter table #{@table_name} alter #{field} type #{current[:db_type]}[] using array[#{field}];
+              alter table #{@table_name} alter #{field} set default '{}';
+            ]
+
+            puts " Coverted #{@table_name}.#{field} to array type".green
+          elsif !current[:default]
+            # force default for array to be present
+            default = type == :string ? "ARRAY[]::character varying[]" : "ARRAY[]::integer[]"
+            transaction_do %[alter table #{@table_name} alter #{field} set default #{default};]
+          end
         end
 
         # if we have array but scema says no array
         if !opts[:array] && current[:db_type].include?('[]')
           m = current[:type] == :integer ? "#{field}[0]" : "array_to_string(#{field}, ',')"
 
-          self.class.transaction_do %[
+          transaction_do %[
             alter table #{@table_name} alter #{field} drop default;
             alter table #{@table_name} alter #{field} type #{current[:db_type].sub('[]','')} using #{m};
           ]
@@ -160,14 +186,14 @@ class AutoMigrate
         end
 
         # 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]});"
+        if type == :string && !opts[:array] && current[:max_length] != opts[:limit]
+          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"
+          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
         end
 
@@ -221,7 +247,7 @@ class AutoMigrate
   end
 
   def rename field_old, field_new
-    existing_fields = @table_name.to_s.classify.constantize.new.attributes.keys.map(&:to_sym)
+    existing_fields = @table_name.to_s.classify.constantize.new.columns
 
     if existing_fields.index(field_old.to_sym) && ! existing_fields.index(field_new.to_sym)
       DB.rename_column(@table_name, field_old, field_new)
@@ -236,11 +262,11 @@ class AutoMigrate
     opts = args[1] || {}
 
     if [:string, :integer, :text, :boolean, :datetime, :date, :jsonb].index(type)
-      @fields[name] = [type, opts]
+      @fields[name.to_sym] = [type, opts]
     elsif [:decimal].index(type)
       opts[:precision] ||= 8
       opts[:scale] ||= 2
-      @fields[name] = [:decimal, opts]
+      @fields[name.to_sym] = [:decimal, opts]
     elsif type == :timestamps
       opts[:null] ||= false
       @fields[:created_at] = [:datetime, opts]

data/bin/cli/assets

@@ -37,5 +37,5 @@ puts "Asset precomlile done in #{speed}"
 
 if ARGV.last && ARGV.last[0,5] == 's3://'
   puts 'Copy to %s'.green % ARGV.last
-  system 'aws s3 sync ./public %s --cache-control "max-age=31536000, no-transform, public"' % ARGV.last
+  system 'aws s3 sync ./public %s --cache-control "max-age=31536000, public"' % ARGV.last
 end

data/bin/cli/console

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 
-ENV['LUX_VERBOSE'] ||= 'true'
-
 load_start = Time.now
 
 require 'awesome_print'
 require 'clipboard'
 require './config/application'
 
+Lux.config.show_server_errors = true
+Lux.config.log_to_stdout      = true
+
 if File.exist?('./config/console.rb')
   puts '* loading ./config/console.rb'
   require './config/console'

data/bin/cli/eval

@@ -2,7 +2,10 @@
 
 require './config/application'
 
-puts '* loading ./config/console.rb' if File.exist?('./config/console.rb')
+if File.exist?('./config/console.rb')
+  puts '* loading ./config/console.rb'
+  load './config/console.rb'
+end
 
 command = ARGV.join('; ')
 
@@ -12,4 +15,10 @@ data = eval command
 puts '-'
 puts 'Class   : %s' % data.class
 puts '-'
-ap data
+
+if data.class == String && data.include?('</body>')
+  require 'nokogiri'
+  puts Nokogiri::XML(data, &:noblanks)
+else
+  ap data
+end

data/bin/cli/exceptions

@@ -19,7 +19,7 @@ end
 
 show = ARGV[0] ? ARGV[0].to_i : nil
 
-error_folders = Dir['%s/*' % ERROR_FOLDER].sort_by { |x| File.mtime(x) }
+error_folders = Dir['%s/*' % ERROR_FOLDER].sort_by { |x| File.mtime(x) }.reverse
 
 if error_folders.length == 0
   puts 'Nothing found in %s'.light_blue % ERROR_FOLDER

data/bin/cli/generate

@@ -80,3 +80,7 @@ for type in templates.keys
   end
 end
 
+# if parse_templates.include?('m')
+#   sql = %[CREATE TABLE IF NOT EXISTS "public"."#{@objects}" ("id" serial, PRIMARY KEY ("id"));]
+#   LuxCli.run "psql -d %s -c '%s'" % [ENV.fetch('DB_NAME'), sql]
+# end

data/bin/cli/render

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+ENV['LUX_VERBOSE'] = 'true'
+
+require './config/application'
+
+unless ARGV[0]
+  Cli.die 'lux render GET /about'
+end
+
+path, http_method = ARGV.reverse
+http_method ||= :get
+
+data = Lux(path)
+
+data[:body] = 'BODY lenght: %s kB' % (data[:body].length.to_f/1024).round(1)
+
+ap data

data/bin/cli/routes

@@ -5,8 +5,10 @@ ENV['LUX_PRINT_ROUTES'] = 'true'
 require 'awesome_print'
 require './config/application'
 
+Lux.config.log_to_stdout = false
+
 path = ARGV[0] || '/print-routes'
 
 puts 'Routes for test route %s' % path.green
 
-Lux path
+Lux.app.render path

data/bin/cli/server

@@ -1 +1,4 @@
-LuxCli.run "LUX_VERBOSE=true puma -p %s" % @port
+@flags ||= 'ALL'
+@flags = @flags.upcase
+
+LuxCli.run "LUX_FLAGS=%s puma -p %s" % [@flags, @port]

data/bin/lux

@@ -29,6 +29,11 @@ Dotenv.load
 @port     = 3000
 lux_root = File.expand_path '../..', __FILE__
 
+if Dir.exists?('.git')
+  test_root = `bundle show lux-fw`.chomp
+  lux_root  = test_root if test_root.include?('lux')
+end
+
 puts 'Lux (%s, v%s)' % [lux_root, File.read('%s/.version' % lux_root)] unless ARGV[0]
 
 ARGV.options do |opts|
@@ -40,6 +45,9 @@ ARGV.options do |opts|
   opts.on("-p", "--port=val", "port (3000)", String) do |v|
     @port = v.to_i
   end
+  opts.on("-f", "--flags=val", "CRSL", String) do |v|
+    @flags = v
+  end
 end.parse!
 
 commands = {}
@@ -51,13 +59,14 @@ commands['eval']       = 'eval code or file'
 commands['exceptions'] = 'show stored exceptions, last created first'
 commands['generate']   = 'generates models and views based on templates'
 commands['get']        = 'get local URL'
-# commands['job_que']    = 'process job que with loaded enviroment'
 commands['nginx']      = 'parse and install config/nginx.conf'
 commands['production'] = 'run puma in production mode'
 commands['routes']     = 'list routes'
+commands['render']     = 'render single page'
 commands['server']     = 'run puma development server'
 commands['systemd']    = 'parse and install config/systemd.conf'
 commands['stat']       = 'goaccess stat to public/goaccess.html'
+# commands['job_que']    = 'process job que with loaded enviroment'
 
 command = ARGV.shift
 

data/bin/txt/nginx.conf

@@ -1,29 +1,46 @@
-worker_processes  1;
-
-events {
-  worker_connections  1024;
-}
+# /etc/nginx/nginx.conf
+# worker_processes 4; # one per proc "grep processor /proc/cpuinfo | wc -l"
+# worker_connections 1024;
 
 server {
-  listen 80;  #default deferred;
-  server_name .color-mont.com;
-  root        /home/deployer/apps/app/public;
-  error_log   /home/deployer/apps/app/log/nginx-error.log;
+  listen 80 default_server;
+  # server_name .novi-informator.hr;
+
+  root $ROOT/public;
+  error_log $ROOT/log/nginx-error.log;
 
   passenger_enabled on;
   passenger_friendly_error_pages on;
 
+  # (1024 * TOTAL_RAM * 0.75) / MB_PER_PROECESS
+  # passenger_max_pool_size 163;
+  # passenger_min_instances 163;
+
+  client_body_timeout 12;
+  client_body_in_file_only clean;
+  client_body_buffer_size 32K;     # form POST
+  client_header_timeout 12;
+  client_max_body_size 50M;
+  keepalive_timeout 20;
+  send_timeout 10;
+  sendfile on;
+
+  gzip             on;
+  gzip_comp_level  2;
+  gzip_min_length  1000;
+  gzip_proxied     expired no-cache no-store private auth;
+  gzip_types       text/plain application/x-javascript text/xml text/css application/xml;
+
+  access_log off;
+
   location = /favicon.ico {
-    log_not_found off;
-    access_log    off;
+      log_not_found off;
+      access_log    off;
   }
 
   location ^~ /assets/ {
-    gzip_static on;
-    expires max;
-    add_header Cache-Control public;
+      gzip_static on;
+      expires max;
+      add_header Cache-Control public;
   }
-
-  client_max_body_size 1G;
-  keepalive_timeout 20;
-}
+}

data/lib/common/class_attributes.rb

@@ -55,17 +55,17 @@ module ClassAttributes
 
   # 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
+  # def current klass, name
+  #   klass.class.send(:define_method, name) do |*args|
+  #     Thread.current[:lux] ||= {}
+  #     Thread.current[:lux]['%s-%s' % [klass, name]]
+  #   end
 
-    klass.class.send(:define_method, '%s=' % name) do |value|
-      Thread.current[:lux] ||= {}
-      Thread.current[:lux]['%s-%s' % [klass, name]] = value
-    end
-  end
+  #   klass.class.send(:define_method, '%s=' % name) do |value|
+  #     Thread.current[:lux] ||= {}
+  #     Thread.current[:lux]['%s-%s' % [klass, name]] = value
+  #   end
+  # end
 end
 
 class Object