casual-api 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38830468e496664ada2481f625e364c583011329
-  data.tar.gz: 90a4833783f0d48c191e16ff4c25de1ad08e5519
+  metadata.gz: 27624cbb80045ccfb0314a36d4219020df61eb69
+  data.tar.gz: 8d3589a94eaa990792dd309cdc68589d391b9031
 SHA512:
-  metadata.gz: 03a6d518fe5f02f885410824de49e985edc407936f98591144ee6552285adc66a0f4d9320576ee51a4de1c1e07f5217d23ac80a6822b043359a2ef8c3823fdcd
-  data.tar.gz: edcf184bcd5008bbdb1d096e5d072735193f163b48fb8bc16fd8ea8d64cbf8cfe16446646c73d345ec3c13e4824a6046ed856069ebaf8c0e74fdf3cb2f1f42c2
+  metadata.gz: 073ebb071c6a17fa68ef6df11a358dd9b013e1eb8be506f2cf7907b3c3ff064128309ec7696722a66e3ae1089a88714466d18b7455096fce768e5d86428c7e77
+  data.tar.gz: b401e0577583eb7ce467781a5046ab38efb89b5ef893a86b8e345be047a6968415067df2dadbbca835fd1c9fc3ced04f63004edbdfe29adda59506d95759cf03

data/lib/casual.rb

@@ -33,8 +33,11 @@ module CasualAPI
     end
     def check_upload_file
       unless @action[:parameters].all?{|k,v|
-          next false if v[:is_file] ^ @params[k].is_a?(Hash)
-          next false if v[:as_file] && @params[k].is_a?(Hash)
+          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)"

data/lib/dsl.rb

@@ -50,7 +50,7 @@ module CasualAPI
     end
 
     def file? file
-      file.is_a? Hash
+      Action.is_file? file
     end
 
     def tempfile file
@@ -85,6 +85,11 @@ module CasualAPI
       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)
@@ -111,7 +116,7 @@ module CasualAPI
       ps
     end
     def self.tempfile(obj,file)
-      if file.is_a? Hash
+      if Action.is_file? file
         file[:tempfile].path
       else
         f = Tempfile.open(SecureRandom.hex(4))
@@ -138,6 +143,14 @@ module CasualAPI
       @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] ||= {}
@@ -152,6 +165,8 @@ module CasualAPI
       @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
@@ -261,6 +276,8 @@ PROC
                 is_file: (hs[:is_file]||[]).include?(n),
                 as_file: (hs[:as_file]||[]).include?(n),
                 tempfile: (hs[:tempfile]||[]).include?(n),
+                is_array: (hs[:is_array]||[]).include?(n),
+                is_hash: (hs[:is_hash]||[]).include?(n),
                }
         }
       }.inject({}, :merge)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: casual-api
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Takeshi Kojima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack