punk 0.3.6 → 0.4.1

data/lib/punk/actions/sessions/verify.rb

@@ -17,8 +17,8 @@ module PUNK
 
     def process
       verify = ProveClaimService.run(session: session, secret: secret)
-      raise BadRequest, 'Secret is incorrect' unless verify.result == true
-      present Info, message: 'We have succesfully verified your identity.  Welcome to GroupFire!'
+      raise BadRequest, "Secret is incorrect" unless verify.result == true
+      present Info, message: "We have succesfully verified your identity.  Welcome to GroupFire!"
     end
   end
 end

data/lib/punk/commands/auth.rb

@@ -15,7 +15,7 @@ PUNK::Command.create "login" do
         "PATH_INFO" => "/sessions",
         "CONTENT_TYPE" => "text/json",
         "SCRIPT_NAME" => "",
-        "rack.input" => StringIO.new({ claim: claim }.to_json)
+        "rack.input" => StringIO.new({claim: claim}.to_json)
       )
     response = ActiveSupport::JSON.decode(response[-1].first).deep_symbolize_keys
     return if response[:errors].present?
@@ -23,17 +23,17 @@ PUNK::Command.create "login" do
     authenticated = false
     while authenticated == false
       SemanticLogger.flush
-      secret = ask("Secret: ") { |q| q.echo = '*' }
+      secret = ask("Secret: ") { |q| q.echo = "*" }
       response =
         PUNK.app.call(
           "REQUEST_METHOD" => "PATCH",
           "PATH_INFO" => "/sessions/#{slug}",
           "CONTENT_TYPE" => "text/json",
           "SCRIPT_NAME" => "",
-          "rack.input" => StringIO.new({ secret: secret }.to_json)
+          "rack.input" => StringIO.new({secret: secret}.to_json)
         )
       response = ActiveSupport::JSON.decode(response[-1].first).deep_symbolize_keys
-      break if response[:errors].present? && response[:errors].first != 'Secret is incorrect'
+      break if response[:errors].present? && response[:errors].first != "Secret is incorrect"
       authenticated = response[:message].present?
     end
     response[:message]

data/lib/punk/commands/generate.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 PUNK::Command.create "generate" do
-  shortcut 'g'
+  shortcut "g"
   description "Generate routes, actions, models, views, services or workers"
 
   def process
-    case args.join(' ')
-    when 'route', 'action', 'model', 'view', 'service', 'worker', 'scaffold'
+    case args.join(" ")
+    when "route", "action", "model", "view", "service", "worker", "scaffold"
       "TBD"
-    when '', 'help'
+    when "", "help"
       "? specify one of: routes, actions, models, views, services, scaffold"
     else
-      "? unkown arguments: #{args.join(',')}"
+      "? unkown arguments: #{args.join(",")}"
     end
   end
 end

data/lib/punk/commands/http.rb

@@ -4,7 +4,7 @@ PUNK::Command.create "GET" do
   description "Perform a HTTP GET request"
 
   def process
-    path, query = args[0].split('?')
+    path, query = args[0].split("?")
     PUNK.app.call(
       "REQUEST_METHOD" => "GET",
       "PATH_INFO" => path,
@@ -24,7 +24,7 @@ PUNK::Command.create "PATCH" do
       "PATH_INFO" => args[0],
       "CONTENT_TYPE" => "text/json",
       "SCRIPT_NAME" => "",
-      "rack.input" => StringIO.new(args[1..-1].join)
+      "rack.input" => StringIO.new(args[1..].join)
     )
   end
 end
@@ -38,7 +38,7 @@ PUNK::Command.create "POST" do
       "PATH_INFO" => args[0],
       "CONTENT_TYPE" => "text/json",
       "SCRIPT_NAME" => "",
-      "rack.input" => StringIO.new(args[1..-1].join)
+      "rack.input" => StringIO.new(args[1..].join)
     )
   end
 end
@@ -52,7 +52,7 @@ PUNK::Command.create "PUT" do
       "PATH_INFO" => args[0],
       "CONTENT_TYPE" => "text/json",
       "SCRIPT_NAME" => "",
-      "rack.input" => StringIO.new(args[1..-1].join)
+      "rack.input" => StringIO.new(args[1..].join)
     )
   end
 end

data/lib/punk/commands/list.rb

@@ -1,30 +1,30 @@
 # frozen_string_literal: true
 
 PUNK::Command.create "list" do
-  shortcut 'l'
+  shortcut "l"
   description "List routes, actions, models, views, services or workers"
 
   option shortcut: :a, name: :all, description: "Include Punk!", type: nil
 
   def process
-    case args.join(' ')
-    when 'routes'
+    case args.join(" ")
+    when "routes"
       PUNK.app
       PUNK::App.route_list # TODO: exclude PUNK routes by default
-    when 'actions'
+    when "actions"
       ObjectSpace.each_object(PUNK::Action.singleton_class).map(&:name).reject { |name| _hide?(name) }
-    when 'models'
+    when "models"
       ObjectSpace.each_object(PUNK::Model.singleton_class).map(&:name).reject { |name| _hide?(name) }
-    when 'views'
+    when "views"
       ObjectSpace.each_object(PUNK::View.singleton_class).map(&:name).reject { |name| _hide?(name) }
-    when 'services'
+    when "services"
       ObjectSpace.each_object(PUNK::Service.singleton_class).select { |klass| klass.superclass == PUNK::Service }.map(&:name).reject { |name| _hide?(name) }
-    when 'workers'
+    when "workers"
       ObjectSpace.each_object(PUNK::Worker.singleton_class).select { |klass| klass.superclass == PUNK::Worker }.map(&:name).reject { |name| _hide?(name) }
-    when '', 'help'
+    when "", "help"
       "? specify one of: routes, actions, models, views, services, workers"
     else
-      "? unkown arguments: #{args.join(',')}"
+      "? unkown arguments: #{args.join(",")}"
     end
   end
 

data/lib/punk/core/app.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'roda'
-require 'sidekiq/web'
-require 'sidekiq/cron/web'
-require 'rack/protection'
+require "roda"
+require "sidekiq/web"
+require "sidekiq/cron/web"
+require "rack/protection"
 
-require_relative '../plugins/all'
+require_relative "../plugins/all"
 
 # don't use rack session for sidekiq (we do our own auth when routing)
 Sidekiq::Web.set(:sessions, false)
 # TODO: need custom roda route csrf in sidekiq web forms
-Sidekiq::Web.use(::Rack::Protection, use: :none, logging: true, logger: SemanticLogger['PUNK::RPT'])
+Sidekiq::Web.use(::Rack::Protection, use: :none, logging: true, logger: SemanticLogger["PUNK::RPT"])
 
 module PUNK
   def self.route(name, &block)
@@ -23,15 +23,15 @@ module PUNK
 
   ROUTES = Tempfile.new("routes.json").path
   PUNK.profile_info("generate", path: ROUTES) do
-    system "roda-parse_routes -f #{ROUTES} #{File.expand_path(File.join(PUNK.get.app.path, 'routes', '*'))} #{File.expand_path(File.join(__dir__, '..', 'routes', '*'))}"
+    system "roda-parse_routes -f #{ROUTES} #{File.expand_path(File.join(PUNK.get.app.path, "routes", "*"))} #{File.expand_path(File.join(__dir__, "..", "routes", "*"))}"
   end
 
   class App < Roda
     include Loggable
 
     REMOTE = PUNK.env.staging? || PUNK.env.production?
-    PUBLIC = File.join(PUNK.get.app.path, '..', 'www')
-    index_path = File.join(PUBLIC, 'index.html')
+    PUBLIC = File.join(PUNK.get.app.path, "..", "www")
+    index_path = File.join(PUBLIC, "index.html")
     INDEX =
       if File.exist?(index_path)
         File.read(index_path)
@@ -50,7 +50,7 @@ module PUNK
         INDEX_HTML
       end
 
-    plugin :sessions, secret: [PUNK.get.cookie.secret].pack('H*'),
+    plugin :sessions, secret: [PUNK.get.cookie.secret].pack("H*"),
                       key: PUNK.get.cookie.key,
                       max_seconds: 1.year.to_i,
                       max_idle_sessions: 1.month.to_i,
