easycrumbs 1.1.0 → 2.0.0

data/Gemfile

@@ -0,0 +1,11 @@
+source 'http://gemcutter.org'
+source 'http://gems.github.com'
+
+gem 'rails', '~> 3.2.0'
+
+group :development do
+	gem 'mocha', '=0.9.12'
+	gem 'shoulda', '=2.11.3'
+	gem 'jeweler', '=1.5.2'
+	gem 'sqlite3'
+end

data/Gemfile.lock

@@ -0,0 +1,98 @@
+GEM
+  remote: http://gemcutter.org/
+  remote: http://gems.github.com/
+  specs:
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    erubis (2.7.0)
+    git (1.2.5)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    journey (1.0.3)
+    json (1.6.5)
+    mail (2.4.1)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    mocha (0.9.12)
+    multi_json (1.1.0)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
+      bundler (~> 1.0)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    shoulda (2.11.3)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler (= 1.5.2)
+  mocha (= 0.9.12)
+  rails (~> 3.2.0)
+  shoulda (= 2.11.3)
+  sqlite3

data/Rakefile

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-#
 require 'rubygems'
 require 'rake'
 
@@ -25,7 +26,7 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :test => :check_dependencies
+task :test
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/easycrumbs.gemspec

@@ -1,61 +1,85 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{easycrumbs}
-  s.version = "1.1.0"
+  s.name = "easycrumbs"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Stanis\305\202aw Kolarzowski"]
-  s.date = %q{2010-10-31}
-  s.description = %q{Easy breadcrumbs for your website}
-  s.email = %q{stanislaw.kolarzowski@gmail.com}
+  s.authors = ["Stanis\u{142}aw Kolarzowski"]
+  s.date = "2012-04-23"
+  s.description = "Easy breadcrumbs for your website"
+  s.email = "stanislaw.kolarzowski@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "easycrumbs.gemspec",
-     "lib/easycrumbs.rb",
-     "lib/easycrumbs/breadcrumb.rb",
-     "lib/easycrumbs/collection.rb",
-     "lib/easycrumbs/errors.rb",
-     "lib/easycrumbs/view_helpers.rb",
-     "test/helper.rb",
-     "test/routes.rb",
-     "test/test_custom_collection.rb",
-     "test/test_easycrumbs.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "easycrumbs.gemspec",
+    "lib/easycrumbs.rb",
+    "lib/easycrumbs/breadcrumb.rb",
+    "lib/easycrumbs/collection.rb",
+    "lib/easycrumbs/errors.rb",
+    "lib/easycrumbs/view_helpers.rb",
+    "test/helper.rb",
+    "test/routes.rb",
+    "test/support/helpers/actors_helper.rb",
+    "test/support/helpers/application_helper.rb",
+    "test/support/helpers/countries_helper.rb",
+    "test/support/helpers/movies_helper.rb",
+    "test/support/stub_request.rb",
+    "test/test_custom_collection.rb",
+    "test/test_easycrumbs.rb"
   ]
