casual-api 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3049bc52a1d33d63c9aa5568779d01e0b38cab6c
-  data.tar.gz: 7e1c8f66974d79ac311ed4d5d42e75c7e77c0d12
+  metadata.gz: 9853c2f2400652c1be412d4e1d06a1c225fdb0e2
+  data.tar.gz: d426774057b79915cd53fe5a0784e17fb4790cf8
 SHA512:
-  metadata.gz: a1695dafa84bd878d25da410f438f621952bdb3c2a597e765655da27a4d78572aa125a11c69661d7a27a9e9b68ddec564c953a14707a29f2dcd2308e2be2dc41
-  data.tar.gz: d3b977773f0d016316ee3a0a7070e3312a274dfe773154bdd9201d391133a40b5c409a0f88f9dd1ce1f0e5dcfdcf0f4a0ed7f978528773b4d0feae6c0b38d608
+  metadata.gz: c15aa9b8c5a2136ad750256fa26eb5979cb732bce08eac311a4b1735490583701d6a2ba96fc8c9982e0205e5c5da8b47a3a01c729685c0791c1cddfcb7bc3e5e
+  data.tar.gz: 705df3971a06e55ff8e07ecbd3c93fd9570841b40dce661a5dfc5e3a74606514cb1aa7ffef34d75f49db45a42c5c8a9fbdfe6b064516e3bdfecffbf7d86028ee

data/lib/action.rb

@@ -0,0 +1,126 @@
+module CasualAPI
+  module Action
+    def self.extended obj
+      obj.instance_variable_set(:@redirect, nil)
+      obj.instance_variable_set(:@session, {})
+      obj.instance_variable_set(:@content_type, nil)
+      obj.instance_variable_set(:@status_code, 200)
+      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
+      Action.is_file? file
+    end
+
+    def tempfile file
+      Action.tempfile self, file
+    end
+
+    def redirect_to url
+      @redirect = url
+    end
+
+    def session_clear
+      session.clear
+      @session = nil
+    end
+
+    def session; @session; end
+    def session=(value); @session = value; end
+    def content_type; @content_type; end
+    def tempfiles; @tempfiles; end
+    def status_code; @status_code; end
+    def content_type=(type); @content_type = type; end
+    def status_code=(code); @status_code = code; end
+    def redirect; @redirect; end
+
+
+    def self.fire(action, params, session)
+      obj = Object
+      obj.extend Action
+      obj.extend BodyWriter
+      obj.content_type = action[:content_type] || :txt
+      obj.session = session
+      ps = action[:action].parameters.map{|_, name|
+        {name => params[name]}
+      }.inject({}, :merge)
+      execute(obj, ps, action)
+      obj.tempfiles.each{|f| f.close }
+      obj
+    end
+
+    def self.is_file? param
+      param.is_a?(Hash) && param[:tempfile] && param[:tempfile].is_a?(Tempfile)
+    end
+
+
+    private
+    def self.execute(obj, ps, action)
+      ps = to_as_file(obj, ps, action)
+      ps = to_tempfile(obj, ps, action)
+      vs = action[:parameters].map{|k,v|ps[k]}
+      obj.instance_exec(*vs, &(action[:action]))
+    end
+
+    def self.to_as_file(obj, ps, action)
+      action[:parameters].select{|_,v|v[:as_file]}.each{|k,v|
+        if v[:is_array]
+          ps[k] = ps[k].map.with_index{|value,i|
+            create_temp_file(obj, i.to_s, value)
+          }
+        elsif v[:is_hash]
+          ps[k] = ps[k].map{|key, value|
+            {key => create_temp_file(obj, key.to_s, value)}
+          }.inject({},:merge)
+        else
+          ps[k] = create_temp_file(obj, k.to_s, ps[k])
+        end
+      }
+      ps
+    end
+    def self.create_temp_file(obj, name, value)
+      f = Tempfile.open(name)
+      f.write value
+      f.close
+      f.open
+      obj.tempfiles.push f
+      {tempfile: f}
+    end
+
+    def self.to_tempfile(obj, ps, action)
+      action[:parameters].select{|_,v|v[:tempfile]}.each{|k,v|
+        if v[:is_array]
+          ps[k] = ps[k].map{|value|
+            tempfile obj, value
+          }
+        elsif v[:is_hash]
+          ps[k] = ps[k].map{|key, value|
+            { key => tempfile(obj, value) }
+          }.inject({},:merge)
+        else
+          ps[k] = tempfile obj, ps[k]
+        end
+      }
+      ps
+    end
+
+    def self.tempfile(obj,file)
+      if Action.is_file? file
+        file[:tempfile].path
+      else
+        f = Tempfile.open(SecureRandom.hex(4))
+        f.write file
+        f.flush
+        f.close
+        f.open
+        obj.tempfiles.push f
+        f.path
+      end
+    end
+  end
+end

data/lib/annotation.rb

@@ -0,0 +1,47 @@
+module CasualAPI
+  module Annotation
+    def is_file *files
+      @context_stack.last[:is_file] ||= []
+      @context_stack.last[:is_file].push(*files)
+    end
+    def as_file *files
+      @context_stack.last[:as_file] ||= []
+      @context_stack.last[:as_file].push(*files)
+    end
+    def tempfile *files
+      @context_stack.last[:tempfile] ||= []
+      @context_stack.last[:tempfile].push(*files)
+    end
+    def is_array *params
+      @context_stack.last[:is_array] ||= []
+      @context_stack.last[:is_array].push(*params)
+    end
+    def is_hash *params
+      @context_stack.last[:is_hash] ||= []
+      @context_stack.last[:is_hash].push(*params)
+    end
+
+    def description(param1, param2=nil)
+      @context_stack.last[:description] ||= {}
+      if param2
+        @context_stack.last[:description][:params] ||= {}
+        @context_stack.last[:description][:params][param1] = param2
+      else
+        @context_stack.last[:description][:path] = param1
+      end
+    end
+    def hide(value=true)
+      @context_stack.last[:hide] = value
+    end
+
+    def clear_annotaion
+      @context_stack.last.delete(:is_file)
+      @context_stack.last.delete(:as_file)
+      @context_stack.last.delete(:tempfile)
+      @context_stack.last.delete(:is_array)
+      @context_stack.last.delete(:is_hash)
+      @context_stack.last.delete(:description)
+      @context_stack.last.delete(:hide)
+    end
+  end
+end

data/lib/body_writer.rb

@@ -0,0 +1,29 @@
+
+module CasualAPI
+  module BodyWriter
+    def self.extended obj
+      obj.instance_variable_set(:@body, "")
+    end
+    def write str
+      @body << str.to_s
+    end
+    def print str
+      @body << str.to_s
+    end
+    def puts str
+      @body << str.to_s << "\n"
+    end
+    def printf *p
+      @body << sprintf(*p)
+    end
+    def command cmd
+      write `#{cmd.to_s}`
+    end
+    def body
+      @body
+    end
+    def body=(value)
+      @body = value
+    end
+  end
+end

data/lib/casual.rb

@@ -1,52 +1,10 @@
 require 'rack'
 require 'tempfile'
 require_relative './dsl.rb'
+require_relative './child_process.rb'
+require_relative './request_checker.rb'
 
 module CasualAPI
-  class ChildProcess
-    def initialize(action, parameters, session)
-      @action = action
-      @params = parameters
-      @session = session
-    end
-
-    def execute
-      check_parameter
-      obj = Action.fire @action, @params, @session
-      {
-       redirect: obj.redirect,
-       session: obj.session,
-       status_code: obj.status_code,
-       content_type: obj.content_type,
-       body: obj.body,
-      }
-    end
-
-    private
-    def check_parameter
-      check_satisfy_required_parameters
-      check_upload_file
-    end
-    def check_satisfy_required_parameters
-      unless @action[:parameters].all?{|k,v|@params[k] || !v[:required]}
-        raise InvalidParameterError, "Invalid parameter(s)"
-      end
-    end
-    def check_upload_file
-      unless @action[:parameters].all?{|k,v|
-          next false if v[:is_file] ^Action.is_file?(Hash)
-          next false if v[:as_file] && Action.is_file?(Hash)
-          next false if v[:is_array] ^ @params[k].is_a?(Array)
-          next false if v[:is_hash] && !Action.is_file?(@params[k]) && !@params[k].is_a?(Hash)
-          next false if !v[:is_hash] && !Action.is_file?(@params[k]) && @params[k].is_a?(Hash)
-          true
-        }
-        raise InvalidParameterError, "Invalid parameter(s)"
-      end
-    end
-  end
-
-
   # RackApp
   class Casual
     def initialize(prefix, file, mode)
@@ -88,14 +46,13 @@ module CasualAPI
                   },
                   [ex.message]]
         rescue => ex
-          [500, {
-                 'Access-Control-Allow-Origin' => '*',
-                }, ["Server Error"]]
+          [500, {'Access-Control-Allow-Origin' => '*'},
+           ["Server Error\n"] + (@mode == "development" ? [ex.message] : [])
+          ]
         end
       else
-        [404, {
-               'Access-Control-Allow-Origin' => '*',
-              }, []]
+        [404, {'Access-Control-Allow-Origin' => '*'},
+         ["API Not Found or Parameter(s) Not Enough"]]
       end
     end
 
@@ -118,9 +75,13 @@ module CasualAPI
       path = request_path
       _method = request_method
       actions.detect{|act|
-        act[:method] == _method && make_path(act) == path
+        cond = act[:method] == _method
+        cond = cond && make_path(act) == path
+        cond = cond && RequestChecker.check(act, parameters)
+        cond
       }
     end
+
     def make_path action
       @prefix + (action[:domain] + action[:names]).compact.map{|p|p.to_s}.join('/')
     end

data/lib/child_process.rb

@@ -0,0 +1,22 @@
+require_relative './request_checker.rb'
+
+module CasualAPI
+  class ChildProcess
+    def initialize(action, parameters, session)
+      @action = action
+      @params = parameters
+      @session = session
+    end
+
+    def execute
+      obj = Action.fire @action, @params, @session
+      {
+       redirect: obj.redirect,
+       session: obj.session,
+       status_code: obj.status_code,
+       content_type: obj.content_type,
+       body: obj.body,
+      }
+    end
+  end
+end

data/lib/dsl.rb

@@ -1,234 +1,14 @@
 require 'pp'
 require 'securerandom'
 require 'tempfile'
+require_relative './errors.rb'
+require_relative './body_writer.rb'
+require_relative './action.rb'
+require_relative './annotation.rb'
+require_relative './ext_expression.rb'
+require_relative './syntax_sugar.rb'
 
 module CasualAPI