@@ -70,12 +70,12 @@ module PUNK
     plugin :path_rewriter
     plugin :slash_path_empty
     plugin :multi_route
-    plugin :type_routing, types: { csv: 'text/csv' }, default_type: :json
+    plugin :type_routing, types: {csv: "text/csv"}, default_type: :json
     plugin :route_list, file: ROUTES
     plugin :disallow_file_uploads
     plugin :public, root: PUBLIC
 
-    plugin :default_headers, 'Content-Type' => 'text/html', 'Content-Security-Policy' => "default-src 'self';img-src *", 'Strict-Transport-Security' => 'max-age=16070400;', 'X-Frame-Options' => 'deny', 'X-Content-Type-Options' => 'nosniff', 'X-XSS-Protection' => '1; mode=block'
+    plugin :default_headers, "Content-Type" => "text/html", "Content-Security-Policy" => "default-src 'self';img-src *", "Strict-Transport-Security" => "max-age=16070400;", "X-Frame-Options" => "deny", "X-Content-Type-Options" => "nosniff", "X-XSS-Protection" => "1; mode=block"
 
     plugin :error_handler
     plugin :not_found
@@ -83,24 +83,24 @@ module PUNK
 
     request_delegate :root, :on, :is, :get, :post, :redirect, :patch, :delete
 
-    rewrite_path(/\A\/?\z/, '/index.html')
-    rewrite_path(/\A\/api\/?\z/, '/api/index.html')
+    rewrite_path(/\A\/?\z/, "/index.html")
+    rewrite_path(/\A\/api\/?\z/, "/api/index.html")
 
     def require_session!
       begin
-        @_current_session = Session[request.session['session_id']]
+        @_current_session = Session[request.session["session_id"]]
         if @_current_session&.active?
           @_current_session.touch
         else
           clear_session
           @_current_session = nil
         end
-      rescue StandardError => e
+      rescue => e
         exception(e)
         raise Unauthorized, e.message
       end
-      raise Unauthorized, 'Session does not exist' if @_current_session.nil?
-      PUNK.logger.info "require_session!", { current_session: current_session.inspect, current_identity: current_identity.inspect, current_user: current_user.inspect }.inspect
+      raise Unauthorized, "Session does not exist" if @_current_session.nil?
+      PUNK.logger.info "require_session!", {current_session: current_session.inspect, current_identity: current_identity.inspect, current_user: current_user.inspect}.inspect
     end
 
     def require_anonymous!
@@ -109,9 +109,9 @@ module PUNK
     end
 
     def require_tenant!
-      raise Unauthorized, 'Session does not exist' if @_current_session.nil?
+      raise Unauthorized, "Session does not exist" if @_current_session.nil?
       @_current_tenant = current_user.tenants_dataset[id: params[:tenant_id]]
-      PUNK.logger.info "require_tenant!", { current_tenant: @_current_tenant.inspect }.inspect
+      PUNK.logger.info "require_tenant!", {current_tenant: @_current_tenant.inspect}.inspect
     end
 
     def args
@@ -145,17 +145,17 @@ module PUNK
     end
 
     PUNK_CONTENT_TYPE_LOOKUP = {
-      csv: 'text/csv',
-      html: 'text/html',
-      json: 'application/json',
-      xml: 'application/xml'
+      csv: "text/csv",
+      html: "text/html",
+      json: "application/json",
+      xml: "application/xml"
     }.freeze
     def render(view)
       raise InternalServerError, "Not a view: #{view}" unless view.is_a?(View)
       format = request.requested_type
       view.profile_info("render", format: format) do
         response.status = view.status if view.is_a?(Fail)
-        response['Content-Type'] = PUNK_CONTENT_TYPE_LOOKUP[format]
+        response["Content-Type"] = PUNK_CONTENT_TYPE_LOOKUP[format]
         view.render(format)
       end
     end
@@ -164,7 +164,7 @@ module PUNK
       exception(e, current_user: current_user)
       case e
       when BadRequest
