riddl 0.99.246 → 0.99.248

data/lib/ruby/riddl/wrapper/layerchecker.rb

@@ -12,8 +12,8 @@ module Riddl
       def check_layers(res)
         #{{{
         messages = []
-        res.each do |res|
-          messages += check_field(res.attributes['name'],res.parent.attributes['relative'] || '/')
+        res.each do |tres|
+          messages += check_field(tres.attributes['name'],tres.parent.attributes['relative'] || '/')
         end
         messages
         #}}}

data/lib/ruby/riddl/wrapper/resourcechecker.rb

@@ -12,17 +12,17 @@ module Riddl
       def check_rec_resources(res,path='')
         #{{{
         messages = []
-        res.each do |res|
+        res.each do |tres|
           tpath = if path == ''
             '/'
           else
-            res.attributes['relative'].nil? ? path + '{}/' : path + res.attributes['relative'] + '/'
+            tres.attributes['relative'].nil? ? path + '{}/' : path + tres.attributes['relative'] + '/'
           end
 
           h_ifield = {}; h_pfield = {}
           h_ofield = {}; h_tfield = {}
           h_cfield = {}
-          res.find("des:get|des:put|des:delete|des:post|des:request").each do |mt|
+          tres.find("des:get|des:put|des:delete|des:post|des:request").each do |mt|
             mn = (mt.attributes['type'].nil? ? mt.qname.to_s : mt.attributes['type'])
 
             h_ifield[mn] ||= {}; h_pfield[mn] ||= {}
@@ -51,14 +51,14 @@ module Riddl
           end
           h_ofield.each do |mn,ofield|
             messages += check_fields(ofield,"#{tpath} -> #{mn}","out","message")
-          end  
+          end
           h_tfield.each do |mn,tfield|
             messages += check_fields(tfield,"#{tpath} -> #{mn}","transformation","transformation")
-          end  
+          end
           h_cfield.each do |mn,cfield|
             messages << "#{tpath} -> #{mn}: more than one catchall (*) operation is not allowed." if cfield > 1
           end
-          messages += check_rec_resources(res.find("des:resource"),tpath)
+          messages += check_rec_resources(tres.find("des:resource"),tpath)
         end
         messages
         #}}}

data/riddl.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.246"
+  s.version          = "0.99.248"
   s.platform         = Gem::Platform::RUBY
-  s.license          = "LGPL-3"
+  s.license          = "LGPL-3.0"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"
 
   s.description      = "rest service interface definition, mixing, and evolution. supports mixed http and xmpp servers."
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'em-websocket-client', '>= 0.1', '~>0'
   s.add_runtime_dependency 'mime-types', '>= 2.4', '~>2'
   s.add_runtime_dependency 'minitest', '>= 5.0.0', '~>5'
-  s.add_runtime_dependency 'blather', '~>1'
+  s.add_runtime_dependency 'blather', '~>1.1'
   s.add_runtime_dependency 'charlock_holmes', '>= 0.7', '~>0'
   s.add_runtime_dependency 'redis', '>= 3.3.0', '~>3.3'
 end

data/tools/riddlcheck

@@ -0,0 +1 @@
+riddlcheck-1_0

data/tools/riddlprocess

@@ -0,0 +1 @@
+riddlprocess-1_0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.246
+  version: 0.99.248
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
@@ -186,14 +186,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
@@ -359,7 +359,6 @@ files:
 - examples/library/rngs/list-of-books.rng
 - examples/library/rngs/list-of-customers.rng
 - examples/library/rngs/list-of-loans.rng
-- examples/library/server-9292.pid
 - examples/library/server.rb
 - examples/library/static/info.txt
 - examples/notifications/implementation/index.html
@@ -513,7 +512,7 @@ files:
 - tools/riddlprocess-1_0
 homepage: http://www.wst.univie.ac.at/communities/riddl/
 licenses:
-- LGPL-3
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -531,7 +530,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'restful interface description and declaration language: tools and client/server

data/examples/declaration-server-distributed/properties.xml

@@ -1,150 +0,0 @@
-<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <message name="value">
-    <choice>
-      <parameter name="value" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
-        <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/properties/1.0">
-          <start>
-            <choice>
-              <element name="value">
-                <ref name="value"/>
-              </element>
-              <element name="not-existing">
-                <empty/>
-              </element>  
-            </choice>
-          </start>
-
-          <define name="value">
-            <zeroOrMore>
-              <choice>
-                <text/>
-                <ref name="any"/>
-              </choice>
-            </zeroOrMore>
-          </define>
-          
-          <define name="any">
-            <element>
-              <anyName/>
-              <zeroOrMore>
-                <attribute>
-                  <anyName/>
-                </attribute>
-              </zeroOrMore>
-              <ref name="value"/>
-            </element>
-          </define>
-
-        </grammar>
-      </parameter>
-      <parameter name="value" type="string"/>
-
-      <parameter name="content" mimetype="text/xml"/>
-      <parameter name="content" mimetype="text/plain"/>
-    </choice>
-  </message>
-
-  <message name="resource-document">
-    <parameter name="document" mimetype="text/xml"/>
-  </message>
-  <message name="resource-document-schema">
-    <parameter name="document-schema" mimetype="text/xml"/>
-  </message>
-
-  <message name="properties">
-    <oneOrMore>
-      <parameter name="name" type="string"/>
-      <choice>
-        <parameter name="value" type="string"/>
-        <parameter name="value" mimetype="text/plain"/>
-        <parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
-        <parameter name="content" type="string"/> <!-- add everything inside the root tag -->
-      </choice>
-    </oneOrMore>
-  </message>
-
-  <message name="propertylist">
-    <parameter name="properties" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
-      <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/properties/1.0">
-        <start>
-          <element name="properties">
-            <zeroOrMore>
-              <ref name="property"/>
-            </zeroOrMore>  
-          </element>
-        </start>
-
-        <define name="property">
-          <element>
-            <anyName/>
-            <data type="string"/>
-          </element>
-        </define>  
-
-      </grammar>
-    </parameter>
-  </message>
-  <message name="addcontent">
-    <choice>
-      <parameter name="value" type="string"/>
-      <parameter name="value" mimetype="text/xml"/>
-    </choice>  
-  </message>
-  <message name="updcontent">
-    <choice>
-      <parameter name="value" type="string"/>
-      <parameter name="value" mimetype="text/plain"/>
-      <parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
-      <parameter name="content" type="string"/> <!-- add everything inside the root tag -->
-    </choice>  
-  </message>
-  <message name="property">
-    <parameter name="name" type="string">
-      <param name="pattern">[a-zA-Z_][a-zA-Z0-9_]*</param>
-    </parameter>
-    <choice>
-      <parameter name="value" type="string"/>
-      <parameter name="value" mimetype="text/plain"/>
-      <parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
-      <parameter name="content" type="string"/> <!-- add everything inside the root tag -->
-    </choice>
-  </message>
-  <message name="query">
-    <parameter name="query" type="string"/>
-  </message>
-
-  <resource pattern="http://riddl.org/ns/common-patterns/properties/1.0">
-    <get in="*" out="resource-document"/>
-    <get in="query" out="value"/>
-    <resource relative="schema">
-      <get in="*" out="resource-document-schema"/>
-      <resource relative="rng">
-        <get in="*" out="resource-document-schema"/>
-      </resource>  
-      <resource relative="xsd">
-        <get in="*" out="resource-document-schema"/>
-      </resource>
-    </resource>
-    <resource relative="values">
-      <get in="*" out="propertylist"/>
-      <post in="property"/>
-      <put in="properties"/>
-      <resource>
-        <get in="*" out="value"/>
-        <delete in="*"/>
-        <post in="addcontent"/>
-        <put in="updcontent"/>
-        <resource>
-          <get in="*" out="value"/>
-          <put in="updcontent"/>
-          <delete in="*"/>
-          <resource recursive='true'>
-            <get in="*" out="value"/>
-          </resource>
-        </resource>
-      </resource>
-    </resource>
-  </resource>  
-
-</description>

data/examples/declaration-server-distributed/xsls/test/properties.xsl

@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="html" doctype-public="XSLT-compat"/>
-  <xsl:template match="*">
-    <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-      <head>
-         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-         <title>Further Explore the Notifications</title>
-      </head>
-      <body>
-        <h1>Navigation </h1>
-        <ul>
-          <li><a href='schema/'>Schema</a></li>  
-          <li><a href='values/'>Values</a></li>  
-        </ul>
-        <h1>RAW</h1>
-        <pre>
-          <xsl:apply-templates select="node()" mode="XmlEscape"/>
-        </pre>  
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:param name="NL"        select="'&#xA;'" /><!-- newline sequence -->
-  <xsl:param name="INDENTSEQ" select="'&#160;&#160;'" /><!-- indent sequence -->
-
-  <xsl:variable name="LT" select="'&lt;'" />
-  <xsl:variable name="GT" select="'&gt;'" />
-
-  <xsl:template match="transform-me">
-    <html>
-      <body>
-        <!-- this XML-escapes an entire sub-structure -->
-        <pre><xsl:apply-templates select="*" mode="XmlEscape" /></pre>
-      </body>
-    </html>
-  </xsl:template>
-
-  <!-- element nodes will be handled here, incl. proper indenting -->
-  <xsl:template match="*" mode="XmlEscape">
-    <xsl:param name="indent" select="''" />
-
-    <xsl:value-of select="concat($indent, $LT, name())" />
-    <xsl:apply-templates select="@*" mode="XmlEscape" />
-
-    <xsl:variable name="HasChildNode" select="node()[not(self::text())]" />
-    <xsl:variable name="HasChildText" select="text()[normalize-space()]" />
-    <xsl:choose>
-      <xsl:when test="$HasChildNode or $HasChildText">
-        <xsl:value-of select="$GT" />
-        <xsl:if test="not($HasChildText)">
-          <xsl:value-of select="$NL" />
-        </xsl:if>
-        <!-- render child nodes -->
-        <xsl:apply-templates mode="XmlEscape" select="node()">
-          <xsl:with-param name="indent" select="concat($INDENTSEQ, $indent)" />
-        </xsl:apply-templates>
-        <xsl:if test="not($HasChildText)">
-          <xsl:value-of select="$indent" />
-        </xsl:if>
-        <xsl:value-of select="concat($LT, '/', name(), $GT, $NL)" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="concat(' /', $GT, $NL)" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- comments will be handled here -->
-  <xsl:template match="comment()" mode="XmlEscape">
-    <xsl:param name="indent" select="''" />
-    <xsl:value-of select="concat($indent, $LT, '!--', ., '--', $GT, $NL)" />
-  </xsl:template>
-
-  <!-- text nodes will be printed XML-escaped -->
-  <xsl:template match="text()" mode="XmlEscape">
-    <xsl:if test="not(normalize-space() = '')">
-      <xsl:call-template name="XmlEscapeString">
-        <xsl:with-param name="s" select="." />
-        <xsl:with-param name="IsAttribute" select="false()" />
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- attributes become a string: '{name()}="{escaped-value()}"' -->
-  <xsl:template match="@*" mode="XmlEscape">
-    <xsl:value-of select="concat(' ', name(), '=&quot;')" />
-    <xsl:call-template name="XmlEscapeString">
-      <xsl:with-param name="s" select="." />
-      <xsl:with-param name="IsAttribute" select="true()" />
-    </xsl:call-template>
-    <xsl:value-of select="'&quot;'" />
-  </xsl:template>
-
-  <!-- template to XML-escape a string -->
-  <xsl:template name="XmlEscapeString">
-    <xsl:param name="s" select="''" />
-    <xsl:param name="IsAttribute" select="false()" />
-    <!-- chars &, < and > are never allowed -->
-    <xsl:variable name="step1">
-      <xsl:call-template name="StringReplace">
-        <xsl:with-param name="s"       select="$s" />
-        <xsl:with-param name="search"  select="'&amp;'" />
-        <xsl:with-param name="replace" select="'&amp;amp;'" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="step2">
-      <xsl:call-template name="StringReplace">
-        <xsl:with-param name="s"       select="$step1" />
-        <xsl:with-param name="search"  select="'&lt;'" />
-        <xsl:with-param name="replace" select="'&amp;lt;'" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="step3">
-      <xsl:call-template name="StringReplace">
-        <xsl:with-param name="s"       select="$step2" />
-        <xsl:with-param name="search"  select="'&gt;'" />
-        <xsl:with-param name="replace" select="'&amp;lt;'" />
-      </xsl:call-template>
-    </xsl:variable>
-    <!-- chars ", TAB, CR and LF are never allowed in attributes -->
-    <xsl:choose>
-      <xsl:when test="$IsAttribute">
-        <xsl:variable name="step4">
-          <xsl:call-template name="StringReplace">
-            <xsl:with-param name="s"       select="$step3" />
-            <xsl:with-param name="search"  select="'&quot;'" />
-            <xsl:with-param name="replace" select="'&amp;quot;'" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="step5">
-          <xsl:call-template name="StringReplace">
-            <xsl:with-param name="s"       select="$step4" />
-            <xsl:with-param name="search"  select="'&#x9;'" />
-            <xsl:with-param name="replace" select="'&amp;#x9;'" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="step6">
-          <xsl:call-template name="StringReplace">
-            <xsl:with-param name="s"       select="$step5" />
-            <xsl:with-param name="search"  select="'&#xA;'" />
-            <xsl:with-param name="replace" select="'&amp;#xD;'" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="step7">
-          <xsl:call-template name="StringReplace">
-            <xsl:with-param name="s"       select="$step6" />
-            <xsl:with-param name="search"  select="'&#xD;'" />
-            <xsl:with-param name="replace" select="'&amp;#xD;'" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="$step7" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$step3" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- generic string replace template -->
-  <xsl:template name="StringReplace">
-    <xsl:param name="s"       select="''" />
-    <xsl:param name="search"  select="''" />
-    <xsl:param name="replace" select="''" />
-
-    <xsl:choose>
-      <xsl:when test="contains($s, $search)">
-        <xsl:value-of select="substring-before($s, $search)" />
-        <xsl:value-of select="$replace" />
-        <xsl:variable name="rest" select="substring-after($s, $search)" />
-        <xsl:if test="$rest">
-          <xsl:call-template name="StringReplace">
-            <xsl:with-param name="s"       select="$rest" />
-            <xsl:with-param name="search"  select="$search" />
-            <xsl:with-param name="replace" select="$replace" />
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$s" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>