riddl 0.99.218 → 0.99.219

data/lib/ruby/riddl/turtle.rb

@@ -0,0 +1,72 @@
+require 'rubygems'
+require 'rdf/smart'
+require 'json'
+
+module Riddl
+  module Utils
+
+    module Turtle
+      
+      class File
+        attr_accessor :data, :changed
+        attr_reader :url
+
+        def initialize(url)
+          @url = url
+          @data = ""
+          @changed = Time.at(0)
+        end
+      end  
+
+      def self::implementation(tf)
+        Proc.new do
+          if ::File.mtime(tf.url) > tf.changed
+            tf.data = ""
+            ::File.open(tf.url,"r") do |f|
+              f.each_line do |line|
+                tf.data += line
+              end
+            end
+            tf.changed = ::File.mtime(tf.url)
+          end
+          run Show, tf.data, tf.changed if get
+          run Query, tf.url if get 'query'
+          on resource do
+            run GetQuery, tf.url if get 
+          end
+        end
+      end
+      class Query < Riddl::Implementation # {{{
+          def response #{{{
+            Riddl::Parameter::Complex.new "list","application/json", JSON::pretty_generate(RDF::Smart.new(@a[0]).execute(@p[0].value))
+          end #}}}
+      end  # }}}
+      class Show < Riddl::Implementation # {{{
+          def response #{{{
+              Riddl::Parameter::Complex.new "list", "text/plain", @a[0]
+          end #}}}
+      end # }}}
+      class GetQuery < Riddl::Implementation#{{{
+        def response #{{{
+          a = RDF::Smart.new(@a[0])
+          if a.namespaces.size > 0
+            ns = ""
+            if @r[-1].start_with?(":")
+              if (!(a.namespaces[nil]))
+                return Riddl::Parameter::Complex.new "value","text/plain", "Error parsing namespaces"
+              end
+              return Riddl::Parameter::Complex.new "value","application/json", JSON::pretty_generate(a.execute("PREFIX : <" + a.namespaces[nil] + "> SELECT * WHERE { #{@r[-1]} ?p ?o}"))
+            else
+              if (!(a.namespaces[@r[-1].partition(":")[0]]))
+                return Riddl::Parameter::Complex.new "value","text/plain", "Error parsing namespaces"
+              end
+              return Riddl::Parameter::Complex.new "value","application/json", JSON::pretty_generate(a.execute("PREFIX #{@r[-1].partition(":")[0]}: <" + a.namespaces[@r[-1].partition(":")[0]] + "> SELECT * WHERE { #{@r[-1]} ?p ?o}"))
+            end 
+          end
+          Riddl::Parameter::Complex.new "list","application/json", JSON::pretty_generate(a.execute("select * where {#{@r[-1]} ?p ?o}"))
+        end #}}}
+      end#}}}
+  
+    end
+  end
+end

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

@@ -116,7 +116,7 @@ module Riddl
             refresh_tokens = @a[1]
 
             access_tokens.delete(token)
-            refresh_tokens.delete_by_token(token)
+            refresh_tokens.delete_by_value(token)
           end
         end
 
@@ -126,8 +126,8 @@ module Riddl
             access_tokens = @a[0]
             refresh_tokens = @a[1]
 
-            token = access_tokens.delete_by_user user_id
-            refresh_tokens.delete_by_token token
+            token = access_tokens.delete_by_value user_id
+            refresh_tokens.delete_by_value token
           end
         end
 

data/lib/ruby/riddl/xmlserve.rb

@@ -0,0 +1,40 @@
+require 'mime/types'
+require 'charlock_holmes'
+require 'digest/md5'
+require 'xml/smart'
+
+module Riddl
+  module Utils
+    class XMLServe < Riddl::Implementation
+      def response
+        path = File.file?(@a[0]) ? @a[0] : nil
+        xpath = @a[1]
+
+        if path.nil? || File.directory?(path)
+          @status = 404
+          return []
+        end
+        if File.exists?(path)
+          mtime = File.mtime(path)
+          @headers << Riddl::Header.new("Last-Modified",mtime.httpdate)
+          @headers << Riddl::Header.new("Cache-Control","max-age=15552000, public")
+          @headers << Riddl::Header.new("ETag",Digest::MD5.hexdigest(mtime.httpdate))
+          htime = @env["HTTP_IF_MODIFIED_SINCE"].nil? ? Time.at(0) : Time.parse(@env["HTTP_IF_MODIFIED_SINCE"])
+          if htime == mtime
+            @headers << Riddl::Header.new("Connection","close")
+            @status = 304 # Not modified
+            return []
+          else 
+            if xpath 
+              res = XML::Smart.open(path).find(xpath)
+              return Riddl::Parameter::Complex.new('file','text/xml',res.any? ? res.first.dump : '<empty/>')
+            else
+              return Riddl::Parameter::Complex.new('file','text/xml',File.open(path,'r'))
+            end
+          end  
+        end
+        @status = 404
+      end  
+    end
+  end  
+end  

data/lib/ruby/riddl/xsloverlay.rb

@@ -0,0 +1,21 @@
+module Riddl
+  module Utils
+
+    class XSLOverlay < Riddl::Implementation
+      def response
+        doc = if @p[0].value.class == String 
+          XML::Smart::string(@p[0].value)
+        elsif @p[0].value.respond_to?(:read)
+          XML::Smart::string(@p[0].value.read)
+        else
+          nil
+        end
+        unless doc.nil?
+          doc.root.add_before "?xml-stylesheet", "href='#{@a[0]}' type='text/xsl'"
+          Riddl::Parameter::Complex.new("content",@p[0].mimetype,doc.to_s)
+        end  
+      end
+    end
+      
+  end
+end

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.218"
+  s.version          = "0.99.219"
   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.218
+  version: 0.99.219
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -387,7 +387,13 @@ 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
@@ -395,6 +401,7 @@ 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
@@ -413,8 +420,11 @@ 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
@@ -427,6 +437,7 @@ 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
@@ -452,6 +463,8 @@ 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