casual-api 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 615e5453eed2773913ee6567ca5e25e8b34e54e5
-  data.tar.gz: caab53ecf1987013cbc48e5a24a6a1cc7214a68f
+  metadata.gz: b1552be82e1bda4452edefb02d6aa9bcf80a3acc
+  data.tar.gz: 72e38979a147b0433d378a5c2a622af96e1624ca
 SHA512:
-  metadata.gz: 6f90e9b8ad933610cff8933eaf2418a9423da898216e95525b7a85eb81f8ab0412bb74817e3b76979c193ac7a4c45b333182b129407d00a5675200525393d105
-  data.tar.gz: 4569b89b9554e635dac8e7e004241ccf602f971d351c7ecfad26d1be74e9ad6217303cb05db240d0afc8a43397b0358c174b142abe53b52f4623715d23a1b568
+  metadata.gz: abfc8346e7c6caba58546df5d88fc242cd3ff37d7768c215d975ecc1f3bf3c0f4cdc5f2fcd17c8f2d630ec3c1df14e1a3b427eed17e1de2d8b21ed556809c0a9
+  data.tar.gz: 1f4471ba83ee2893bae942cee31911ca86452c93cb317f432a187f844066e8e6b6351a1afdb84e43a5ecf203fbd972fe9ef1e711cad4dc19dbf4a2a85f376186

data/bin/casual-api

@@ -1,8 +1,20 @@
 #!/usr/bin/env ruby
 require 'open3'
 lib = File.expand_path('../../lib', __FILE__)
-port = ARGV[0] || 3000
-command = "thin -p #{port} -R #{lib}/config.ru start"
+command = "rackup #{lib}/config.ru #{ ARGV.join(' ')  }"
 puts "casual-api is running, CTRL+C to stop"
 _, out, err, th = Open3.popen3(command)
+tho = Thread.new{
+  while line = out.gets
+    STDOUT.puts line
+  end
+}
+the = Thread.new{
+  while line = err.gets
+    STDERR.puts line
+  end
+}
+
 th.join
+tho.join
+the.join

data/lib/casual.rb

@@ -40,15 +40,23 @@ class Casual
     actions = parse_actions
     action = detect_action actions
     if action
-      cp = ChildProcess.new(action, parameters, session)
-      result = cp.execute
-      @req.session['casual.session'] = result[:session]
-      res = Rack::Response.new(){|r|
-        r.status = result[:status_code]
-        r.write result[:body]
-        r['Content-Type'] = map_content_type(result[:content_type])
-      }
-      res.finish
+      begin
+        cp = ChildProcess.new(action, parameters, session)
+        result = cp.execute
+        @req.session['casual.session'] = result[:session]
+        res = Rack::Response.new(){|r|
+          r.status = result[:status_code]
+          r.write result[:body]
+          r['Content-Type'] = map_content_type(result[:content_type])
+        }
+        res.finish
+      rescue CommandError => ex
+        return [ex.status_code,
+                { 'Content-Type' => map_content_type(ex.content_type) },
+                [ex.message]]
+      rescue => ex
+        [500, {}, ["Server Error"]]
+      end
     else
       [404, {}, []]
     end
@@ -77,7 +85,7 @@ class Casual
     }
   end
   def make_path action
-    @prefix + (action[:domain] + [action[:name]]).compact.map{|p|p.to_s}.join('/')
+    @prefix + (action[:domain] + action[:names]).compact.map{|p|p.to_s}.join('/')
   end
   def parameters
     @req.params.map{|k,v| {k.to_sym => v} }.inject({}, :merge)

data/lib/dsl.rb

@@ -28,6 +28,13 @@ module BodyWriter
   end
 end
 
+class CommandError < StandardError
+  def content_type; :txt; end
+  def status_code; 400; end
+end
+class InvalidParameterError < CommandError
+end
+
 module Action
   def self.extended obj
     obj.instance_variable_set(:@session, {})
@@ -36,6 +43,10 @@ module Action
     obj.instance_variable_set(:@tempfiles, [])
   end
 
+  def invalid_parameter *params
+    raise InvalidParameterError, "Invalid parameter(s): #{params.map{|p|p.to_s}.join(',')}"
+  end
+
   def file? file
     file.is_a? Hash
   end
@@ -77,9 +88,7 @@ module Action
     }.inject({}, :merge)
     result = execute(obj, ps, action[:action])
     unless result[:executed]
-      obj.status_code = 400
-      obj.body = "Not given enough parameter"
-      obj.content_type = :txt
+      raise InvalidParameterError, "Not given required parameter(s)"
     end
     obj.tempfiles.each{|f| f.close }
     obj
@@ -127,13 +136,47 @@ module ExtExpression
 end
 
 module SyntaxSugar
-  def get(path, &block); path(:get, path, caller, &block); end
-  def post(path, &block); path(:post, path, caller, &block); end
+  def get(*names, &block); path(:get, *names, &block); end
+  def post(*names, &block); path(:post, *names, &block); end
   
-  def command(path, cmd)
-    get path do
-      write `#{cmd}`
+  def command(*names, cmd)
+    eval(replace :get, names, "write `#{cmd}`")
+  end
+
+  def text(*names, text)
+    eval(replace :get, names, "write \"#{text}\"")
+  end
+
+  def get_command(*names, cmd); command(*names, cmd); end
+  def post_command(*names, cmd)
+    eval(replace :post, names, "write `#{cmd}`")
+  end
+
+  def get_text(*names, text); text(*names, text); end
+  def post_text(*names, text)
+    eval(replace :post, names, "write \"#{text}\"")
+  end
+
+  private
+  def replace meth, names, cmd,
+    ps = cmd.scan(/\$\{(?<p>[^\}]*)\}/).flatten
+    fs = cmd.scan(/\$\<(?<p>[^\}]*)\>/).flatten
+    c = ps.inject(cmd){|acc,c|
+      acc.gsub /\$\{#{c}\}/, "\#{#{c}}"
+    }
+    c = fs.inject(c){|acc,c|
+      acc.gsub /\$\<#{c}\>/, "\#{#{c}}"
+    }
+    filecheck = fs.inject(""){|acc,f|
+      acc << "invalid_parameter :#{f} unless file? #{f}\n"
+      acc << "#{f} = tempfile #{f}\n"
+    }
+    args = (ps + fs).join(',')
+    <<PROC
+    #{meth.to_s}(#{names.map{|n|":#{n.to_s}"}.join(',')}) do | #{args} |
+      #{filecheck}#{c}
     end
+PROC
   end
 end
 
@@ -165,10 +208,10 @@ module DSL
     clear_annotaion
   end
 
-  def path(method, name, c=nil, &block)
+  def path(method, *names, &block)
     meta = @context_stack.last.clone
     meta[:method] = method
-    meta[:name] = name
+    meta[:names] = names
     meta[:domain] = @domain_stack.clone
     meta[:action] = block
     clear_annotaion    # annotations effect only a path.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casual-api
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Takeshi Kojima
@@ -10,26 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement