shaf 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a160e3aeb1d9b86b59371417e6354d351acfbe9a90efde270b51a1fe2a307a88
-  data.tar.gz: d3c9eec43a5b5da8795e1e9396f8916be2458d235a14296c75646be25680b658
+  metadata.gz: 45e90f32663688a63993bcf1aa79c6c9b8667d11dbfc9a5fdba50141e983ea53
+  data.tar.gz: 919292b331cc09ce95031e4d1e723371114fef9e86b6d97c2e90e816befb0d77
 SHA512:
-  metadata.gz: '093623e69f3fdf57124cdabd6b01c00129fe77e479ec54aa5d3fdef252ec92fa93895b99708ca7c831421c11c838dbe9e034acec9546c96fc1a5f6197bd39211'
-  data.tar.gz: 4305a775fff58412125a1c984d27617c87fdd3d0fa1f20b798f6b47978aeafb34996bcd8f67b97f6ac1e3e1a2f117bf55c33f4e615af10bc0fdf917d61730231
+  metadata.gz: 788b01fd3f933f9e86ef99c9b51c14768208f73c5dc3cf4fe0a39fcb19078f82eb7eaaa2a1dcfc33d4d1a44980dc66254693a240b2e2b28d4a6e6b0d0383b676
+  data.tar.gz: a07510311e28e5008991d5461f9c2e97485640cd146a8304874bc216888eb722c941c266dc74b59b184ca3ea302b6a508a315421ed040dd64c2d111ea80548c7

data/lib/shaf/extensions.rb

@@ -1,11 +1,15 @@
 require 'shaf/extensions/resource_uris'
+require 'shaf/extensions/current_user'
 require 'shaf/extensions/authorize'
+require 'shaf/extensions/symbolic_routes'
 
 module Shaf
   def self.extensions
     [
       ResourceUris,
+      CurrentUser,
       Authorize,
+      SymbolicRoutes
     ]
   end
 end

data/lib/shaf/extensions/authorize.rb

@@ -19,7 +19,7 @@ module Shaf
 
   module Helpers
     def policy(resource)
-      return @policy if @policy
+      return @policy if defined?(@policy) && @policy
       user = current_user if respond_to? :current_user
       @policy = self.class.policy_class&.new(user, resource)
     end

data/lib/shaf/extensions/current_user.rb

@@ -0,0 +1,44 @@
+require 'digest'
+
+module Shaf
+  module CurrentUser
+    def self.registered(app)
+      return unless app.respond_to?(:current_user) && app.current_user
+
+      app.log.info 'Using Shaf::CurrentUser'
+      app.helpers Helpers
+    end
+
+    def lookup_user_with(&block)
+      unless block_given? && block.respond_to?(:call)
+        raise ArgumentError, '::lookup_user_with requires a block argument'
+      end
+      log.info 'Using custom current_user lookup'
+      Helpers.lookup_proc = block
+    end
+  end
+
+  module Helpers
+    class << self
+      attr_accessor :lookup_proc
+
+      def user_lookup(request, token)
+        return lookup_proc.call(token, request) if lookup_proc
+        return unless token
+        digest = Digest::SHA256.hexdigest(token)
+        User.where(auth_token_digest: digest).first
+      end
+    end
+
+    def current_user
+      return @current_user if defined?(@current_user)
+      header = settings.auth_token_header
+      token = request.env[header]
+      @current_user = Helpers.user_lookup(request, token)
+    end
+
+    def authenticated?
+      !current_user.nil?
+    end
+  end
+end

data/lib/shaf/extensions/resource_uris.rb

@@ -4,7 +4,8 @@ module Shaf
   module ResourceUris
     def resource_uris_for(*args)
       CreateUriMethods.new(*args).call
-      include UriHelper
+
+      include UriHelper unless self < UriHelper
     end
 
     def register_uri(name, uri)
@@ -13,6 +14,9 @@ module Shaf
       end
       method_string = MethodBuilder.as_string(name, uri)
       UriHelperMethods.eval_method(method_string)
+      UriHelperMethods.register(MethodBuilder.template_method_name(name)) { uri.dup.freeze }
+
+      include UriHelper unless self < UriHelper
     end
   end
 
@@ -31,6 +35,10 @@ module Shaf
   module UriHelper
     extend UriHelperMethods
     include UriHelperMethods
+
+    def self.included(mod)
+      mod.extend self
+    end
   end
 
   # This class register uri helper methods like:
@@ -39,6 +47,12 @@ module Shaf
   # new_book_uri          => /books/form
   # edit_book_uri(book)   => /books/5/edit
   #
+  # And uri template methods:
+  # books_uri_template             => /books
+  # book_uri_template              => /books/:id
+  # new_book_uri_template          => /books/form
+  # edit_book_uri_template         => /books/:id/edit
+  #
   class CreateUriMethods
     def initialize(name, base: nil, plural_name: nil)
       @name = name.to_s
@@ -62,17 +76,23 @@ module Shaf
     attr_reader :name, :base, :plural_name
 
     def register_resources_uri
-      uri = "#{base}/#{plural_name}"
-      UriHelperMethods.register "#{plural_name}_uri" do
-        uri.dup.freeze
-      end
+      uri = "#{base}/#{plural_name}".freeze
+
+      UriHelperMethods.register("#{plural_name}_uri") { uri }
+      UriHelperMethods.register("#{plural_name}_uri_template") { uri }
     end
 
     def register_resource_uri
       uri = "#{base}/#{plural_name}"
+
       UriHelperMethods.register "#{name}_uri" do |resrc|
         id = resrc.is_a?(Integer) ? resrc : resrc&.id
-        "#{uri}/#{id}".freeze unless id.nil?
+        raise ArgumentError, "id must be an integer! was #{id.class}" unless id.is_a?(Integer)
+        "#{uri}/#{id}".freeze
+      end
+
+      UriHelperMethods.register "#{name}_uri_template" do
+        "#{uri}/:id".freeze
       end
     end
 
@@ -83,27 +103,37 @@ module Shaf
       uri = "#{base}/#{plural_name}"
       UriHelperMethods.register "#{plural_name}_uri" do |resrc = nil|
         if resrc.nil?
-          uri.dup.freeze
+          uri.freeze
         else
-          id = resrc.is_a?(Integer) ? resrc : resrc&.id
-          "#{uri}/#{id}".freeze unless id.nil?
+          id = (resrc.is_a?(Integer) ? resrc : resrc.id).to_i
+          raise ArgumentError, "id must be an integer! was #{id.class}" unless id.is_a?(Integer)
+          "#{uri}/#{id}".freeze
         end
       end
+
+      UriHelperMethods.register "#{plural_name}_uri_template" do |collection = false|
+        (collection ? uri : "#{uri}/:id").freeze
+      end
     end
 
     def register_new_resource_uri
-      uri = "#{base}/#{plural_name}/form"
-      UriHelperMethods.register "new_#{name}_uri" do
-        uri.dup.freeze
-      end
+      uri = "#{base}/#{plural_name}/form".freeze
+
+      UriHelperMethods.register("new_#{name}_uri") { uri }
+      UriHelperMethods.register("new_#{name}_uri_template") { uri }
     end
 
     def register_edit_resource_uri
       uri = "#{base}/#{plural_name}"
+
       UriHelperMethods.register "edit_#{name}_uri" do |resrc|
         id = resrc.is_a?(Integer) ? resrc : resrc&.id
         "#{uri}/#{id}/edit".freeze unless id.nil?
       end
+
+      UriHelperMethods.register "edit_#{name}_uri_template" do
+        "#{uri}/:id/edit".freeze
+      end
     end
   end
 
@@ -113,6 +143,10 @@ module Shaf
         "#{name}_uri"
       end
 
+      def template_method_name(name)
+        "#{method_name(name)}_template"
+      end
+
       def signature(name, uri)
         args = extract_symbols(uri)
         s = method_name(name)

data/lib/shaf/extensions/symbolic_routes.rb

@@ -0,0 +1,27 @@
+module Shaf
+  module SymbolicRoutes
+    [
+      :get,
+      :put,
+      :post,
+      :patch,
+      :delete,
+      :head,
+      :options,
+      :link,
+      :unlink
+    ].each do |m|
+      define_method m do |path, &block|
+        super(rewrite_path(path), &block)
+      end
+    end
+
+    def rewrite_path(path)
+      return path unless path.is_a? Symbol
+
+      m = "#{path}_template"
+      raise "Don't know how to 'get #{path}'" unless respond_to? m
+      send m
+    end
+  end
+end

data/lib/shaf/formable.rb

@@ -1,7 +1,12 @@
 module Shaf
   module Formable
     class Field
-      attr_reader :name, :type, :value, :label
+      attr_reader :name, :type, :value, :label, :required
+
+      HTML_TYPE_MAPPINGS = {
+        'string' => 'text',
+        'boolean' => 'checkbox',
+      }.freeze
 
       def initialize(name, params = {})
         @name = name