-  s.homepage = %q{http://github.com/staszek/easycrumbs}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://github.com/staszek/easycrumbs"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Easy breadcrumbs}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Easy breadcrumbs"
   s.test_files = [
     "test/helper.rb",
-     "test/routes.rb",
-     "test/test_custom_collection.rb",
-     "test/test_easycrumbs.rb"
+    "test/routes.rb",
+    "test/support/helpers/actors_helper.rb",
+    "test/support/helpers/application_helper.rb",
+    "test/support/helpers/countries_helper.rb",
+    "test/support/helpers/movies_helper.rb",
+    "test/support/stub_request.rb",
+    "test/test_custom_collection.rb",
+    "test/test_easycrumbs.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, ["~> 3.2.0"])
+      s.add_development_dependency(%q<mocha>, ["= 0.9.12"])
+      s.add_development_dependency(%q<shoulda>, ["= 2.11.3"])
+      s.add_development_dependency(%q<jeweler>, ["= 1.5.2"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
+      s.add_dependency(%q<rails>, ["~> 3.2.0"])
+      s.add_dependency(%q<mocha>, ["= 0.9.12"])
+      s.add_dependency(%q<shoulda>, ["= 2.11.3"])
+      s.add_dependency(%q<jeweler>, ["= 1.5.2"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rails>, ["~> 3.2.0"])
+    s.add_dependency(%q<mocha>, ["= 0.9.12"])
+    s.add_dependency(%q<shoulda>, ["= 2.11.3"])
+    s.add_dependency(%q<jeweler>, ["= 1.5.2"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

data/lib/easycrumbs/breadcrumb.rb

@@ -88,15 +88,15 @@ module EasyCrumbs
       i18n == true ? I18n.t("breadcrumbs.actions.#{action}", :name => name) : "#{action.titlecase} #{name}"
     end
 
-    # Set path using hash from ActionController::Routing::Routes.recognize_path
+    # Set path using hash from Rails.application.routes.recognize_path
     # Example looks like:
     # {:country_id => "1", :movie_id => "1", :id => "1", :action => "show", :controller => "movies"}
     def set_path(path, blank_links)
-      path.nil? || path.empty? ? "/" : ActionController::Routing::Routes.generate_extras(path).first
+      path.nil? || path.empty? ? "/" : Rails.application.routes.generate_extras(path).first
       rescue ActionController::RoutingError => e
         raise EasyCrumbs::NoPath.new(e.message) unless blank_links == true
         nil
     end
 
   end
-end
+end

data/lib/easycrumbs/collection.rb

@@ -16,10 +16,8 @@ module EasyCrumbs
 
     # Finding route with given path and method
     # Return ActionController:Routing::Route object
-    def find_route
-      routes = ActionController::Routing::Routes.routes.select do |route|
-        route.recognize(request_path, :method => request_method) != nil
-      end
+    def find_route(request = @request)
+      routes = Rails.application.routes.router.send(:find_routes, request.env)
       raise EasyCrumbs::NotRecognized if routes.empty?
       routes.first
     end
@@ -28,40 +26,72 @@ module EasyCrumbs
     # for example:
     # { :controller => 'movies', :action => 'show', :country_id => '23', :id => '12' }
     def find_path
-      @route.recognize(request_path, :method => request_method)
+      #@route.recognize(request_path, :method => request_method)
+      @route.second
     end
 
     # Select only static and dynamic segments from route. Static segments points at controllers and dynamic points at models.
     # It is given in right order
     # If last segment is equal to member action then it should be deleted. for example movies/123/edit should not return "edit" segment
     def segments
-      segments = @route.segments.select do |segment|
-        [ActionController::Routing::DynamicSegment, ActionController::Routing::StaticSegment].include? segment.class
+      #segments = @route.segments.select do |segment|
+      #  [ActionController::Routing::DynamicSegment, ActionController::Routing::StaticSegment].include? segment.class
+      #end
+      #segments.pop if segments.last.is_a?(ActionController::Routing::StaticSegment) && segments.last.value == @action && segments.last.value != 'new'
+      #segments
+      resolve_segments
+    end
+
+    # Return array of dynamic segments
+    # for example
+    # [ :country_id, :dynamic], [:movie_id, :dynamic], [:id, :dynamic] ]
+    def dynamic_segments
+      @route.third.path.names.map do |segment|
+        [segment.to_sym, :dynamic]
+      end
+    end
+
+    # Return array of all segments with :static and :dynamic annotation
+    # for examle:
+    # [[:countries, :static], [:country_id, :dynamic], [:movies, :static], [:movie_id, :dynamic], [:actors, :static] ]
+    def resolve_segments
+      @route.third.path.spec.to_s.split(/[\/(\)\.]/).map do |segment|
+        [segment.delete(":").to_sym, :static] unless segment.blank?
+      end.compact.map do |segment|
+        if dynamic_segments.map(&:first).include? segment.first
+          [segment.first, :dynamic]
+        else
+          segment
+        end
       end
-      segments.pop if segments.last.is_a?(ActionController::Routing::StaticSegment) && segments.last.value == @action && segments.last.value != 'new'
-      segments
     end
 
     # Returning controller object from static segment
     def pick_controller(segment)
-      segment = last_controller_segment if segment.value == "new"
-      "#{segment.value.titlecase}Controller".constantize.new
+      #segment = last_controller_segment if segment.value == "new"
+      #"#{segment.value.titlecase}Controller".constantize.new
+      segment = last_controller_segment if segment.first == :new
+      "#{segment.first.to_s.titlecase}Controller".constantize.new rescue nil
     end
 
     # Returns last controller segment in segments
     def last_controller_segment
-      segments.select{ |seg| seg.is_a?(ActionController::Routing::StaticSegment) && seg.value != "new"}.last
+      #segments.select{ |seg| seg.is_a?(ActionController::Routing::StaticSegment) && seg.value != "new"}.last
+      segments.select{ |seg| seg.second == :static && seg.first != :new }.last
     end
 
     # Retrung model object from dynamic segment
     # If key has not model name then it is taken from current controller(it is taken from path)
     def pick_model(segment)
-      key = segment.key
+      key = segment.first
       if key == :id
         model = @controller.singularize
-      else
+      elsif key.to_s.include?("_id")
         model = key.to_s[0..-4]  # model_id without last 3 signs = model
+      else
+        return nil
       end
+
       model = model.titlecase.constantize
       model.find(@path[key])
     end
@@ -71,12 +101,12 @@ module EasyCrumbs
     # [#<CountriesController:0x001>, #<Country:0x001 @name="usa">, #<MoviesController:0x001>, #<Movie:0x001 @name="titanic">]
     def objects
       segments.map do |segment|
-        if segment.is_a? ActionController::Routing::DynamicSegment
+        if segment.second == :dynamic
           pick_model(segment)
         else
           pick_controller(segment)
         end
-      end
+      end.compact
     end
 
     # Return array of breadcrumbs object in right order
@@ -92,23 +122,23 @@ module EasyCrumbs
 
     # Retrurn parameters for path of model
     # If it is last object then action is equal to request action
-    def path_for_model(segment)
-      key = segment.key
-      if key == :id
-        {:action => @action, :id => @path[key]}
-      else
-        {:action => 'show', key => @path[key]}
-      end
-    end
+    #def path_for_model(segment)
+    #  key = segment.value
+    #  if key == :id
+    #    {:action => @action, :id => @path[key]}
+    #  else
+    #    {:action => 'show', key => @path[key]}
+    #  end
+    #end
 
     # Retrun parameters for path of controller
-    def path_for_controller(segment)
-      if segment.value == "new"
-        {:action => "new", :controller => last_controller_segment.value}
-      else
-        {:action => 'index', :controller => segment.value}
-      end
-    end
+    #def path_for_controller(segment)
+    #  if segment.value == "new"
+    #    {:action => "new", :controller => last_controller_segment.value}
+    #  else
+    #    {:action => 'index', :controller => segment.value}
+    #  end
+    #end
 
     # If controller name is connected with object then parameter should be :id instead of :object_id
     # {:controller => 'movies', :movie_id => 1} will be {:controller => 'movies', :id => 1}
@@ -130,16 +160,28 @@ module EasyCrumbs
     # {:action => 'index', :controller => 'actors', :country_id => 1, :movie_id => 2},
     # {:action => 'update', :controller => 'actors', :country_id => 1, :movie_id => 2, :id => 3}
     def make_pathes
-      path = {}
-      segments.map do |segment|
-        if segment.is_a? ActionController::Routing::DynamicSegment
-          path.merge! path_for_model(segment)
-          result = repaired_model_path(path)
-        else
-          result = path.merge! path_for_controller(segment)
-        end
-        result.dup
+      #path = {}
+      #segments.map do |segment|
+      #  if segment.is_a? ActionController::Routing::DynamicSegment
+      #    path.merge! path_for_model(segment)
+      #    result = repaired_model_path(path)
+      #  else
+      #    result = path.merge! path_for_controller(segment)
+      #  end
+      #  result.dup
+      #end
+      result = []
+      @route.first.to_s.split("/")[1...-1].inject([]) do |current_path, segment|
+        current_path << segment
+        request = ActionDispatch::Request.new("PATH_INFO"     => "/#{current_path.join("/")}",
+                                              "REQUEST_METHOD"  => "GET")
+
+        result << (find_route(request).second rescue nil)
+
+        current_path
       end
+
+      (result << @route.second).compact
     end
 
     def render(options = {})

data/test/helper.rb

@@ -1,14 +1,15 @@
-require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 require "mocha"
-require 'active_record'
-require "action_view"
+require "rails"
+require "active_record"
 require "action_controller"
 require "routes"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support', 'helpers'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'support/stub_request'
 require 'easycrumbs'
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")

data/test/routes.rb

@@ -1,9 +1,12 @@
-ActionController::Routing::Routes.draw do |map|
-	
-	map.resources :countries do |country|
-		country.resources :movies do |movie|
-		  movie.resources :actors
+module EasyCrumbs
+  class Application < ::Rails::Application
+  end
+end
+
+EasyCrumbs::Application.routes.draw do
+	resources :countries do
+		resources :movies do
+		  resources :actors
 		end
 	end	
-	
-end
+end

data/test/support/stub_request.rb

@@ -0,0 +1,4 @@
+def stub_request(path="/", method=:get)
+  ActionDispatch::TestRequest.new("PATH_INFO"      => path,
+                                  "REQUEST_METHOD" => method.to_s.upcase)
+end

data/test/test_easycrumbs.rb

@@ -132,17 +132,17 @@ class TestEasycrumbs < Test::Unit::TestCase
     context "Collection" do
       setup do
         Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors/#{@leo.id}", :request_method => :put)
-        @collection = Collection.new("request object")
+        @collection = Collection.new(stub_request("/countries/#{@usa.id}/movies/#{@titanic.id}/actors/#{@leo.id}", :put))
       end
 
       context "finding route" do
         should "return route if it can find it" do
-          assert_equal(ActionController::Routing::Route, @collection.route.class)
+          assert_equal(Journey::Route, @collection.route.third.class)
         end
 
         should "raise error when it can not find route" do
           assert_raise(EasyCrumbs::NotRecognized) do
-            @collection.stubs(:request_path => "/countres/1/videos/1")
+            @collection = Collection.new(stub_request("/countres/1/videos/"))
             @collection.find_route
           end
         end
@@ -157,61 +157,63 @@ class TestEasycrumbs < Test::Unit::TestCase
       context "selecting right segments" do
         should "select only static and dynamic segments" do
           results = @collection.segments
-          results = results.map(&:class).uniq
-          results.delete(ActionController::Routing::StaticSegment)
-          results.delete(ActionController::Routing::DynamicSegment)
+          results = results.map(&:second).uniq
+          results.delete(:static)
+          results.delete(:dynamic)
           assert_equal(true, results.empty?)
         end
 
         should "return proper segments for member action" do
-          Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors/#{@leo.id}/edit", :request_method => :get)
-          collection = Collection.new("request object")
-          assert_equal(6, collection.segments.size)
+          #Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors/#{@leo.id}/edit", :request_method => :get)
+          collection = Collection.new(stub_request("/countries/#{@usa.id}/movies/#{@titanic.id}/actors/#{@leo.id}/edit", :get))
+          assert_equal(8, collection.segments.size)
         end
 
         should "return proper segments for new action" do
-          Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors/new", :request_method => :get)
-          collection = Collection.new("request object")
-          assert_equal(6, collection.segments.size)
+          #Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors/new", :request_method => :get)
+          collection = Collection.new(stub_request("/countries/#{@usa.id}/movies/#{@titanic.id}/actors/new", :get))
+          assert_equal(7, collection.segments.size)
         end
       end
 
       context "pick_controller" do
         should "return controller object" do
-          assert_equal(MoviesController, @collection.pick_controller(ActionController::Routing::StaticSegment.new("movies")).class)
+          assert_equal(MoviesController, @collection.pick_controller([:movies, :static]).class)
         end
 
         should "return controller object if action is new" do
-          assert_equal(ActorsController, @collection.pick_controller(ActionController::Routing::StaticSegment.new("new")).class)
+          assert_equal(ActorsController, @collection.pick_controller([:new, :static]).class)
         end
       end
 
       context "last controller" do
         should "return last controller object if last segment is dynamic" do
-          assert_equal("actors", @collection.last_controller_segment.value)
+          assert_equal(:actors, @collection.last_controller_segment.first)
         end
 
         should "return last controller object if last segment is static" do
-          Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors", :request_method => :get)
-          collection = Collection.new("request object")
-          assert_equal("actors", collection.last_controller_segment.value)
+          #Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors", :request_method => :get)
+          collection = Collection.new(stub_request("/countries/#{@usa.id}/movies/#{@titanic.id}/actors", :get))
+          assert_equal(:actors, collection.last_controller_segment.first)
         end
 
         should "return last controller object if last segment is new action" do
-          Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors/new", :request_method => :get)
-          collection = Collection.new("request object")
-          assert_equal("actors", collection.last_controller_segment.value)
+          #Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors/new", :request_method => :get)
+          collection = Collection.new(stub_request("/countries/#{@usa.id}/movies/#{@titanic.id}/actors/new", :get))
+          assert_equal(:actors, collection.last_controller_segment.first)
         end
       end
 
       context "pick_model" do
         should "return model object when key has model name" do
-          segment = ActionController::Routing::DynamicSegment.new(:movie_id)
+          #segment = ActionController::Routing::DynamicSegment.new(:movie_id)
+          segment = [:movie_id, :dynamic]
           assert_equal(@titanic, @collection.pick_model(segment))
         end
 
         should "return model object when key has not model name"do
-          segment = ActionController::Routing::DynamicSegment.new(:id)
+          #segment = ActionController::Routing::DynamicSegment.new(:id)
+          segment = [:id, :dynamic]
           assert_equal(@leo, @collection.pick_model(segment))
         end
       end
@@ -222,29 +224,29 @@ class TestEasycrumbs < Test::Unit::TestCase
         end
       end
 
-      context "path_for_model" do
-        should "return id and current action for last object" do
-          segment = ActionController::Routing::DynamicSegment.new(:id)
-          assert_equal({:action => 'update', :id => @leo.id.to_s}, @collection.path_for_model(segment))
-        end
-
-        should "return show action and object id for not last object" do
-          segment = ActionController::Routing::DynamicSegment.new(:movie_id)
-          assert_equal({:action => 'show', :movie_id => @titanic.id.to_s}, @collection.path_for_model(segment))
-        end
-      end
-
-      context "path_for_controller" do
-        should "return index action and controller name" do
-          segment = ActionController::Routing::StaticSegment.new("movies")
-          assert_equal({:action => 'index', :controller => 'movies'}, @collection.path_for_controller(segment))
-        end
-
-        should "return new action and controller name for new action segment" do
-          segment = ActionController::Routing::StaticSegment.new("new")
-          assert_equal({:action => 'new', :controller => 'actors'}, @collection.path_for_controller(segment))
-        end
-      end
+      #context "path_for_model" do
+      #  should "return id and current action for last object" do
+      #    segment = ActionController::Routing::DynamicSegment.new(:id)
+      #    assert_equal({:action => 'update', :id => @leo.id.to_s}, @collection.path_for_model(segment))
+      #  end
+      #
+      #  should "return show action and object id for not last object" do
+      #    segment = ActionController::Routing::DynamicSegment.new(:movie_id)
+      #    assert_equal({:action => 'show', :movie_id => @titanic.id.to_s}, @collection.path_for_model(segment))
+      #  end
+      #end
+
+      #context "path_for_controller" do
+      #  should "return index action and controller name" do
+      #    segment = ActionController::Routing::StaticSegment.new("movies")
+      #    assert_equal({:action => 'index', :controller => 'movies'}, @collection.path_for_controller(segment))
+      #  end
+      #
+      #  should "return new action and controller name for new action segment" do
+      #    segment = ActionController::Routing::StaticSegment.new("new")
+      #    assert_equal({:action => 'new', :controller => 'actors'}, @collection.path_for_controller(segment))
+      #  end
+      #end
 
       context "repaired_model_path" do
         should "return repaired path if model is connected with controller" do
@@ -271,8 +273,8 @@ class TestEasycrumbs < Test::Unit::TestCase
         end
 
         should "return patches array for objects for new action" do
-          Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors/new", :request_method => :get)
-          collection = Collection.new("request_object")
+          #Collection.any_instance.stubs(:request_path => "/countries/#{@usa.id}/movies/#{@titanic.id}/actors/new", :request_method => :get)
+          collection = Collection.new(stub_request("/countries/#{@usa.id}/movies/#{@titanic.id}/actors/new", :get))
           assert_equal([
           {:action => 'index', :controller => 'countries'},
           {:action => 'show', :controller => 'countries', :id => @usa.id.to_s},
@@ -291,7 +293,7 @@ class TestEasycrumbs < Test::Unit::TestCase
 
         should "return array of breadcrumbs objects" do
           assert_equal(@collection.objects.size + 1, @results.size)
-          @results.map.uniq == [EasyCrumbs::Breadcrumb]
+          @results.uniq == [EasyCrumbs::Breadcrumb]
         end
 
         should "last breadcrumb have name with action prefix" do

metadata

@@ -1,49 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: easycrumbs
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 2.0.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Stanis\xC5\x82aw Kolarzowski"
+authors:
+- Stanisław Kolarzowski
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-31 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+date: 2012-04-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2174258960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2174258960
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2174258320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+  type: :development
+  prerelease: false
+  version_requirements: *2174258320
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2174257540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.11.3
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2174257540
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2174256760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.5.2
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2174256760
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2174256060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2174256060
+- !ruby/object:Gem::Dependency
+  name: thoughtbot-shoulda
+  requirement: &2174255340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2174255340
 description: Easy breadcrumbs for your website
 email: stanislaw.kolarzowski@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -56,44 +100,47 @@ files:
 - lib/easycrumbs/view_helpers.rb
 - test/helper.rb
 - test/routes.rb
+- test/support/helpers/actors_helper.rb
+- test/support/helpers/application_helper.rb
+- test/support/helpers/countries_helper.rb
+- test/support/helpers/movies_helper.rb
+- test/support/stub_request.rb
 - test/test_custom_collection.rb
 - test/test_easycrumbs.rb
-has_rdoc: true
 homepage: http://github.com/staszek/easycrumbs
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -899090780415789417
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Easy breadcrumbs
-test_files: 
+test_files:
 - test/helper.rb
 - test/routes.rb
+- test/support/helpers/actors_helper.rb
+- test/support/helpers/application_helper.rb
+- test/support/helpers/countries_helper.rb
+- test/support/helpers/movies_helper.rb
+- test/support/stub_request.rb
 - test/test_custom_collection.rb
 - test/test_easycrumbs.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC