ditty 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a55bb96414dd9974ba6f8ce44aadacbc340967e4
-  data.tar.gz: c529f7ac183eedfc9530d7c8703660d9a8894093
+SHA256:
+  metadata.gz: 2fea055fdddd9b21951527617015b2926b064191dfda753fd930037738122c50
+  data.tar.gz: b8d1cc9f9430ff39d3f345719a0988f51bc03f4a7f718fabe78a69d314e5762a
 SHA512:
-  metadata.gz: 759f21f4031b46c3f486081f238d8846402c0c1d7c85dab75fc6f19d096757150020e217531772e5cfca88c6a32031663a8fb71692a046c2956010d63c70cd24
-  data.tar.gz: b821ad004ff984706263355b5408ae66d33f0f230fe22057fefd28dc075308a7c74928f11b68ab08fa3540220b042fb386f82caded9400fe9847222aced3366c
+  metadata.gz: eafbcf7aaadabc7e9458f403cf2252b3311dc9a716f08884c1651055426864e796866e60f7c3986be4405cc83d3d0552d49fca43e2764e516066884a56e7c4ea
+  data.tar.gz: f2f3b62750d7711bdd59ee7e0df4630ec89992cda013d5e5e96736aa541a5a2cd55ff096de65b774bef4ab74c90e0983a7a3826d30a498e3a3a474bd1cdfc1cf

data/.travis.yml

@@ -6,19 +6,24 @@ rvm:
 - 2.2.6
 gemfile: Gemfile.ci
 env:
-- DATABASE_URL="sqlite::memory:" RACK_ENV=test
+  global:
+    - CC_TEST_REPORTER_ID=289860573c6284a8e277de86848caba84d840be49e35f3601bcd672ab40d1e35
+  matrix:
+    - DATABASE_URL="sqlite::memory:" RACK_ENV=test
 before_install:
-- gem install bundler -v 1.12.5
+  - gem install bundler -v 1.12.5
 before_script:
-- bundle exec rake ditty:prep
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+  - bundle exec rake ditty:prep
 script:
-- bundle exec rake
-- bundle exec rubocop --fail-level W lib views
-addons:
-  code_climate:
-    repo_token: 289860573c6284a8e277de86848caba84d840be49e35f3601bcd672ab40d1e35
+  - bundle exec rake
+  - bundle exec rubocop --fail-level W lib views
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 after_success:
-- bundle exec codeclimate-test-reporter
+  - bundle exec codeclimate-test-reporter
 deploy:
   provider: rubygems
   api_key:

data/ditty.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'factory_girl'
+  spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'racksh'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/ditty/controllers/application.rb

@@ -52,47 +52,70 @@ module Ditty
 
     not_found do
       respond_to do |format|
+        status 404
         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]]
+          json code: 404, errors: ['Not Found']
         end
       end
     end
 
-    error do
-      error = env['sinatra.error']
-      broadcast(:application_error, error)
+    error Helpers::NotAuthenticated, ::Pundit::NotAuthorizedError do
       respond_to do |format|
+        status 401
         format.html do
-          haml :error, locals: { title: 'Something went wrong', error: error }
+          flash[:warning] = 'Please log in first.'
+          redirect "#{settings.map_path}/auth/identity"
         end
         format.json do
-          [500, { 'Content-Type' => 'application/json' }, [{ code: 500, errors: ['Something went wrong'] }.to_json]]
+          json code: 401, errors: ['Not Authenticated']
         end
       end
     end
 
-    error Helpers::NotAuthenticated, ::Pundit::NotAuthorizedError do
+    error Sequel::ValidationFailed do
       respond_to do |format|
+        entity = env['sinatra.error'].model
+        errors = env['sinatra.error'].errors
+        status 400
         format.html do
-          flash[:warning] = 'Please log in first.'
-          redirect "#{settings.map_path}/auth/identity"
+          action = entity.id ? :edit : :new
+          haml :"#{view_location}/#{action}", locals: { entity: entity, title: heading(action) }
         end
         format.json do
-          [401, { 'Content-Type' => 'application/json' }, [{ code: 401, errors: ['Not Authenticated'] }.to_json]]
+          json code: 400, errors: errors
         end
       end
     end
 
     error ::Sequel::ForeignKeyConstraintViolation do
+      error = env['sinatra.error']
+      broadcast(:application_error, error)
+      ::Ditty::Services::Logger.instance.error error
+      respond_to do |format|
+        status 400
+        format.html do
+          haml :error, locals: { title: 'Something went wrong', error: error }
+        end
+        format.json do
+          json code: 400, errors: ['Invalid Relation Specified']
+        end
+      end
+    end
+
+    error do
+      error = env['sinatra.error']
+      broadcast(:application_error, error)
+      ::Ditty::Services::Logger.instance.error error
       respond_to do |format|
+        status 500
         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]]
+          json code: 500, errors: ['Something went wrong']
         end
       end
     end

data/lib/ditty/controllers/component.rb

@@ -89,20 +89,5 @@ module Ditty
       log_action("#{dehumanized}_delete".to_sym) if settings.track_actions
       delete_response(entity)
     end
-
-    error Sequel::ValidationFailed do
-      respond_to do |format|
-        entity = env['sinatra.error'].model
-        errors = env['sinatra.error'].errors
-        status 400
-        format.html do
-          action = entity.id ? :edit : :new
-          haml :"#{view_location}/#{action}", locals: { entity: entity, title: heading(action) }
-        end
-        format.json do
-          json [400, { errors: errors }]
-        end
-      end
-    end
   end
 end

data/lib/ditty/helpers/authentication.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+require 'ditty/models/user'
+require 'ditty/models/role'
+require 'ditty/models/identity'
 
 module Ditty
   module Helpers

data/lib/ditty/helpers/views.rb

@@ -46,15 +46,19 @@ module Ditty
         haml :'partials/delete_form', locals: locals
       end
 
+      def query_string(add = {})
+        qs = params.clone.merge(add)
+        qs.delete('captures')
+        Rack::Utils.build_query qs
+      end
+
       def pagination(list, base_path, qp = {})
         return unless list.respond_to? :pagination_record_count
-        qs = params.clone.merge(qp)
-        qs.delete('captures')
         locals = {
-          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))}",
+          first_link: "#{base_path}?" + query_string(qp.merge(page: 1)),
+          next_link: list.last_page? ? '#' : "#{base_path}?" + query_string(qp.merge(page: list.next_page)),
+          prev_link: list.first_page? ? '#' : "#{base_path}?" + query_string(qp.merge(page: list.prev_page)),
+          last_link: "#{base_path}?" + query_string(qp.merge(page: list.page_count)),
           base_path: base_path,
           list: list
         }

data/lib/ditty/middleware/error_catchall.rb

@@ -1,3 +1,5 @@
+require 'ditty/services/logger'
+
 module Ditty
   module Middleware
     class ErrorCatchall
@@ -11,7 +13,9 @@ module Ditty
         @env = env
         begin
           @app.call env
-        rescue StandardError
+        rescue StandardError => e
+          ::Ditty::Services::Logger.instance.error "Ditty Catchall: #{e.class}"
+          ::Ditty::Services::Logger.instance.error e
           [500, {}, ['Unknown Error']]
         end
       end

data/lib/ditty/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Sinatra Based Application Framework