Skip to content

Commit

Permalink
better layout, require depencies and fix spec issue
Browse files Browse the repository at this point in the history
  • Loading branch information
flyerhzm committed Apr 5, 2010
1 parent 5cc9e58 commit 87d8069
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 4 deletions.
1 change: 0 additions & 1 deletion init.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Include hook code here
require 'sitemap'
require 'sitemap_ping'
require 'hack/resources'
1 change: 1 addition & 0 deletions lib/sitemap.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'active_support'
require 'action_controller'
require 'sitemap/resources'
require 'zlib'

module Sitemap
Expand Down
10 changes: 10 additions & 0 deletions lib/sitemap/resources.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module ActionController
module Resources
alias_method :origin_action_options_for, :action_options_for

def action_options_for(action, resource, method = nil, resource_options = {})
options = origin_action_options_for(action, resource, method, resource_options)
resource.options.reject {|k, v| !['priority', 'changefreq'].include? k.to_s}.merge(options)
end
end
end
6 changes: 4 additions & 2 deletions spec/sitemap_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require 'spec_helper'

describe "Sitemap::Routes" do
class Post
attr_accessor :id, :name, :updated_at
Expand Down Expand Up @@ -112,7 +114,7 @@ def to_param
map.connect 'posts/:year/:month/:day', :controller => 'posts', :action => 'find_by_date', :substitution => {:model => 'Post', :year => 'year', :month => 'month', :day => 'day'}
end
Sitemap::Routes.parse
Sitemap::Routes.results.collect {|result| result[:location]}.should == ['/posts/2009/8/9', '/posts/2009/8/10']
Sitemap::Routes.results.collect {|result| result[:location]}.should == ['/posts/2009/8/9', '/posts/2009/8/10', '/posts/2009/8/10']
end

it "should parse connect with substitution array" do
Expand Down Expand Up @@ -142,7 +144,7 @@ def to_param
end
end
Sitemap::Routes.parse
Sitemap::Routes.results.collect {|result| result[:location]}.should == ['/categories', '/categories/1', '/categories/1/posts', '/categories/1/posts/1', '/categories/1/posts/2']
Sitemap::Routes.results.collect {|result| result[:location]}.should == ['/categories/1/posts', '/categories/1/posts/1', '/categories/1/posts/2', '/categories', '/categories/1']
end
end

Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
require 'mocha'

require File.join(File.dirname(__FILE__), '../lib/sitemap.rb')
require File.join(File.dirname(__FILE__), '../lib/hack/resources.rb')

0 comments on commit 87d8069

Please sign in to comment.