dandy 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 957ee61c0f0fc8a9891b30d458af1c6f0c4e08b9
-  data.tar.gz: 7fa0d88828eec48189ee75e54191663853a69e37
+  metadata.gz: 638225663a3c7bb092445c17472c8ea044a83a56
+  data.tar.gz: 447b928898b071c070a4ecdc08c6a940b65cdef2
 SHA512:
-  metadata.gz: d604e83febbd93b0e10ba5dfd100c83d1675ca9a0f1ffa03affb9f0d4074a0c634b622d3a1febb524c73f700626ef57751c2408a8c39bae0012aef6125e50f69
-  data.tar.gz: 7b7691cc316bc47363c272f7be1a29de5bdac66f73403789c92d3e0b9eaa2b228287177d07f91a961187ea4ac9bedbd78c2afb8c082bbffba95dde4f09d9abe1
+  metadata.gz: d117ca4ae73aeb227f93c53fbb77239d0b41f662891fb0ad7d0f9c3ebee77149b0244bfab012700d2a7127423e64cfa258fadf6ecbcce3817f006b074b8c4e06
+  data.tar.gz: c962ed1ef887d8ef5f481ade14964e106ae7b22705839f68e0a6a14982cb80009cfe9e72c951096c6372746b11a1f045abf7bcaf6eb90c792b4b6b8600ea0a61

data/lib/dandy/config.rb

@@ -1,11 +1,13 @@
 require 'yaml'
+require 'erb'
 require 'dandy/extensions/hash'
 
 module Dandy
   class Config
     def initialize(config_file_path)
       path = File.join(Dir.pwd, config_file_path)
-      @params = YAML.load_file(path).deep_symbolize_keys!
+      yaml = ERB.new(File.read(path)).result
+      @params = YAML.load(yaml).deep_symbolize_keys!
     end
 
     def [](key)

data/lib/dandy/generators/templates/actions/common/handle_errors.rb

@@ -1,2 +1,5 @@
 class HandleErrors < Dandy::HandleErrors
+  def call
+    puts @dandy_error
+  end
 end

data/lib/dandy/generators/templates/app/app.routes

@@ -1,4 +1,4 @@
 :receive
     .->
         GET -> message@welcome -> :respond <- show_welcome
-:catch -> handle_errors
+:catch -> common/handle_errors

data/lib/dandy/generators/templates/config.ru

@@ -16,7 +16,7 @@ use Rack::Cors do
   #   end
 end
 
-if ENV['DANDY_ENV'] == 'development' || ENV['DANDY_ENV'] == ''
+if ENV['DANDY_ENV'] == 'development' || ENV['DANDY_ENV'].nil?
   use Rack::Reloader
 end
 

data/lib/dandy/request.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'dandy/chain_factory'
 require 'dandy/view_factory'
 
@@ -30,9 +31,13 @@ module Dandy
         register_params(data, :dandy_data)
 
         chain = @chain_factory.create(match)
-        result = chain.execute
+        chain_result = chain.execute
 
-        body = match.route.view ? @view_factory.create(match.route.view, content_type) : result
+        if match.route.view
+          body =  @view_factory.create(match.route.view, content_type)
+        else
+          body = chain_result.is_a?(String) ? chain_result : JSON.generate(chain_result)
+        end
 
         status = @container.resolve(:dandy_status)
         result = [status, { 'Content-Type' => content_type }, [body]]

data/lib/dandy/routing/syntax_grammar.tt

@@ -28,7 +28,7 @@ grammar Syntax
   end
 
   rule path
-    ('.' / ('/' [a-z0-9_\-]+)) 1..1 <Path>
+    ('.' / (('/' [a-z0-9_\-]+)+)) 1..1 <Path>
   end
 
   rule http_verb

data/lib/dandy/version.rb

@@ -1,3 +1,3 @@
 module Dandy
-  VERSION = '0.7.4'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandy
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Vladimir Kalinkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hypo