-  module BodyWriter
-    def self.extended obj
-      obj.instance_variable_set(:@body, "")
-    end
-    def write str
-      @body << str.to_s
-    end
-    def print str
-      @body << str.to_s
-    end
-    def puts str
-      @body << str.to_s << "\n"
-    end
-    def printf *p
-      @body << sprintf(*p)
-    end
-    def command cmd
-      write `#{cmd.to_s}`
-    end
-    def body
-      @body
-    end
-    def body=(value)
-      @body = value
-    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(:@redirect, nil)
-      obj.instance_variable_set(:@session, {})
-      obj.instance_variable_set(:@content_type, nil)
-      obj.instance_variable_set(:@status_code, 200)
-      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
-      Action.is_file? file
-    end
-
-    def tempfile file
-      Action.tempfile self, file
-    end
-
-    def redirect_to url
-      @redirect = url
-    end
-
-    def session_clear
-      session.clear
-      @session = nil
-    end
-
-    def session; @session; end
-    def session=(value); @session = value; end
-    def content_type; @content_type; end
-    def tempfiles; @tempfiles; end
-    def status_code; @status_code; end
-    def content_type=(type); @content_type = type; end
-    def status_code=(code); @status_code = code; end
-    def redirect; @redirect; end
-
-
-    def self.fire(action, params, session)
-      obj = Object
-      obj.extend Action
-      obj.extend BodyWriter
-      obj.content_type = action[:content_type] || :txt
-      obj.session = session
-      ps = action[:action].parameters.map{|_, name|
-        {name => params[name]}
-      }.inject({}, :merge)
-      execute(obj, ps, action)
-      obj.tempfiles.each{|f| f.close }
-      obj
-    end
-
-    def self.is_file? param
-      param.is_a?(Hash) && param[:tempfile] && param[:tempfile].is_a?(Tempfile)
-    end
-
-
-    private
-    def self.execute(obj, ps, action)
-      ps = to_as_file(obj, ps, action)
-      ps = to_tempfile(obj, ps, action)
-      vs = action[:parameters].map{|k,v|ps[k]}
-      obj.instance_exec(*vs, &(action[:action]))
-    end
-
-    def self.to_as_file(obj, ps, action)
-      action[:parameters].select{|_,v|v[:as_file]}.each{|k,_|
-        f = Tempfile.open(k.to_s)
-        f.write ps[k]
-        f.close
-        f.open
-        obj.tempfiles.push f
-        ps[k] = {tempfile: f}
-      }
-      ps
-    end
-    def self.to_tempfile(obj, ps, action)
-      action[:parameters].select{|_,v|v[:tempfile]}.each{|k,_|
-        ps[k] = tempfile obj, ps[k]
-      }
-      ps
-    end
-    def self.tempfile(obj,file)
-      if Action.is_file? file
-        file[:tempfile].path
-      else
-        f = Tempfile.open(SecureRandom.hex(4))
-        f.write file
-        f.flush
-        f.close
-        f.open
-        obj.tempfiles.push f
-        f.path
-      end
-    end
-  end
-
-  module Annotation
-    def is_file *files
-      @context_stack.last[:is_file] ||= []
-      @context_stack.last[:is_file].push(*files)
-    end
-    def as_file *files
-      @context_stack.last[:as_file] ||= []
-      @context_stack.last[:as_file].push(*files)
-    end
-    def tempfile *files
-      @context_stack.last[:tempfile] ||= []
-      @context_stack.last[:tempfile].push(*files)
-    end
-    def is_array *params
-      @context_stack.last[:is_array] ||= []
-      @context_stack.last[:is_array].push(*params)
-    end
-    def is_hash *params
-      @context_stack.last[:is_hash] ||= []
-      @context_stack.last[:is_hash].push(*params)
-    end
-
-    def description(param1, param2=nil)
-      @context_stack.last[:description] ||= {}
-      if param2
-        @context_stack.last[:description][:params] ||= {}
-        @context_stack.last[:description][:params][param1] = param2
-      else
-        @context_stack.last[:description][:path] = param1
-      end
-    end
-    def clear_annotaion
-      @context_stack.last.delete(:is_file)
-      @context_stack.last.delete(:as_file)
-      @context_stack.last.delete(:tempfile)
-      @context_stack.last.delete(:is_array)
-      @context_stack.last.delete(:is_hash)
-      @context_stack.last.delete(:description)
-    end
-  end
-
-  module ExtExpression
-    def content_type type
-      @context_stack.last[:content_type] = type
-    end
-  end
-
-  module SyntaxSugar
-    def get(*names, &block); path(:get, *names, &block); end
-    def post(*names, &block); path(:post, *names, &block); end
-    
-    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(/\$\{file:(?<p>[^:\}]*)\}/).flatten
-      c = ps.inject(cmd){|acc,c|
-        acc.gsub /\$\{#{c}\}/, "\#{#{c}}"
-      }
-      c = fs.inject(c){|acc,c|
-        acc.gsub /\$\{file:#{c}\}/, "\#{#{c}}"
-      }
-      is_file_annotation = "is_file " + fs.map{|f|":#{f}"}.join(',')
-      tempfile_annotation = "tempfile " + fs.map{|f|":#{f}"}.join(',')
-      args = (ps + fs).join(',')
-    <<PROC
-    #{is_file_annotation}
-    #{tempfile_annotation}
-    #{meth.to_s}(#{names.map{|n|":#{n.to_s}"}.join(',')}) do | #{args} |
-      #{c}
-    end
-PROC
-    end
-  end
-
-
   module DSL
     def self.extended obj
       # add stacks and a context to an extended object.
@@ -244,10 +24,20 @@ PROC
       @action_stack
     end
 
+    def echo
+      p "W"
+    end
+
+    def import(path)
+      if File.exist?(path)
+        open(path){|f| eval(f.read, binding) }
+      end
+    end
+
     def domain(*path , &block)
       # annotations don't effect over domain
       clear_annotaion
-      @domain_stack.push *path
+      @domain_stack.push(*path)
       @context_stack.push(@context_stack.last.clone)
       block.call
       @context_stack.pop
@@ -287,13 +77,15 @@ PROC
                }
         }
       }.inject({}, :merge)
