dandy 0.12.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3801fd28080c3bdea511c614591b6b15c3d33066724ba8692941b9d77a56957
-  data.tar.gz: 226894d6c2cdfedaa9fda4677e3b9ac607e57de240045d7879a1f1f93312a78a
+  metadata.gz: f4cb37da294ec33ad6decfb043f63b542a12510a51df75ead5638c032b65a6d1
+  data.tar.gz: 07a54c2cd08d9ad03c0ef7dd7aab5381cbef0b2e393c9be1ded7ace34ea7da04
 SHA512:
-  metadata.gz: 86a58f84405999d88351c799c2475fdce2d8835ced1c2ae07a046d5f3491f3b7dc73f69073abdb97fb48f59934769fcd681c7a7ee4d6a10856305fed46cf3b75
-  data.tar.gz: e8b2e3ec269c757881ae9d42af8944ed9979d8b95713aed9b33cdf34357bb32018e423989eb59a07b119c66acf56af67f85a08560c55d04600c8af9d8fc56782
+  metadata.gz: 393ea464f6049946efa5ba1e2eef32675a964d648defc34e56feffd5d22b0b21edc56167370c72ae801ef5b5fa2adf2fdc287eb4673ba3d2e8280697cef4a0c8
+  data.tar.gz: 2c6dc7c37a44bfa9e03fdbd9ee75e30f8c7570ce8853c2c46812214ac032210374796b2bb3184959ccc59bf9e5ea865d9baa99739f1dce71a45be238eb10807b

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.15.4
+  - 2.6
+before_install: gem install bundler

data/README.md

@@ -109,7 +109,7 @@ or just
     $ rackup -p 8000 config.ru
 ```
 
-4. Run curl command `curl http://localhost:9292 -H "Accept: application/json"` and you'll see: 
+4. Run curl command `curl http://localhost:8000 -H "Accept: application/json"` and you'll see: 
 
 ```json
   {"message": "Welcome to dandy-app!"}

data/dandy.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'hypo', '~> 0.9.0'
+  spec.add_dependency 'hypo', '~> 1.0.0'
   spec.add_dependency 'rack', '~> 2.0.3'
   spec.add_dependency 'thor', '~> 0.20.0'
   spec.add_dependency 'treetop', '~> 1.6.8'
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'awrence', '~> 1.0.0'
   spec.add_dependency 'plissken', '~> 1.2.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-mocks', '~> 3.6'

data/lib/dandy/app.rb

@@ -46,7 +46,8 @@ module Dandy
     def register_dependencies
       instances = {
         config_file_path: 'dandy.yml',
-        dandy_env: ENV['DANDY_ENV'] || 'development'
+        dandy_env: ENV['DANDY_ENV'] || 'development',
+        env: ENV
       }
 
       instances.keys.each do |name|

data/lib/dandy/request.rb

@@ -34,6 +34,7 @@ module Dandy
 
       if match.nil?
         result = [404, {'Content-Type' => headers['Accept']}, []]
+        release
       else
         status = match.route.http_status || default_http_status(match.route.http_verb)
         register_params(match.params)
@@ -50,11 +51,16 @@ module Dandy
 
         body = @safe_executor.execute(match.route, headers)
 
+        begin
+          release
+        rescue Exception => error
+          body = @safe_executor.handle_error(match.route, headers, error)
+        end
+
         status = @container.resolve(:dandy_status)
-        result = [status, {'Content-Type' => headers['Accept']}, [body]]
+        result = [status, {'Content-Type' => 'application/json'}, [body]]
       end
 
-      release
 
       result
     end

data/lib/dandy/response.rb

@@ -0,0 +1,11 @@
+module Dandy
+  class Response
+    def self.format(result, headers)
+      if headers['Keys-Format'] == 'camel' && result
+        result = result.to_camelback_keys
+      end
+
+      JSON.generate(result)
+    end
+  end
+end

data/lib/dandy/safe_executor.rb

@@ -1,3 +1,5 @@
+require 'dandy/response'
+
 module Dandy
   class SafeExecutor
     def initialize(container, dandy_config, view_factory)
@@ -15,27 +17,23 @@ module Dandy
           result = @view_factory.create(route.view, headers['Accept'], {keys_format: headers['Keys-Format'] || 'snake'})
         end
 
-        body = result.is_a?(String) ? result : format_response(result, headers)
+        body = result.is_a?(String) ? result : Response.format(result, headers)
       rescue Exception => error
-        @container
-          .register_instance(error, :dandy_error)
-          .using_lifetime(:scope)
-          .bound_to(:dandy_request)
-
-        action = @container.resolve(route.catch.name.to_sym)
-        body = format_response(action.call, headers)
+        p error
+        body = handle_error(route, headers, error)
       end
 
       body
     end
 
-    private
-    def format_response(result, headers)
-      if headers['Keys-Format'] == 'camel' && result
-        result = result.to_camelback_keys
-      end
+    def handle_error(route, headers, error)
+      @container
+        .register_instance(error, :dandy_error)
+        .using_lifetime(:scope)
+        .bound_to(:dandy_request)
 
-      JSON.generate(result)
+      action = @container.resolve(route.catch.name.to_sym)
+      Response.format(action.call, headers)
     end
   end
 end

data/lib/dandy/version.rb

@@ -1,3 +1,3 @@
 module Dandy
-  VERSION = '0.12.2'.freeze
+  VERSION = '1.0.1'
 end

data/lib/dandy/view_factory.rb

@@ -12,8 +12,14 @@ module Dandy
 
     def create(name, content_type, options = {})
       type = content_type ? content_type.split('/')[1] : 'json'
-      template = @template_registry.get(name, type)
       builder = @view_builder_registry.get(type)
+
+      if builder.nil?
+        type = 'json'
+        builder = @view_builder_registry.get(type)
+      end
+
+      template = @template_registry.get(name, type)
       view = builder.new(template, @container, options)
       view.process
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandy
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Vladimir Kalinkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hypo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +256,7 @@ files:
 - lib/dandy/loaders/template_loader.rb
 - lib/dandy/loaders/type_loader.rb
 - lib/dandy/request.rb
+- lib/dandy/response.rb
 - lib/dandy/routing/builder.rb
 - lib/dandy/routing/file_reader.rb
 - lib/dandy/routing/match.rb
@@ -317,8 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Dandy is a minimalistic web API framework.