semi_static 0.4.3 → 0.4.4

data/lib/semi_static/controller/page.rb

@@ -7,6 +7,7 @@ module SemiStatic::Controller::Page
     raise ActionController::RoutingError.new("Invalid Encoded URL") unless params[:id].valid_encoding?
     @article = resource.find(params[:id])
     raise ActionController::RoutingError.new(url_for(:id => params[:id], :only_path => true)) unless @article
+    redirect_to @article unless params[:id] == @article.to_param
   end
 
   private

data/lib/semi_static/page.rb

@@ -19,6 +19,7 @@ class SemiStatic::Page
   end
 
   def self.find(param)
+    param = CGI.unescape(param) if param =~ /%/
     all.find {|a| a.to_param == param }
   end
 

data/lib/semi_static/version.rb

@@ -1,3 +1,3 @@
 module SemiStatic
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/acceptance/page_spec.rb

@@ -16,6 +16,7 @@ feature 'page' do
 
   scenario 'show multibyte bang' do
     visit "/event_planning_tips/#{CGI.escape("イベントやろう")}"
+    current_path.should == "/event_planning_tips/#{CGI.escape("イベントやろう")}"
     page.find("h1").text.should == "イベントやろう！"
   end
 
@@ -39,4 +40,10 @@ feature 'page' do
     visit "/event_planning_tips/%8e%8f"
     page.status_code.should == 404
   end
+
+  scenario 'redirect in case of double escape' do
+    visit "/event_planning_tips/#{CGI.escape(CGI.escape("イベントやろう"))}"
+    current_path.should == "/event_planning_tips/#{CGI.escape("イベントやろう")}"
+    page.find("h1").text.should == "イベントやろう！"
+  end
 end

data/spec/page_spec.rb

@@ -14,4 +14,6 @@ describe SemiStatic::Page do
   it { @english_page.to_s.should == "foo bar" }
   it { described_class.new(nil, {}).to_s.should == "" }
   it { SemiStatic::Page.find("foo-bar").should == @english_page }
+  it { SemiStatic::Page.find("ほげ").should == @japanese_page }
+  it { SemiStatic::Page.find(CGI.escape("ほげ")).should == @japanese_page }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semi_static
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157129860 !ruby/object:Gem::Requirement
+  requirement: &18708200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157129860
+  version_requirements: *18708200
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2155985060 !ruby/object:Gem::Requirement
+  requirement: &18707340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155985060
+  version_requirements: *18707340
 - !ruby/object:Gem::Dependency
   name: babosa
-  requirement: &2157160360 !ruby/object:Gem::Requirement
+  requirement: &18706300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157160360
+  version_requirements: *18706300
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2157159940 !ruby/object:Gem::Requirement
+  requirement: &18705500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157159940
+  version_requirements: *18705500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157159440 !ruby/object:Gem::Requirement
+  requirement: &18704500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2157159440
+  version_requirements: *18704500
 - !ruby/object:Gem::Dependency
   name: steak
-  requirement: &2157159020 !ruby/object:Gem::Requirement
+  requirement: &18703740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157159020
+  version_requirements: *18703740
 description: Easily create content for your Rails apps using just textfiles
 email:
 - paul@mobalean.com
@@ -155,27 +155,4 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Text file based CMS for Rails
-test_files:
-- spec/acceptance/acceptance_helper.rb
-- spec/acceptance/custom_controllers_spec.rb
-- spec/acceptance/fake/app.rb
-- spec/acceptance/fake/app/controllers/admin/faqs_controller.rb
-- spec/acceptance/fake/app/controllers/faqs_controller.rb
-- spec/acceptance/fake/app/models/event_planning_tip.rb
-- spec/acceptance/fake/app/models/faq.rb
-- spec/acceptance/fake/app/models/news.rb
-- spec/acceptance/fake/app/views/application.html.erb
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/erb_chained.md.erb
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/erb_page.erb
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/manner.md
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/multibyte-bang.md
-- spec/acceptance/fake/semi_static_pages/event_planning_tips/non_standard_slug.md
-- spec/acceptance/fake/semi_static_pages/faqs/checkin_devices.md
-- spec/acceptance/fake/semi_static_pages/news/2011-07-26-replaced-download.md
-- spec/acceptance/news_spec.rb
-- spec/acceptance/page_spec.rb
-- spec/backend_spec.rb
-- spec/news_spec.rb
-- spec/page_spec.rb
-- spec/semi_static_pages/news/2011-07-26-replaced-download.md
-- spec/spec_helper.rb
+test_files: []