playerconnect-wsdsl 0.3.7 → 0.3.8

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/wsdsl.rb

@@ -331,8 +331,8 @@ class WSDSL
   end
 
   SERVICE_ROOT_REGEXP = /(.*?)[\/\(\.]/  
-  SERVICE_ACTION_REGEXP = /[\/\(\.]([a-z0-9_]+)[\/\(\.\?]/i
-  SERVICE_RESTFUL_SHOW_REGEXP = /\/:[a-z0-9_]+\.\w{3}$/
+  SERVICE_ACTION_REGEXP = /[\/\(\.]([a-z0-9_]+)[\/\.\(\?]?/i # /[\/\(\.]([a-z0-9_]+)[\/\(\.\?]/i
+  SERVICE_RESTFUL_SHOW_REGEXP = /\/:[a-z0-9_]+$/ # /\/:[a-z0-9_]+\.\w{3}$/
   
   private
   

data/playerconnect-wsdsl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "playerconnect-wsdsl"
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Team SDOD"]
-  s.date = "2012-07-06"
+  s.date = "2013-12-09"
   s.description = "A Ruby DSL describing Web Services without implementation details."
   s.email = "sdod"
   s.extra_rdoc_files = [

data/spec/hello_world_service.rb

@@ -1,4 +1,4 @@
-describe_service "hello_world.xml" do |service|
+describe_service "hello_world" do |service|
   service.formats    :xml
   service.http_verb :get
   service.disable_auth # on by default

data/spec/params_verification_spec.rb

@@ -3,7 +3,7 @@ require_relative "spec_helper"
 describe ParamsVerification do
 
   before :all do
-    @service = WSList.all.find{|s| s.url == 'services/test.xml'}
+    @service = WSList.all.find{|s| s.url == 'services/test'}
     @service.should_not be_nil
   end
 
@@ -72,7 +72,7 @@ describe ParamsVerification do
   end
 
   it "should cast a comma delimited string into an array when param marked as an array" do
-    service = WSList.all.find{|s| s.url == "services/array_param.xml"}
+    service = WSList.all.find{|s| s.url == "services/array_param"}
     service.should_not be_nil
     params = {'seq' => "a,b,c,d,e,g"}
     validated = ParamsVerification.validate!(params, service.defined_params)
@@ -80,7 +80,7 @@ describe ParamsVerification do
   end
 
   it "should not raise an exception if a req array param doesn't contain a comma" do
-    service = WSList.all.find{|s| s.url == "services/array_param.xml"}
+    service = WSList.all.find{|s| s.url == "services/array_param"}
     params = {'seq' => "a b c d e g"}
     lambda{ ParamsVerification.validate!(params, service.defined_params) }.should_not raise_exception(ParamsVerification::InvalidParamType)
   end
@@ -127,13 +127,13 @@ describe ParamsVerification do
     lambda{ ParamsVerification.validate!(params, @service.defined_params) }.should raise_exception(ParamsVerification::InvalidParamValue)
     # other service
     params = {'preference' => {'region_code' => 'us', 'language_code' => 'de'}}
-    service = WSList.all.find{|s| s.url == 'preferences.xml'}
+    service = WSList.all.find{|s| s.url == 'preferences'}
     service.should_not be_nil
     lambda{ ParamsVerification.validate!(params, service.defined_params) }.should raise_exception(ParamsVerification::InvalidParamValue)
   end
 
   it "should validate that no params are passed when accept_no_params! is set on a service" do
-    service = WSList.all.find{|s| s.url == "services/test_no_params.xml"}
+    service = WSList.all.find{|s| s.url == "services/test_no_params"}
     service.should_not be_nil
     params = @valid_params.dup
     lambda{ ParamsVerification.validate!(params, service.defined_params) }.should raise_exception

data/spec/preferences_service.rb

@@ -1,4 +1,4 @@
-describe_service "preferences.xml" do |service|
+describe_service "preferences" do |service|
   
   service.params do |p|
     p.namespace :preference do |pr|

data/spec/test_services.rb

@@ -1,6 +1,6 @@
 WSDSLSpecOptions = ['RSpec', 'Bacon'] # usually pulled from a model
 
-describe_service "services/test.xml" do |service|
+describe_service "services/test" do |service|
   service.formats  :xml, :json
   service.http_verb :get
 
@@ -63,19 +63,19 @@ The most common way to use this service looks like that:
 end
 
 
-describe_service "services/test_no_params.xml" do |service|
+describe_service "services/test_no_params" do |service|
   service.formats  :xml
   service.http_verb :get
   service.accept_no_params!
 end
 
-describe_service "services.xml" do |service|
+describe_service "services" do |service|
   service.formats  :xml
   service.http_verb :put
 
 end
 
-describe_service "services/array_param.xml" do |s|
+describe_service "services/array_param" do |s|
   s.formats :xml
   s.http_verb :post
 

data/spec/wsdsl_sinatra_ext_spec.rb

@@ -12,13 +12,13 @@ describe "Hello World example" do
     end
 
     before(:all) do
-      service = WSList.all.find{|s| s.url == 'hello_world.xml'}
+      service = WSList.all.find{|s| s.url == 'hello_world'}
       service.should_not be_nil
       service.load_sinatra_route
     end
 
     it "should dispatch the hello world service properly" do
-      get "/hello_world.xml"
+      get "/hello_world"
       last_response.body.should include("Hello World")
     end
 

data/spec/wsdsl_spec.rb

@@ -3,13 +3,13 @@ require File.expand_path("spec_helper", File.dirname(__FILE__))
 describe WSDSL do
   
   before :all do
-    @service = WSList.all.find{|s| s.url == 'services/test.xml'}
+    @service = WSList.all.find{|s| s.url == 'services/test'}
     @service.should_not be_nil
   end
   
   it "should have an url" do
     # dummy test since that's how we found the service, but oh well
-    @service.url.should be == 'services/test.xml'
+    @service.url.should be == 'services/test'
   end
   
   it "should have some http verbs defined" do
@@ -39,7 +39,7 @@ describe WSDSL do
   it "should set the controller accordingly" do
     @service.controller_name.should_not be_nil
     @service.controller_name.should be == 'ServicesController'
-    service = WSDSL.new("preferences.xml")
+    service = WSDSL.new("preferences")
     service.name.should be == 'preferences'
     ExtlibCopy.classify('preferences').should be == 'Preferences'
     service.controller_name.should be == 'PreferencesController'
@@ -51,7 +51,7 @@ describe WSDSL do
   end
   
   it "should support restful routes based on the HTTP verb" do
-    service = WSList.all.find{|s| s.url == "services.xml"}
+    service = WSList.all.find{|s| s.url == "services"}
     service.should_not be_nil
     service.http_verb.should be == :put
     service.action.should_not be_nil
@@ -60,39 +60,39 @@ describe WSDSL do
   end
 
   it "should have a default action" do
-   service = WSDSL.new('spec_test.xml')
+   service = WSDSL.new('spec_test')
    service.action.should be == 'list'
   end
 
   it "should route to show when an id is the last passed param" do
-    service = WSDSL.new("players/:id.xml")
+    service = WSDSL.new("players/:id")
     service.action.should be == 'show'
   end
 
   it "should support some extra attributes" do
-    service = WSDSL.new("players/:id.xml")
+    service = WSDSL.new("players/:id")
     service.extra[:custom_name] = 'fooBar'
     service.extra[:custom_name].should be == 'fooBar'
   end
 
   it "should respect the global controller pluralization flag" do
     WSDSL.use_pluralized_controllers = true
-    service = WSDSL.new("player/:id.xml")
+    service = WSDSL.new("player/:id")
     service.controller_name.should be == "PlayersController"
-    service = WSDSL.new("players/:id.xml")
+    service = WSDSL.new("players/:id")
     service.controller_name.should be == "PlayersController"
     WSDSL.use_pluralized_controllers = false
-    service = WSDSL.new("player/:id.xml")
+    service = WSDSL.new("player/:id")
     service.controller_name.should be == "PlayerController"
   end
 
 
   it "should let overwrite the controller name and action after initialization" do
-    describe_service "players/:id.xml" do |service|
+    describe_service "players/:id" do |service|
       service.controller_name "CustomController"
       service.action :foo
     end
-    service = WSList.all.find{|s| s.url == "players/:id.xml"}
+    service = WSList.all.find{|s| s.url == "players/:id"}
     service.controller_name.should be == "CustomController"
     service.action.should be == :foo
   end
@@ -132,36 +132,36 @@ describe WSDSL do
     end
 
     it "should be able to dispatch controller" do
-      describe_service("projects.xml") { |s| }
-      service = WSList.all.find{|s| s.url == "projects.xml"}
+      describe_service("projects") { |s| }
+      service = WSList.all.find{|s| s.url == "projects"}
       service.controller_dispatch("application").
         should be == ["application", "projects"]
     end
 
     it "should be able to dispatch namespaced controller" do
-      describe_service("project/:project_id/tasks.xml") do |service|
+      describe_service("project/:project_id/tasks") do |service|
         service.controller_name = "Projects::TasksController"
         service.action = "list"
       end
 
-      describe_service("project/:project_id/task/:task_id/items.xml") do |service|
+      describe_service("project/:project_id/task/:task_id/items") do |service|
         service.controller_name = "Projects::Tasks::ItemsController"
         service.action = "list"
       end
 
-      service = WSList.all.find{|s| s.url == "project/:project_id/tasks.xml"}
+      service = WSList.all.find{|s| s.url == "project/:project_id/tasks"}
       service.controller_dispatch("application").should be == ["application", "project"]
 
-      service = WSList.all.find{|s| s.url == "project/:project_id/task/:task_id/items.xml"}
+      service = WSList.all.find{|s| s.url == "project/:project_id/task/:task_id/items"}
       service.controller_dispatch("application").should be == ["application", "project"]
     end
 
     it "should raise exception when controller class is not found" do
-      describe_service("unknown.xml") do |service|
+      describe_service("unknown") do |service|
         service.controller_name = "UnknownController"
         service.action = "list"
       end
-      service = WSList.all.find{|s| s.url == "unknown.xml"}
+      service = WSList.all.find{|s| s.url == "unknown"}
       lambda { service.controller_dispatch("application") }.
         should raise_error("The UnknownController class was not found")
       lambda { service.controller_dispatch("application") }.
@@ -237,7 +237,7 @@ describe WSDSL do
     end
     
     it "should allow to define namespaced params doc" do
-      service = WSList.all.find{|s| s.url == "services.xml"}
+      service = WSList.all.find{|s| s.url == "services"}
       service.documentation do |doc|
         doc.namespace :preference do |ns|
           ns.param :id, "Ze id."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playerconnect-wsdsl
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,63 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157239240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2157239240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157238640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2157238640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157238060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2157238060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2157237460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :development
   prerelease: false
-  version_requirements: *2157237460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2157236860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2157236860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: A Ruby DSL describing Web Services without implementation details.
 email: sdod
 executables: []
@@ -121,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Web Service DSL