punk 0.3.6 → 0.4.1

data/lib/punk/core/commands.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-require_relative '../framework/command'
+require_relative "../framework/command"
 
 module PUNK
-  def self.commands(target, scope=nil)
-    path = File.expand_path(File.join(__dir__, '..', 'commands'))
+  def self.commands(target, scope = nil)
+    path = File.expand_path(File.join(__dir__, "..", "commands"))
     PUNK.profile_debug("commands", path: path) do
-      Dir.glob(File.join(path, '**/*.rb')).sort.each { |file| require(file) }
+      Dir.glob(File.join(path, "**/*.rb")).sort.each { |file| require(file) }
     end
-    path = File.expand_path(File.join(PUNK.get.app.path, 'commands'))
+    path = File.expand_path(File.join(PUNK.get.app.path, "commands"))
     PUNK.profile_debug("commands", path: path) do
-      Dir.glob(File.join(path, '**/*.rb')).sort.each { |file| require(file) }
+      Dir.glob(File.join(path, "**/*.rb")).sort.each { |file| require(file) }
     end
     case target
     when :commander
-      require_relative 'commander'
+      require_relative "commander"
       Command.commander
     when :pry
-      require_relative 'pry'
+      require_relative "pry"
       Command.pry
     when :spec
       Command.spec(scope)

data/lib/punk/core/env.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'active_support/string_inquirer'
+require "active_support/string_inquirer"
 
-require 'date'
-require 'fileutils'
-require 'dotenv'
+require "date"
+require "fileutils"
+require "dotenv"
 
 module PUNK
   class Env < Settings
     def logger
-      SemanticLogger['PUNK::Env']
+      SemanticLogger["PUNK::Env"]
     end
 
     def initialize(*args)
@@ -47,10 +47,10 @@ module PUNK
     private
 
     def _load
-      _load_environment(File.join(PUNK.store.args.path, '..', 'env'), ENV.fetch('PUNK_ENV'), PUNK.store.args.task)
+      _load_environment(File.join(PUNK.store.args.path, "..", "env"), ENV.fetch("PUNK_ENV"), PUNK.store.args.task)
       @schema = {}
-      _load_schemas(File.join(__dir__, '..', 'config'), ENV.fetch('PUNK_ENV'), PUNK.store.args.task)
-      _load_schemas(File.join(PUNK.store.args.path, 'config'), ENV.fetch('PUNK_ENV'), PUNK.store.args.task)
+      _load_schemas(File.join(__dir__, "..", "config"), ENV.fetch("PUNK_ENV"), PUNK.store.args.task)
+      _load_schemas(File.join(PUNK.store.args.path, "config"), ENV.fetch("PUNK_ENV"), PUNK.store.args.task)
       @values = @schema.keys.zip(Array.new(@schema.length, nil)).to_h
       _add_config(
         task: PUNK.store.args.task,
@@ -58,8 +58,8 @@ module PUNK
           path: PUNK.store.args.path
         }
       )
-      _load_configs(File.join(__dir__, '..', 'config'), ENV.fetch('PUNK_ENV'), PUNK.store.args.task)
-      _load_configs(File.join(PUNK.store.args.path, 'config'), ENV.fetch('PUNK_ENV'), PUNK.store.args.task)
+      _load_configs(File.join(__dir__, "..", "config"), ENV.fetch("PUNK_ENV"), PUNK.store.args.task)
+      _load_configs(File.join(PUNK.store.args.path, "config"), ENV.fetch("PUNK_ENV"), PUNK.store.args.task)
       _add_environment
       _add_arguments
       _validate
@@ -84,7 +84,7 @@ module PUNK
     def _unflatten(data)
       results = {}
       data.each do |key, value|
-        name = key.join('.')
+        name = key.join(".")
         search = results
         while key.length > 1
           item = key.shift
@@ -108,12 +108,12 @@ module PUNK
         required = false
         key.map! do |name|
           match = /^(_?)([a-z_]+)(!?)$/.match(name)
-          raise InternalServerError, "Invalid schema key: #{key.join('.')}" if match.nil?
-          override &&= match[1] != '_'
-          required ||= match[3] == '!'
+          raise InternalServerError, "Invalid schema key: #{key.join(".")}" if match.nil?
+          override &&= match[1] != "_"
+          required ||= match[3] == "!"
           match[2].to_sym
         end