-        present Fail, message: 'Bad Request', error_messages: [e.message], status: 400
+        present Fail, message: "Bad Request", error_messages: [e.message], status: 400
       when Unauthorized
         present Fail, message: "Unauthorized", error_messages: [e.message], status: 401
       when Forbidden
@@ -190,10 +190,10 @@ module PUNK
       @_started = Time.now.utc
       name = "#{request.request_method} #{request.path}"
       logger.info "Started #{name} for #{request.ip}", params.deep_symbolize_keys.sanitize.inspect
-      logger.trace request.env['HTTP_USER_AGENT']
+      logger.trace request.env["HTTP_USER_AGENT"]
       logger.info "Started #{name} for #{request.ip || Session.default_values[:remote_addr].to_s}", params.deep_symbolize_keys.sanitize.inspect
-      logger.trace request.env['HTTP_USER_AGENT'] || Session.default_values[:user_agent]
-      logger.trace request.env['HTTP_COOKIE']
+      logger.trace request.env["HTTP_USER_AGENT"] || Session.default_values[:user_agent]
+      logger.trace request.env["HTTP_COOKIE"]
       logger.push_tags(name)
       _set_cookie(request.env)
     end
@@ -203,14 +203,14 @@ module PUNK
       name = logger.pop_tags(1).join
       duration = 1000.0 * (Time.now.utc - @_started)
       logger.pop_tags
-      logger.trace((headers.present? ? headers['Set-Cookie'] : nil) || "(no cookie set)")
+      logger.trace((headers.present? ? headers["Set-Cookie"] : nil) || "(no cookie set)")
       logger.info message: "Completed #{name} status #{status}", duration: duration
       _store_cookie(headers)
     end
 
     route do |r|
       r.public
-      r.on 'jobs' do
+      r.on "jobs" do
         require_session!
         r.run Sidekiq::Web
       end
@@ -222,26 +222,26 @@ module PUNK
     def _set_cookie(headers)
       return if REMOTE
       return if headers.blank?
-      return if headers['HTTP_USER_AGENT'].present?
-      return if headers['HTTP_COOKIE'].present?
-      cookie_file = 'tmp/.cookie-jar'
-      cookie_file += '-test' if PUNK.env.test?
+      return if headers["HTTP_USER_AGENT"].present?
+      return if headers["HTTP_COOKIE"].present?
+      cookie_file = "tmp/.cookie-jar"
+      cookie_file += "-test" if PUNK.env.test?
       cookie = File.read(cookie_file) if File.exist?(cookie_file)
       return if cookie.blank?
-      headers['HTTP_COOKIE'] = cookie
+      headers["HTTP_COOKIE"] = cookie
     end
 
     def _store_cookie(headers)
       return if REMOTE
       return if headers.blank?
-      cookie = headers['Set-Cookie']
+      cookie = headers["Set-Cookie"]
       return if cookie.blank?
-      cookie_file = 'tmp/.cookie-jar'
-      cookie_file += '-test' if PUNK.env.test?
-      if cookie =~ /max-age=0/
+      cookie_file = "tmp/.cookie-jar"
+      cookie_file += "-test" if PUNK.env.test?
+      if /max-age=0/.match?(cookie)
         File.delete(cookie_file)
       else
-        File.open(cookie_file, 'w') { |file| file << cookie }
+        File.open(cookie_file, "w") { |file| file << cookie }
       end
     end
   end

data/lib/punk/core/boot.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../startup/logger'
-require_relative '../startup/environment'
-require_relative '../startup/task'
-require_relative '../startup/database'
-require_relative '../startup/cache'
+require_relative "../startup/logger"
+require_relative "../startup/environment"
+require_relative "../startup/task"
+require_relative "../startup/database"
+require_relative "../startup/cache"
 
 PUNK.store[:state] = :booted

data/lib/punk/core/cli.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../../punk'
+require_relative "../../punk"
 
-require 'highline/import'
+require "highline/import"
 
-PUNK.init(task: 'console', config: { app: { name: 'Punk!' } }).exec
+PUNK.init(task: "console", config: {app: {name: "Punk!"}}).exec
 
 PUNK.commands(:pry)
 

