punk 0.1.4 → 0.2.0

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module PUNK
+  class VerifySessionAction < Action
+    args :session, :secret
+
+    def validate
+      validates_not_null :session
+      validates_not_empty :session
+      return if session.blank?
+      validates_not_null :secret
+      return if secret.blank?
+      validates_type Session, :session
+      validates_state :session, :pending
+      validates_event :session, :verify
+    end
+
+    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!'
+    end
+  end
+end

data/lib/punk/actions/tenants/list.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module PUNK
+  class ListTenantsAction < Action
+    args :user
+
+    def validate
+      validates_not_null :user
+      validates_not_empty :user
+      return if user.blank?
+      validates_type User, :user
+    end
+
+    def process
+      present ListTenantsView, tenants: user.tenants_dataset.order(:name).all
+    end
+  end
+end

data/lib/punk/actions/users/list_group.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module PUNK
+  class ListGroupUsersAction < Action
+    args :group
+
+    def validate
+      validates_not_null :group
+      validates_not_empty :group
+      return if group.blank?
+      validates_type Group, :group
+    end
+
+    def process
+      present ListUsersView, users: group.users
+    end
+  end
+end

data/lib/punk/actions/users/list_tenant.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module PUNK
+  class ListTenantUsersAction < Action
+    args :tenant
+
+    def validate
+      validates_not_null :tenant
+      validates_not_empty :tenant
+      return if tenant.blank?
+      validates_type Tenant, :tenant
+    end
+
+    def process
+      present ListUsersView, users: tenant.users
+    end
+  end
+end

data/lib/punk/actions/users/show.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module PUNK
+  class ShowUserAction < Action
+    args :user
+
+    def validate
+      validates_not_null :user
+      validates_not_empty :user
+      return if user.blank?
+      validates_type User, :user
+    end
+
+    def process
+      present ShowUserView, user: user
+    end
+  end
+end

data/lib/punk/commands/list.rb

@@ -4,25 +4,31 @@ PUNK::Command.create "list" do
   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'
       PUNK.app
-      PUNK::App.route_list
+      PUNK::App.route_list # TODO: exclude PUNK routes by default
     when 'actions'
-      ObjectSpace.each_object(PUNK::Action.singleton_class).map(&:name).reject { |name| name.nil? || name =~ /^PUNK/ }
+      ObjectSpace.each_object(PUNK::Action.singleton_class).map(&:name).reject { |name| _hide?(name) }
     when 'models'
-      ObjectSpace.each_object(PUNK::Model.singleton_class).map(&:name).reject { |name| name.nil? || name =~ /^PUNK/ }
+      ObjectSpace.each_object(PUNK::Model.singleton_class).map(&:name).reject { |name| _hide?(name) }
     when 'views'
-      ObjectSpace.each_object(PUNK::View.singleton_class).map(&:name).reject { |name| name.nil? || name =~ /^PUNK/ }
+      ObjectSpace.each_object(PUNK::View.singleton_class).map(&:name).reject { |name| _hide?(name) }
     when 'services'
-      ObjectSpace.each_object(PUNK::Service.singleton_class).select { |klass| klass.superclass == PUNK::Service }.map(&:name).reject { |name| name.nil? || name =~ /^PUNK/ }
+      ObjectSpace.each_object(PUNK::Service.singleton_class).select { |klass| klass.superclass == PUNK::Service }.map(&:name).reject { |name| _hide?(name) }
     when 'workers'
-      ObjectSpace.each_object(PUNK::Worker.singleton_class).select { |klass| klass.superclass == PUNK::Worker }.map(&:name).reject { |name| name.nil? || name =~ /^PUNK/ }
+      ObjectSpace.each_object(PUNK::Worker.singleton_class).select { |klass| klass.superclass == PUNK::Worker }.map(&:name).reject { |name| _hide?(name) }
     when '', 'help'
       "? specify one of: routes, actions, models, views, services, workers"
     else
       "? unkown arguments: #{args.join(',')}"
     end
   end
+
+  def _hide?(name)
+    name.nil? || (name =~ /^PUNK/) && !opts[:all]
+  end
 end

data/lib/punk/config/defaults.json

@@ -30,6 +30,9 @@
     "api_key": "$USERSTACK_API_KEY",
     "use_ssl": false
   },
+  "ipstack": {
+    "api_key": "$IPSTACK_ACCESS_KEY"
+  },
   "db": {
     "url": "$DATABASE_URL"
   },

