ditty 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c1aeccd30ff2045fdc743913e43590e7cc5ca03
-  data.tar.gz: 5c85c18dfd395210a4c64a11b9d801d8afaf2360
+  metadata.gz: 2b443ee45c38fca3c0f69379d0631b03f1f91263
+  data.tar.gz: 3b26f6324b6979e1e517c6338e41cb994dce80c0
 SHA512:
-  metadata.gz: 9152764039916756b7c355de8466597f83f64921122e969f5dec13a5376c3310ab4d2c5e95576abf583bc86aa6a0ad0e1a60a7c3fdb0a8cde3b5946523d3fd22
-  data.tar.gz: c1df6170f906e47a460abb59a52ee4054ae5434daa926c6da8062cecda9e1554227efdfb936fd5204a848436cb08af55d1a7bcffa5b8f05870c8fba7fb57513d
+  metadata.gz: 6794d0ac24c5fa6f0e95bd98e90cf8456f42b12c3cc8b3c0f3933f76a01912e1f62a798eddbc0076068351077b08d9e80e1071305630a256a9f27a78091071c3
+  data.tar.gz: 4356aa0fca5ffd090d90a39450d2d8f5dfa90286aa9d0c66e7708ded6e1669d1cfa853ea5d4dbab9dc34476c233e0f2e72b5bed759833b82f55cd7b52de561b3

data/.travis.yml

@@ -11,6 +11,9 @@ before_install:
   - gem install bundler -v 1.12.5
 before_script:
   - bundle exec rake ditty:prep
+script:
+  - bundle exec rake
+  - bundle exec rubocop --fail-level W lib views
 addons:
   code_climate:
     repo_token: 289860573c6284a8e277de86848caba84d840be49e35f3601bcd672ab40d1e35

data/lib/ditty/controllers/application.rb

@@ -50,22 +50,62 @@ module Ditty
     end
 
     not_found do
-      haml :'404', locals: { title: '4 oh 4' }
+      respond_to do |format|
+        format.html do
+          haml :'404', locals: { title: '4 oh 4' }
+        end
+        format.json do
+          [404, { 'Content-Type' => 'application/json' }, [{ code: 404, errors: ['Not Found'] }.to_json]]
+        end
+      end
     end
 
     error do
       error = env['sinatra.error']
-      haml :error, locals: { title: 'Something went wrong', error: error }
+      broadcast(:application_error, error)
+      respond_to do |format|
+        format.html do
+          haml :error, locals: { title: 'Something went wrong', error: error }
+        end
+        format.json do
+          [500, { 'Content-Type' => 'application/json' }, [{ code: 500, errors: ['Something went wrong'] }.to_json]]
+        end
+      end
     end
 
     error Helpers::NotAuthenticated do
-      flash[:warning] = 'Please log in first.'
-      redirect "#{settings.map_path}/auth/identity"
+      respond_to do |format|
+        format.html do
+          flash[:warning] = 'Please log in first.'
+          redirect "#{settings.map_path}/auth/identity"
+        end
+        format.json do
+          [401, { 'Content-Type' => 'application/json' }, [{ code: 401, errors: ['Not Authenticated'] }.to_json]]
+        end
+      end
     end
 
     error ::Pundit::NotAuthorizedError do
-      flash[:warning] = 'Please log in first.'
-      redirect "#{settings.map_path}/auth/identity"
+      respond_to do |format|
+        format.html do
+          flash[:warning] = 'Please log in first.'
+          redirect "#{settings.map_path}/auth/identity"
+        end
+        format.json do
+          [401, { 'Content-Type' => 'application/json' }, [{ code: 401, errors: ['Not Authorized'] }.to_json]]
+        end
+      end
+    end
+
+    error ::Sequel::ForeignKeyConstraintViolation do
+      respond_to do |format|
+        format.html do
+          haml :error, locals: { title: 'Something went wrong', error: error }
+        end
+        format.json do
+          [400, { 'Content-Type' => 'application/json' }, [{ code: 400, errors: ['Invalid Relation Specified'] }.to_json]]
+        end
+      end
     end
 
     before(/.*/) do

data/lib/ditty/controllers/component.rb

@@ -13,6 +13,10 @@ module Ditty
     set view_location: nil
     set track_actions: false
 
+    def read(id)
+      dataset.first(settings.model_class.primary_key => id)
+    end
+
     # List
     get '/', provides: %i[html json] do
       authorize settings.model_class, :list
@@ -29,8 +33,8 @@ module Ditty
         format.json do
           # TODO: Add links defined by actions (New #{heading})
           json(
-            'items' => list.map(&:for_json),
-            'page' => params[:page],
+            'items' => list.all.map(&:for_json),
+            'page' => (params['page'] || 1).to_i,
             'count' => list.count,
             'total' => dataset.count
           )
@@ -63,11 +67,11 @@ module Ditty
           end
         end
         format.json do
-          headers 'Content-Type' => 'application/json'
+          content_type :json
           if success
             redirect "#{base_path}/#{entity.id}", 201
           else
-            400
+            [400, { errors: entity.errors }.to_json]
           end
         end
       end
@@ -75,7 +79,7 @@ module Ditty
 
     # Read
     get '/:id' do |id|
-      entity = dataset.first(settings.model_class.primary_key => id)
+      entity = read(id)
       halt 404 unless entity
       authorize entity, :read
 
@@ -97,7 +101,7 @@ module Ditty
 
     # Update Form
     get '/:id/edit' do |id|
-      entity = dataset.first(settings.model_class.primary_key => id)
+      entity = read(id)
       halt 404 unless entity
       authorize entity, :update
 
@@ -106,7 +110,7 @@ module Ditty
 
     # Update
     put '/:id' do |id|
-      entity = dataset.first(settings.model_class.primary_key => id)
+      entity = read(id)
       halt 404 unless entity
       authorize entity, :update
 
@@ -117,6 +121,7 @@ module Ditty
       if success
         respond_to do |format|
           format.html do
+            # TODO: Ability to customize the return path and message?
             flash[:success] = "#{heading} Updated"
             redirect "#{base_path}/#{entity.id}"
           end
@@ -131,14 +136,15 @@ module Ditty
             haml :"#{view_location}/edit", locals: { entity: entity, title: heading(:edit) }
           end
           format.json do
-            400
+            content_type :json
+            [400, { errors: entity.errors }.to_json]
           end
         end
       end
     end
 
     delete '/:id' do |id|
-      entity = dataset.first(settings.model_class.primary_key => id)
+      entity = read(id)
       halt 404 unless entity
       authorize entity, :delete
 
@@ -151,7 +157,7 @@ module Ditty
           redirect base_path.to_s
         end
         format.json do
-          content_type 'application/json'
+          content_type :json
           headers 'Location' => '/users'
           status 204
         end

data/lib/ditty/controllers/users.rb

@@ -59,11 +59,11 @@ module Ditty
         respond_to do |format|
           format.html do
             flash[:success] = 'User created'
-            redirect "/users/#{user.id}"
+            redirect "#{base_path}/#{user.id}"
           end
           format.json do
             headers 'Content-Type' => 'application/json'
-            redirect "/users/#{user.id}", 201
+            redirect "#{base_path}/#{user.id}", 201
           end
         end
       else
@@ -87,7 +87,7 @@ module Ditty
 
     # Update
     put '/:id' do |id|
-      entity = dataset[id.to_i]
+      entity = dataset.first(settings.model_class.primary_key => id)
       halt 404 unless entity
       authorize entity, :update
 
@@ -105,7 +105,7 @@ module Ditty
         respond_to do |format|
           format.html do
             flash[:success] = "#{heading} Updated"
-            redirect "/users/#{entity.id}"
+            redirect back
           end
           format.json do
             content_type 'application/json'
@@ -127,7 +127,7 @@ module Ditty
     end
 
     put '/:id/identity' do |id|
-      entity = dataset[id.to_i]
+      entity = dataset.first(settings.model_class.primary_key => id)
       halt 404 unless entity
       authorize entity, :update
 
@@ -151,7 +151,7 @@ module Ditty
         log_action("#{dehumanized}_update_password".to_sym) if settings.track_actions
         flash[:success] = 'Password Updated'
         redirect back
-      elsif current_user.super_admin? && current_user.id != id
+      elsif current_user.super_admin? && current_user.id != id.to_i
         haml :"#{view_location}/display", locals: { entity: entity, identity: identity, title: heading }
       else
         haml :"#{view_location}/profile", locals: { entity: entity, identity: identity, title: heading }
@@ -160,7 +160,7 @@ module Ditty
 
     # Delete
     delete '/:id', provides: %i[html json] do |id|
-      entity = dataset[id.to_i]
+      entity = dataset.first(settings.model_class.primary_key => id)
       halt 404 unless entity
       authorize entity, :delete
 
@@ -172,7 +172,7 @@ module Ditty
       respond_to do |format|
         format.html do
           flash[:success] = "#{heading} Deleted"
-          redirect '/users'
+          redirect base_path
         end
         format.json do
           content_type 'application/json'

data/lib/ditty/helpers/authentication.rb

