wadl 0.3.1.pre1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d354b61e4f78949b820f81bafd9cf67a151c609
-  data.tar.gz: 703da45e4134f0b86d6207229af2f1f54dceb6e6
+  metadata.gz: f58dc8816878169475848021e03ee729eff81c69
+  data.tar.gz: cecdcad605786fbc540f1d83900fd12ad8c3aa8d
 SHA512:
-  metadata.gz: 3b2bb97cfad57a442ba3471ebc76f612c0d9b54f95881dc7f51968c2905582f969b36721abd7c036430a5de89661e119e20167c674bc98981b9cc0fa60d2f4bc
-  data.tar.gz: d0539b0d84a7e6a9b2ef7ed34a04ad37c9a6b8c0f85a1f0e97710e64b58f2a5a986ab84a7465f3ef0e6ebe183c22ae4c77d9c6aa411da13add36e639591bdcbe
+  metadata.gz: 150215dfa3826822b38bd76feef2292132d511bd27f60f848bc0199184cf03db0a8200a7a3c446a343763fc520889ce8d941c6c2f8b432ad584f76ecca9f21e5
+  data.tar.gz: 2380f2b7918c52a1e239d159a052b2968821f6b08ddce1cee7d9b0b72fb86e406760d3e1afe77cf346b1ab0546955d95eed3e0f1d2c6bc038b75c6f377459e97

data/README

@@ -61,7 +61,7 @@ Travis CI::          https://travis-ci.org/blackwinter/wadl
 == LICENSE AND COPYRIGHT
 
 Copyright (C) 2006-2008 Leonard Richardson
-Copyright (C) 2010-2015 Jens Wille
+Copyright (C) 2010-2016 Jens Wille
 
 wadl is free software: you can redistribute it and/or modify it under
 the terms of the GNU Affero General Public License as published by the

data/Rakefile

@@ -15,7 +15,7 @@ begin
       homepage:     :blackwinter,
       dependencies: {
         'cyclops'    => '~> 0.2',
-        'mime-types' => '~> 2.6',
+        'mime-types' => '~> 3.0',
         'safe_yaml'  => '~> 1.0'
       },
 

data/lib/wadl/address.rb

@@ -4,7 +4,7 @@
 # A component of wadl, the super cheap Ruby WADL client.                      #
 #                                                                             #
 # Copyright (C) 2006-2008 Leonard Richardson                                  #
-# Copyright (C) 2010-2014 Jens Wille                                          #
+# Copyright (C) 2010-2016 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Leonard Richardson <leonardr@segfault.org> (Original author)            #
@@ -195,12 +195,12 @@ module WADL
 
     private
 
-    def _deep_copy_hash(h)
-      h.inject({}) { |h, (k, v)| h[k] = v && v.dup; h }
+    def _deep_copy_hash(o)
+      o.inject({}) { |h, (k, v)| h[k] = v && v.dup; h }
     end
 
-    def _deep_copy_array(a)
-      a.inject([]) { |a, e| a << (e && e.dup) }
+    def _deep_copy_array(o)
+      o.inject([]) { |a, e| a << (e && e.dup) }
     end
 
   end

data/lib/wadl/cheap_schema.rb

@@ -4,7 +4,7 @@
 # A component of wadl, the super cheap Ruby WADL client.                      #
 #                                                                             #
 # Copyright (C) 2006-2008 Leonard Richardson                                  #
-# Copyright (C) 2010-2014 Jens Wille                                          #
+# Copyright (C) 2010-2016 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Leonard Richardson <leonardr@segfault.org> (Original author)            #
@@ -112,11 +112,11 @@ module WADL
               auto_dereference = args.shift
               auto_dereference = true if auto_dereference.nil?
 
-              match = #{collection_name}.find { |match|
-                block[match] || (
+              match = #{collection_name}.find { |_match|
+                block[_match] || (
                   #{klass}.may_be_reference? &&
                   auto_dereference &&
-                  block[match.dereference]
+                  block[_match.dereference]
                 )
               }
 
@@ -337,10 +337,10 @@ module WADL
       if default
         memo = []
 
-        paths.map { |level, path|
-          if path
-            memo.slice!(level..-1)
-            memo[level] = path
+        paths.map { |_level, _path|
+          if _path
+            memo.slice!(_level..-1)
+            memo[_level] = _path
 
             nil  # ignore
           else
@@ -352,12 +352,12 @@ module WADL
       end
     end
 
-    def to_s(indent = 0, collection = false)
+    def to_s(indent = 0, is_collection = false)
       klass = self.class
 
       a = '  '
       i = a * indent
-      s = "#{collection ? a * (indent - 1) + '- ' : i}#{klass.name}\n"
+      s = "#{is_collection ? a * (indent - 1) + '- ' : i}#{klass.name}\n"
 
       if klass.may_be_reference? and href = attributes['href']
         s << "#{i}= href=#{href}\n"

data/lib/wadl/param.rb

@@ -4,7 +4,7 @@
 # A component of wadl, the super cheap Ruby WADL client.                      #
 #                                                                             #
 # Copyright (C) 2006-2008 Leonard Richardson                                  #
-# Copyright (C) 2010-2014 Jens Wille                                          #
+# Copyright (C) 2010-2016 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Leonard Richardson <leonardr@segfault.org> (Original author)            #
@@ -26,7 +26,7 @@
 ###############################################################################
 #++
 
-require 'uri'
+require 'erb'
 
 module WADL
 
@@ -101,10 +101,10 @@ module WADL
       # If the param lists acceptable values in option tags, make sure that
       # all values are found in those tags.
       if options && !options.empty?
-        values.each { |value|
-          unless find_option(value)
+        values.each { |_value|
+          unless find_option(_value)
             acceptable = options.map { |o| o.value }.join('", "')
-            raise ArgumentError, %Q{"#{value}" is not among the acceptable parameter values ("#{acceptable}")}
+            raise ArgumentError, %Q{"#{_value}" is not among the acceptable parameter values ("#{acceptable}")}
           end
         }
       end
@@ -112,23 +112,29 @@ module WADL
       if style == 'query' || parent.is_a?(RequestFormat) || (
         parent.respond_to?(:is_form_representation?) && parent.is_form_representation?
       )
-        values.map { |v| "#{URI.escape(name)}=#{URI.escape(v.to_s)}" }.join('&')
+        values.map { |v| "#{uri_escape(name)}=#{uri_escape(v.to_s)}" }.join('&')
       elsif style == 'matrix'
         if type == 'xsd:boolean'
           values.map { |v| ";#{name}" if v =~ BOOLEAN_RE }.compact.join
         else
-          values.map { |v| ";#{URI.escape(name)}=#{URI.escape(v.to_s)}" if v }.compact.join
+          values.map { |v| ";#{uri_escape(name)}=#{uri_escape(v.to_s)}" if v }.compact.join
         end
       elsif style == 'header'
         values.join(',')
       else
         # All other cases: plain text representation.
-        values.map { |v| URI.escape(v.to_s) }.join(',')
+        values.map { |v| uri_escape(v.to_s) }.join(',')
       end
     end
 
     alias_method :%, :format
 
+    private
+
+    def uri_escape(v)
+      ERB::Util.url_encode(v)
+    end
+
   end
 
 end

data/lib/wadl/representation_format.rb

@@ -4,7 +4,7 @@
 # A component of wadl, the super cheap Ruby WADL client.                      #
 #                                                                             #
 # Copyright (C) 2006-2008 Leonard Richardson                                  #
-# Copyright (C) 2010-2014 Jens Wille                                          #
+# Copyright (C) 2010-2016 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Leonard Richardson <leonardr@segfault.org> (Original author)            #
@@ -63,7 +63,7 @@ module WADL
           raise ArgumentError, "Your proposed representation is missing a value for #{param.name}" if param.required?
         end
 
-        p_values.each { |v| representation << "#{CGI::escape(name)}=#{CGI::escape(v.to_s)}" } if p_values
+        p_values.each { |v| representation << "#{CGI.escape(name)}=#{CGI.escape(v.to_s)}" } if p_values
       }
 
       representation.join('&')

data/lib/wadl/version.rb

@@ -10,7 +10,7 @@ module WADL
 
       # Returns array representation.
       def to_a
-        [MAJOR, MINOR, TINY] << 'pre1'
+        [MAJOR, MINOR, TINY]
       end
 
       # Short-cut for version string.

metadata

@@ -1,36 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wadl
 version: !ruby/object:Gem::Version
-  version: 0.3.1.pre1
+  version: 0.3.1
 platform: ruby
 authors:
 - Leonard Richardson
 - Jens Wille
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQswCQYDVQQDDAJ3dzEb
-  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
-  HhcNMTMwMTMxMDkyMjIyWhcNMTQwMTMxMDkyMjIyWjA+MQswCQYDVQQDDAJ3dzEb
-  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVXmfa6rbTwKOvtuGoROc1
-  I4qZjgLX0BA4WecYB97PjwLJmJ1hRvf9JulVCJYYmt5ZEPPXbgi9xLbcp6ofGmnC
-  i68/kbhcz20/fRUtIJ2phU3ypQTEd2pFddpL7SR2FxLkzvvg5E6nslGn7o2erDpO
-  8sm610A3xsgT/eNIr9QA7k4pHh18X1KvZKmmQR4/AjVyKmKawzauKUoHHepjvjVs
-  s0pVoM7UmOmrS4SafQ3OwUo37f19CVdN2/FW7z3e5+iYhKxdIFdhniX9iDWtA3Jn
-  7oUOtiolhCRK4P/c30UjTCDkRkOldsWciFUasROJ5VAV2SVv7FtGHoQLDZ/++tRr
-  AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFIAPWU4BEoYUe82hY/0EkoGd
-  Oo/WMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAf2YnB0mj42of22dA
-  MimgJCAEgB3H5aHbZ6B5WVnFvrC2UUnhP+/kLj/6UgOfqcasy4Xh62NVGuNrf7rF
-  7NMN87XwexGuU2GCpIMUd6VCTA7zMP2OWuXEcba7jT5OtiI55buO0J4CRtyeX1XF
-  qwlGgx4ItcGhMTlDFXj3IkpeVtjD8O7yWE21bHf9lLURmqK/r9KjoxrrVi7+cESJ
-  H19TDW3R9p594jCl1ykPs3dz/0Bk+r1HTd35Yw+yBbyprSJb4S7OcRRHCryuo09l
-  NBGyZvOBuqUp0xostWSk0dfxyn/YQ7eqvQRGBhK1VGa7Tg/KYqnemDE57+VOXrua
-  59wzaA==
-  -----END CERTIFICATE-----
-date: 2015-12-21 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyclops
@@ -52,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +163,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--title"
-- wadl Application documentation (v0.3.1.pre1)
+- wadl Application documentation (v0.3.1)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -200,12 +179,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Super cheap Ruby WADL client.