playerconnect-wsdsl 0.3.1 → 0.3.2

data/Rakefile

@@ -11,7 +11,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{A Ruby DSL describing Web Services without implementation details.}
   gem.email = "sdod"
   gem.authors = ["Team SDOD"]
-  gem.version = "0.3.1"
+  gem.version = "0.3.2"
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/wsdsl.rb

@@ -169,9 +169,12 @@ class WSDSL
   # @api private
   def controller_dispatch(app)
     unless @controller
-      if Object.const_defined?(@controller_name)
-        @controller = Object.const_get(@controller_name)
-      else
+      begin
+        @controller = Object
+        @controller_name.split("::").each do |const|
+          @controller = @controller.const_get(const)
+        end
+      rescue NameError => e
         raise "The #{@controller_name} class was not found"
       end
     end

data/playerconnect-wsdsl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{playerconnect-wsdsl}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Team SDOD}]
-  s.date = %q{2011-09-21}
+  s.date = %q{2011-10-15}
   s.description = %q{A Ruby DSL describing Web Services without implementation details.}
   s.email = %q{sdod}
   s.extra_rdoc_files = [

data/spec/wsdsl_spec.rb

@@ -97,6 +97,76 @@ describe WSDSL do
     service.action.should be == :foo
   end
 
+  describe "#controller_dispatch" do
+
+    class ProjectsController
+      def initialize(app, service)
+        @app = app
+        @service = service.name
+      end
+
+      def send(action)
+        [@app, @service, action]
+      end
+    end
+
+    module Projects
+      class TasksController < ProjectsController
+      end
+    end
+
+    module Projects
+      module Tasks
+        class ItemsController < ProjectsController
+        end
+      end
+    end
+
+    before :all do
+      @original_services = WSList.all.dup
+      WSList.all.clear
+    end
+
+    after :all do
+      WSList.all.replace @original_services
+    end
+
+    it "should be able to dispatch controller" do
+      describe_service("projects.xml") { |s| }
+      service = WSList.all.find{|s| s.url == "projects.xml"}
+      service.controller_dispatch("application").
+        should == ["application", "projects", "list"]
+    end
+
+    it "should be able to dispatch namespaced controller" do
+      describe_service("project/:project_id/tasks.xml") do |service|
+        service.controller_name = "Projects::TasksController"
+        service.action = "list"
+      end
+
+      describe_service("project/:project_id/task/:task_id/items.xml") 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.controller_dispatch("application").should == ["application", "project", "list"]
+
+      service = WSList.all.find{|s| s.url == "project/:project_id/task/:task_id/items.xml"}
+      service.controller_dispatch("application").should == ["application", "project", "list"]
+    end
+
+    it "should raise exception when controller class is not found" do
+      describe_service("unknown.xml") do |service|
+        service.controller_name = "UnknownController"
+        service.action = "list"
+      end
+      service = WSList.all.find{|s| s.url == "unknown.xml"}
+      lambda { service.controller_dispatch("application") }.
+        should raise_error("The UnknownController class was not found")
+    end
+  end
+
   describe WSDSL::Params do
     
     before(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playerconnect-wsdsl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000Z
+date: 2011-10-15 00:00:00.000000000Z
 dependencies: []
 description: A Ruby DSL describing Web Services without implementation details.
 email: sdod