@@ -4,11 +4,10 @@ module Ditty
   module Helpers
     module Authentication
       def current_user
-        if env['rack.session'].nil? || env['rack.session']['user_id'].nil?
-          self.current_user = anonymous_user
-        end
+        user_id = current_user_id
+        self.current_user = anonymous_user if user_id.nil?
         @users ||= Hash.new { |h, k| h[k] = User[k] }
-        @users[env['rack.session']['user_id']]
+        @users[user_id]
       end
 
       def current_user=(user)
@@ -16,6 +15,11 @@ module Ditty
         env['rack.session']['user_id'] = user.id if user
       end
 
+      def current_user_id
+        return env['omniauth.auth'].uid if env['omniauth.auth']
+        env['rack.session']['user_id'] if env['rack.session']
+      end
+
       def authenticate
         authenticated?
       end

data/lib/ditty/helpers/component.rb

@@ -13,10 +13,10 @@ module Ditty
       end
 
       def list
-        params['count'] ||= 10
-        params['page'] ||= 1
+        count = params['count'] || 10
+        page = params['page'] || 1
 
-        dataset.select.paginate(params['page'].to_i, params['count'].to_i)
+        dataset.select.paginate(page.to_i, count.to_i)
       end
 
       def heading(action = nil)

data/lib/ditty/helpers/views.rb

@@ -46,10 +46,14 @@ module Ditty
         haml :'partials/delete_form', locals: locals
       end
 
-      def pagination(list, base_path)
+      def pagination(list, base_path, qp = {})
+        qs = params.clone.merge(qp)
+        qs.delete('captures')
         locals = {
-          next_link: list.last_page? ? '#' : "#{base_path}?page=#{list.next_page}&count=#{list.page_size}",
-          prev_link: list.first_page? ? '#' : "#{base_path}?page=#{list.prev_page}&count=#{list.page_size}",
+          first_link: "#{base_path}?#{Rack::Utils.build_query(qs.merge('page' => 1))}",
+          next_link: list.last_page? ? '#' : "#{base_path}?#{Rack::Utils.build_query(qs.merge('page' => list.next_page))}",
+          prev_link: list.first_page? ? '#' : "#{base_path}?#{Rack::Utils.build_query(qs.merge('page' => list.prev_page))}",
+          last_link: "#{base_path}?#{Rack::Utils.build_query(qs.merge('page' => list.page_count))}",
           base_path: base_path,
           list: list
         }

data/lib/ditty/listener.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wisper'
 
 module Ditty
@@ -11,7 +13,7 @@ module Ditty
       return unless args[0].is_a? Hash
       vals[:user] = args[0][:user] if args[0] && args[0].key?(:user)
       vals[:details] = args[0][:details] if args[0] && args[0].key?(:details)
-      @mutex.synchronize { AuditLog.create vals }
+      @mutex.synchronize { Ditty::AuditLog.create vals }
     end
 
     def respond_to_missing?(_method, _include_private = false)
@@ -20,4 +22,4 @@ module Ditty
   end
 end
 
-Wisper.subscribe(Ditty::Listener.new)
+Wisper.subscribe(Ditty::Listener.new) unless ENV['RACK_ENV'] == 'test'

data/lib/ditty/middleware/error_catchall.rb

@@ -0,0 +1,20 @@
+module Ditty
+  module Middleware
+    class ErrorCatchall
+      attr_reader :env
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        @env = env
+        begin
+          @app.call env
+        rescue StandardError
+          [500, {}, ['Unknown Error']]
+        end
+      end
+    end
+  end
+end

data/lib/ditty/rake_tasks.rb

@@ -32,13 +32,13 @@ module Ditty
           puts 'Preparing the Ditty public folder'
           Dir.mkdir 'public' unless File.exist?('public')
           ::Ditty::Components.public_folder.each do |path|
-            FileUtils.cp_r "#{path}/.", 'public'
+            FileUtils.cp_r "#{path}/.", 'public' unless File.expand_path("#{path}/.").eql? File.expand_path('public')
           end
 
           puts 'Preparing the Ditty migrations folder'
           Dir.mkdir 'migrations' unless File.exist?('migrations')
           ::Ditty::Components.migrations.each do |path|
-            FileUtils.cp_r "#{path}/.", 'migrations'
+            FileUtils.cp_r "#{path}/.", 'migrations' unless File.expand_path("#{path}/.").eql? File.expand_path('migrations')
           end
           puts 'Migrations added:'
           Dir.foreach('migrations').sort.each { |x| puts x if File.file?("migrations/#{x}") }

data/lib/ditty/services/email.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'mail'
+require 'ditty/services/logger'
+
+module Ditty
+  module Services
+    module Email
+      CONFIG = './config/email.yml'.freeze
+
+      class << self
+        def method_missing(method, *args, &block)
+          return super unless respond_to_missing?(method)
+          config!
+          Mail.send(method, *args, &block)
+        end
+
+        def respond_to_missing?(method, _include_private = false)
+          Mail.respond_to? method
+        end
+
+        def config
+          @config ||= symbolize_keys File.exist?(CONFIG) ? YAML.load_file(CONFIG) : default
+        end
+
+        private
+
+        def config!
+          cfg = config
+          Mail.defaults do
+            delivery_method cfg[:delivery_method].to_sym, (cfg[:options] || {})
+          end
+        end
+
+        def default
+          { delivery_method: :logger, logger: Ditty::Services::Logger.instance }
+        end
+
+        def symbolize_keys(hash)
+          return hash.map { |v| symbolize_keys(v) } if hash.is_a? Array
+          return hash unless hash.is_a? Hash
+          Hash[hash.map { |k, v| [k.to_sym, symbolize_keys(v)] }]
+        end
+      end
+    end
+  end
+end

data/lib/ditty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ditty
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

data/lib/ditty.rb

@@ -33,6 +33,10 @@ module Ditty
     def inject(memo, &block)
       @mutex.synchronize { @hash.inject(memo, &block) }
     end
+
+    def each_with_object(memo, &block)
+      @mutex.synchronize { @hash.each_with_object(memo, &block) }
+    end
   end
 
   # Ripped off from Roda - https://github.com/jeremyevans/roda
@@ -68,19 +72,19 @@ module Ditty
 
     # Return a hash of controllers with their routes as keys: `{ '/users' => Ditty::Controllers::Users }`
     def self.routes
-      components.inject({}) do |memo, comp|
+      rts = components.each_with_object({}) do |comp, memo|
         memo.merge! comp[1].routes if comp[1].respond_to?(:routes)
-        memo
-      end.compact
+      end
+      rts.compact
     end
 
     # Return an ordered list of navigation items:
     # `[{order:0, link:'/users/', text:'Users'}, {order:1, link:'/roles/', text:'Roles'}]
     def self.navigation
-      components.inject([]) do |memo, comp|
+      nav = components.each_with_object([]) do |comp, memo|
         memo.concat comp[1].navigation if comp[1].respond_to?(:navigation)
-        memo
-      end.sort_by { |v| v[:order] }
+      end
+      nav.sort_by { |v| v[:order] }
     end
 
     def self.migrations
@@ -102,9 +106,8 @@ module Ditty
     end
 
     def self.workers
-      components.inject([]) do |memo, comp|
+      components.each_with_object([]) do |comp, memo|
         memo.concat comp[1].workers if comp[1].respond_to?(:workers)
-        memo
       end
     end
 

data/views/partials/pager.haml

@@ -2,13 +2,25 @@
   - if list.pagination_record_count > 0
     %p.text-center Showing #{list.current_page_record_range} of #{list.pagination_record_count} records
     %ul.pager
-      %li
-        %a{href: "#{base_path}?page=1&count=#{list.page_size}"} First
-      %li{class: ("disabled" if list.first_page?)}
-        %a{href: prev_link} Previous
-      %li{class: ("disabled" if list.last_page?)}
-        %a{href: next_link} Next
-      %li
-        %a{href: "#{base_path}?page=#{list.page_count}&count=#{list.page_size}"} Last
+      - if list.first_page?
+        %li.disabled
+          %span First
+        %li.disabled
+          %span Previous
+      - else
+        %li
+          %a{href: first_link} First
+        %li
+          %a{href: prev_link} Previous
+      - if list.last_page?
+        %li.disabled
+          %span Next
+        %li.disabled
+          %span Last
+      - else
+        %li
+          %a{href: next_link} Next
+        %li
+          %a{href: last_link} Last
   - else
     %p.text-center No records to show

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -352,6 +352,7 @@ files:
 - lib/ditty/helpers/views.rb
 - lib/ditty/helpers/wisper.rb
 - lib/ditty/listener.rb
+- lib/ditty/middleware/error_catchall.rb
 - lib/ditty/models/audit_log.rb
 - lib/ditty/models/base.rb
 - lib/ditty/models/identity.rb
@@ -364,6 +365,7 @@ files:
 - lib/ditty/policies/user_policy.rb
 - lib/ditty/rake_tasks.rb
 - lib/ditty/seed.rb
+- lib/ditty/services/email.rb
 - lib/ditty/services/logger.rb
 - lib/ditty/version.rb
 - migrate/20170207_base_tables.rb