trollied 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/models/line_item.rb

@@ -6,6 +6,10 @@ class LineItem < ActiveRecord::Base
 
   delegate :user, :to => :order
 
+  # this is deprecated in Rails 3x, find workaround
+  # an observer seemed like overkill and would have 3x compatibility stuff todo anyway
+  after_destroy { |record| record.order.line_item_destroyed }
+
   # needs to be unique to orders that are current (but not unique to orders generally)
   # validates_uniqueness_of :order_id, :scope => [:purchasable_item_type, :purchasable_item_id]
   def validate

data/app/models/order.rb

@@ -26,4 +26,10 @@ class Order < ActiveRecord::Base
   def may_note?
     in_process? || ready? || user_review?
   end
+
+  # if there are no more line_items or notes, destroy self
+  # i.e. we don't want to keep around empty orders
+  def line_item_destroyed
+    destroy if line_items.size == 0 && notes.size == 0
+  end
 end

data/app/views/orders/_order.html.erb

@@ -2,7 +2,7 @@
 
 <fieldset class="order">
 
-<% if params[:controller] == 'orders' -%>
+<% if params[:controller] == 'orders' && !(params[:action] == 'show' && current_user == order.user) -%>
   <h3><%= t '.user' -%> <%= link_to_orders_for(order.user) -%></h3>
 <% end -%>
 

data/config/locales/en.yml

@@ -85,7 +85,7 @@ en:
       purchasable_item_description: "Item"
       user: "User:"
     show:
-      your_title: "Your Order"
+      your_order: "Your Order"
       for_user_title: "Order for {{name}}"
     controllers:
       change_to_cancel: "Order Cancelled"

data/lib/has_trolley_controller_helpers.rb

@@ -7,11 +7,15 @@ module HasTrolleyControllerHelpers
   module UrlFor
     # expects user in options or @user or trolley being set
     def url_for_trolley(options = { })
-      user = options[:user] || @user
-      user = @trolley.user if @trolley && user.blank?
-
+      user = options[:user]
       trolley = options[:trolley] || @trolley || user.trolley
 
+      if trolley.blank?
+        user = @user
+      else
+        user = trolley.user
+      end
+
       # TODO: Hack, not sure if this is 2.3.5 bug or my ignorance
       # but url_for returns marshalled trolley, in addition to correct url
       url = url_for(:user_id => user.id,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trollied
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Walter McGinnis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +12:00
+date: 2011-06-29 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -238,19 +238,6 @@ files:
 - test/full_2_3_5_app_with_tests/test/unit/trolley_test.rb
 - test/full_2_3_5_app_with_tests/tmp/restart.txt
 - test/helper.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/init.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/base.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/force_extension.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/locale.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/pagination.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/uuid_token.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/force_extension_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/generation_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/pagination_extension_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/recognition_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/routing_filter_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kete/trollied
 licenses: []
@@ -329,17 +316,4 @@ test_files:
 - test/full_2_3_5_app_with_tests/test/unit/note_test.rb
 - test/full_2_3_5_app_with_tests/test/unit/order_test.rb
 - test/full_2_3_5_app_with_tests/test/unit/trolley_test.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/init.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/base.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/force_extension.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/locale.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/pagination.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/uuid_token.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/force_extension_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/generation_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/pagination_extension_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/recognition_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/routing_filter_spec.rb
-- test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/spec_helper.rb
 - test/helper.rb

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/init.rb

@@ -1 +0,0 @@
-require 'routing_filter'

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/base.rb

@@ -1,31 +0,0 @@
-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/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/force_extension.rb

@@ -1,57 +0,0 @@
-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/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/locale.rb

@@ -1,70 +0,0 @@
-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
-    end
-
-    def around_recognize(path, env, &block)
-      locale = 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)
-      locale = args.extract_options!.delete(:locale) # extract the passed :locale option
-      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
-          prepend_locale!(url, locale)
-        end
-      end
-    end
-
-    protected
-
-      def extract_locale!(path)
-        path.sub! self.class.locales_pattern, ''
-        $1
-      end
-
-      def prepend_locale?(locale)
-        self.class.include_default_locale? || !default_locale?(locale)
-      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
-
-      def prepend_locale!(url, locale)
-        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{locale}#{$2}" }
-      end
-  end
-end

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/pagination.rb

@@ -1,33 +0,0 @@
-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/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter/uuid_token.rb

@@ -1,78 +0,0 @@
-# This is a routing filter that extracts UUIDs from urls and exposes them via
-# params[:uuid_token]
-#
-# URL scheme: http://example.com/d00fbbd1-82b6-4c1a-a57d-098d529d6854/your_route
-#
-# To enable this filter add map.filter :uuid_token to your routes.rb
-# 
-# To make your restful path helpers use this :uuid_token use:
-# new_post_path(:uuid_token => params[:uuid_token])
-#
-# If don't want to pass the :uuid_token manually you can add a custom module
-# like this to your RAILS_ROOT/lib directory:
-#
-#   module AccessToken
-#     
-#     class << self
-#       def current=(token)
-#         Thread.current[:uuid_token] = token
-#       end
-#       
-#       def current
-#         Thread.current[:uuid_token] ||= ""
-#       end
-#     end
-#     
-#   end
-#
-# Now in your application_controller you can set a before_filter which sets that
-# token for every request:
-# 
-#   before_filter :set_token
-#   
-#   protected
-#   
-#     def set_token
-#       AccessToken.current = params[:uuid_token] if params[:uuid_token]
-#     end
-#
-# As you can see below in the around_generate method, if you don't provide a 
-# :uuid_token argument for your restful path helpers it will try to get the
-# current :uuid_token from the AccessToken module.
-
-require 'routing_filter/base'
-
-module RoutingFilter
-  class UuidToken < Base
-
-    def around_recognize(path, env, &block)
-      token = extract_token!(path)                              # remove the token from the beginning of the path
-      returning yield do |params|                               # invoke the given block (calls more filters and finally routing)
-        params[:uuid_token] = token if token                    # set recognized token to the resulting params hash
-      end
-    end
-
-    def around_generate(*args, &block)
-      token = args.extract_options!.delete(:uuid_token)         # extract the passed :token option
-      token = AccessToken.current if AccessToken && token.nil?  # default to AccessToken.current when token is nil (could also be false)
-
-      returning yield do |result|
-        if token
-          url = result.is_a?(Array) ? result.first : result
-          prepend_token!(url, token)
-        end
-      end
-    end
-
-    protected
-
-      def extract_token!(path)
-        path.sub! /([a-z\d]{8}\-[a-z\d]{4}\-[a-z\d]{4}\-[a-z\d]{4}\-[a-z\d]{12})\//, ''
-        $1
-      end
-
-      def prepend_token!(url, token)
-        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{token}#{$2}" }
-      end
-  end
-end

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/lib/routing_filter.rb

@@ -1,94 +0,0 @@
-module RoutingFilter
-  mattr_accessor :active
-  @@active = true
-
-  class Chain < Array
-    def << (filter)
-      filter.chain = self
-      super
-    end
-
-    def run(method, *args, &final)
-      RoutingFilter.active && !first.nil? ? first.run(method, *args, &final) : final.call
-    end
-
-    def run_reverse(method, *args, &final)
-      RoutingFilter.active && !last.nil? ? last.run_reverse(method, *args, &final) : final.call
-    end
-
-    def predecessor(filter)
-      ix = index(filter)
-      ix > 0 ? self[ix - 1] : nil
-    end
-
-    def successor(filter)
-      ix = index(filter)
-      ix < length - 1 ? self[ix + 1] : nil
-    end
-  end
-end
-
-# allows to install a filter to the route set by calling: map.filter 'locale'
-ActionController::Routing::RouteSet::Mapper.class_eval do
-  def filter(name, options = {})
-    require options.delete(:file) || "routing_filter/#{name}"
-    klass = RoutingFilter.const_get(name.to_s.camelize)
-    @set.filters << klass.new(options)
-  end
-end
-
-# same here for the optimized url generation in named routes
-ActionController::Routing::RouteSet::NamedRouteCollection.class_eval do
-  # gosh. monkey engineering optimization code
-  def generate_optimisation_block_with_filtering(*args)
-    code = generate_optimisation_block_without_filtering(*args)
-    if match = code.match(%r(^return (.*) if (.*)))
-      # returned string must not contain newlines, or we'll spill out of inline code comments in
-      # ActionController::Routing::RouteSet::NamedRouteCollection#define_url_helper
-      "returning(#{match[1]}) { |result|" +
-      "  ActionController::Routing::Routes.filters.run_reverse(:around_generate, *args, &lambda{ result }) " +
-      "} if #{match[2]}"
-    end
-  end
-  alias_method_chain :generate_optimisation_block, :filtering
-end
-
-ActionController::Routing::RouteSet.class_eval do
-  def clear_with_filtering!
-    @filters.clear if @filters
-    clear_without_filtering!
-  end
-  alias_method_chain :clear!, :filtering
-
-  attr_writer :filters
-
-  def filters
-    @filters ||= RoutingFilter::Chain.new
-  end
-
-  def recognize_path_with_filtering(path, env = {})
-    path = ::URI.unescape(path.dup) # string is frozen due to memoize
-    filters.run(:around_recognize, path, env, &lambda{ recognize_path_without_filtering(path, env) })
-  end
-  alias_method_chain :recognize_path, :filtering
-
-  def generate_with_filtering(*args)
-    filters.run_reverse(:around_generate, args.first, &lambda{ generate_without_filtering(*args) })
-  end
-  alias_method_chain :generate, :filtering
-
-  # add some useful information to the request environment
-  # right, this is from jamis buck's excellent article about routes internals
-  # http://weblog.jamisbuck.org/2006/10/26/monkey-patching-rails-extending-routes-2
-  # TODO move this ... where?
-  alias_method :extract_request_environment_without_host, :extract_request_environment unless method_defined? :extract_request_environment_without_host
-  def extract_request_environment(request)
-    returning extract_request_environment_without_host(request) do |env|
-      env.merge! :host => request.host,
-                 :port => request.port,
-                 :host_with_port => request.host_with_port,
-                 :domain => request.domain,
-                 :subdomain => request.subdomains.first
-    end
-  end
-end

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/force_extension_spec.rb

@@ -1,65 +0,0 @@
-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

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/generation_spec.rb

@@ -1,367 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-describe 'RoutingFilter', 'url generation' do
-  include RoutingFilterHelpers
-
-  before :each do
-    setup_environment :locale, :pagination
-
-    @site = Site.new
-    @section = Section.new
-    @article = Article.new
-  end
-
-  describe "named route url_helpers" do
-    describe "a not nested resource" do
-      it 'does not change the section_path when given page option equals 1' do
-        section_path(:id => 1, :page => 1).should == '/en/sections/1'
-      end
-
-      it 'appends the pages segments to section_path when given page option does not equal 1' do
-        section_path(:id => 1, :page => 2).should == '/en/sections/1/pages/2'
-      end
-
-      it 'prepends the current locale to section_path' do
-        I18n.locale = :de
-        section_path(:id => 1).should == '/de/sections/1'
-      end
-
-      it 'prepends a given locale param to section_path' do
-        I18n.locale = :de
-        section_path(:id => 1, :locale => :fi).should == '/fi/sections/1'
-      end
-
-      it 'does not prepend a locale to section_path if given locale is false' do
-        section_path(:id => 1, :locale => false).should == '/sections/1'
-      end
-
-      it 'works on section_path with both a locale and page option' do
-        section_path(:id => 1, :locale => :fi, :page => 2).should == '/fi/sections/1/pages/2'
-      end
-
-      it 'should not prepend an invalid locale to section_path' do
-        section_path(:id => 1, :locale => :aa).should == '/sections/1'
-      end
-
-      it 'should prepend a longer locale to section_path' do
-        section_path(:id => 1, :locale => 'en-US').should == '/en-US/sections/1'
-      end
-
-      it 'should not prepend the default locale when configured not to' do
-        RoutingFilter::Locale.include_default_locale = false
-        section_path(:id => 1, :locale => :en).should == '/sections/1'
-      end
-    end
-
-    describe "a nested resource" do
-      it 'does not change the section_article_path when given page option equals 1' do
-        section_article_path(:section_id => 1, :id => 1, :page => 1).should == '/en/sections/1/articles/1'
-      end
-
-      it 'appends the pages segments to section_article_path when given page option does not equal 1' do
-        section_article_path(:section_id => 1, :id => 1, :page => 2).should == '/en/sections/1/articles/1/pages/2'
-      end
-
-      it 'prepends the current locale to section_article_path' do
-        I18n.locale = :de
-        section_article_path(:section_id => 1, :id => 1).should == '/de/sections/1/articles/1'
-      end
-
-      it 'prepends a given locale param to section_article_path' do
-        I18n.locale = :de
-        section_article_path(:section_id => 1, :id => 1, :locale => :fi).should == '/fi/sections/1/articles/1'
-      end
-
-      it 'does not prepend a locale to section_article_path if given locale is false' do
-        section_article_path(:section_id => 1, :id => 1, :locale => false).should == '/sections/1/articles/1'
-      end
-
-      it 'works on section_article_path with both a locale and page option' do
-        section_article_path(:section_id => 1, :id => 1, :locale => :fi, :page => 2).should == '/fi/sections/1/articles/1/pages/2'
-      end
-
-      it 'should not prepend an invalid locale to section_article_path' do
-        section_article_path(:section_id => 1, :id => 1, :locale => :aa).should == '/sections/1/articles/1'
-      end
-
-      it 'should prepend a longer locale to section_article_path' do
-        section_article_path(:section_id => 1, :id => 1, :locale => 'en-US').should == '/en-US/sections/1/articles/1'
-      end
-
-      it 'should not prepend the default locale when configured not to' do
-        RoutingFilter::Locale.include_default_locale = false
-        section_article_path(:section_id => 1, :id => 1, :locale => :en).should == '/sections/1/articles/1'
-      end
-    end
-  end
-
-  describe 'when used with named route url_helper with "optimized" generation blocks' do
-    describe "a not nested resource" do
-      it 'does not change the section_path when given page option equals 1' do
-        section_path(1, :page => 1).should == '/en/sections/1'
-      end
-
-      it 'appends the pages segments to section_path when given page option does not equal 1' do
-        section_path(1, :page => 2).should == '/en/sections/1/pages/2'
-      end
-
-      it 'prepends the current locale to section_path' do
-        I18n.locale = :de
-        section_path(1).should == '/de/sections/1'
-      end
-
-      it 'prepends a given locale param to section_path' do
-        I18n.locale = :de
-        section_path(1, :locale => :fi).should == '/fi/sections/1'
-      end
-
-      it 'does not prepend a locale to section_path if given locale is false' do
-        section_path(1, :locale => false).should == '/sections/1'
-      end
-
-      it 'works for section_path with both a locale and page option' do
-        section_path(1, :locale => :fi, :page => 2).should == '/fi/sections/1/pages/2'
-      end
-
-      it 'should not prepend an invalid locale to section_path' do
-        section_path(1, :locale => :aa).should == '/sections/1'
-      end
-
-      it 'should prepend a longer locale to section_path' do
-        section_path(1, :locale => 'en-US').should == '/en-US/sections/1'
-      end
-
-      it 'should not prepend the default locale when configured not to' do
-        RoutingFilter::Locale.include_default_locale = false
-        section_path(1, :locale => :en).should == '/sections/1'
-      end
-    end
-
-    describe "a nested resource" do
-      it 'does not change the section_article_path when given page option equals 1' do
-        section_article_path(1, 1, :page => 1).should == '/en/sections/1/articles/1'
-      end
-
-      it 'appends the pages segments to section_article_path when given page option does not equal 1' do
-        section_article_path(1, 1, :page => 2).should == '/en/sections/1/articles/1/pages/2'
-      end
-
-      it 'prepends the current locale to section_article_path' do
-        I18n.locale = :de
-        section_article_path(1, 1).should == '/de/sections/1/articles/1'
-      end
-
-      it 'prepends a given locale param to section_article_path' do
-        I18n.locale = :de
-        section_article_path(1, 1, :locale => :fi).should == '/fi/sections/1/articles/1'
-      end
-
-      it 'does not prepend a locale to section_article_path if given locale is false' do
-        section_article_path(1, 1, :locale => false).should == '/sections/1/articles/1'
-      end
-
-      it 'works for section_article_path with both a locale and page option' do
-        section_article_path(1, 1, :locale => :fi, :page => 2).should == '/fi/sections/1/articles/1/pages/2'
-      end
-
-      it 'should not prepend an invalid locale to section_article_path' do
-        section_article_path(1, 1, :locale => :aa).should == '/sections/1/articles/1'
-      end
-
-      it 'should prepend a longer locale to section_article_path' do
-        section_article_path(1, 1, :locale => 'en-US').should == '/en-US/sections/1/articles/1'
-      end
-
-      it 'should not prepend the default locale when configured not to' do
-        RoutingFilter::Locale.include_default_locale = false
-        section_article_path(1, 1, :locale => :en).should == '/sections/1/articles/1'
-      end
-    end
-  end
-
-  describe 'when used with a polymorphic_path' do
-    describe "a not nested resource" do
-      it 'does not change the section_path when given page option equals 1' do
-        section_path(@section, :page => 1).should == '/en/sections/1'
-      end
-
-      it 'appends the pages segments to section_path when given page option does not equal 1' do
-        section_path(@section, :page => 2).should == '/en/sections/1/pages/2'
-      end
-
-      it 'prepends the current locale to section_path' do
-        I18n.locale = :de
-        section_path(@section).should == '/de/sections/1'
-      end
-
-      it 'prepends a given locale param to section_path' do
-        I18n.locale = :de
-        section_path(@section, :locale => :fi).should == '/fi/sections/1'
-      end
-
-      it 'does not prepend a locale to section_path if given locale is false' do
-        section_path(@section, :locale => false).should == '/sections/1'
-      end
-
-      it 'works for section_path with both a locale and page option' do
-        section_path(@section, :locale => :fi, :page => 2).should == '/fi/sections/1/pages/2'
-      end
-
-      it 'should not prepend an invalid locale to section_path' do
-        section_path(@section, :locale => :aa).should == '/sections/1'
-      end
-
-      it 'should prepend a longer locale to section_path' do
-        section_path(@section, :locale => 'en-US').should == '/en-US/sections/1'
-      end
-
-      it 'should not prepend the default locale when configured not to' do
-        RoutingFilter::Locale.include_default_locale = false
-        section_path(@section, :locale => :en).should == '/sections/1'
-      end
-    end
-
-    describe "a nested resource" do
-      it 'does not change the section_article_path when given page option equals 1' do
-        section_article_path(@section, @article, :page => 1).should == '/en/sections/1/articles/1'
-      end
-
-      it 'appends the pages segments to section_article_path when given page option does not equal 1' do
-        section_article_path(@section, @article, :page => 2).should == '/en/sections/1/articles/1/pages/2'
-      end
-
-      it 'prepends the current locale to section_article_path' do
-        I18n.locale = :de
-        section_article_path(@section, @article).should == '/de/sections/1/articles/1'
-      end
-
-      it 'prepends a given locale param to section_article_path' do
-        I18n.locale = :de
-        section_article_path(@section, @article, :locale => :fi).should == '/fi/sections/1/articles/1'
-      end
-
-      it 'does not prepend a locale to section_article_path if given locale is false' do
-        section_article_path(@section, @article, :locale => false).should == '/sections/1/articles/1'
-      end
-
-      it 'works for section_article_path with both a locale and page option' do
-        section_article_path(@section, @article, :locale => :fi, :page => 2).should == '/fi/sections/1/articles/1/pages/2'
-      end
-
-      it 'should not prepend an invalid locale to section_article_path' do
-        section_article_path(@section, @article, :locale => :aa).should == '/sections/1/articles/1'
-      end
-
-      it 'should prepend a longer locale to section_article_path' do
-        section_article_path(@section, @article, :locale => 'en-US').should == '/en-US/sections/1/articles/1'
-      end
-
-      it 'should not prepend the default locale when configured not to' do
-        RoutingFilter::Locale.include_default_locale = false
-        section_article_path(@section, @article, :locale => :en).should == '/sections/1/articles/1'
-      end
-    end
-  end
-
-  describe 'when used with url_for and an ActivRecord instance' do
-    describe "a not nested resource" do
-      it 'does not change the url_for result when given page option equals 1' do
-        params = @section_params.update :id => @section, :page => 1
-        url_for(params).should == 'http://test.host/en/sections/1'
-      end
-
-      it 'appends the pages segments to url_for result when given page option does not equal 1' do
-        params = @section_params.update :id => @section, :page => 2
-        url_for(params).should == 'http://test.host/en/sections/1/pages/2'
-      end
-
-      it 'prepends the current locale to url_for result' do
-        I18n.locale = :de
-        params = @section_params.update :id => @section
-        url_for(params).should == 'http://test.host/de/sections/1'
-      end
-
-      it 'prepends a given locale param url_for result' do
-        I18n.locale = :de
-        params = @section_params.update :id => @section, :locale => :fi
-        url_for(params).should == 'http://test.host/fi/sections/1'
-      end
-
-      it 'does not prepend a locale to url_for result if given locale is false' do
-        params = @section_params.update :id => @section, :locale => false
-        url_for(params).should == 'http://test.host/sections/1'
-      end
-
-      it 'works for url_for result with both a locale and page option' do
-        params = @section_params.update :id => @section, :locale => :fi, :page => 2
-        url_for(params).should == 'http://test.host/fi/sections/1/pages/2'
-      end
-
-      it 'should not prepend an invalid locale to section_path' do
-        params = @section_params.update :id => @section, :locale => :aa
-        url_for(params).should == 'http://test.host/sections/1'
-      end
-
-      it 'should prepend a longer locale to section_path' do
-        params = @section_params.update :id => @section, :locale => 'en-US'
-        url_for(params).should == 'http://test.host/en-US/sections/1'
-      end
-
-      it 'should not prepend the default locale when configured not to' do
-        RoutingFilter::Locale.include_default_locale = false
-        params = @section_params.update :id => @section, :locale => :en
-        url_for(params).should == 'http://test.host/sections/1'
-      end
-    end
-
-    describe "a nested resource" do
-      it 'does not change the url_for result when given page option equals 1' do
-        params = @article_params.update :section_id => @section, :id => @article, :page => 1
-        url_for(params).should == 'http://test.host/en/sections/1/articles/1'
-      end
-
-      it 'appends the pages segments to url_for result when given page option does not equal 1' do
-        params = @article_params.update :section_id => @section, :id => @article, :page => 2
-        url_for(params).should == 'http://test.host/en/sections/1/articles/1/pages/2'
-      end
-
-      it 'prepends the current locale to url_for result' do
-        I18n.locale = :de
-        params = @article_params.update :section_id => @section, :id => @article
-        url_for(params).should == 'http://test.host/de/sections/1/articles/1'
-      end
-
-      it 'prepends a given locale param to url_for result' do
-        I18n.locale = :de
-        params = @article_params.update :section_id => @section, :id => @article, :locale => :fi
-        url_for(params).should == 'http://test.host/fi/sections/1/articles/1'
-      end
-
-      it 'does not prepend a locale to url_for result if given locale is false' do
-        params = @article_params.update :section_id => @section, :id => @article, :locale => false
-        url_for(params).should == 'http://test.host/sections/1/articles/1'
-      end
-
-      it 'works for url_for result with both a locale and page option' do
-        params = @article_params.update :section_id => @section, :id => @article, :locale => :fi, :page => 2
-        url_for(params).should == 'http://test.host/fi/sections/1/articles/1/pages/2'
-      end
-
-      it 'should not prepend an invalid locale to url_for result' do
-        params = @article_params.update :section_id => @section, :id => @article, :locale => :aa
-        url_for(params).should == 'http://test.host/sections/1/articles/1'
-      end
-
-      it 'should prepend a longer locale to section_article_path' do
-        params = @article_params.update :section_id => @section, :id => @article, :locale => 'en-US'
-        url_for(params).should == 'http://test.host/en-US/sections/1/articles/1'
-      end
-
-      it 'should not prepend the default locale when configured not to' do
-        RoutingFilter::Locale.include_default_locale = false
-        params = @article_params.update :section_id => @section, :id => @article, :locale => :en
-        url_for(params).should == 'http://test.host/sections/1/articles/1'
-      end
-    end
-  end
-end

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/pagination_extension_spec.rb

@@ -1,19 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-describe 'RoutingFilter::Pagination' do
-  include RoutingFilterHelpers
-
-  before :each do
-    setup_environment(:pagination)
-  end
-
-  describe 'url generation' do
-    it 'appends the segments /pages/:page to the generated path' do
-      section_path(1, :page => 2).should == '/sections/1/pages/2'
-    end
-
-    it 'appends the segments /pages/:page to the generated path excluding http get params' do
-      section_path(1, :page => 2, :foo => 'bar').should == '/sections/1/pages/2?foo=bar'
-    end
-  end
-end

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/recognition_spec.rb

@@ -1,76 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-describe 'RoutingFilter', 'url recognition' do
-  include RoutingFilterHelpers
-
-  before :each do
-    setup_environment :locale, :pagination
-  end
-
-  it 'recognizes the path /de/sections/1 and sets the :locale param' do
-    should_recognize_path '/de/sections/1', @section_params.update(:locale => 'de')
-  end
-
-  it 'recognizes the path /sections/1/pages/1 and sets the :page param' do
-    should_recognize_path '/sections/1/pages/1', @section_params.update(:page => 1)
-  end
-
-  it 'recognizes the path /de/sections/1/pages/1 and sets the :locale param' do
-    should_recognize_path '/de/sections/1/pages/1', @section_params.update(:locale => 'de', :page => 1)
-  end
-
-  it 'recognizes the path /sections/1/articles/1 and sets the :locale param' do
-    should_recognize_path '/sections/1/articles/1', @article_params
-  end
-
-  it 'recognizes the path /de/sections/1/articles/1 and sets the :locale param' do
-    should_recognize_path '/de/sections/1/articles/1', @article_params.update(:locale => 'de')
-  end
-
-  it 'recognizes the path /de/sections/1/articles/1/pages/1 and sets the :locale param' do
-    should_recognize_path '/de/sections/1/articles/1/pages/1', @article_params.update(:locale => 'de', :page => 1)
-  end
-
-  it 'recognizes the path /sections/1 and does not set a :locale param' do
-    should_recognize_path '/sections/1', @section_params
-  end
-
-  it 'recognizes the path /sections/1 and does not set a :page param' do
-    should_recognize_path '/sections/1', @section_params
-  end
-
-  # Test that routing errors are thrown for invalid locales
-  it 'does not recognizes the path /aa/sections/1 and does not set a :locale param' do
-    begin
-      should_recognize_path '/aa/sections/1', @section_params.update(:locale => 'aa')
-      false
-    rescue ActionController::RoutingError
-      true
-    end
-  end
-
-  it 'recognizes the path /en-US/sections/1 and sets a :locale param' do
-    should_recognize_path '/en-US/sections/1', @section_params.update(:locale => 'en-US')
-  end
-
-  it 'recognizes the path /sections/1/articles/1 and does not set a :locale param' do
-    should_recognize_path '/sections/1/articles/1', @article_params
-  end
-
-  it 'recognizes the path /sections/1/articles/1 and does not set a :page param' do
-    should_recognize_path '/sections/1/articles/1', @article_params
-  end
-
-  it 'invalid locale: does not recognize the path /aa/sections/1/articles/1 and does not set a :locale param' do
-    lambda { @set.recognize_path('/aa/sections/1/articles/1', {}) }.should raise_error(ActionController::RoutingError)
-  end
-
-  it 'recognizes the path /en-US/sections/1/articles/1 and sets a :locale param' do
-    should_recognize_path '/en-US/sections/1/articles/1', @article_params.update(:locale => 'en-US')
-  end
-
-  it 'unescapes the path for the filters' do
-    @set.should_receive(:recognize_path_without_filtering).with('/sections/motörhead', 'test')
-    @set.recognize_path('/sections/mot%C3%B6rhead', 'test')
-  end
-end

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/routing_filter_spec.rb

@@ -1,114 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-describe 'RoutingFilter' do
-  include RoutingFilterHelpers
-
-  before :each do
-    setup_environment :locale, :pagination
-  end
-
-  def recognize_path(path = '/de/sections/1', options = {})
-    @set.recognize_path(path, options)
-  end
-
-  it 'installs filters to the route set' do
-    @locale_filter.should be_instance_of(RoutingFilter::Locale)
-    @pagination_filter.should be_instance_of(RoutingFilter::Pagination)
-  end
-
-  it 'calls the first filter for route recognition' do
-    @locale_filter.should_receive(:around_recognize).and_return :foo => :bar
-    recognize_path.should == { :foo => :bar }
-  end
-
-  it 'calls the second filter for route recognition' do
-    @pagination_filter.should_receive(:around_recognize).and_return :foo => :bar
-    recognize_path.should == { :foo => :bar, :locale => 'de' }
-  end
-
-  it 'calls the first filter for url generation' do
-    @locale_filter.should_receive(:around_generate).and_return '/en/sections/1?page=2'
-    url_for(:controller => 'sections', :action => 'show', :section_id => 1)
-  end
-
-  it 'calls the second filter for url generation' do
-    @pagination_filter.should_receive(:around_generate).and_return '/sections/1?page=2'
-    url_for(:controller => 'sections', :action => 'show', :section_id => 1)
-  end
-
-  it 'calls the first filter for named route url_helper' do
-    @locale_filter.should_receive(:around_generate).and_return '/en/sections/1'
-    section_path(:section_id => 1)
-  end
-
-  it 'calls the filter for named route url_helper with "optimized" generation blocks' do
-    # at_least(1) since the inline code comments in ActionController::Routing::RouteSet::NamedRouteCollection#define_url_helper also call us (as of http://github.com/rails/rails/commit/a2270ef2594b97891994848138614657363f2806)
-    @locale_filter.should_receive(:around_generate).at_least(1).and_return '/en/sections/1'
-    section_path(1)
-  end
-
-  it 'calls the filter for named route polymorphic_path' do
-    # at_least(1) since the inline code comments in ActionController::Routing::RouteSet::NamedRouteCollection#define_url_helper also call us (as of http://github.com/rails/rails/commit/a2270ef2594b97891994848138614657363f2806)
-    @locale_filter.should_receive(:around_generate).at_least(1).and_return '/en/sections/1'
-    section_path(Section.new)
-  end
-
-  # When filters are set up in the order:
-  #
-  #   map.filter :locale
-  #   map.filter :pagination
-  #
-  # Then #around_recognize should be first called on the locale filter and then
-  # on the pagination filter. Whereas #around_generate should be first called
-  # on the pagination filter and then on the locale filter. Right?
-
-  it 'calls #around_recognize in the expected order' do
-    params = { :id => "1", :page => 2, :controller => "sections", :action => "show" }
-    @pagination_filter.stub!(:around_recognize).and_return({ :page => 2, :controller => "sections", :action => "show" })
-
-    recognize_path('/de/sections/1/pages/2')[:locale].should == "de"
-    recognize_path('/de/sections/1/pages/2')[:page].should == 2
-  end
-
-  it 'calls #around_generate in the expected order' do
-    @locale_filter.stub!(:around_generate).and_return('de/sections/1')
-    section_path(1, :page => 2).should == "de/sections/1/pages/2"
-  end
-
-  it 'does not call deactivated filters' do
-    with_deactivated_filters(RoutingFilter::Locale) do
-      @locale_filter.should_not_receive(:around_generate)
-      section_path(Section.new)
-    end
-  end
-
-  it 'still calls successors of deactivated filters' do
-    with_deactivated_filters(RoutingFilter::Locale) do
-      @pagination_filter.should_receive(:around_recognize).and_return :foo => :bar
-      recognize_path('/sections/1').should == { :foo => :bar }
-    end
-  end
-
-  # chain
-
-  it 'adds filters in the order they are registered' do
-    @set.filters[0].should == @locale_filter
-    @set.filters[1].should == @pagination_filter
-  end
-
-  it 'returns the previous filter as a predecessor of a filter' do
-    @set.filters.predecessor(@pagination_filter).should == @locale_filter
-  end
-
-  it 'returns the nil as a predecessor of the first filter' do
-    @set.filters.successor(@pagination_filter).should be_nil
-  end
-
-  it 'returns the next filter as a successor of a filter' do
-    @set.filters.successor(@locale_filter).should == @pagination_filter
-  end
-
-  it 'returns the nil as a successor of the last filter' do
-    @set.filters.successor(@pagination_filter).should be_nil
-  end
-end