data/lib/punk/config/schema.json

@@ -32,6 +32,9 @@
     "api_key": "String",
     "use_ssl": "Flag"
   },
+  "ipstack": {
+    "api_key": "String"
+  },
   "log": {
     "enabled!": "Flag",
     "type!": "Enum(stdout, stderr, file)",

data/lib/punk/core/app.rb

@@ -23,7 +23,7 @@ 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', '*'))}"
+    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
@@ -88,8 +88,7 @@ module PUNK
 
     def require_session!
       begin
-        # TODO
-        @_current_session = nil # Session[request.session['session_id']]
+        @_current_session = Session[request.session['session_id']]
         if @_current_session&.active?
           @_current_session.touch
         else
@@ -192,9 +191,8 @@ module PUNK
       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']
-      # TODO
-      # 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.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.push_tags(name)
       _set_cookie(request.env)

data/lib/punk/core/commander.rb

@@ -74,10 +74,13 @@ command 'db migrate' do |c|
     say('Migrating db...')
     PUNK.boot
     Sequel.extension :migration
-    if options.relative.nil?
-      Sequel::Migrator.run(PUNK.db, File.join(PUNK.get.app.path, 'migrations'))
-    else
-      Sequel::Migrator.run(PUNK.db, File.join(PUNK.get.app.path, 'migrations'), relative: options.relative)
+    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)
+      else
+        Sequel::Migrator.run(PUNK.db, migrations_path, relative: options.relative)
+      end
     end
     database = File.basename(PUNK.get.db.url)
     `pg_dump #{database} --schema-only > schema.psql`

data/lib/punk/core/exec.rb

@@ -23,6 +23,7 @@ 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'))
   retval = PUNK.get.app.reloadable ? PUNK.loader : PUNK::App.freeze.app
   SemanticLogger.flush
@@ -32,6 +33,7 @@ end
 PUNK.inject :loader, :app
 
 ['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/load.rb

@@ -4,6 +4,5 @@ PUNK.db
 
 require_relative '../helpers/all'
 require_relative '../framework/all'
-require_relative '../views/all'
 
 PUNK.store[:state] = :loaded

data/lib/punk/framework/command.rb

@@ -71,7 +71,11 @@ module PUNK
         define_method(:options) do |opt|
           punk_command = PUNK.store.commands[match]
           punk_command.instance_variable_get(:@options).each_value do |option|
-            opt.on option[:shortcut], option[:name], option[:description], argument: true, as: option[:type]
+            if option[:type].present?
+              opt.on option[:shortcut], option[:name], option[:description], argument: true, as: option[:type]
+            else
+              opt.on option[:shortcut], option[:name], option[:description]
+            end
           end
         end
         define_method(:process) do

data/lib/punk/framework/plugins/validation.rb

@@ -28,20 +28,6 @@ module PUNK
           end
         end
 
-        def validates_parse_id(atts, opts={})
-          default = { message: "is not a Parse ID" }
-          validatable_attributes(atts, default.merge(opts)) do |_name, value, message|
-            message unless /^[[:alnum:]]{10}$/.match(value)
-          end
-        end
-
-        def validates_subdomain(atts, opts={})
-          default = { message: "is not a subdomain" }
-          validatable_attributes(atts, default.merge(opts)) do |_name, value, message|
-            message unless /^[A-Za-z0-9](?:[A-Za-z0-9\-]{0,61}[A-Za-z0-9])?$/.match(value)
-          end
-        end
-
         def validates_state(name, state)
           errors.add(name, "is not in #{state} state") unless self[name].send("#{state}?")
         end

data/lib/punk/helpers/loggable.rb

@@ -22,7 +22,7 @@ module PUNK
 
     def exception(e, extra={})
       if ENV.key?('SENTRY_DSN')
-        ::Raven.capture_exception(
+        ::Sentry.capture_exception(
           e,
           message: e.message,
           extra: extra,

data/lib/punk/migrations/001_punk.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+def _tenants
+  create_table :tenants do
+    uuid :id, primary_key: true, default: Sequel.function(:gen_random_uuid)
+    punk_state :state, null: false, default: 'created'
+    String :name, null: false, text: true
+    String :icon, text: true
+    jsonb :data, default: '{}'
+    DateTime :created_at
+    DateTime :updated_at
+  end
+end
+
+def _users
+  create_table :users do
+    uuid :id, primary_key: true, default: Sequel.function(:gen_random_uuid)
+    punk_state :state, null: false, default: 'created'
+    String :name, null: false, text: true
+    String :icon, text: true
+    String :email, text: true, unique: true
+    String :phone, text: true, unique: true
+    jsonb :data, default: '{}'
+    DateTime :created_at
+    DateTime :updated_at
+  end
+end
+
+def _tenants_users
+  create_table :tenants_users do
+    primary_key [:tenant_id, :user_id]
+    foreign_key :tenant_id, :tenants, null: false, type: :uuid
+    foreign_key :user_id, :users, null: false, type: :uuid
+    index [:tenant_id, :user_id]
+  end
+end
+
+def _groups
+  create_table :groups do
+    uuid :id, primary_key: true, default: Sequel.function(:gen_random_uuid)
+    punk_state :state, null: false, default: 'created'
+    String :name, null: false, text: true
+    String :icon, text: true
+    jsonb :data, default: '{}'
+    DateTime :created_at
+    DateTime :updated_at
+    foreign_key :tenant_id, :tenants, null: false, type: :uuid
+  end
+end
+
+def _groups_users
+  create_table :groups_users do
+    primary_key [:group_id, :user_id]
+    foreign_key :group_id, :groups, null: false, type: :uuid
+    foreign_key :user_id, :users, null: false, type: :uuid
+    index [:group_id, :user_id]
+  end
+end
+
+def _identities
+  create_enum(:claim_type, %w[email phone])
+  create_table :identities do
+    uuid :id, primary_key: true, default: Sequel.function(:gen_random_uuid)
+    punk_state :state, null: false, default: 'created'
+    claim_type :claim_type, null: false
+    String :claim, text: true, null: false, unique: true
+    jsonb :data, default: '{}'
+    DateTime :created_at
+    DateTime :updated_at
+    foreign_key :user_id, :users, null: true, type: :uuid
+  end
+end
+
+def _sessions
+  create_enum(:session_state, %w[pending created active deleted expired])
+  create_table :sessions do
+    uuid :id, primary_key: true, default: Sequel.function(:gen_random_uuid)
+    uuid :slug, default: Sequel.function(:gen_random_uuid)
+    session_state :state, null: false, default: 'created'
+    File :salt, text: true
+    File :hash, text: true
+    Integer :attempt_count, null: false, default: 0
+    cidr :remote_addr, null: false, default: '127.0.0.1'
+    String :user_agent, text: true, null: false, default: 'Mozilla/5.0 (compatible; Punk!; +https://punk.kranzky.com)'
+    jsonb :data, default: '{}'
+    DateTime :created_at
+    DateTime :updated_at
+    foreign_key :identity_id, :identities, null: false, type: :uuid
+  end
+end
+
+PUNK.migration do
+  change do
+    create_enum(:punk_state, %w[created active deleted])
+    _tenants
+    _users
+    _tenants_users
+    _groups
+    _groups_users
+    _identities
+    _sessions
+  end
+end

data/lib/punk/models/group.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module PUNK
+  # @model
+  # @property id(required) [string] a unique identifier for the group
+  # @property name(required) [string] the name of the group
+  # @property icon(required) [string] an image URL
+  class Group < PUNK::Model
+    alias to_s name
+
+    many_to_one :tenant
+    many_to_many :users
+
+    def validate
+      validates_presence :tenant
+      validates_presence :name
+      validates_url :icon, allow_blank: true
+    end
+  end
+end

data/lib/punk/models/group_user_metadata.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module PUNK
+  class GroupUserMetadata < PUNK::Model(:groups_users)
+    many_to_one :group
+    many_to_one :user
+
+    def validate
+      validates_presence :group
+      validates_presence :user
+    end
+
+    def to_s
+      "#{group_id}|#{user_id}"
+    end
+  end
+end

data/lib/punk/models/identity.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module PUNK
+  class Identity < PUNK::Model
+    alias to_s claim
+
+    many_to_one :user
+    one_to_many :sessions
+
+    symbolize :claim_type
+
+    def validate
+      validates_presence :claim
+      validates_presence :claim_type
+      validates_unique :claim
+      validates_includes [:email, :phone], :claim_type
+      validates_email :claim if email?
+      validates_phone :claim if phone?
+    end
+
+    def email?
+      claim_type == :email
+    end
+
+    def phone?
+      claim_type == :phone
+    end
+  end
+end