data/lib/punk/core/commander.rb

@@ -1,65 +1,65 @@
 # frozen_string_literal: true
 
 command :test do |c|
-  c.description = 'Run rubocop and rspec'
+  c.description = "Run rubocop and rspec"
   c.action do
-    say('Running tests...')
-    unless ENV['PUNK_ENV'] == 'test'
-      error('!!! PUNK_ENV should be test !!!')
+    say("Running tests...")
+    unless ENV["PUNK_ENV"] == "test"
+      error("!!! PUNK_ENV should be test !!!")
       exit 1 # rubocop:disable Rails/Exit
     end
     ENV.delete_if { |name, _value| name =~ /^PUNK_/ }
-    system('rubocop') &&
+    system("rubocop") &&
       # system('quasar build -m pwa') &&
-      system('PUNK_ENV=test rspec')
+      system("PUNK_ENV=test rspec")
     exit $CHILD_STATUS.exitstatus # rubocop:disable Rails/Exit
   end
 end
 
 command :console do |c|
-  c.description = 'Launch the console'
+  c.description = "Launch the console"
   c.action do
-    say(HighLine.color('🤘 Are you ready to rock?', :green, :bold))
-    path = File.join(__dir__, 'cli.rb')
+    say(HighLine.color("🤘 Are you ready to rock?", :green, :bold))
+    path = File.join(__dir__, "cli.rb")
     exec "pry -r #{path}"
   end
 end
 alias_command :c, :console
 
 command :server do |c|
-  c.description = 'Start the server'
+  c.description = "Start the server"
   c.action do
-    say('Starting server...')
-    exec 'puma -C ./config/puma.rb'
+    say("Starting server...")
+    exec "puma -C ./config/puma.rb"
   end
 end
 alias_command :s, :server
 
 command :worker do |c|
-  c.description = 'Start the worker'
+  c.description = "Start the worker"
   c.action do
-    say('Starting worker...')
-    path = File.join(__dir__, 'worker.rb')
+    say("Starting worker...")
+    path = File.join(__dir__, "worker.rb")
     exec "sidekiq -r #{path} -C ./config/sidekiq.yml"
   end
 end
 alias_command :w, :worker
 
-command 'env dump' do |c|
-  c.description = 'Display the environment'
+command "env dump" do |c|
+  c.description = "Display the environment"
   c.action do
-    say('Dumping env...')
+    say("Dumping env...")
     ap PUNK.get # rubocop:disable Rails/Output
   end
 end
 
-command 'db create' do |c|
-  c.description = 'Create the database (dropping it first if necessary)'
+command "db create" do |c|
+  c.description = "Create the database (dropping it first if necessary)"
   c.action do
-    say('Creating db...')
-    require 'sequel'
+    say("Creating db...")
+    require "sequel"
     database = File.basename(PUNK.get.db.url)
-    server = PUNK.get.db.url.gsub(/[^\/]+$/, 'postgres')
+    server = PUNK.get.db.url.gsub(/[^\/]+$/, "postgres")
     pg = Sequel.connect(server)
     pg.execute "DROP DATABASE IF EXISTS #{database}"
     pg.execute "CREATE DATABASE #{database}"
@@ -67,14 +67,14 @@ command 'db create' do |c|
   end
 end
 
-command 'db migrate' do |c|
-  c.description = 'Run database migrations'
-  c.option '-r', 'Number of versions to migrate, +ve for up and -ve for down', '--relative NUMBER', Integer
+command "db migrate" do |c|
+  c.description = "Run database migrations"
+  c.option "-r", "Number of versions to migrate, +ve for up and -ve for down", "--relative NUMBER", Integer
   c.action do |_args, options|
-    say('Migrating db...')
+    say("Migrating db...")
     PUNK.boot
     Sequel.extension :migration
-    migrations_path = File.join(PUNK.get.app.path, 'migrations')
+    migrations_path = File.join(PUNK.get.app.path, "migrations")
     if File.exist?(migrations_path)
       if options.relative.nil?
         Sequel::Migrator.run(PUNK.db, migrations_path)