@@ -9,6 +14,7 @@ module Shaf
         @label = params[:label]
         @has_value = params.key? :value
         @value = params[:value]
+        @required = params[:required] || false
       end
 
       def has_value?
@@ -32,8 +38,18 @@ module Shaf
       end
 
       def input_element
-        _value = value ? %Q( value="#{value.to_s}") : ""
-        %Q(<input type="#{type.to_s}" class="form--input" id="#{name.to_s}" name="#{name.to_s}"#{_value}>)
+        _value = value ? %Q(value="#{value.to_s}") : nil
+        _required = required ? "required" : nil
+        attributes = [
+          %Q(type="#{HTML_TYPE_MAPPINGS[type.to_s]}"),
+          'class="form--input"',
+          %Q(id="#{name.to_s}"),
+          %Q(name="#{name.to_s}"),
+        ]
+        attributes << %Q(value="#{value.to_s}") if value
+        attributes << "required" if required
+
+        "<input #{attributes.join(" ")}>"
       end
     end
 

data/lib/shaf/generator/policy.rb

@@ -35,6 +35,7 @@ module Shaf
       def opts
         {
           policy_class_name: "#{policy_name.capitalize}Policy",
+          name: policy_name,
           attributes: attributes,
         }
       end

data/lib/shaf/generator/templates/api/controller.rb.erb

@@ -2,52 +2,50 @@ require '<%= policy_file %>'
 
 class <%= controller_class_name %> < BaseController
 
+  authorize_with <%= policy_class_name %>
+
   resource_uris_for :<%= name %>
 
-  authorize_with <%= policy_class_name %>
+  get :<%= plural_name %>_uri do
+    authorize! :read
+    collection = paginate(<%= model_class_name %>.order(:created_at).reverse)
+    respond_with_collection collection, serializer: <%= serializer_class_name %>
+  end
 
-  get '/<%= plural_name %>/form' do
-    form = <%= model_class_name %>.create_form
-    form.self_link = new_<%= name %>_uri
-    form.href = <%= plural_name %>_uri
-    respond_with form
+  get :new_<%= name %>_uri do
+    authorize! :read
+    respond_with create_form
   end
 
-  get '/<%= plural_name %>/:id/edit' do
-    form = <%= name %>.edit_form
-    form.self_link = edit_<%= name %>_uri(<%= name %>)
-    form.href = <%= name %>_uri(<%= name %>)
-    respond_with form
+  post :<%= plural_name %>_uri do
+    authorize! :write
+    <%= name %> = <%= model_class_name %>.create(<%= name %>_params)
+    headers({ "Location" => <%= name %>_uri(<%= name %>) })
+    respond_with <%= name %>, status: 201
   end
 
-  get '/<%= plural_name %>/:id' do
+  get :<%= name %>_uri do
+    authorize! :read
     respond_with <%= name %>
   end
 
-  put '/<%= plural_name %>/:id' do
+  get :edit_<%= name %>_uri do
+    authorize! :read
+    respond_with edit_form
+  end
+
+  put :<%= name %>_uri do
     authorize! :write
     <%= name %>.update(<%= name %>_params)
     respond_with <%= name %>
   end
 
-  delete '/<%= plural_name %>/:id' do
+  delete :<%= name %>_uri do
     authorize! :write
     <%= name %>.destroy
     status 204
   end
 
-  get '/<%= plural_name %>' do
-    collection = paginate(<%= model_class_name %>.order(:created_at).reverse)
-    respond_with_collection collection, serializer: <%= serializer_class_name %>
-  end
-
-  post '/<%= plural_name %>' do
-    authorize! :write
-    <%= name %> = <%= model_class_name %>.create(<%= name %>_params)
-    headers({ "Location" => <%= name %>_uri(<%= name %>) })
-    respond_with <%= name %>, status: 201
-  end
-
   def <%= name %>_params
     # Generated method - TODO: Remove any params that should not be allowed!
     safe_params(<%= params.map { |p| ":#{p[0]}" }.join(', ') %>)
@@ -59,4 +57,17 @@ class <%= controller_class_name %> < BaseController
     end
   end
 
+  def create_form
+    <%= model_class_name %>.create_form.tap do |form|
+      form.self_link = new_<%= name %>_uri
+      form.href = <%= plural_name %>_uri
+    end
+  end
+
+  def edit_form
+    <%= name %>.edit_form.tap do |form|
+      form.self_link = edit_<%= name %>_uri(<%= name %>)
+      form.href = <%= name %>_uri(<%= name %>)
+    end
+  end
 end

data/lib/shaf/generator/templates/api/policy.rb.erb

@@ -3,6 +3,8 @@ class <%= policy_class_name %>
 
   # Auto generated policy: Update this file to suite your API!
  
+  alias :<%= name %> :resource
+
   <%= attributes.join("\n  ") %>
 
   link :up
@@ -16,11 +18,12 @@ class <%= policy_class_name %>
   end
 
   def read?
+    # FIXME!!
     true
   end
 
   def write?
-    # !!current_user
+    # FIXME!!
     true
   end
 end

data/lib/shaf/helpers.rb

@@ -1,7 +1,6 @@
 require 'shaf/helpers/payload'
 require 'shaf/helpers/json_html'
 require 'shaf/helpers/paginate'
-require 'shaf/helpers/session'
 
 module Shaf
   def self.helpers
@@ -9,7 +8,6 @@ module Shaf
       Payload,
       JsonHtml,
       Paginate,
-      Session,
     ]
   end
 end