-      { 
+      {
+        content_type: hs[:content_type],
         method: hs[:method],
-          names: hs[:names],
-          description: description,
-          domain: hs[:domain],
-          action: hs[:action],
-          parameters: parameters,
+        names: hs[:names],
+        description: description,
+        domain: hs[:domain],
+        action: hs[:action],
+        parameters: parameters,
+        hide: hs[:hide],
       }
     end
   end

data/lib/errors.rb

@@ -0,0 +1,9 @@
+
+module CasualAPI
+  class CommandError < StandardError
+    def content_type; :txt; end
+    def status_code; 400; end
+  end
+  class InvalidParameterError < CommandError
+  end
+end

data/lib/ext_expression.rb

@@ -0,0 +1,8 @@
+
+module CasualAPI
+  module ExtExpression
+    def content_type type
+      @context_stack.last[:content_type] = type
+    end
+  end
+end

data/lib/request_checker.rb

@@ -0,0 +1,60 @@
+module CasualAPI
+  class RequestChecker
+    def self.check(action, params)
+      @action = action
+      @params = params
+      check_satisfy_required_parameters && check_upload_file      
+    end
+    private
+    def self.check_satisfy_required_parameters
+      @action[:parameters].all?{|k,v|@params[k] || !v[:required]}
+    end
+    def self.check_upload_file
+      @action[:parameters].all?{|k,v|
+        next false unless check_is_file(v, @params[k])
+        next false unless check_as_file(v, @params[k])
+        next false unless check_is_array(v, @params[k])
+        next false unless check_is_hash(v, @params[k])
+        true
+      }
+    end
+    def self.check_is_hash(attr, value)
+      attr[:is_hash] ^ !(value.is_a?(Hash) && !Action.is_file?(value))
+    end
+    def self.check_is_array(attr, value)
+      attr[:is_array] ^ !value.is_a?(Array)
+    end
+    def self.check_as_file(attr, value)
+      if attr[:as_file]
+        if attr[:is_array]
+          return value.is_a?(Array) && value.all?{|v| !Action.is_file?(v) }
+        elsif attr[:is_hash]
+          return value.is_?(Hash) && value.all?{|_,v| !Action.is_file?(v) }
+        else
+          return !Action.is_file?(value)
+        end
+      end
+      return true
+    end 
+    def self.check_is_file(attr, value)
+      if attr[:is_file]
+        if attr[:is_array]
+          return value.is_a?(Array) && value.all?{|v| Action.is_file?(v) }
+        elsif attr[:is_hash]
+          return value.is_?(Hash) && value.all?{|_,v| Action.is_file?(v) }
+        else
+          return Action.is_file?(value)
+        end
+      else
+        if attr[:is_array]
+          return value.is_a?(Array) && value.all?{|v| !Action.is_file?(v) }
+        elsif attr[:is_hash]
+          return value.is_?(Hash) && value.all?{|_,v| !Action.is_file?(v) }
+        else
+          return !Action.is_file?(value)
+        end
+      end
+      return false
+    end
+  end
+end

data/lib/syntax_sugar.rb

@@ -0,0 +1,46 @@
+module CasualAPI
+  module SyntaxSugar
+    def get(*names, &block); path(:get, *names, &block); end
+    def post(*names, &block); path(:post, *names, &block); end
+    
+    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(/\$\{file:(?<p>[^:\}]*)\}/).flatten
+      cmd = ps.inject(cmd){|acc,c|
+        acc.gsub(/\$\{#{c}\}/, "\#{#{c}}")
+      }
+      cmd = fs.inject(cmd){|acc,c|
+        acc.gsub(/\$\{file:#{c}\}/, "\#{#{c}}")
+      }
+      is_file_annotation = "is_file " + fs.map{|f|":#{f}"}.join(',')
+      tempfile_annotation = "tempfile " + fs.map{|f|":#{f}"}.join(',')
+      args = (ps + fs).join(',')
+    <<PROC
+    #{is_file_annotation}
+    #{tempfile_annotation}
+    #{meth.to_s}(#{names.map{|n|":#{n.to_s}"}.join(',')}) do | #{args} |
+      #{cmd}
+    end
+PROC
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: casual-api
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Takeshi Kojima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,10 +38,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/casual-api
+- lib/action.rb
+- lib/annotation.rb
+- lib/body_writer.rb
 - lib/casual-api.rb
 - lib/casual.rb
+- lib/child_process.rb
 - lib/config.ru
 - lib/dsl.rb
+- lib/errors.rb
+- lib/ext_expression.rb
+- lib/request_checker.rb
+- lib/syntax_sugar.rb
 homepage: https://github.com/tatkeshi/casual-api
 licenses:
 - MIT