riddl 0.99.120 → 0.99.121

data/lib/riddl/server.rb

@@ -329,7 +329,7 @@ module Riddl
           :h => @riddl_headers,
           :p => @riddl_parameters,
           :r => @riddl_pinfo.sub(/\//,'').split('/').map{|e|Protocols::HTTP::Parser::unescape(e)}, 
-          :s => @riddl_matching_path[0].sub(/\//,'').split('/').map{|e|Protocols::HTTP::Parser::unescape(e)},
+          :s => @riddl_matching_path[0].sub(/\//,'').split('/'),
           :m => @riddl_method, 
           :env =>  Hash[@riddl_env.root.attributes.map{|a| [a.qname.name, a.value] }].merge({ 'riddl.transport' => 'xmpp' }),
           :match => []
@@ -390,7 +390,7 @@ module Riddl
           :h => @riddl_headers,
           :p => @riddl_parameters,
           :r => @riddl_pinfo.sub(/\//,'').split('/').map{|e|Protocols::HTTP::Parser::unescape(e)}, 
-          :s => @riddl_matching_path[0].sub(/\//,'').split('/').map{|e|Protocols::HTTP::Parser::unescape(e)},
+          :s => @riddl_matching_path[0].sub(/\//,'').split('/'),
           :m => @riddl_method, 
           :env => @riddl_env.reject{|k,v| k =~ /^rack\./}.merge({'riddl.transport' => 'xmpp'}),
           :match => []

data/lib/riddl/utils/erbserve.rb

@@ -13,7 +13,7 @@ module Riddl
         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).to_s,rval.result(binding))
+          return Riddl::Parameter::Complex.new("data",MIME::Types.type_for(path)[0].to_s,rval.result(binding))
         end
         @status = 404
         []

data/riddl.gemspec

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

data/test/tc_library.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__) + '/smartrunner.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/riddl/client')
+require 'xml/smart'
+require 'pp'
+
+class TestLibrary <  MiniTest::Unit::TestCase
+  include ServerCase
+
+  SERVER = [
+    TestServerInfo.new(
+      File.expand_path(File.dirname(__FILE__) + '/../examples/library/server.rb'),
+      File.expand_path(File.dirname(__FILE__) + '/../examples/library/description.xml')
+    )
+  ]
+  NORUN = false
+
+  def test_library
+    ep = Riddl::Client.interface(SERVER[0].url,SERVER[0].schema)
+
+    test = ep.resource('/')
+    status, res = test.get
+    assert status == 200
+    assert res.length == 1
+    assert res[0].mimetype == 'text/plain'
+
+
+    test = ep.resource('/books')
+    status, res = test.request 'get' => [
+      Riddl::Header.new("Library",7),
+      Riddl::Parameter::Simple.new("author","Mangler"),
+      Riddl::Parameter::Simple.new("title","12 bottles of beer on the wall")
+    ]
+    assert status == 200
+    assert res.length == 1
+    assert res[0].mimetype == 'text/xml'
+
+    doc = XML::Smart.string(res[0].value.read)
+    assert doc.find('string(/books/book/title)') == '12 bottles of beer on the wall'
+    assert doc.find('string(/books/book/author[1])') == 'Agador'
+    assert doc.find('string(/books/book/author[2])') == 'Mangler'
+  end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.120
+  version: 0.99.121
+  prerelease: 
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blather
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -145,87 +164,87 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- lib/riddl/ns/declaration/1.0/declaration.rng
 - lib/riddl/ns/common/relaxng-modular.rng
 - lib/riddl/ns/common/relaxng.rng
 - lib/riddl/ns/common/datatypes-1_0.rng
 - lib/riddl/ns/description/1.0/description.rng
-- lib/riddl/ns/common-patterns/riddl-description/show.xml
-- lib/riddl/ns/common-patterns/riddl-description/resource-show.xml
 - lib/riddl/ns/common-patterns/properties/1.0/properties.xml
 - lib/riddl/ns/common-patterns/properties/1.0/properties.schema.xsl
 - lib/riddl/ns/common-patterns/properties/1.0/properties.schema.schema
 - lib/riddl/ns/common-patterns/notifications-producer/1.0/producer.xml
-- lib/riddl/ns/common-patterns/notifications-consumer/1.0/consumer.xml
 - lib/riddl/ns/common-patterns/addon-security/request.xml
 - lib/riddl/ns/common-patterns/addon-security/response.xml
 - lib/riddl/ns/common-patterns/downloadify/1.0/downloadify.xml
-- lib/riddl/ns/declaration/1.0/declaration.rng
+- lib/riddl/ns/common-patterns/notifications-consumer/1.0/consumer.xml
+- lib/riddl/ns/common-patterns/riddl-description/resource-show.xml
+- lib/riddl/ns/common-patterns/riddl-description/show.xml
 - tools/riddlprocess-1_0
 - tools/flash-policy-server.rb
+- tools/riddlprocess
 - tools/riddlcheck
 - tools/riddlcheck-1_0
-- tools/riddlprocess
+- ns/declaration/1.0/declaration.rng
 - ns/common/relaxng-modular.rng
 - ns/common/relaxng.rng
 - ns/common/datatypes-1_0.rng
 - ns/description/1.0/description.rng
-- ns/common-patterns/riddl-description/show.xml
-- ns/common-patterns/riddl-description/resource-show.xml
 - ns/common-patterns/properties/1.0/properties.xml
 - ns/common-patterns/properties/1.0/properties.schema.xsl
 - ns/common-patterns/properties/1.0/properties.schema.schema
 - ns/common-patterns/notifications-producer/1.0/producer.xml
-- ns/common-patterns/notifications-consumer/1.0/consumer.xml
 - ns/common-patterns/addon-security/request.xml
 - ns/common-patterns/addon-security/response.xml
 - ns/common-patterns/downloadify/1.0/downloadify.xml
-- ns/declaration/1.0/declaration.rng
+- ns/common-patterns/notifications-consumer/1.0/consumer.xml
+- ns/common-patterns/riddl-description/resource-show.xml
+- ns/common-patterns/riddl-description/show.xml
 - contrib/riddl.svg
-- contrib/riddl.png
 - contrib/riddl.jpg
-- lib/riddl/wrapper.rb
-- lib/riddl/header.rb
-- lib/riddl/option.rb
-- lib/riddl/commonlogger.rb
-- lib/riddl/protocols/websocket.rb
-- lib/riddl/protocols/xmpp/parser.rb
-- lib/riddl/protocols/xmpp/generator.rb
-- lib/riddl/protocols/http/parser.rb
-- lib/riddl/protocols/http/generator.rb
+- contrib/riddl.png
+- lib/riddl/parameter.rb
+- lib/riddl/handlers/plain-type.rb
 - lib/riddl/handlers/oauth.rb
-- lib/riddl/handlers/xmlschema.rb
 - lib/riddl/handlers/relaxng.rb
-- lib/riddl/handlers/plain-type.rb
+- lib/riddl/handlers/xmlschema.rb
 - lib/riddl/client.rb
+- lib/riddl/option.rb
+- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0/base.rb
+- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Fon_behalf.rb
+- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Faccess_token.rb
+- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Frequest_token.rb
 - lib/riddl/roles.rb
-- lib/riddl/implementation.rb
-- lib/riddl/utils/properties.rb
-- lib/riddl/utils/fileserve.rb
-- lib/riddl/utils/notifications_producer.rb
-- lib/riddl/utils/downloadify.rb
-- lib/riddl/utils/description.rb
-- lib/riddl/utils/xsloverlay.rb
-- lib/riddl/utils/erbserve.rb
-- lib/riddl/server.rb
 - lib/riddl/handlers.rb
+- lib/riddl/server.rb
 - lib/riddl/constants.rb
+- lib/riddl/wrapper.rb
+- lib/riddl/implementation.rb
+- lib/riddl/header.rb
 - lib/riddl/error.rb
-- lib/riddl/wrapper/description/resource.rb
-- lib/riddl/wrapper/description/access.rb
-- lib/riddl/wrapper/description/message_and_transformation.rb
-- lib/riddl/wrapper/layerchecker.rb
-- lib/riddl/wrapper/declaration.rb
-- lib/riddl/wrapper/resourcechecker.rb
-- lib/riddl/wrapper/declaration/interface.rb
 - lib/riddl/wrapper/declaration/tile.rb
 - lib/riddl/wrapper/declaration/facade.rb
+- lib/riddl/wrapper/declaration/interface.rb
+- lib/riddl/wrapper/layerchecker.rb
+- lib/riddl/wrapper/declaration.rb
 - lib/riddl/wrapper/description.rb
+- lib/riddl/wrapper/resourcechecker.rb
 - lib/riddl/wrapper/messageparser.rb
-- lib/riddl/parameter.rb
-- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Fon_behalf.rb
-- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Faccess_token.rb
-- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Frequest_token.rb
-- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0/base.rb
+- lib/riddl/wrapper/description/message_and_transformation.rb
+- lib/riddl/wrapper/description/access.rb
+- lib/riddl/wrapper/description/resource.rb
+- lib/riddl/utils/properties.rb
+- lib/riddl/utils/xsloverlay.rb
+- lib/riddl/utils/downloadify.rb
+- lib/riddl/utils/notifications_producer.rb
+- lib/riddl/utils/erbserve.rb
+- lib/riddl/utils/description.rb
+- lib/riddl/utils/fileserve.rb
+- lib/riddl/commonlogger.rb
+- lib/riddl/protocols/http/generator.rb
+- lib/riddl/protocols/http/parser.rb
+- lib/riddl/protocols/xmpp/generator.rb
+- lib/riddl/protocols/xmpp/parser.rb
+- lib/riddl/protocols/websocket.rb
 - COPYING
 - Rakefile
 - riddl.gemspec
@@ -233,43 +252,46 @@ files:
 - TODO
 - AUTHORS
 - INSTALL
-- test/tc_declaration-local.rb
+- test/tc_declaration-distributed.rb
 - test/tc_properties.rb
+- test/tc_library.rb
+- test/tc_declaration-local.rb
+- test/tc_declaration-hybrid.rb
 - test/tc_helloworld.rb
 - test/tc_producer.rb
-- test/tc_declaration-distributed.rb
-- test/tc_declaration-hybrid.rb
 - test/smartrunner.rb
 homepage: http://www.wst.univie.ac.at/communities/riddl/
 licenses:
 - LGPL-3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ! 'restful interface description and declaration language: tools and client/server
   libs'
 test_files:
-- test/tc_declaration-local.rb
+- test/tc_declaration-distributed.rb
 - test/tc_properties.rb
+- test/tc_library.rb
+- test/tc_declaration-local.rb
+- test/tc_declaration-hybrid.rb
 - test/tc_helloworld.rb
 - test/tc_producer.rb
-- test/tc_declaration-distributed.rb
-- test/tc_declaration-hybrid.rb
 - test/smartrunner.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 83b6b45a52b9d8f36e0513828dc2a9fab98340e4
-  data.tar.gz: 4a12c4baeb158c3ffc56ced94020aeb18af4bcff
-SHA512:
-  metadata.gz: 4e8c3a24baef2852681bd6e7e0ed22eea8d1785bb807e5220baff6799845468f4bff7486824c03420e08c3d1e098d28ae230778285755400491f268bd611e29d
-  data.tar.gz: 66580459c566080ea9317e559f7d1b9bf8c79346b715bcd3d15c2fa39c4c3a36046fe2ab08c6574bf927d6a10fcb85582bdd9089dbc209f82fb74a077307e26e