riddl 0.99.196 → 0.99.197

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71e91dab768e617feaeefd4578f8f6ed7a5b0794
-  data.tar.gz: 22ea00a94c657f994e37c5450f3dcf6466c2079c
+  metadata.gz: f63ab5e073d3f4ad52ca2a8da2610744e41c5bd3
+  data.tar.gz: 6d2230ea52f58d53079cea749da984748705edbe
 SHA512:
-  metadata.gz: 41c7e768e4b3fb83274672d08e15cc832822d488904e943d700e316b1e11dc6879231a675e9347a9688f17efb7cd98ed1292204df7ecc1a33a04c37afca894f7
-  data.tar.gz: 62fd64e0c2d91059bce0b209572c95f34aa54a7178897ec2600e084464bcc3e0553398c20206a08e1f9b6419e4e7ca7e96576faa9a72c2ae05bcd6372ea2f547
+  metadata.gz: d81f4ada7e6f5439766326bea935a36d4e111b58fe32a069b9f5710c9963f4de8e29bdeb4492b1cf58b3912174d8e88af0af3e9efead16e0d22939c7064b3103
+  data.tar.gz: c76110264a2abffa77c0e6136eda9f4a571b08d3b7c056604157da273582b5c86566e38faeda7be72c564b07ade64a97976a221a051c2ab75d8e85d32e9ef488

data/lib/ruby/riddl/server.rb

@@ -43,13 +43,14 @@ module Riddl
     end #}}}
 
     OPTS = { 
-      :host     => 'localhost',
-      :port     => 9292,
-      :secure   => false,
-      :mode     => :debug,
-      :basepath => File.expand_path(File.dirname($0)),
-      :pidfile  => File.basename($0,'.rb') + '.pid',
-      :conffile => File.basename($0,'.rb') + '.conf'
+      :host            => 'localhost',
+      :port            => 9292,
+      :secure          => false,
+      :mode            => :debug,
+      :basepath        => File.expand_path(File.dirname($0)),
+      :pidfile         => File.basename($0,'.rb') + '.pid',
+      :conffile        => File.basename($0,'.rb') + '.conf',
+      :runtime_options => []
     }
 
     def loop! #{{{
@@ -61,16 +62,18 @@ module Riddl
       operation = "start"
       ARGV.options { |opt|
         opt.summary_indent = ' ' * 4
-        opt.banner = "Usage:\n#{opt.summary_indent}ruby server.rb [options] start|startclean|stop|restart|info\n"
+        opt.banner = "Usage:\n#{opt.summary_indent}ruby server.rb [options] start|stop|restart|info|...\n"
         opt.on("Options:")
         opt.on("--http-only", "-s", "Only http, no other protocols.") { http_only = true }
         opt.on("--verbose", "-v", "Do not daemonize. Write ouput to console.") { verbose = true }
         opt.on("--help", "-h", "This text.") { puts opt; exit }
         opt.separator(opt.summary_indent + "start|stop|restart|info".ljust(opt.summary_width+1) + "Do operation start, stop, restart or get information.")
-        opt.separator(opt.summary_indent + "startclean".ljust(opt.summary_width+1) + "Delete all instances before starting.")
+        @riddl_opts[:runtime_options].each do |ro|
+          opt.separator(opt.summary_indent + ro[0].ljust(opt.summary_width+1) + ro[1])
+        end
         opt.parse!
       }
-      unless %w{start startclean stop restart info}.include?(ARGV[0])
+      unless (%w{start stop restart info} + @riddl_opts[:runtime_options].map{|ro| ro[0] }).include?(ARGV[0])
         puts ARGV.options
         exit
       end
@@ -104,10 +107,12 @@ module Riddl
         end
         exit
       end
-      if %w{start startclean}.include?(operation) && status.call == true
+      if %w{start}.include?(operation) && status.call == true
         puts "Server (#{@riddl_opts[:url]}) already started"
         exit
       end
+
+
       
       ########################################################################################################################
       # stop/restart server
@@ -127,12 +132,10 @@ module Riddl
       end
       
       ########################################################################################################################
-      # start server
+      # go through user defined startup thingis
       ########################################################################################################################
-      if operation == 'startclean'
-        Dir.glob(File.expand_path(@riddl_opts[:basepath] + '/instances/*')).each do |d|
-          FileUtils.rm_r(d) if File.basename(d) =~ /^\d+$/
-        end
+      @riddl_opts[:runtime_options].each do |ro|
+        ro[2].call(status.call) if operation == ro[0]
       end
 
       app = Rack::Builder.new self

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

@@ -21,18 +21,25 @@ module Riddl
             @headers << Riddl::Header.new("Connection","close")
             @status = 304 # Not modified
             return []
-          else 
-            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]
+          else
+            fmt = @a[1] || begin
+              mt = MIME::Types.type_for(path).first
+              if mt.nil?
+                'text/plain;charset=utf-8'
+              else
+                apx = ''
+                if mt.ascii?
+                  tstr = File.read(path,CharlockHolmes::EncodingDetector::DEFAULT_BINARY_SCAN_LEN)
+                  apx = ';charset=' + CharlockHolmes::EncodingDetector.detect(tstr)[:encoding]
+                end
+                mt.to_s + apx
+              end
             end
-            return Riddl::Parameter::Complex.new('file',mt.to_s + apx,File.open(path,'r'))
-          end  
+            return Riddl::Parameter::Complex.new('file',fmt,File.open(path,'r'))
+          end
         end
         @status = 404
-      end  
+      end
     end
-  end  
-end  
+  end
+end

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.196"
+  s.version          = "0.99.197"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.196
+  version: 0.99.197
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart