strikeroff-routing-filter 0.0.2 → 0.1.0

data/lib/routing_filter/base.rb

@@ -1,31 +1,31 @@
-module RoutingFilter
-  class Base
-    class_inheritable_accessor :active
-    self.active = true
-
-    attr_accessor :chain, :options
-
-    def initialize(options = {})
-      @options = options
-      options.each { |name, value| instance_variable_set :"@#{name}", value }
-    end
-
-    def run(method, *args, &block)
-      _next = successor ? lambda { successor.run(method, *args, &block) } : block
-      active ? send(method, *args, &_next) : _next.call(*args)
-    end
-
-    def run_reverse(method, *args, &block)
-      _prev = predecessor ? lambda { predecessor.run(method, *args, &block) } : block
-      active ? send(method, *args, &_prev) : _prev.call(*args)
-    end
-
-    def predecessor
-      @chain.predecessor(self)
-    end
-
-    def successor
-      @chain.successor(self)
-    end
-  end
+module RoutingFilter
+  class Base
+    class_inheritable_accessor :active
+    self.active = true
+
+    attr_accessor :chain, :options
+
+    def initialize(options = {})
+      @options = options
+      options.each { |name, value| instance_variable_set :"@#{name}", value }
+    end
+
+    def run(method, *args, &block)
+      _next = successor ? lambda { successor.run(method, *args, &block) } : block
+      active ? send(method, *args, &_next) : _next.call(*args)
+    end
+
+    def run_reverse(method, *args, &block)
+      _prev = predecessor ? lambda { predecessor.run(method, *args, &block) } : block
+      active ? send(method, *args, &_prev) : _prev.call(*args)
+    end
+
+    def predecessor
+      @chain.predecessor(self)
+    end
+
+    def successor
+      @chain.successor(self)
+    end
+  end
 end

data/lib/routing_filter/force_extension.rb

@@ -1,57 +1,57 @@
-require 'routing_filter/base'
-
-module RoutingFilter
-  class ForceExtension < Base
-    attr_reader :extension, :exclude
-
-    def initialize(*args)
-      super
-      @extension ||= 'html'
-      @exclude = %r(^(http.?://[^/]+)?\/?$) if @exclude.nil?
-    end
-
-    def around_recognize(path, env, &block)
-      extract_extension!(path) unless excluded?(path)
-      yield(path, env)
-    end
-
-    def around_generate(*args, &block)
-      returning yield do |result|
-        url = result.is_a?(Array) ? result.first : result
-        append_extension!(url) if append_extension?(url)
-      end
-    end
-
-    protected
-
-      def extract_extension!(path)
-        path.sub! /\.#{extension}$/, ''
-        $1
-      end
-      
-      def append_extension?(url)
-        !(url.blank? || excluded?(url) || mime_extension?(url))
-      end
-      
-      def excluded?(url)
-        case exclude
-        when Regexp
-          url =~ exclude
-        when Proc
-          exclude.call(url)
-        end
-      end
-      
-      def mime_extension?(url)
-        url =~ /\.#{Mime::EXTENSION_LOOKUP.keys.join('|')}(\?|$)/
-      end
-      
-      def append_extension!(url)
-        url.replace url.sub(/(\?|$)/, ".#{extension}\\1")
-      end
-
-      def append_page!(url, page)
-        url.replace "#{url}/pages/#{page}"
-      end
-  end
+require 'routing_filter/base'
+
+module RoutingFilter
+  class ForceExtension < Base
+    attr_reader :extension, :exclude
+
+    def initialize(*args)
+      super
+      @extension ||= 'html'
+      @exclude = %r(^(http.?://[^/]+)?\/?$) if @exclude.nil?
+    end
+
+    def around_recognize(path, env, &block)
+      extract_extension!(path) unless excluded?(path)
+      yield(path, env)
+    end
+
+    def around_generate(*args, &block)
+      returning yield do |result|
+        url = result.is_a?(Array) ? result.first : result
+        append_extension!(url) if append_extension?(url)
+      end
+    end
+
+    protected
+
+      def extract_extension!(path)
+        path.sub! /\.#{extension}$/, ''
+        $1
+      end
+      
+      def append_extension?(url)
+        !(url.blank? || excluded?(url) || mime_extension?(url))
+      end
+      
+      def excluded?(url)
+        case exclude
+        when Regexp
+          url =~ exclude
+        when Proc
+          exclude.call(url)
+        end
+      end
+      
+      def mime_extension?(url)
+        url =~ /\.#{Mime::EXTENSION_LOOKUP.keys.join('|')}(\?|$)/
+      end
+      
+      def append_extension!(url)
+        url.replace url.sub(/(\?|$)/, ".#{extension}\\1")
+      end
+
+      def append_page!(url, page)
+        url.replace "#{url}/pages/#{page}"
+      end
+  end
 end

data/lib/routing_filter/locale.rb

@@ -1,82 +1,82 @@
-require 'i18n'
-require 'routing_filter/base'
-
-module RoutingFilter
-  class Locale < Base
-    @@include_default_locale = true
-    cattr_writer :include_default_locale
-
-    class << self
-      def include_default_locale?
-        @@include_default_locale
-      end
-
-      def locales
-        @@locales ||= I18n.available_locales.map(&:to_sym)
-      end
-
-      def locales=(locales)
-        @@locales = locales.map(&:to_sym)
-      end
-
-      def locales_pattern
-        @@locales_pattern ||= %r(^/(#{self.locales.map { |l| Regexp.escape(l.to_s) }.join('|')})(?=/|$))
-      end
-
-      def extract_locale!(path)
-        path.sub! self.locales_pattern, ''
-        $1
-      end
-
-      def prepend_locale!(url, locale)
-        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{locale}#{$2}" }
-      end
-    end
-
-    def around_recognize(path, env, &block)
-      locale = self.class.extract_locale!(path)                 # remove the locale from the beginning of the path
-      returning yield do |params|                    # invoke the given block (calls more filters and finally routing)
-        params[:locale] = locale if locale           # set recognized locale to the resulting params hash
-      end
-    end
-
-    def around_generate(*args, &block)
-      options = args.extract_options!
-
-      locale = options.delete(:locale)
-      unless  skip_prepend_locale? options
-        locale = I18n.locale if locale.nil?            # default to I18n.locale when locale is nil (could also be false)
-        locale = nil unless valid_locale?(locale)     # reset to no locale when locale is not valid
-        returning yield do |result|
-          if locale && prepend_locale?(locale)
-            url = result.is_a?(Array) ? result.first : result
-            self.class.prepend_locale!(url, locale)
-          end
-        end
-      else
-        yield
-      end
-    end
-
-    protected
-
-
-    def prepend_locale?(locale)
-      self.class.include_default_locale? || !default_locale?(locale)
-    end
-
-    def skip_prepend_locale?(options)
-      !!options[:scip_locale_filter]
-    end
-
-    def valid_locale?(locale)
-      locale && self.class.locales.include?(locale.to_sym)
-    end
-
-    def default_locale?(locale)
-      locale && locale.to_sym == I18n.default_locale.to_sym
-    end
-
-
-  end
-end
+require 'i18n'
+require 'routing_filter/base'
+
+module RoutingFilter
+  class Locale < Base
+    @@include_default_locale = true
+    cattr_writer :include_default_locale
+
+    class << self
+      def include_default_locale?
+        @@include_default_locale
+      end
+
+      def locales
+        @@locales ||= I18n.available_locales.map(&:to_sym)
+      end
+
+      def locales=(locales)
+        @@locales = locales.map(&:to_sym)
+      end
+
+      def locales_pattern
+        @@locales_pattern ||= %r(^/(#{self.locales.map { |l| Regexp.escape(l.to_s) }.join('|')})(?=/|$))
+      end
+
+      def extract_locale!(path)
+        path.sub! self.locales_pattern, ''
+        $1
+      end
+
+      def prepend_locale!(url, locale)
+        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{locale}#{$2}" }
+      end
+    end
+
+    def around_recognize(path, env, &block)
+      locale = self.class.extract_locale!(path)                 # remove the locale from the beginning of the path
+      returning yield do |params|                    # invoke the given block (calls more filters and finally routing)
+        params[:locale] = locale if locale           # set recognized locale to the resulting params hash
+      end
+    end
+
+    def around_generate(*args, &block)
+      options = args.extract_options!
+
+      locale = options.delete(:locale)
+      unless  skip_prepend_locale? options
+        locale = I18n.locale if locale.nil?            # default to I18n.locale when locale is nil (could also be false)
+        locale = nil unless valid_locale?(locale)     # reset to no locale when locale is not valid
+        returning yield do |result|
+          if locale && prepend_locale?(locale)
+            url = result.is_a?(Array) ? result.first : result
+            self.class.prepend_locale!(url, locale)
+          end
+        end
+      else
+        yield
+      end
+    end
+
+    protected
+
+
+    def prepend_locale?(locale)
+      self.class.include_default_locale? || !default_locale?(locale)
+    end
+
+    def skip_prepend_locale?(options)
+      !!options[:scip_locale_filter]
+    end
+
+    def valid_locale?(locale)
+      locale && self.class.locales.include?(locale.to_sym)
+    end
+
+    def default_locale?(locale)
+      locale && locale.to_sym == I18n.default_locale.to_sym
+    end
+
+
+  end
+end

data/lib/routing_filter/pagination.rb

@@ -1,33 +1,33 @@
-require 'routing_filter/base'
-
-module RoutingFilter
-  class Pagination < Base
-    def around_recognize(path, env, &block)
-      page = extract_page!(path)
-      returning yield(path, env) do |params|
-        params[:page] = page.to_i if page
-      end
-    end
-
-    def around_generate(*args, &block)
-      page = args.extract_options!.delete(:page)
-      returning yield do |result|
-        if page && page != 1
-          url = result.is_a?(Array) ? result.first : result
-          append_page!(url, page)
-        end
-      end
-    end
-
-    protected
-
-      def extract_page!(path)
-        path.sub! %r(/pages/([\d]+)/?$), ''
-        $1
-      end
-
-      def append_page!(url, page)
-        url.sub!(/($|\?)/) { "/pages/#{page}#{$1}" }
-      end
-  end
+require 'routing_filter/base'
+
+module RoutingFilter
+  class Pagination < Base
+    def around_recognize(path, env, &block)
+      page = extract_page!(path)
+      returning yield(path, env) do |params|
+        params[:page] = page.to_i if page
+      end
+    end
+
+    def around_generate(*args, &block)
+      page = args.extract_options!.delete(:page)
+      returning yield do |result|
+        if page && page != 1
+          url = result.is_a?(Array) ? result.first : result
+          append_page!(url, page)
+        end
+      end
+    end
+
+    protected
+
+      def extract_page!(path)
+        path.sub! %r(/pages/([\d]+)/?$), ''
+        $1
+      end
+
+      def append_page!(url, page)
+        url.sub!(/($|\?)/) { "/pages/#{page}#{$1}" }
+      end
+  end
 end

data/routing-filter.gemspec

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{routing_filter}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Vesov Ilya"]
+  s.date = %q{2009-10-18}
+  s.description = %q{routing_filter}
+  s.email = %q{strikeroff@gmail.com}
+  s.extra_rdoc_files = ["lib/routing_filter/base.rb", "lib/routing_filter/force_extension.rb", "lib/routing_filter/locale.rb", "lib/routing_filter/pagination.rb", "lib/routing_filter.rb"]
+  s.files = ["init.rb", "lib/routing_filter/base.rb", "lib/routing_filter/force_extension.rb", "lib/routing_filter/locale.rb", "lib/routing_filter/pagination.rb", "lib/routing_filter.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.markdown", "routing-filter.gemspec", "routing_filter.gemspec", "spec/force_extension_spec.rb", "spec/generation_spec.rb", "spec/pagination_extension_spec.rb", "spec/recognition_spec.rb", "spec/routing_filter_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "VERSION"]
+  s.homepage = %q{http://7studio.ru}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Routing_filter", "--main", "README.markdown", "-c utf-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{routing_filter}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{routing_filter}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/spec/force_extension_spec.rb

@@ -1,65 +1,65 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-describe 'RoutingFilter::ForceExtension' do
-  include RoutingFilterHelpers
-
-  before :each do
-    setup_environment(:force_extension)
-  end
-
-  describe 'url recognition' do
-    it 'recognizes the path /sections/1.html' do
-      should_recognize_path '/sections/1.html', @section_params
-    end
-
-    it 'recognizes the path /sections/1/articles/1.html' do
-      should_recognize_path '/sections/1/articles/1.html', @article_params
-    end
-
-    it 'does not recognize the path /sections/1/articles/1.foobar' do
-      lambda { @set.recognize_path('/sections/1/articles/1.foobar', {}) }.should raise_error(ActionController::RoutingError)
-    end
-  end
-
-  describe 'url generation' do
-    it 'appends the .html extension to generated paths (section_path)' do
-      section_path(:id => 1).should == '/sections/1.html'
-    end
-
-    it 'appends the .html extension to generated paths (section_article_path)' do
-      section_article_path(:section_id => 1, :id => 1).should == '/sections/1/articles/1.html'
-    end
-
-    it 'appends the .html extension to generated paths (admin_articles_path)' do
-      admin_articles_path.should == '/admin/articles.html'
-    end
-
-    it 'does not replace or add on an existing extension' do
-      section_path(:id => 1, :format => 'xml').should == '/sections/1.xml'
-    end
-
-    it 'works with url query params' do
-      section_path(:id => 1, :foo => 'bar').should == '/sections/1.html?foo=bar'
-    end
-    
-    it 'excludes / by default' do
-      home_path.should == '/'
-    end
-    
-    it 'excludes http://test.host/ by default' do
-      home_url.should == 'http://test.host/'
-    end
-    
-    it 'excludes with custom regexp' do
-      setup_environment { |map| map.filter :force_extension, :exclude => %r(^/(admin|$)) }
-      home_path.should == '/'
-      admin_articles_path.should == '/admin/articles'
-      section_path(:id => 1).should == '/sections/1.html'
-    end
-
-    it 'does not exclude / when :exclude => false was passed' do
-      setup_environment { |map| map.filter :force_extension, :exclude => false }
-      home_path.should == '/.html'
-    end
-  end
-end
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe 'RoutingFilter::ForceExtension' do
+  include RoutingFilterHelpers
+
+  before :each do
+    setup_environment(:force_extension)
+  end
+
+  describe 'url recognition' do
+    it 'recognizes the path /sections/1.html' do
+      should_recognize_path '/sections/1.html', @section_params
+    end
+
+    it 'recognizes the path /sections/1/articles/1.html' do
+      should_recognize_path '/sections/1/articles/1.html', @article_params
+    end
+
+    it 'does not recognize the path /sections/1/articles/1.foobar' do
+      lambda { @set.recognize_path('/sections/1/articles/1.foobar', {}) }.should raise_error(ActionController::RoutingError)
+    end
+  end
+
+  describe 'url generation' do
+    it 'appends the .html extension to generated paths (section_path)' do
+      section_path(:id => 1).should == '/sections/1.html'
+    end
+
+    it 'appends the .html extension to generated paths (section_article_path)' do
+      section_article_path(:section_id => 1, :id => 1).should == '/sections/1/articles/1.html'
+    end
+
+    it 'appends the .html extension to generated paths (admin_articles_path)' do
+      admin_articles_path.should == '/admin/articles.html'
+    end
+
+    it 'does not replace or add on an existing extension' do
+      section_path(:id => 1, :format => 'xml').should == '/sections/1.xml'
+    end
+
+    it 'works with url query params' do
+      section_path(:id => 1, :foo => 'bar').should == '/sections/1.html?foo=bar'
+    end
+    
+    it 'excludes / by default' do
+      home_path.should == '/'
+    end
+    
+    it 'excludes http://test.host/ by default' do
+      home_url.should == 'http://test.host/'
+    end
+    
+    it 'excludes with custom regexp' do
+      setup_environment { |map| map.filter :force_extension, :exclude => %r(^/(admin|$)) }
+      home_path.should == '/'
+      admin_articles_path.should == '/admin/articles'
+      section_path(:id => 1).should == '/sections/1.html'
+    end
+
+    it 'does not exclude / when :exclude => false was passed' do
+      setup_environment { |map| map.filter :force_extension, :exclude => false }
+      home_path.should == '/.html'
+    end
+  end
+end