riddl 0.99.220 → 0.99.221

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce47165e288d9448eecdc4ceff488af317a1458f
-  data.tar.gz: 16e22cc288618e8c91e4f01dea79c316321e57f4
+  metadata.gz: d5cf129b80641d4c8065f26e8d0ef4ab4826f61d
+  data.tar.gz: 0037ac8bd56d521e825201f1a13195056d41aeb0
 SHA512:
-  metadata.gz: a4cccae7cfedfe0c4e76139c73a5b130961b11050a0bb10434f0048131159a0878b968899f42d38a7bf65c1678482be28d6e237b9432cd656e4052b4e5ba9ecc
-  data.tar.gz: 533e699f9267e98379440f9a13bf0379aeed2f847360388df3998083398fcd7d0ad9e517b2c60ea5d7685c324edc3719381aed6c3752d53b7fba36ca33819e04
+  metadata.gz: 63d54e200b15c4701f67384b3d9c35a1489eddcf0bc73f4e8464c899765bac510618ff1b9b92b9a4d52ac85113331c3edc73e410c9d0baa326a20acf61e5aca2
+  data.tar.gz: dfc2a396ca3cc988dc08f1ced7dd7313dc700a32004b7a29d0ff6991e9295d4bbcfbd08ab0316e9b653419a6f87477ad62fc385fcd199683eb696ef7abbaf8c0

data/lib/ruby/riddl/utils/oauth2-helper.rb

@@ -15,7 +15,7 @@ module Riddl
             read
           end
 
-          def get(name,valuem,dur)
+          def get(name)
             read if changed != @changed
             @tokens[name]
           end

data/lib/ruby/riddl/utils/oauth2-univie.rb

@@ -55,7 +55,7 @@ module Riddl
 								}.to_json)
 							end
 
-							@headers << Riddl::Header.new('AUTHORIZATION_BEARER', access_tokens[token])
+							@headers << Riddl::Header.new('AUTHORIZATION_BEARER', access_tokens.get(token))
 						end
 
 						@p
@@ -145,15 +145,15 @@ module Riddl
               return Riddl::Parameter::Complex.new('data', 'application/json', {
                 :error => 'Token must be refreshed by issuer.'
               }.to_json)
-            elsif refresh_tokens[refresh_token].nil? || token_data['exp'] <= Time.now.to_i
+            elsif !refresh_tokens.key?(refresh_token) || token_data['exp'] <= Time.now.to_i
               @status = 403
-              puts "i dont know #{refresh_token}", "#{refresh_tokens[refresh_token]}"
+              puts "i dont know #{refresh_token}", "#{refresh_tokens.get(refresh_token)}"
               return Riddl::Parameter::Complex.new('data', 'application/json', {
                 :error => 'Invalid refresh token.'
               }.to_json)
             end
 
-            old_token = refresh_tokens[refresh_token]
+            old_token = refresh_tokens.get(refresh_token)
             user = access_tokens.delete old_token
 
             token = Riddl::Utils::OAuth2::Helper::generate_access_token(client_id, client_id + ':' + client_secret, adur)

data/riddl.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.220
+  version: 0.99.221
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -387,13 +387,7 @@ files:
 - lib/ruby/riddl/client.rb
 - lib/ruby/riddl/commonlogger.rb
 - lib/ruby/riddl/constants.rb
-- lib/ruby/riddl/description.rb
-- lib/ruby/riddl/docoverlay.html
-- lib/ruby/riddl/docoverlay.rb
-- lib/ruby/riddl/downloadify.rb
-- lib/ruby/riddl/erbserve.rb
 - lib/ruby/riddl/error.rb
-- lib/ruby/riddl/fileserve.rb
 - lib/ruby/riddl/handlers.rb
 - lib/ruby/riddl/handlers/oauth.rb
 - lib/ruby/riddl/handlers/plain-type.rb
@@ -401,7 +395,6 @@ files:
 - lib/ruby/riddl/handlers/xmlschema.rb
 - lib/ruby/riddl/header.rb
 - lib/ruby/riddl/implementation.rb
-- lib/ruby/riddl/notifications_producer.rb
 - lib/ruby/riddl/ns/common-patterns/addon-security/request.xml
 - lib/ruby/riddl/ns/common-patterns/addon-security/response.xml
 - lib/ruby/riddl/ns/common-patterns/downloadify/1.0/downloadify.xml
@@ -420,11 +413,8 @@ files:
 - lib/ruby/riddl/ns/common/relaxng.rng
 - lib/ruby/riddl/ns/declaration/1.0/declaration.rng
 - lib/ruby/riddl/ns/description/1.0/description.rng
-- lib/ruby/riddl/oauth2-helper.rb
-- lib/ruby/riddl/oauth2-univie.rb
 - lib/ruby/riddl/option.rb
 - lib/ruby/riddl/parameter.rb
-- lib/ruby/riddl/properties.rb
 - lib/ruby/riddl/protocols/http/generator.rb
 - lib/ruby/riddl/protocols/http/parser.rb
 - lib/ruby/riddl/protocols/utils.rb
@@ -437,7 +427,6 @@ files:
 - lib/ruby/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Frequest_token.rb
 - lib/ruby/riddl/roles/http%3A%2F%2Foauth.net%2F1.0/base.rb
 - lib/ruby/riddl/server.rb
-- lib/ruby/riddl/turtle.rb
 - lib/ruby/riddl/utils/description.rb
 - lib/ruby/riddl/utils/docoverlay.html
 - lib/ruby/riddl/utils/docoverlay.rb
@@ -463,8 +452,6 @@ files:
 - lib/ruby/riddl/wrapper/layerchecker.rb
 - lib/ruby/riddl/wrapper/messageparser.rb
 - lib/ruby/riddl/wrapper/resourcechecker.rb
-- lib/ruby/riddl/xmlserve.rb
-- lib/ruby/riddl/xsloverlay.rb
 - ns/common-patterns/addon-security/request.xml
 - ns/common-patterns/addon-security/response.xml
 - ns/common-patterns/downloadify/1.0/downloadify.xml

data/lib/ruby/riddl/description.rb

@@ -1,33 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../client')
-
-module Riddl
-  module Utils
-    module Description
-
-      class RDR < Riddl::Implementation
-        def response
-          @headers << Riddl::Header.new("RIDDL_DESCRIPTION", 'oh my, a riddl description')
-          return Riddl::Parameter::Complex.new("riddl-description","text/xml",@a[0])
-        end
-      end
-
-      class Call < Riddl::Implementation
-        def response
-          client = Riddl::Client.new @a[3]
-
-          path = client.resource "/" + @a[4]
-          @status, result, headers = if @a[0].nil?
-            path.request @m => [ Riddl::Header.new("RIDDL_DECLARATION_RESOURCE", @a[2]), Riddl::Header.new("RIDDL-DECLARATION-PATH", @a[1]) ] + @h.map{|a,b| Riddl::Header.new(a,b)} + @p
-          else 
-            path.request @m => [ Riddl::Header.new("RIDDL_DECLARATION_RESOURCE", @a[2]), Riddl::Header.new("RIDDL-DECLARATION-PATH", @a[1]) ] + @a[0].headers.map{|a,b| Riddl::Header.new(a,b)} + @a[0].response
-          end
-          headers.each do |k,v|
-            @headers << Riddl::Header.new(k,v) unless ["CONTENT_TYPE", "CONTENT_DISPOSITION", "RIDDL_TYPE", "CONTENT_ID", "CONTENT_LENGTH", "CONNECTION", "SERVER"].include?(k)
-          end
-          result
-        end
-      end
-      
-    end
-  end
-end

data/lib/ruby/riddl/docoverlay.html

@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=EDGE"/>
-
-    <title>Documentation</title>
-
-    <style>
-      body {
-        counter-reset: h1counter;
-      }
-      h1 { font-size: 1.5em; counter-reset: h2counter; }
-      h2 { font-size: 1.2em; }
-      h3 { font-size: 1.0em }
-      h1:before {
-          content: counter(h1counter) ".\0000a0\0000a0";
-          counter-increment: h1counter;
-      }
-      h2:before {
-        content: counter(h1counter) "." counter(h2counter) ".\0000a0\0000a0";
-        counter-increment: h2counter;
-      }
-      .code {
-        border: 1px dashed #425d73; background-color: #DEE6EE; margin:0px; padding: 0.5em 1em; font-family: monospace; font-size:0.9em;
-      }
-    </style>
-
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.2/marked.min.js"></script>
-    <script src="https://cdn.rawgit.com/vkiryukhin/vkBeautify/master/vkbeautify.js"></script>
-    <script>//<![CDATA[
-      $.fn.serializeXML = function(){
-        var out = '';
-        if (typeof XMLSerializer == 'function') {
-          var xs = new XMLSerializer();
-          this.each(function() {
-            out += xs.serializeToString(this);
-          });
-        } else if (this[0] && this[0].xml != 'undefined') {
-          this.each(function() {
-            out += this.xml;
-          });
-        }
-        return out;
-      };
-
-      function docChildren(path,name,data){
-        var ret= [];
-        var subject = path ? $(path,data) : $(data);
-        subject.children().each(function(k,ele){
-          if (ele.localName == name && ele.namespaceURI == "http://riddl.org/ns/documentation/1.0") {
-            ret.push(ele);
-          }
-        });
-        return $(ret);
-      }
-
-      function codeFormat(temp) {
-        temp = temp.replace(/\&/g,"&amp;").replace(/\"/g,"&quot;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/'/g,"&apos;");
-        temp = temp.replace(/\t/g,'  ');
-        temp = temp.replace(/\r/g,'');
-        temp = temp.replace(/^$/g,' ');
-        temp = temp.replace(/^ */gm,function mf(m){
-          var tm = (m.length + 2) * 0.6 + 2 * 0.6;
-          return "<div style='text-indent:-" + tm + "em;margin-left:" + tm + "em'>" + (Array(m.length + 1).join("&#160;"));
-        });
-        temp = temp.replace(/  /g," &#160;");
-        temp = temp.replace(/\n/g,"</div>\n");
-        temp += "</div>\n";
-        temp = temp.replace(/href=&quot;([^&]+)&quot;/g,'href=&quot;<a href="/__doc_includes/$1">$1</a>&quot;')
-        return temp;
-      }
-
-      $(document).ready(function(){
-        var rpath = "<%= @h['RIDDL_DECLARATION_PATH'] %>";
-        var pathele = _.compact(rpath.split('/'));
-
-        var t = $('#breadcrumblink')[0];
-        var link = "";
-        _.each(pathele,function(e){
-          link = link + "/" + e; 
-          var clone = document.importNode(t.content, true); 
-          $('a',clone).attr('href',link + "/?doc=true");
-          $('a',clone).text(e);
-          $('#breadcrumb').append(clone);
-        });
-
-        $.ajax({
-          url: rpath + "?riddl-resource-description",
-          success: function(data){
-            $('#main').append(marked(docChildren('description > resource','documentation',data).text()));
-
-            var subr = $('description > resource > resource',data);
-            if (subr.length == 0) {
-              $('#subresources').remove();
-            } else {
-              $('description > resource > resource',data).each(function(k,ele){
-                var sum = docChildren(null,'documentation',ele).attr('summary');
-                var exa = docChildren(null,'example',ele);
-                    exa = exa.length == 0 ? null : exa.text();
-                if (exa) {
-                  var rell = exa;
-		  if ($(ele).attr('relative')) {
-	            var relt = exa + ' (' + $(ele).attr('relative') + ')';
-		  } else {
-	            var relt = '{} (any string possible)';
-		  }
-                } else {
-                  var rell = $(ele).attr('relative');
-                  var relt = _.trim(rell);
-                }
-                var t = $('#subresourceitem')[0];
-                var clone = document.importNode(t.content, true); 
-                $('a',clone).attr('href','./' + rell + '/?doc=true');
-                if (relt != "") {
-                  $('a',clone).text(relt);
-                }
-                if (sum) { $('.content',clone).text(sum); }
-                $('#subresources .anchor').append(clone); 
-              });
-            }
-
-            var oprs = $('description > resource > get, description > resource > post, description > resource > put, description > resource > delete, description > resource > request',data);
-            if (oprs.length == 0) {
-              $('#operations').remove();
-            } else {
-              oprs.each(function(k,ele){
-                var sum = docChildren(null,'documentation',ele).attr('summary');
-                var details = docChildren(null,'documentation',ele).text();
-		var example =  docChildren(null,'example',ele);
-                var ex = null;
-
-                var tin = $(ele).attr('in');
-                var tout = $(ele).attr('out');
-                var whatl = $(ele).prop('tagName');
-                var whatd = tin == "*" ? '' : '( ' + tin + ' )';
-                    whatd += tout ? ' : ' +  tout : '';
-
-                var tinmess = "";
-                if (tin && tin != "*") {
-                  $('description > message[name="' + tin + '"]',data).each(function(k,mess){
-                    tinmess = mess;
-                    _.each(mess.attributes,function(attr){
-                      if (attr.localName == 'example' && attr.namespaceURI == "http://riddl.org/ns/documentation/1.0") {
-                        ex = attr.nodeValue; 
-                      }
-                    });
-                  });
-                }
-                if (example.length > 0) { ex = example.text(); }
-
-                var toutmess = "";
-                if (tout && tout != "*") {
-                  $('description > message[name="' + tout + '"]',data).each(function(k,mess){
-                    toutmess = mess;
-                  });
-                }
-
-                // Overview
-                var t = $('#operationitem')[0];
-                var clone = document.importNode(t.content, true); 
-                $('.what .link',clone).text(whatl);
-                $('.what .link',clone).attr('href','#' + (whatl + '_' + whatd).replace(/ /g,'_'));
-                $('.what .details',clone).text(whatd);
-                if (ex != null) {
-                  if (ex == "")
-                    $('.what .try a',clone).attr('href',window.location.pathname);
-                  else
-                    $('.what .try a',clone).attr('href','?' + ex);
-                } else {
-                  $('.what .try',clone).remove();
-                }
-                if (sum) { $('.content',clone).text(sum); }
-                $('#operations .anchor').append(clone); 
-
-                //Details
-                var t = $('#operationsec')[0];
-                var clone = document.importNode(t.content, true); 
-                $('.what',clone).text(whatl + ' ' + whatd);
-                $('.what',clone).attr('id',(whatl + '_' + whatd).replace(/ /g,'_'));
-                if (_.trim(details) == "") {
-                  $('.text',clone).text(sum);
-                } else {
-                  $('.text',clone).append(marked(details));
-                }
-                if (ex != null) {
-                  if (ex == "") {
-                    $('.try a',clone).attr('href',window.location.pathname);
-                  } else {
-                    $('.try a',clone).attr('href','?' + ex);
-                    $('.try a',clone).text('?' + ex);
-                  } 
-                } else {
-                  $('.try',clone).remove();
-                }
-
-                if (tin && tin != "*") {
-                  $('.input .message',clone).html(codeFormat(vkbeautify.xml($(tinmess).serializeXML(),'  ')));
-                } else {
-                  $('.input',clone).remove();
-                }
-                if (tout) {
-                  $('.output .message',clone).html(codeFormat(vkbeautify.xml($(toutmess).serializeXML(),'  ')));
-                } else {
-                  $('.output',clone).remove();
-                }
-                $('#operations').append(clone); 
-              });
-            }
-          }
-        });
-      });
-    //]]></script> 
-  </head>
-  <body>
-    <template id="breadcrumblink"><span> / </span><a href=""></a></template>
-    <template id="subresourceitem"><li><div class='what'><a class='details' href=''>Example missing</a></div><div class="content"></div></li></template>
-    <template id="operationitem"><li><div class='what'><a class='link' href=''></a> <span class='details'></span> <span class='try'>(<a href=''>Try it!</a>)</span></div><div class="content"></div></li></template>
-    <template id="operationsec">
-      <section>
-        <h2 class="what" id=""></h2>
-        <p class="try">Example: <a href=""><i>no parameters</i></a></p>
-        <p class="text"></p>
-        <div class="input">
-          <h3>Input</h3>
-          <div class='message code'></div>
-        </div>
-        <div class="output">
-          <h3>Output</h3>
-          <div class='message code'></div>
-        </div>
-      </section>
-    </template>
-
-    <nav id="breadcrumb">[<a href="/">TOP</a>]</nav>
-    <section id="main"></section> 
-    <section id="subresources">
-      <h1>Sub-Resources</h1>
-      <p>From here on you can go to the following sub resources:</p>
-      <ul class="anchor"></ul>
-    </section> 
-    <section id="operations">
-      <h1>Operations</h1>
-      <section>
-        <p>For this resource the following operations are possible:</p>
-        <ul class="anchor"></ul>
-      </section>
-    </section> 
-  </body>
-</html>
-
-
-

data/lib/ruby/riddl/docoverlay.rb

@@ -1,14 +0,0 @@
-require 'erb'
-
-module Riddl
-  module Utils
-
-    class DocOverlay < Riddl::Implementation
-      def response
-        rval = ERB.new(File.read(File.dirname(__FILE__) + '/docoverlay.html'), 0, "%<>")
-        Riddl::Parameter::Complex.new('documentationresponse','text/html',rval.result(binding))
-      end
-    end
-      
-  end
-end

data/lib/ruby/riddl/downloadify.rb

@@ -1,14 +0,0 @@
-require 'mime/types'
-require 'digest/md5'
-
-module Riddl
-  module Utils
-    class Downloadify < Riddl::Implementation
-      def response
-        mimetype = @p.find{|e|e.name == 'mimetype'}.value
-        content = @p.find{|e|e.name == 'content'}.value
-        Riddl::Parameter::Complex.new("content",mimetype,content,@r.last)
-      end  
-    end
-  end  
-end  

data/lib/ruby/riddl/erbserve.rb

@@ -1,24 +0,0 @@
-require 'mime/types'
-require 'erb'
-
-module Riddl
-  module Utils
-    class ERBServe < Riddl::Implementation
-      def response
-        path = File.file?(@a[0]) ? @a[0] : "#{@a[0]}/#{@r[@match.length..-1].join('/')}".gsub(/\/+/,'/')
-        input = @a[1]
-        if File.directory?(path)
-          @status = 404
-          return []
-        end
-        if File.exists?(path)
-          __ERB_FILE__ = path
-          rval = ERB.new(File.read(path), 0, "%<>")
-          return Riddl::Parameter::Complex.new("data",MIME::Types.type_for(path)[0].to_s,rval.result(binding))
-        end
-        @status = 404
-        []
-      end  
-    end
-  end  
-end