shoulda_routing 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 832b942a3e7e0ab735e347c59bafe3ec73d35c2e
-  data.tar.gz: b0482ed38c91c2b2b2a440bdaa5629946497d829
+  metadata.gz: f5df9f49ea7c93004c80b8e62ff3065c31db89bf
+  data.tar.gz: 049b382b1511a4a9a3bec7f1d04701ffe8c7a884
 SHA512:
-  metadata.gz: 9500058f252a20feb176b13ff62acdaec1a56ba0af67f35f3718cb0019eb918cc46e996324ecd20d1722daa1baacd87477b77f64766610397c0474ab11a7d7ba
-  data.tar.gz: cb726bd1d77d8efe297eb34b043cba391233598a2f786f768aa75360a022af3d1622ff790ed1742450b2b3c3d0db9b99d7e57b95c4868009cae6c0ecc62f6e58
+  metadata.gz: a9e159d945db57bf022f6426c713e028b5c3dbdba9aa141bc2f1cfbe297cd0fa71c6e1fb172c61a5b384b2406596151e40ffaceca53102856acd2bb1b0813bcf
+  data.tar.gz: e55be1b76c395dd36bab5666c2bc6bb5a533e460b4f600bdb925d8da9ce7e18662117a40259ccbbd3bad0316b6f15ef66f024fbfceb58375c000dff1e014ba05

data/README.md

@@ -23,15 +23,19 @@ In your routes.rb file:
 
 ```ruby
 YourApp::Application.routes.draw do
-  resources :users
-  resources :posts, :accounts, :roles
-
-  resources :countries do
-    resources :states, :cities, except: :destroy
+  namespace :admin do
+    resources :users
+    resources :posts, only: [:index, :show]
+
+    namespace :mobile do
+      resources :users
+      resources :parents, controller: :users
+    end
   end
 
-  resources :comments, only: [:index, :show]
-  resources :parents, controller: :users
+  resources :users, except: :destroy do
+    resources :posts, :comments
+  end
 end
 ```
 
@@ -41,21 +45,25 @@ In your routing_spec.rb file:
 require 'spec_helper'
 
 describe "Routes" do
-  resources :users
-  resources :posts, :accounts, :roles
-
-  resources :countries do
-    resources :states, :cities, except: :destroy
+  namespace :admin do
+    resources :users
+    resources :posts, only: [:index, :show]
+
+    namespace :mobile do
+      resources :users
+      resources :parents, controller: :users
+    end
   end
 
-  resources :comments, only: [:index, :show]
-  resources :parents, controller: :users
+  resources :users, except: :destroy do
+    resources :posts, :comments
+  end
 end
 ```
+This will generate the necessary tests for all rails routes above.
 
 ## TO-DO
 
-* Support namespaces
 * Support member and collection routes.
 * Support single resources (get, post, put, delete) actions.
 

data/features/integration.feature

@@ -0,0 +1,54 @@
+Feature: Features integration
+
+  Background:
+    When I generate a new rails application
+    And I generate resources "user post comment likes role account"
+    And I generate resources "user post comment likes role account" in namespace "admin"
+    And I generate resources "user post comment likes role account" in namespace "admin::control"
+    And I configure the application to use rspec-rails
+    And I run the rspec generator
+    And I configure the application to use "shoulda_routing"
+
+  Scenario: Support nested namespaces
+    Given I write to "config/routes.rb" with:
+      """
+      TestApp::Application.routes.draw do
+        namespace :admin do
+          resources :users do
+            resources :posts, :comments
+          end
+
+          namespace :control do
+            resources :roles, only: :index
+            resources :accounts, except: :destroy
+          end
+        end
+
+        resources :users do
+          resources :posts, :comments
+        end
+      end
+      """
+    And I write to "spec/routing/routing_spec.rb" with:
+      """
+      require 'spec_helper'
+
+      describe 'Routes' do
+        namespace :admin do
+          resources :users do
+            resources :posts, :comments
+          end
+
+          namespace :control do
+            resources :roles, only: :index
+            resources :accounts, except: :update
+          end
+        end
+
+        resources :users do
+          resources :posts, :comments, :likes
+        end
+      end
+      """
+    When I run routing specs
+    Then the output should contain "63 examples, 9 failures"

data/features/namespaces.feature

@@ -0,0 +1,30 @@
+Feature: Support namespaces
+
+  Background:
+    When I generate a new rails application
+    And I generate resources "user" in namespace "admin"
+    And I configure the application to use rspec-rails
+    And I run the rspec generator
+    And I configure the application to use "shoulda_routing"
+
+  Scenario: Support namespaces
+    Given I write to "config/routes.rb" with:
+      """
+      TestApp::Application.routes.draw do
+        namespace :admin do
+          resources :users
+        end
+      end
+      """
+    And I write to "spec/routing/routing_spec.rb" with:
+      """
+      require 'spec_helper'
+
+      describe 'Routes' do
+        namespace :admin do
+          resources :users, :posts
+        end
+      end
+      """
+    When I run routing specs
+    Then the output should contain "14 examples, 7 failures"

data/features/nested_namespaces.feature

@@ -0,0 +1,34 @@
+Feature: Support nested namespaces
+
+  Background:
+    When I generate a new rails application
+    And I generate resources "user post" in namespace "admin::control"
+    And I configure the application to use rspec-rails
+    And I run the rspec generator
+    And I configure the application to use "shoulda_routing"
+
+  Scenario: Support nested namespaces
+    Given I write to "config/routes.rb" with:
+      """
+      TestApp::Application.routes.draw do
+        namespace :admin do
+          namespace :control do
+            resources :users
+          end
+        end
+      end
+      """
+    And I write to "spec/routing/routing_spec.rb" with:
+      """
+      require 'spec_helper'
+
+      describe 'Routes' do
+        namespace :admin do
+          namespace :control do
+            resources :users, :posts
+          end
+        end
+      end
+      """
+    When I run routing specs
+    Then the output should contain "14 examples, 7 failures"

data/features/step_definitions/namespaces_steps.rb

@@ -0,0 +1,21 @@
+When /^I generate resources "([^\"]+)" in namespace "([^\"]+)"$/ do |resources, namespace|
+  resources.split(" ").each do |resource|
+    namespace_path = namespace.split("::").join("/")
+    namespaces = namespace.split("::").map(&:camelcase).join("::")
+
+    steps %{
+      When I write to "app/controllers/#{namespace_path}/#{resource.pluralize}_controller.rb" with:
+        """
+        class #{namespaces}::#{resource.pluralize.camelcase}Controller < ApplicationController
+          def index; end
+          def show; end
+          def edit; end
+          def update; end
+          def create; end
+          def new; end
+          def destroy; end
+        end
+        """
+    }
+  end
+end

data/lib/shoulda_routing.rb

@@ -2,6 +2,12 @@ module ShouldaRouting
   autoload :DSL,     'shoulda_routing/dsl.rb'
   autoload :VERSION, 'shoulda_routing/version.rb'
 
+  module Namespaces
+    autoload :Base,   'shoulda_routing/namespaces/base.rb'
+    autoload :DSL,    'shoulda_routing/namespaces/dsl.rb'
+    autoload :Method, 'shoulda_routing/namespaces/method.rb'
+  end
+
   module Resources
     autoload :Base,   'shoulda_routing/resources/base.rb'
     autoload :DSL,    'shoulda_routing/resources/dsl.rb'
@@ -9,9 +15,9 @@ module ShouldaRouting
   end
 
   module Routes
-    autoload :Spec,    'shoulda_routing/routes/spec.rb'
-    autoload :Helpers, 'shoulda_routing/routes/helpers.rb'
-    autoload :STACK,   'shoulda_routing/routes/stack.rb'
+    autoload :Spec,     'shoulda_routing/routes/spec.rb'
+    autoload :Helpers,  'shoulda_routing/routes/helpers.rb'
+    autoload :STACK,    'shoulda_routing/routes/stack.rb'
   end
 end
 

data/lib/shoulda_routing/dsl.rb

@@ -4,5 +4,8 @@ module ShouldaRouting
     # Includes resources method to the DSL.
     include Resources::Method
 
+    # Includes namespace method to the DSL.
+    include Namespaces::Method
+
   end
 end

data/lib/shoulda_routing/namespaces/base.rb

@@ -0,0 +1,20 @@
+module ShouldaRouting
+  module Namespaces
+    class Base
+
+      attr_accessor :current, :options, :block
+
+      def initialize *args, &block
+        @options = args.extract_options!
+        @current = args
+        @block   = block
+      end
+
+      def test!
+        Routes::STACK.namespaces.push(current)
+        DSL.instance_eval(&block) if block
+        Routes::STACK.namespaces.pop
+      end
+    end
+  end
+end

data/lib/shoulda_routing/namespaces/dsl.rb

@@ -0,0 +1,8 @@
+module ShouldaRouting
+  module Namespaces
+    class DSL
+      extend Method
+      extend Resources::Method
+    end
+  end
+end

data/lib/shoulda_routing/namespaces/method.rb

@@ -0,0 +1,12 @@
+module ShouldaRouting
+  module Namespaces
+    module Method
+
+      # This method provides a simple way to support namespaces.
+      def namespace *args, &block
+        Namespaces::Base.new(*args, &block).test!
+      end
+
+    end
+  end
+end

data/lib/shoulda_routing/resources/base.rb

@@ -1,7 +1,6 @@
 module ShouldaRouting
   module Resources
     class Base
-      include Routes::Helpers
 
       attr_accessor :current, :options, :block
 
@@ -12,27 +11,27 @@ module ShouldaRouting
       end
 
       def test!
-        Routes::STACK.push(current)
+        Routes::STACK.resources.push(current)
 
-        route_permutations(Routes::STACK).each do |stack|
-          specs_for(routeable_actions, stack)
-          specs_for(unrouteable_actions, stack, :not_to)
+        Routes::STACK.routes.each do |route|
+          specs_for(routeable_actions, route)
+          specs_for(unrouteable_actions, route, :not_to)
         end
 
         DSL.instance_eval(&block) if block
-        Routes::STACK.pop
+        Routes::STACK.resources.pop
       end
 
       private
 
-      def specs_for actions, stack, spec_method = :to
+      def specs_for actions, route, spec_method = :to
         actions.each do |action, args|
           Routes::Spec.execute do |config|
             config.via        = args[:via]
-            config.path       = route_path(stack, suffix: args[:path])
-            config.controller = options[:controller] || stack.last
+            config.path       = route[:url] + (args[:path] || "")
+            config.controller = options[:controller] || route[:controller]
             config.action     = action
-            config.params     = route_params(stack, args[:params] || {})
+            config.params     = route[:params].merge(args[:params] || {})
             config.method     = spec_method
           end
         end

data/lib/shoulda_routing/routes/helpers.rb

@@ -2,23 +2,13 @@ module ShouldaRouting
   module Routes
     module Helpers
 
-      # Returns a string path according to an array.
-      def route_path stack, options = {}
-        "/#{stack.join("/1/")}" + options[:suffix].to_s
-      end
-
-      # Returns the combinations according to an array passed by param.
-      # This is in order to generate all the nested routes.
-      def route_permutations stack
+      def permutations stack
         stack.inject(&:product).map{|e| e.flatten rescue [e]}
       end
 
-      def route_params stack, options = {}
+      def params stack
         params = {}
-        stack[0...stack.size - 1].each do |resource|
-          params[:"#{resource.to_s.singularize}_id"] = "1"
-        end
-        params.merge!(options)
+        stack.each{ |e| params[:"#{e.to_s.singularize}_id"] = "1" }
         params
       end
 

data/lib/shoulda_routing/routes/stack.rb

@@ -1,5 +1,37 @@
 module ShouldaRouting
   module Routes
-    STACK = []
+    class Stack
+      include Routes::Helpers
+
+      def resources
+        @resources ||= []
+      end
+
+      def namespaces
+        @namespaces ||= []
+      end
+
+      def routes
+        permutations(stack).map do |segments|
+          namespaces = segments[0...self.namespaces.count]
+          resources  = segments[self.namespaces.count...segments.count]
+
+          options = {}
+          options[:segments]    = segments
+          options[:url]         = "/#{namespaces.join("/")}/#{resources.join("/1/")}"
+          options[:params]      = params(resources[0...-1])
+          options[:controller]  = (namespaces + [segments.last]).join("/")
+          options
+        end
+      end
+
+      private
+
+      def stack
+        namespaces + resources
+      end
+    end
+
+    STACK = Stack.new
   end
 end

data/lib/shoulda_routing/version.rb

@@ -1,3 +1,3 @@
 module ShouldaRouting
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/shoulda_routing/dsl_spec.rb

@@ -3,5 +3,6 @@ require 'spec_helper'
 module ShouldaRouting
   describe DSL do
     it { should include(Resources::Method) }
+    it { should include(Namespaces::Method) }
   end
 end

data/spec/shoulda_routing/namespaces/base_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+module ShouldaRouting
+  module Namespaces
+    describe Base do
+      subject { described_class.new(:admin, options: "options") }
+
+      describe "initialize" do
+        it { expect(subject.options).to eq({options: "options"})}
+        it { expect(subject.current).to eq([:admin]) }
+      end
+
+      describe "#test!" do
+        pending
+      end
+    end
+  end
+end

data/spec/shoulda_routing/namespaces/dsl_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+module ShouldaRouting
+  module Namespaces
+    describe DSL do
+      it { described_class.should respond_to :namespace }
+      it { described_class.should respond_to :resources }
+    end
+  end
+end

data/spec/shoulda_routing/namespaces/method_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module ShouldaRouting
+  module Namespaces
+    describe Method do
+      subject { Class.new.extend described_class }
+
+      describe "#namespace" do
+        it "calls Namespaces::Base test! method with correct params" do
+          namespace_instance = Namespaces::Base.new
+          namespace_instance.stub(:test!).and_return("tested!")
+
+          Namespaces::Base.should_receive(:new).
+                           with(:admin, option: 1).
+                           exactly(1).times.
+                           and_return(namespace_instance)
+
+          subject.namespace(:admin, option: 1).should eq "tested!"
+        end
+      end
+    end
+  end
+end

data/spec/shoulda_routing/resources/base_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module ShouldaRouting
+  module Resources
+    describe Base do
+      subject { described_class.new(:users, except: :destroy) }
+
+      describe "initialize" do
+        it { expect(subject.options).to eq({except: :destroy})}
+        it { expect(subject.current).to eq([:users]) }
+      end
+
+      describe "#test!" do
+        pending
+      end
+
+      describe "-#specs_for" do
+        pending
+      end
+
+      describe "-#actions" do
+        it "retuns restful actions definition" do
+          actions = {
+            :index   => { via: :get },
+            :create  => { via: :post },
+            :new     => { via: :get, path: "/new" },
+            :edit    => { via: :get, path: "/1/edit", params: { id: "1" }},
+            :show    => { via: :get, path: "/1", params: { id: "1" }},
+            :update  => { via: :put, path: "/1", params: { id: "1" }},
+            :destroy => { via: :delete, path: "/1", params: { id: "1" }}
+          }
+          subject.send(:actions).should eq actions
+        end
+      end
+
+      describe "-#routeable_actions" do
+        pending
+      end
+
+      describe "-#unrouteable_actions" do
+        pending
+      end
+    end
+  end
+end

data/spec/shoulda_routing/resources/dsl_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+module ShouldaRouting
+  module Resources
+    describe DSL do
+      it { described_class.should respond_to :resources }
+    end
+  end
+end

data/spec/shoulda_routing/resources/method_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module ShouldaRouting
+  module Resources
+    describe Method do
+      subject { Class.new.extend described_class }
+
+      describe "#resources" do
+        it "calls Resources::Base test! method with correct params" do
+          resource_instance = Resources::Base.new
+          resource_instance.stub(:test!).and_return("tested!")
+
+          Resources::Base.should_receive(:new).
+                          with(:users, except: :destroy).
+                          exactly(1).times.
+                          and_return(resource_instance)
+
+          subject.resources(:users, except: :destroy).should eq "tested!"
+        end
+      end
+    end
+  end
+end

data/spec/shoulda_routing/routes/helpers_spec.rb

@@ -3,47 +3,39 @@ require 'spec_helper'
 module ShouldaRouting
   module Routes
     describe Helpers do
-      let!(:subject){ Class.send(:include, described_class).tap(&:new) }
+      subject { Class.new.extend described_class }
 
-      describe "#route_path" do
-        it "returns string path accoring to an array" do
-          stack    = [:users, :posts, :likes]
-          expected = "/users/1/posts/1/likes"
-          expect(subject.route_path(stack)).to eq(expected)
-        end
-      end
-
-      describe "#route_permutations" do
+      describe "#permutations" do
         it "returns permutations accoring to an array" do
           stack     = [[1, 2]]
           expected  = [[1], [2]]
-          expect(subject.route_permutations(stack)).to eq(expected)
+          expect(subject.permutations(stack)).to eq(expected)
         end
 
         it "returns permutations accoring to an array" do
           stack     = [[1, 2], [3, 4]]
           expected  = [[1, 3], [1, 4], [2, 3], [2, 4]]
-          expect(subject.route_permutations(stack)).to eq(expected)
+          expect(subject.permutations(stack)).to eq(expected)
         end
 
         it "returns permutations accoring to an array" do
           stack     = [[1, 2], [3]]
           expected  = [[1, 3], [2, 3]]
-          expect(subject.route_permutations(stack)).to eq(expected)
+          expect(subject.permutations(stack)).to eq(expected)
         end
 
         it "returns permutations accoring to an array" do
           stack     = [[1, 2], [3], [4, 5]]
           expected  = [[1, 3, 4], [1, 3, 5], [2, 3, 4], [2, 3, 5]]
-          expect(subject.route_permutations(stack)).to eq(expected)
+          expect(subject.permutations(stack)).to eq(expected)
         end
       end
 
-      describe "#route_params" do
+      describe "#params" do
         it "returns params accoring to an array" do
           stack     = [:users, :posts, :likes]
-          expected  = {user_id: "1", post_id: "1"}
-          expect(subject.route_params(stack)).to eq(expected)
+          expected  = {user_id: "1", post_id: "1", like_id: "1"}
+          expect(subject.params(stack)).to eq(expected)
         end
       end
     end

data/spec/shoulda_routing/routes/stack_spec.rb

@@ -3,7 +3,39 @@ require 'spec_helper'
 module ShouldaRouting
   module Routes
     describe STACK do
-      it { should be_an_instance_of(Array) }
+      it { should be_an_instance_of(Stack) }
+    end
+
+    describe Stack do
+      it { subject.class.should include(Routes::Helpers) }
+
+      describe "#resources" do
+        it "returns a cached array" do
+          subject.resources.should eq []
+          subject.resources.push(:users)
+          subject.resources.should eq [:users]
+        end
+      end
+
+      describe "#namespaces" do
+        it "returns a cached array" do
+          subject.namespaces.should eq []
+          subject.namespaces.push(:admin)
+          subject.namespaces.should eq [:admin]
+        end
+      end
+
+      describe "#routes" do
+        pending
+      end
+
+      describe "-#stack" do
+        it "returns an array with resources and namespaces" do
+          subject.stub(:namespaces).and_return([1,2,3])
+          subject.stub(:resources).and_return([4,5,6])
+          subject.send(:stack).should eq [1,2,3,4,5,6]
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,5 +7,5 @@ Coveralls::Output.silent = true
 
 require 'simplecov'
 SimpleCov.start do
-  minimum_coverage 90
+  minimum_coverage 80
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoulda_routing
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alejandro Gutiérrez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -121,14 +121,21 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- features/integration.feature
 - features/multiple_resources.feature
+- features/namespaces.feature
+- features/nested_namespaces.feature
 - features/nested_resources.feature
 - features/resources.feature
 - features/resources_with_options.feature
+- features/step_definitions/namespaces_steps.rb
 - features/step_definitions/resources_steps.rb
 - features/support/env.rb
 - lib/shoulda_routing.rb
 - lib/shoulda_routing/dsl.rb
+- lib/shoulda_routing/namespaces/base.rb
+- lib/shoulda_routing/namespaces/dsl.rb
+- lib/shoulda_routing/namespaces/method.rb
 - lib/shoulda_routing/resources/base.rb
 - lib/shoulda_routing/resources/dsl.rb
 - lib/shoulda_routing/resources/method.rb
@@ -138,6 +145,12 @@ files:
 - lib/shoulda_routing/version.rb
 - shoulda_routing.gemspec
 - spec/shoulda_routing/dsl_spec.rb
+- spec/shoulda_routing/namespaces/base_spec.rb
+- spec/shoulda_routing/namespaces/dsl_spec.rb
+- spec/shoulda_routing/namespaces/method_spec.rb
+- spec/shoulda_routing/resources/base_spec.rb
+- spec/shoulda_routing/resources/dsl_spec.rb
+- spec/shoulda_routing/resources/method_spec.rb
 - spec/shoulda_routing/routes/helpers_spec.rb
 - spec/shoulda_routing/routes/stack_spec.rb
 - spec/shoulda_routing_spec.rb
@@ -162,18 +175,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A simple DSL to test rails routes.
 test_files:
+- features/integration.feature
 - features/multiple_resources.feature
+- features/namespaces.feature
+- features/nested_namespaces.feature
 - features/nested_resources.feature
 - features/resources.feature
 - features/resources_with_options.feature
+- features/step_definitions/namespaces_steps.rb
 - features/step_definitions/resources_steps.rb
 - features/support/env.rb
 - spec/shoulda_routing/dsl_spec.rb
+- spec/shoulda_routing/namespaces/base_spec.rb
+- spec/shoulda_routing/namespaces/dsl_spec.rb
+- spec/shoulda_routing/namespaces/method_spec.rb
+- spec/shoulda_routing/resources/base_spec.rb
+- spec/shoulda_routing/resources/dsl_spec.rb
+- spec/shoulda_routing/resources/method_spec.rb
 - spec/shoulda_routing/routes/helpers_spec.rb
 - spec/shoulda_routing/routes/stack_spec.rb
 - spec/shoulda_routing_spec.rb