data/test/full_2_3_5_app_with_tests/vendor/plugins/routing-filter/spec/spec_helper.rb

@@ -1,108 +0,0 @@
-$: << File.dirname(__FILE__)
-$: << File.dirname(__FILE__) + '/../lib/'
-
-require 'rubygems'
-require 'action_pack'
-require 'active_support'
-require 'action_controller'
-require 'action_controller/test_process'
-require 'active_support/vendor'
-require 'spec'
-
-require 'routing_filter'
-require 'routing_filter/locale'
-require 'routing_filter/pagination'
-
-class Site
-end
-
-class Section
-  def id; 1 end
-  alias :to_param :id
-  def type; 'Section' end
-  def path; 'section' end
-end
-
-class Article
-  def to_param; 1 end
-end
-
-module RoutingFilterHelpers
-  def draw_routes(&block)
-    set = returning ActionController::Routing::RouteSet.new do |set|
-      class << set; def clear!; end; end
-      set.draw &block
-      silence_warnings{ ActionController::Routing.const_set 'Routes', set }
-    end
-    set
-  end
-
-  def instantiate_controller(params)
-    returning ActionController::Base.new do |controller|
-      request = ActionController::TestRequest.new
-      url = ActionController::UrlRewriter.new(request, params)
-      controller.stub!(:request).and_return request
-      controller.instance_variable_set :@url, url
-      controller
-    end
-  end
-
-  def should_recognize_path(path, params)
-    @set.recognize_path(path, {}).should == params
-  end
-
-  def home_path(*args)
-    @controller.send :home_path, *args
-  end
-
-  def home_url(*args)
-    @controller.send :home_url, *args
-  end
-
-  def section_path(*args)
-    @controller.send :section_path, *args
-  end
-
-  def section_article_path(*args)
-    @controller.send :section_article_path, *args
-  end
-
-  def admin_articles_path(*args)
-    @controller.send :admin_articles_path, *args
-  end
-
-  def url_for(*args)
-    @controller.send :url_for, *args
-  end
-
-  def setup_environment(*filters)
-    RoutingFilter::Locale.locales = [:en, 'en-US', :de, :fi, 'en-UK']
-    RoutingFilter::Locale.include_default_locale = true
-    I18n.default_locale = :en
-    I18n.locale = :en
-
-    @controller = instantiate_controller :locale => 'de', :id => 1
-    @set = draw_routes do |map|
-      yield map if block_given?
-      filters.each { |filter| map.filter filter }
-      map.section 'sections/:id.:format', :controller => 'sections', :action => "show"
-      map.section_article 'sections/:section_id/articles/:id', :controller => 'articles', :action => "show"
-      map.admin_articles 'admin/articles/:id', :controller => 'admin/articles', :action => "index"
-      map.home '/', :controller => 'home', :action => 'index'
-    end
-
-    @section_params = {:controller => 'sections', :action => "show", :id => "1"}
-    @article_params = {:controller => 'articles', :action => "show", :section_id => "1", :id => "1"}
-    @locale_filter = @set.filters.first
-    @pagination_filter = @set.filters.last
-  end
-  
-  def with_deactivated_filters(*filters, &block)
-    states = filters.inject({}) do |states, filter| 
-      states[filter], filter.active = filter.active, false
-      states
-    end
-    yield
-    states.each { |filter, state| filter.active = state }
-  end
-end