json-rpc-objects 0.1.2 → 0.1.3

data/Gemfile

@@ -4,7 +4,6 @@ source "http://rubygems.org"
    gem "multitype-introspection", ">= 0.1.0"
    gem "hash-utils", ">= 0.3.0"
    gem "types", ">= 0.1.0"
-   gem "version", ">= 0.9.2"
    gem "addressable", ">= 2.2.2"
    gem "yajl-ruby", ">= 0.7.8"
 

data/Gemfile.lock

@@ -12,8 +12,7 @@ GEM
     rake (0.8.7)
     types (0.1.0)
       multitype-introspection (>= 0.1.0)
-    version (0.9.2)
-    yajl-ruby (0.7.8)
+    yajl-ruby (0.7.9)
 
 PLATFORMS
   ruby
@@ -25,5 +24,4 @@ DEPENDENCIES
   jeweler (~> 1.5.2)
   multitype-introspection (>= 0.1.0)
   types (>= 0.1.0)
-  version (>= 0.9.2)
   yajl-ruby (>= 0.7.8)

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/json-rpc-objects.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json-rpc-objects}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Kozák"]
-  s.date = %q{2011-01-16}
+  s.date = %q{2011-01-18}
   s.email = %q{martinkozak@martinkozak.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -77,7 +77,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<multitype-introspection>, [">= 0.1.0"])
       s.add_runtime_dependency(%q<hash-utils>, [">= 0.3.0"])
       s.add_runtime_dependency(%q<types>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<version>, [">= 0.9.2"])
       s.add_runtime_dependency(%q<addressable>, [">= 2.2.2"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0.7.8"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -86,7 +85,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<multitype-introspection>, [">= 0.1.0"])
       s.add_dependency(%q<hash-utils>, [">= 0.3.0"])
       s.add_dependency(%q<types>, [">= 0.1.0"])
-      s.add_dependency(%q<version>, [">= 0.9.2"])
       s.add_dependency(%q<addressable>, [">= 2.2.2"])
       s.add_dependency(%q<yajl-ruby>, [">= 0.7.8"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -96,7 +94,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<multitype-introspection>, [">= 0.1.0"])
     s.add_dependency(%q<hash-utils>, [">= 0.3.0"])
     s.add_dependency(%q<types>, [">= 0.1.0"])
-    s.add_dependency(%q<version>, [">= 0.9.2"])
     s.add_dependency(%q<addressable>, [">= 2.2.2"])
     s.add_dependency(%q<yajl-ruby>, [">= 0.7.8"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/json-rpc-objects/v11/wd/service-description.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "version"
 require "addressable/uri"
 require "json-rpc-objects/v11/wd/service-procedure-description"
 require "json-rpc-objects/generic"
@@ -41,6 +40,12 @@ module JsonRpcObjects
                 #
                 
                 PROCEDURE_DESCRIPTION_CLASS = JsonRpcObjects::V11::WD::ServiceProcedureDescription
+                
+                ##
+                # Holds version number matcher.
+                #
+                
+                VERSION_MATCHER = /^\d+\.\d+/
             
                 ##
                 # Holds service name.
@@ -121,8 +126,8 @@ module JsonRpcObjects
                     if not @name.kind_of? Symbol
                         raise Exception::new("Service name must be Symbol or convertable to Symbol.")
                     end
-                    
-                    if not (@version.nil?) and ((@version.to_a.length < 2) or @version.prerelease?)
+
+                    if not (@version.nil?) and not @version.match(self.class::VERSION_MATCHER)
                         raise Exception::new("Version must be at least in <major>.<minor> format and must contain numbers only.")
                     end
                     
@@ -152,7 +157,7 @@ module JsonRpcObjects
                     }
                     
                     if not @version.nil?
-                        data[:version] = @version.to_s
+                        data[:version] = @version
                     end
                     
                     if not @summary.nil?
@@ -228,10 +233,6 @@ module JsonRpcObjects
                         @id = Addressable::URI::parse(@id.to_s)
                     end
                     
-                    if (not @version.nil?) and (not @version.kind_of? Version)
-                        @version = @version.to_s.to_version
-                    end
-                    
                     if not @summary.nil?
                         @summary = @summary.to_s
                     end

data/lib/json-rpc-objects/v11/wd/tests/test.rb

@@ -15,7 +15,7 @@ res = JsonRpcObjects::V11::WD::ProcedureReturn::create(true, nil, :id => 12345)
 puts res.to_json
 
 require "../service-description"
-sdesc = JsonRpcObjects::V11::WD::ServiceDescription::create(:alfa, 100)
+sdesc = JsonRpcObjects::V11::WD::ServiceDescription::create(:alfa, 100, :version => "1.2.34")
 puts sdesc.to_json
 
 require "../service-procedure-description"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - "Martin Koz\xC3\xA1k"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 +01:00
+date: 2011-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,24 +62,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: version
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: addressable
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,10 +76,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,10 +91,10 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -121,10 +106,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -136,7 +121,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 description: 
 email: martinkozak@martinkozak.net
 executables: []
@@ -207,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4360897851459333970
+      hash: -3422692750047768793
       segments: 
       - 0
       version: "0"