riddl 0.99.164 → 0.99.166

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 489adb35b73cd33ca81b091cb2501a60f41d1f43
-  data.tar.gz: a1d2eea4782ab9011cb02bc8c8a830077c496881
+  metadata.gz: 7494d6014d9695052b9f418118023b46a41f5df5
+  data.tar.gz: 569a3a767b3333f0791c8b393b9a9992316f2bca
 SHA512:
-  metadata.gz: 890ff194f9185f100584596a2625bae405635fedc7f5ae9f09f2a24322eac9a59cda8358a5fd6da0f379e6a492d643ff21fc3c76d6940ad1726f8cd2b610da41
-  data.tar.gz: 26a286f3ed8215bad4dfc8c60f0b9b6ff7c2e63e8d0d5afcbb1962214e5855c7b2d8ab6727486c393c440ed5513698afb97c924f5ed9b6f8098f0b1574ca6046
+  metadata.gz: 7f1f6c98ddbe9d190b2d55c9d55835029d73124f84a09b169c071bcfe9cf85a9d6a2192e9cd039950a15a93159b4e14908e9e278edd776c917528976ec22446d
+  data.tar.gz: 4306072b8bb92db673f629a3742966a9afb10d8341d8cf4f444ad9e2b94c3cf716c2757d01eb2654b8a07936df495ec57cf3684948705019a18004269472595a

data/lib/ruby/riddl/parameter.rb

@@ -21,11 +21,12 @@ module Riddl
       end
     end
     class Complex
-      attr_reader :mimetype, :filename, :value, :type, :additional
+      attr_reader :mimetype, :filename, :value, :type, :additional, :mimextra
       attr_accessor :name
       def initialize(name,mimetype,file=nil,filename=nil,additional=[])
         @name = name
-        @mimetype = mimetype.gsub(/;.*/,'')
+        @mimetype = mimetype.gsub(/(;.*)/,'')
+        @mimextra = $1 || ''
         @filename = filename
         @type = :body
         @additional = additional

data/lib/ruby/riddl/protocols/http/generator.rb

@@ -39,7 +39,7 @@ module Riddl
               end
             when Riddl::Parameter::Complex
               tmp.write(r.value.respond_to?(:read) ? r.value.read : r.value)
-              @headers['Content-Type'] = r.mimetype
+              @headers['Content-Type'] = r.mimetype + r.mimextra
               @headers['RIDDL-TYPE'] = 'complex'
               if r.filename.nil?
                 @headers['Content-ID'] = r.name
@@ -92,7 +92,7 @@ module Riddl
                     tmp.write "Content-Disposition: #{mode == :input ? 'form-data' : 'riddl-data'}; name=\"#{r.name}\""
                     tmp.write r.filename.nil? ? EOL : "; filename=\"#{r.filename}\"" + EOL
                     tmp.write "Content-Transfer-Encoding: binary" + EOL
-                    tmp.write "Content-Type: " + r.mimetype + EOL
+                    tmp.write "Content-Type: " + r.mimetype + r.mimextra + EOL
                     tmp.write EOL
                     tmp.write(r.value.respond_to?(:read) ? r.value.read : r.value)
                     tmp.write EOL

data/lib/ruby/riddl/protocols/xmpp/generator.rb

@@ -102,7 +102,7 @@ module Riddl
               n = @node.add('part')
               n.namespaces.add(nil,XR_NS)
               n.text = (r.value.respond_to?(:read) ? r.value.read : r.value)
-              n.attributes['content-type'] = r.mimetype
+              n.attributes['content-type'] = r.mimetype + r.mimextra
               n.attributes['RIDDL-TYPE'] = 'complex'
               if r.filename.nil?
                 n.attributes['content-id'] = r.name
@@ -153,7 +153,7 @@ module Riddl
                     n.attributes['RIDDL-TYPE'] = 'complex'
                     n.attributes['content-disposition'] = "#{mode == :input ? 'form-data' : 'riddl-data'}; name=\"#{r.name}\"#{r.filename.nil? ? '' : "; filename=\"#{r.filename}\""}"
                     n.attributes['content-transfer-encoding'] = 'binary'
-                    n.attributes['content-type'] = r.mimetype
+                    n.attributes['content-type'] = r.mimetype + r.mimextra
                     n.text = (r.value.respond_to?(:read) ? r.value.read : r.value)
                 end   
               end

data/lib/ruby/riddl/utils/fileserve.rb

@@ -1,4 +1,5 @@
 require 'mime/types'
+require 'charlock_holmes'
 require 'digest/md5'
 
 module Riddl
@@ -21,7 +22,13 @@ module Riddl
             @status = 304 # Not modified
             return []
           else 
-            return Riddl::Parameter::Complex.new("file",MIME::Types.type_for(path).first.to_s,File.open(path,'r'))
+            mt = MIME::Types.type_for(path).first
+            apx = ''
+            if mt.ascii?
+              tstr = File.read(path,CharlockHolmes::EncodingDetector::DEFAULT_BINARY_SCAN_LEN)
+              apx = ';charset=' + CharlockHolmes::EncodingDetector.detect(tstr)[:encoding]
+            end
+            return Riddl::Parameter::Complex.new('file',mt.to_s + apx,File.open(path,'r'))
           end  
         end
         @status = 404

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.164"
+  s.version          = "0.99.166"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"
@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'mime-types'
   s.add_runtime_dependency 'minitest', '>= 5.0.0'
   s.add_runtime_dependency 'blather'
+  s.add_runtime_dependency 'charlock_holmes'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.164
+  version: 0.99.166
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 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: xml-smart
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: rest service interface definition, mixing, and evolution. supports mixed
   http and xmpp servers.
 email: juergen.mangler@gmail.com