data/lib/shaf/helpers/payload.rb

@@ -1,5 +1,7 @@
 module Shaf
   module Payload
+    EXCLUDED_FORM_PARAMS = ['captures', 'splat'].freeze
+
     def supported_response_types(resource)
       [
         mime_type(:hal),
@@ -39,7 +41,7 @@ module Shaf
 
     def parse_payload
       if request.env['CONTENT_TYPE'] == 'application/x-www-form-urlencoded'
-        return params.reject { |key,_| ['captures', 'splat'].include? key }
+        return params.reject { |key,_| EXCLUDED_FORM_PARAMS.include? key }
       end
 
       input = read_input
@@ -56,9 +58,11 @@ module Shaf
 
     def safe_params(*fields)
       return {} unless payload
+      field_strings = fields.map { |f| f.to_s.downcase }
+      field_strings << 'id' unless field_strings.include? 'id'
+
       {}.tap do |allowed|
-        fields.each do |field|
-          f = field.to_s.downcase
+        field_strings.each do |f|
           allowed[f.to_sym] = payload[f] if payload[f]
         end
       end

data/lib/shaf/spec/http_method_utils.rb

@@ -1,9 +1,9 @@
 module Shaf
   module Spec
-    module HttpMethodUtils
+    module HttpUtils
       include ::Rack::Test::Methods
 
-      [:get, :put, :post, :delete].each do |m|
+      [:get, :put, :patch, :post, :delete, :options, :head, :link, :unlink].each do |m|
         define_method m do |*args|
           set_headers
           super(*args)
@@ -16,9 +16,8 @@ module Shaf
       end
 
       def headers
-        last_response&.headers
+        last_response&.headers || {}
       end
-
     end
   end
 end

data/lib/shaf/spec/integration_spec.rb

@@ -2,7 +2,7 @@ module Shaf
   module Spec
     class IntegrationSpec < Minitest::Spec
       include Minitest::Hooks
-      include HttpMethodUtils
+      include HttpUtils
       include PayloadUtils
       include UriHelper
 
@@ -30,6 +30,8 @@ module Shaf
       def parse_response(body)
         return nil if body.empty?
         JSON.parse(body, symbolize_names: true)
+      rescue JSON::ParserError => e
+        assert e.nil?, "Could not parse reponse as json"
       end
 
       def app
@@ -46,6 +48,13 @@ module Shaf
         end
       end
 
+      def auth_token(token)
+        @__integration_test_auth_token = token
+      end
+
+      def clear_auth_token
+        @__integration_test_auth_token = nil
+      end
 
 #       def login(email, pass)
 #         params = {email: email, password: pass}

data/lib/shaf/spec/payload_utils.rb

@@ -3,42 +3,6 @@ require 'minitest/assertions'
 module Shaf
   module Spec
     module PayloadUtils
-
-      class Embedded
-        include HttpMethodUtils
-        include PayloadUtils
-        include Minitest::Assertions
-
-        # This is needed by Minitest::Assertions
-        # And we need that module to have all assert_*/refute_* methods
-        # available in this class
-        attr_accessor :assertions
-
-        def initialize(payload, context, block)
-          @payload = payload
-          @context = context
-          @block = block
-          @assertions = 0
-        end
-
-        def call(*args)
-          instance_exec(*args, &@block)
-        end
-
-        def method_missing(method, *args, &block)
-          if @context&.respond_to? method
-            define_singleton_method(method) { |*a, &b| @context.public_send(method, *a, &b) }
-            return public_send(method, *args, &block)
-          end
-          super
-        end
-
-        def respond_to_missing?(method, include_private = false)
-          return true if @context&.respond_to? method
-          super
-        end
-      end
-
       def set_payload(payload)
         @payload = payload
         @payload = JSON.parse(payload, symbolize_names: true) if payload.is_a?(String)
@@ -69,7 +33,7 @@ module Shaf
         assert_has_embedded name unless name.nil?
         keys = [:_embedded, name&.to_sym].compact
         return last_payload.dig(*keys) unless block_given?
-        Embedded.new(last_payload.dig(*keys), self, Proc.new).call
+        exec_embed_block(last_payload.dig(*keys), Proc.new)
       end
 
       def each_embedded(name, &block)
@@ -80,7 +44,7 @@ module Shaf
           "Embedded '#{name}' is not an instance of Array. Actual: #{list.class}"
 
         list.each_with_index do |resource, i|
-          Embedded.new(resource, self, block).call(i)
+          exec_embed_block(resource, block, i)
         end
       end
 
@@ -172,6 +136,15 @@ module Shaf
             "Response contains disallowed embedded resource with name '#{name}': #{last_payload}"
         end
       end
+
+      private
+
+      def exec_embed_block(payload, block, *args)
+        prev_payload = last_payload
+        set_payload(payload)
+        instance_exec(*args, &block)
+        set_payload(prev_payload)
+      end
     end
   end
 end

data/lib/shaf/tasks/test.rb

@@ -5,24 +5,28 @@ namespace :test do |ns|
     t.libs = %w(. api spec)
     t.pattern = "spec/integration/**/*_spec.rb"
     t.verbose = true
+    t.warning = false
   end
 
   Rake::TestTask.new(:models) do |t|
     t.libs = %w(. api spec)
     t.pattern = "spec/models/**/*_spec.rb"
     t.verbose = true
+    t.warning = false
   end
 
   Rake::TestTask.new(:serializers) do |t|
     t.libs = %w(. api spec)
     t.pattern = "spec/serializers/**/*_spec.rb"
     t.verbose = true
+    t.warning = false
   end
 
   Rake::TestTask.new(:lib) do |t|
     t.libs = %w(. api spec)
     t.pattern = "spec/lib/**/*_spec.rb"
     t.verbose = true
+    t.warning = false
   end
 
   Rake::TestTask.new(:all) do |t|
@@ -34,6 +38,7 @@ namespace :test do |ns|
       "spec/integration/**/*_spec.rb"
     ]
     t.verbose = true
+    t.warning = false
   end
 
 end

data/lib/shaf/version.rb

@@ -1,3 +1,3 @@
 module Shaf
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/templates/api/controllers/base_controller.rb

@@ -12,21 +12,28 @@ class BaseController < Sinatra::Base
     set :public_folder, ASSETS_DIR
     disable :dump_errors
     set :show_exceptions, :after_handler
+    enable :current_user
+    set :auth_token_header, AUTH_TOKEN_HEADER
   end
 
   use Rack::Deflater
-  register(*Shaf.extensions)
-  helpers(*Shaf.helpers)
 
   def self.inherited(controller)
     super
     Shaf::App.use controller
   end
 
-  def log
+  def self.log
     $logger
   end
 
+  def log
+    self.class.log
+  end
+
+  register(*Shaf.extensions)
+  helpers(*Shaf.helpers)
+
   before do
     log.info "Processing: #{request.request_method} #{request.path_info}"
     log.debug "Payload: #{payload || 'empty'}"

data/templates/api/controllers/docs_controller.rb

@@ -1,12 +1,13 @@
 class DocsController < BaseController
 
-  register_uri :doc_curie,    '/doc/:resource/rels/{rel}'
+  register_uri :doc_curie,      '/doc/:resource/rels/{rel}'
+  register_uri :documentation,  '/doc/:resource'
 
-  get '/doc/:resource/rels/:rel' do
+  get doc_curie_uri_template do
     doc.link(params[:rel])
   end
 
-  get '/doc/:resource' do
+  get documentation_uri_template do
     doc.to_s
   end
 

data/templates/api/controllers/root_controller.rb

@@ -2,7 +2,7 @@ class RootController < BaseController
 
   register_uri :root,    '/'
 
-  get '/' do
+  get root_uri do
     respond_with nil, serializer: RootSerializer
   end
 end

data/templates/api/serializers/form_serializer.rb

@@ -33,9 +33,13 @@ class FormSerializer
     fields = resource&.fields
     break if fields.nil? || fields.empty?
     hash[:fields] = fields.map do |field|
-      { name: field.name, type: field.type }.tap do |f|
+      {
+        name: field.name,
+        type: field.type,
+        label: field.label,
+      }.tap do |f|
         f[:value] = field.value if field.has_value?
-        f[:label] = field.label
+        f[:required] = true if field.required
       end
     end
   end

data/templates/config/constants.rb

@@ -1,5 +1,7 @@
 APP_ROOT = File.expand_path('../', __dir__)
 APP_DIR = File.expand_path('api', APP_ROOT)
+SRC_DIR = File.expand_path('src', APP_ROOT)
 VIEWS_DIR = File.join(APP_ROOT, Shaf::Settings.views_folder)
 ASSETS_DIR = File.join(APP_ROOT, Shaf::Settings.public_folder)
+AUTH_TOKEN_HEADER = 'HTTP_X_AUTH_TOKEN'
 PAGINATION_PER_PAGE = Shaf::Settings.paginate_per_page || 25

data/templates/config/directories.rb

@@ -21,7 +21,7 @@ def sort_files(files)
   end
 end
 
-Dir.chdir(APP_DIR) do
+def require_ruby_files
   files = Dir[File.join('**', '*.rb')]
   sort_files(files).each do |file|
     # load all files with .rb extension in subfolders of api
@@ -30,3 +30,15 @@ Dir.chdir(APP_DIR) do
   end
 end
 
+if Dir.exist? SRC_DIR
+  $:.unshift SRC_DIR
+
+  Dir.chdir(SRC_DIR) do
+    require_ruby_files
+  end
+end
+
+Dir.chdir(APP_DIR) do
+  require_ruby_files
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -31,7 +31,7 @@ cert_chain:
   CNZdF8Vavp6xMQbPHZwqjaeZz2WRXYS7jyYSvCunjwa3OtvXtfbIEGEWE6IM+t9k
   H1g6Q+B6qk9O6g==
   -----END CERTIFICATE-----
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -252,7 +252,9 @@ files:
 - lib/shaf/errors.rb
 - lib/shaf/extensions.rb
 - lib/shaf/extensions/authorize.rb
+- lib/shaf/extensions/current_user.rb
 - lib/shaf/extensions/resource_uris.rb
+- lib/shaf/extensions/symbolic_routes.rb
 - lib/shaf/formable.rb
 - lib/shaf/generator.rb
 - lib/shaf/generator/controller.rb
@@ -277,7 +279,6 @@ files:
 - lib/shaf/helpers/json_html.rb
 - lib/shaf/helpers/paginate.rb
 - lib/shaf/helpers/payload.rb
-- lib/shaf/helpers/session.rb
 - lib/shaf/middleware.rb
 - lib/shaf/middleware/request_id.rb
 - lib/shaf/registrable_factory.rb

data/lib/shaf/helpers/session.rb

@@ -1,53 +0,0 @@
-require 'digest'
-
-module Shaf
-  module Session
-
-    SESSION_TTL = 60 * 60 * 24 * 2 # 2 days
-
-    def login(email, password)
-      return unless email && password
-      user = User.first(email: email) or return
-      bcrypt = BCrypt::Password.new(user.password_digest)
-      return unless bcrypt == password
-      @current_user = user
-
-      Session.where(user_id: user.id).delete
-      params = {
-        user_id: user.id,
-        expire_at: Time.now + SESSION_TTL,
-      }
-      Session.create(params)
-    end
-
-    def extend_session(session)
-      return unless session
-      session.update(expire_at: Time.now + SESSION_TTL)
-      session.auth_token = request.env['HTTP_X_AUTH_TOKEN']
-      session
-    end
-
-    def logout
-      current_session&.destroy
-    end
-
-    def current_user
-      unless defined?(@current_user) && @current_user
-        return unless request.env.key? 'HTTP_X_AUTH_TOKEN'
-        digest = Digest::SHA256.hexdigest(request.env['HTTP_X_AUTH_TOKEN'])
-        session = Session.where(auth_token_digest: digest).first
-        @current_user = User[session.user_id] if session&.valid?
-      end
-      @current_user
-    end
-
-    def current_session
-      unless @current_session
-        return unless current_user
-        @current_session = Session.where(user_id: current_user.id).first
-      end
-      @current_session
-    end
-
-  end
-end