deas 0.20.0 → 0.21.0

data/lib/deas/url.rb

@@ -26,7 +26,7 @@ module Deas
     end
 
     def apply_ordered_params(path, params)
-      params.inject(path){ |p, v| p.sub(/\*+|\:\w+/i, v.to_s) }
+      params.inject(path){ |p, v| p.sub(/\*+|\:\w+/i, v.to_s) }.gsub(/\/\/+/, '/')
     end
 
   end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.20.0"
+  VERSION = "0.21.0"
 end

data/test/unit/router_tests.rb

@@ -146,6 +146,12 @@ class Deas::Router
       assert_equal exp_path, subject.url_for(:get_info, 'now')
     end
 
+    should "'squash' duplicate forward-slashes when building urls" do
+      exp_path = "/info/now"
+      assert_equal exp_path, subject.url_for(:get_info, :for => '/now')
+      assert_equal exp_path, subject.url_for(:get_info, '/now')
+    end
+
     should "complain if building a named url that hasn't been defined" do
       assert_raises ArgumentError do
         subject.url_for(:get_all_info, 'now')

data/test/unit/url_tests.rb

@@ -73,9 +73,6 @@ class Deas::Url
 
       exp_path = "/goose/a/well/*"
       assert_equal exp_path, subject.path_for('a', 'well', 'some' => 'goose')
-    end
-
-    should "pass on this" do
 
       exp_path = "/a/goose/cooked/well"
       assert_equal exp_path, subject.path_for('ignore', 'these', 'params', {
@@ -85,6 +82,15 @@ class Deas::Url
       })
     end
 
+    should "'squash' duplicate forward-slashes" do
+      exp_path = "/a/goose/cooked/well/"
+      assert_equal exp_path, subject.path_for({
+        'some'  => '/a',
+        :thing  => '/goose',
+        'splat' => ['///cooked', 'well//']
+      })
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 75
   prerelease: 
   segments: 
   - 0
-  - 20
+  - 21
   - 0
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-19 00:00:00 Z
+date: 2013-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ns-options
@@ -148,7 +148,6 @@ files:
 - lib/deas/error_handler.rb
 - lib/deas/exceptions.rb
 - lib/deas/logging.rb
-- lib/deas/plugin.rb
 - lib/deas/rack_request_fix.rb
 - lib/deas/redirect_proxy.rb
 - lib/deas/route.rb
@@ -188,7 +187,6 @@ files:
 - test/unit/error_handler_tests.rb
 - test/unit/exceptions_tests.rb
 - test/unit/logging_tests.rb
-- test/unit/plugin_tests.rb
 - test/unit/redirect_proxy_tests.rb
 - test/unit/route_proxy_tests.rb
 - test/unit/route_tests.rb
@@ -259,7 +257,6 @@ test_files:
 - test/unit/error_handler_tests.rb
 - test/unit/exceptions_tests.rb
 - test/unit/logging_tests.rb
-- test/unit/plugin_tests.rb
 - test/unit/redirect_proxy_tests.rb
 - test/unit/route_proxy_tests.rb
 - test/unit/route_tests.rb

data/lib/deas/plugin.rb

@@ -1,38 +0,0 @@
-module Deas
-  module Plugin
-
-    # use the Plugin mixin to define your own custom plugins you want to mixin
-    # on your Deas view handlers.  Define included hooks using `plugin_included`.
-    # this allows you to define multiple hooks separately and ensures the hooks
-    # will only be called once - even if your plugin is mixed in multiple times.
-
-    def self.included(receiver)
-      receiver.class_eval do
-        extend ClassMethods
-
-        # install an included hook that first checks if this plugin has
-        # already been installed on the reciever.  If it has not been,
-        # class eval each callback on the receiver.
-
-        def self.included(plugin_receiver)
-          return if self.deas_plugin_receivers.include?(plugin_receiver)
-
-          self.deas_plugin_receivers.push(plugin_receiver)
-          self.deas_plugin_included_hooks.each do |hook|
-            plugin_receiver.class_eval(&hook)
-          end
-        end
-
-      end
-    end
-
-    module ClassMethods
-
-      def deas_plugin_receivers; @plugin_receivers ||= []; end
-      def deas_plugin_included_hooks; @plugin_included_hooks ||= []; end
-      def plugin_included(&hook); self.deas_plugin_included_hooks << hook; end
-
-    end
-
-  end
-end

data/test/unit/plugin_tests.rb

@@ -1,95 +0,0 @@
-require 'assert'
-require 'deas/plugin'
-
-module Deas::Plugin
-
-  class BaseTests < Assert::Context
-    TestPlugin = Module.new do
-      include Deas::Plugin
-
-      plugin_included{ inc_hook1 }
-      plugin_included{ inc_hook2 }
-    end
-
-    desc "Deas::Plugin"
-    setup do
-      @receiver = Class.new do
-        def self.inc_hook1;   @hook1_count ||= 0; @hook1_count += 1; end
-        def self.hook1_count; @hook1_count ||= 0; end
-        def self.inc_hook2;   @hook2_count ||= 0; @hook2_count += 1; end
-        def self.hook2_count; @hook2_count ||= 0; end
-      end
-
-      @hook1 = proc{ 1 }
-      @hook2 = proc{ 2 }
-
-      @plugin = Module.new{ include Deas::Plugin }
-    end
-    subject{ @plugin }
-
-    should have_imeths :deas_plugin_included_hooks, :deas_plugin_receivers
-    should have_imeths :plugin_included
-
-    should "have no plugin_included_hooks by default" do
-      assert_empty subject.deas_plugin_included_hooks
-    end
-
-    should "have no plugin_receivers by default" do
-      assert_empty subject.deas_plugin_receivers
-    end
-
-    should "append hooks with #plugin_included" do
-      subject.plugin_included(&@hook1)
-      subject.plugin_included(&@hook2)
-
-      assert_equal @hook1, subject.deas_plugin_included_hooks.first
-      assert_equal @hook2, subject.deas_plugin_included_hooks.last
-    end
-
-    should "call the plugin included hooks when mixed in" do
-      assert_equal 0, @receiver.hook1_count
-      assert_equal 0, @receiver.hook2_count
-
-      @receiver.send(:include, BaseTests::TestPlugin)
-
-      assert_equal 1, @receiver.hook1_count
-      assert_equal 1, @receiver.hook2_count
-    end
-
-    should "call hooks once when mixed in multiple times" do
-      @receiver.send(:include, BaseTests::TestPlugin)
-
-      assert_equal 1, @receiver.hook1_count
-      assert_equal 1, @receiver.hook2_count
-
-      @receiver.send(:include, BaseTests::TestPlugin)
-
-      assert_equal 1, @receiver.hook1_count
-      assert_equal 1, @receiver.hook2_count
-    end
-
-    should "call hooks once when mixed in by a 3rd party" do
-      third_party = Module.new do
-        def self.included(receiver)
-          receiver.send(:include, BaseTests::TestPlugin)
-        end
-      end
-      @receiver.send(:include, third_party)
-
-      assert_equal 1, @receiver.hook1_count
-      assert_equal 1, @receiver.hook2_count
-
-      @receiver.send(:include, BaseTests::TestPlugin)
-
-      assert_equal 1, @receiver.hook1_count
-      assert_equal 1, @receiver.hook2_count
-
-      @receiver.send(:include, third_party)
-
-      assert_equal 1, @receiver.hook1_count
-      assert_equal 1, @receiver.hook2_count
-    end
-
-  end
-
-end