-        raise InternalServerError, "Duplicate schema key: #{key.join('.')}" if @schema.key?(key)
+        raise InternalServerError, "Duplicate schema key: #{key.join(".")}" if @schema.key?(key)
         @schema[key] = {
           required: required,
           override: override,
@@ -122,9 +122,9 @@ module PUNK
       end
     end
 
-    def _load_schemas(base, name=nil, dir=nil)
+    def _load_schemas(base, name = nil, dir = nil)
       base = File.expand_path(base)
-      _load_schema(File.join(base, 'schema.json'))
+      _load_schema(File.join(base, "schema.json"))
       _load_schema(File.join(base, "schema_#{name}.json")) unless name.nil?
       _load_schemas(File.join(base, dir), name) unless dir.nil?
     end
@@ -133,7 +133,7 @@ module PUNK
       @schema.each do |key, value|
         next unless value[:required]
         current_value = @values[key]
-        raise InternalServerError, "Missing required configuration value: #{key.join('.')}" if current_value.nil?
+        raise InternalServerError, "Missing required configuration value: #{key.join(".")}" if current_value.nil?
       end
     end
 
@@ -212,16 +212,16 @@ module PUNK
         else
           raise InternalServerError, "Unknown validation: #{validation}"
         end
-      raise InternalServerError, "#{value} is invalid for #{key.join('.')}: #{validation}" unless valid
+      raise InternalServerError, "#{value} is invalid for #{key.join(".")}: #{validation}" unless valid
       value
     end
 
     def _add_value(key, value)
       schema = @schema[key]
-      raise InternalServerError, "Configuration not found in schema: #{key.join('.')}" if schema.nil?
+      raise InternalServerError, "Configuration not found in schema: #{key.join(".")}" if schema.nil?
       unless schema[:override]
         current_value = @values[key]
-        raise InternalServerError, "Cannot override configuration value: #{key.join('.')}" unless current_value.nil?
+        raise InternalServerError, "Cannot override configuration value: #{key.join(".")}" unless current_value.nil?
       end
       @values[key] = _typecast(key, value, schema[:validate], schema[:required])
     end
@@ -238,9 +238,9 @@ module PUNK
       _add_config(ActiveSupport::JSON.decode(File.read(path)))
     end
 
-    def _load_configs(base, name=nil, dir=nil)
+    def _load_configs(base, name = nil, dir = nil)
       base = File.expand_path(base)
-      _load_config(File.join(base, 'defaults.json'))
+      _load_config(File.join(base, "defaults.json"))
       _load_config(File.join(base, "#{name}.json")) unless name.nil?
       _load_configs(File.join(base, dir), name) unless dir.nil?
     end
@@ -251,12 +251,12 @@ module PUNK
       Dotenv.load(path)
     end
 
-    def _load_environment(base, name=nil, dir=nil)
+    def _load_environment(base, name = nil, dir = nil)
       base = File.expand_path(base)
       _load_environment(File.join(base, dir), name) unless dir.nil?
-      _load_dotenv(File.join(base, 'locals.sh'))
+      _load_dotenv(File.join(base, "locals.sh"))
       _load_dotenv(File.join(base, "#{name}.sh"))
-      _load_dotenv(File.join(base, 'defaults.sh'))
+      _load_dotenv(File.join(base, "defaults.sh"))
     end
 
     def _add_environment
@@ -264,7 +264,7 @@ module PUNK
         key = key.downcase
         match = /^punk_(.*)$/.match(key)
         next unless match
-        key = match[1].split('_').reject(&:empty?).map(&:to_sym)
+        key = match[1].split("_").reject(&:empty?).map(&:to_sym)
         _add_value(key, value)
       end
     end

data/lib/punk/core/exec.rb

@@ -7,24 +7,24 @@ module PUNK
       if PUNK.get.app.reloadable?
         PUNK.loader.require(path)
       else
-        Dir.glob(File.join(path, '**/*.rb')).sort.each { |file| require(file) }
+        Dir.glob(File.join(path, "**/*.rb")).sort.each { |file| require(file) }
       end
     end
   end
 end
 
 PUNK::Interface.register(:loader) do
-  require 'rack/unreloader'
+  require "rack/unreloader"
   raise PUNK::InternalServerError, "App is not reloadable" unless PUNK.get.app.reloadable?
   retval = Rack::Unreloader.new { PUNK::App }
-  require_relative './monkey_unreloader'
+  require_relative "./monkey_unreloader"
   retval
 end
 
 PUNK::Interface.register(:app) do
-  require_relative 'app'
-  PUNK.require_all(File.join(__dir__, '..', 'routes'))
-  PUNK.require_all(File.join(PUNK.get.app.path, 'routes'))
+  require_relative "app"
+  PUNK.require_all(File.join(__dir__, "..", "routes"))
+  PUNK.require_all(File.join(PUNK.get.app.path, "routes"))
   retval = PUNK.get.app.reloadable ? PUNK.loader : PUNK::App.freeze.app
   SemanticLogger.flush
   retval
@@ -32,8 +32,8 @@ end
 
 PUNK.inject :loader, :app
 
-['actions', 'models', 'views', 'services', 'workers'].each do |dir|
-  PUNK.require_all(File.join(__dir__, '..', dir))
+["actions", "models", "views", "services", "workers"].each do |dir|
+  PUNK.require_all(File.join(__dir__, "..", dir))
   PUNK.require_all(File.join(PUNK.get.app.path, dir))
 end
 

data/lib/punk/core/interface.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'active_support/dependencies/autoload'
-require 'active_support/core_ext'
-require 'active_support/json'
+require "active_support/dependencies/autoload"
+require "active_support/core_ext"
+require "active_support/json"
 
-require 'oj'
+require "oj"
 Oj.optimize_rails
 
-require 'forwardable'
-require 'dim'
+require "forwardable"
+require "dim"
 
-require_relative 'version'
-require_relative 'error'
-require_relative 'monkey'
+require_relative "version"
+require_relative "error"
+require_relative "monkey"
 
 module PUNK
   extend SingleForwardable
@@ -27,30 +27,30 @@ module PUNK
 end
 
 PUNK::Interface.register(:store) do
-  require 'ostruct'
+  require "ostruct"
   store = OpenStruct.new
   store.state = :included
   Thread.current[:rr] = store
 end
 
 PUNK::Interface.register(:bootstrap) do
-  raise PUNK::InternalServerError, 'Must call PUNK.init first!' if PUNK.state != :initialised
-  require_relative 'settings'
-  require_relative 'logger'
+  raise PUNK::InternalServerError, "Must call PUNK.init first!" if PUNK.state != :initialised
+  require_relative "settings"
+  require_relative "logger"
 end
 
 PUNK::Interface.register(:config) do |c|
   c.bootstrap
-  PUNK.profile_trace('config') do
-    require_relative 'env'
+  PUNK.profile_trace("config") do
+    require_relative "env"
     PUNK.get.load!
-    require_relative 'commands'
+    require_relative "commands"
   end
 end
 
 PUNK::Interface.register(:boot) do |c|
   c.config
-  retval = PUNK.profile_trace('boot') { require_relative 'boot' }
+  retval = PUNK.profile_trace("boot") { require_relative "boot" }
   PUNK.logger.info "Punk! v#{PUNK.version}"
   PUNK.db.fetch("SELECT version(), timeofday()") do |row|
     row.each_value { |value| PUNK.logger.info value }
@@ -60,12 +60,12 @@ end
 
 PUNK::Interface.register(:load) do |c|
   c.boot
-  PUNK.profile_debug('load') { require_relative 'load' }
+  PUNK.profile_debug("load") { require_relative "load" }
 end
 
 PUNK::Interface.register(:exec) do |c|
   c.load
-  retval = PUNK.profile_debug('exec') { require_relative 'exec' }
+  retval = PUNK.profile_debug("exec") { require_relative "exec" }
   PUNK.logger.tagged(PUNK.env, PUNK.task) do
     PUNK.logger.info PUNK.get.app.name
   end

data/lib/punk/core/load.rb

@@ -2,7 +2,7 @@
 
 PUNK.db
 
-require_relative '../helpers/all'
-require_relative '../framework/all'
+require_relative "../helpers/all"
+require_relative "../framework/all"
 
 PUNK.store[:state] = :loaded

data/lib/punk/core/logger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'semantic_logger'
+require "semantic_logger"
 
 module PUNK
   include SemanticLogger::Loggable
@@ -22,9 +22,9 @@ module PUNK
 
   SemanticLogger.default_level =
     case PUNK.store.args.task
-    when 'console', 'script'
+    when "console", "script"
       :info
-    when 'spec'
+    when "spec"
       :debug
     else
       :trace

data/lib/punk/core/monkey.rb

@@ -2,6 +2,6 @@
 
 class Hash
   def sanitize
-    merge(slice(:password, :secret, 'password', 'secret').transform_values { "***" })
+    merge(slice(:password, :secret, "password", "secret").transform_values { "***" })
   end
 end

data/lib/punk/core/pry.rb

@@ -22,9 +22,9 @@ ensure
 end
 
 def reload!
-  ['actions', 'models', 'views', 'services', 'workers'].each do |dir|
+  ["actions", "models", "views", "services", "workers"].each do |dir|
     path = File.join(PUNK.get.app.path, dir)
-    Dir.glob(File.join(path, '**/*.rb')).each { |file| load(file) }
+    Dir.glob(File.join(path, "**/*.rb")).each { |file| load(file) }
   end
   "Reloaded all actions, models, views, services and workers."
 ensure

data/lib/punk/core/settings.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'dot_hash'
+require "dot_hash"
 
 module PUNK
   class Settings < DotHash::Settings
-    alias key? has_key?
+    alias_method :key?, :has_key?
 
     delegate :inspect, to: :_inspect_hash
 
@@ -13,9 +13,9 @@ module PUNK
       if match && key?(match[1]) && !key?(key)
         value = execute(match[1], *args, &block)
         case match[2]
-        when '?'
+        when "?"
           return value if value.is_a?(TrueClass) || value.is_a?(FalseClass)
-        when '!'
+        when "!"
           raise InternalServerError, "Value is nil: #{key}" if value.nil?
           return value
         end

data/lib/punk/core/version.rb

@@ -2,6 +2,6 @@
 
 module PUNK
   def self.version
-    File.read(File.join(__dir__, '..', '..', '..', 'VERSION'))
+    File.read(File.join(__dir__, "..", "..", "..", "VERSION"))
   end
 end

data/lib/punk/core/worker.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../punk'
-require 'sidekiq'
-require 'sidekiq-cron'
+require_relative "../../punk"
+require "sidekiq"
+require "sidekiq-cron"
 
-PUNK.init(task: 'worker', config: { app: { name: 'Roadie' } }).exec
+PUNK.init(task: "worker", config: {app: {name: "Roadie"}}).exec
 
-Sidekiq.logger = SemanticLogger['PUNK::SKQ']
+Sidekiq.logger = SemanticLogger["PUNK::SKQ"]
 Sidekiq.logger.class.alias_method(:with_context, :tagged)
 
-path = File.expand_path(File.join(PUNK.get.app.path, '..', 'config', 'schedule.yml'))
+path = File.expand_path(File.join(PUNK.get.app.path, "..", "config", "schedule.yml"))
 Sidekiq::Cron::Job.load_from_hash(YAML.load_file(path))

data/lib/punk/framework/all.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'plugins/all'
-require_relative 'model'
-require_relative 'runnable'
-require_relative 'service'
-require_relative 'worker'
-require_relative 'action'
-require_relative 'view'
-require_relative 'command'
+require_relative "plugins/all"
+require_relative "model"
+require_relative "runnable"
+require_relative "service"
+require_relative "worker"
+require_relative "action"
+require_relative "view"
+require_relative "command"

data/lib/punk/framework/model.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'aasm'
+require "aasm"
 
 AASM::Configuration.hide_warnings = true
 
@@ -22,17 +22,18 @@ module PUNK
 
     plugin PUNK::Plugins::Validation
 
-    def validate; end
+    def validate
+    end
 
     def inspect
       id.present? ? "#{id}|#{self}" : to_s
     end
 
-    def self.sample_dataset(count=1)
-      order(Sequel.lit('random()')).limit(count)
+    def self.sample_dataset(count = 1)
+      order(Sequel.lit("random()")).limit(count)
     end
 
-    def self.sample(count=1)
+    def self.sample(count = 1)
       query = sample_dataset(count)
       count == 1 ? query.first : query.all
     end