ghoul 0.1.9 → 0.2.0

data/lib/ghoul/lib/url_helpers.rb

@@ -13,42 +13,42 @@ module Ghoul
     end
     
     def repository_path(repository)
-      url "/repository/#{repository}/trunk/tree"
+      url "/repository/#{URI.escape repository}/trunk/tree"
     end
     
     def repository_git_url(repository)
-      return "http://#{@request.host_with_port}/repo/#{repository}"
+      return "http://#{@request.host_with_port}/repo/#{URI.escape repository}"
     end
     
     def repository_settings_path(repository)
-      url "/repository/#{repository}/settings"
+      url "/repository/#{URI.escape repository}/settings"
     end
     
     def clone_url(repository)
-      return "http://#{@request.host_with_port}/repo/#{repository}"
+      return "http://#{@request.host_with_port}/repo/#{URI.escape repository}"
     end
     
     def commits_path(repository, page=1)
-      url "/repository/#{repository}/commits/#{page}"
+      url "/repository/#{URI.escape repository}/commits/#{page}"
     end
     
     def commit_path(repository, commit)
-      url "/repository/#{repository}/commits/#{commit}"
+      url "/repository/#{URI.escape repository}/commits/#{commit}"
     end
         
     def blob_for_commit_path(repository, commit, splat="", name="")
-      parts = [repository, commit, "tree", splat, name].find_all { |i| i != ""}
+      parts = [repository, commit, "tree", splat, name].find_all { |i| i != ""}.map {|i| i && URI.escape(i)}
       url "/repository/#{parts.join("/")}"
     end
     alias_method :tree_for_commit_path, :blob_for_commit_path
     
     def raw_blob_for_commit_path(repository, commit, splat="", name="")
-      parts = [repository, commit, "raw", splat, name].find_all { |i| i != ""}
+      parts = [repository, commit, "raw", splat, name].find_all { |i| i != ""}.map {|i| i && URI.escape(i)}
       url "/repository/#{parts.join("/")}"
     end
     
     def diff_for_commit_path(repository, commit)
-      url "/repository/#{repository}/#{commit}/diff"
+      url "/repository/#{URI.escape repository}/#{commit}/diff"
     end
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghoul
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/spec/url_helper_spec.rb

@@ -12,6 +12,10 @@ describe Ghoul::UrlHelpers do
     return url
   end
   
+  def unsafe_characters
+    %q{#%^`{}'"\\ }
+  end
+  
   it "should route guides_path" do
     guides_path.should == "/guides"
   end
@@ -20,37 +24,87 @@ describe Ghoul::UrlHelpers do
     repository_path(@repository).should == "/repository/ghoul/trunk/tree"
   end
   
+  it "should route repository path for a repository with invalid URI characters" do
+    repository = "ghoul#{unsafe_characters}repo"
+    repository_path(repository).should == "/repository/#{URI.escape repository}/trunk/tree"
+  end
+  
   it "should route repository_git_url" do
     @request.should_receive(:host_with_port).and_return("localhost:3000")
     repository_git_url(@repository).should == "http://localhost:3000/repo/ghoul"    
   end
   
+  it "should route repository_git_url for a repository with invalid URI characters" do
+    repository = "ghoul#{unsafe_characters}repo"
+    @request.should_receive(:host_with_port).and_return("localhost:3000")
+    repository_git_url(repository).should == "http://localhost:3000/repo/#{URI.escape repository}"
+  end
+  
   it "should route repository_settings_path" do
     repository_settings_path(@repository).should == "/repository/ghoul/settings"    
   end
   
+  it "should route repository_settings_path for a repository with invalid URI characters" do
+    repository = "ghoul#{unsafe_characters}repo"
+    repository_settings_path(repository).should == "/repository/#{URI.escape repository}/settings"
+  end
+  
   it "should route clone_url" do
     @request.should_receive(:host_with_port).and_return("localhost:3000")
     clone_url(@repository).should == "http://localhost:3000/repo/ghoul"
   end
   
+  it "should route clone_url for a repository with invalid URI characters" do
+    repository = "ghoul#{unsafe_characters}repo"
+    @request.should_receive(:host_with_port).and_return("localhost:3000")
+    clone_url(repository).should == "http://localhost:3000/repo/#{URI.escape repository}"
+  end
+  
   it "should route commit_path" do
     commit_path(@repository, "xyz").should == "/repository/ghoul/commits/xyz"
   end
   
+  it "should route commit_path for a repository with invalid URI characters" do
+    repository = "ghoul#{unsafe_characters}repo"
+    commit_path(repository, "xyz").should == "/repository/#{URI.escape repository}/commits/xyz"
+  end
+  
   it "should route blob_for_commit_path" do
     blob_for_commit_path(@repository, "xyz", "abc/def", "ruby.rb").should == "/repository/ghoul/xyz/tree/abc/def/ruby.rb"
   end
   
+  it "should route blob_for_commit_path for parts with invalid URI characters" do
+    repository = "ghoul#{unsafe_characters}repo"
+    splat = "#{unsafe_characters}/#{unsafe_characters}"
+    name = "#{unsafe_characters}.rb"
+    blob_for_commit_path(repository, "xyz", splat, name).should == "/repository/#{URI.escape repository}/xyz/tree/#{URI.escape splat}/#{URI.escape name}"
+  end
+  
   it "should route blob_for_commit_path without a path" do
     blob_for_commit_path(@repository, "xyz", "", "ruby.rb").should == "/repository/ghoul/xyz/tree/ruby.rb"
   end
   
+  it "should route blob_for_commit_path with a nil name" do
+    blob_for_commit_path(@repository, "xyz", "", nil).should == "/repository/ghoul/xyz/tree/"
+  end
+  
   it "should route raw_blob_for_commit_path" do
     raw_blob_for_commit_path(@repository, "commitxyz", "xyz/e/fe/fe").should == "/repository/ghoul/commitxyz/raw/xyz/e/fe/fe"
   end
+  
+  it "should route raw_blob_for_commit_path for repository with invalid URI characters" do
+    repository = "ghoul#{unsafe_characters}repo"
+    splat = "#{unsafe_characters}/#{unsafe_characters}"
+    name = "#{unsafe_characters}.rb"
+    raw_blob_for_commit_path(repository, "commitxyz", splat, name).should == "/repository/#{URI.escape repository}/commitxyz/raw/#{URI.escape splat}/#{URI.escape name}"
+  end
 
   it "should route diff_for_commit_path" do
     diff_for_commit_path(@repository, "commitxyz").should == "/repository/ghoul/commitxyz/diff"
   end
+  
+  it "should route diff_for_commit_path for repository with invalid URI characters" do
+    repository = "ghoul#{unsafe_characters}repo"
+    diff_for_commit_path(repository, "commitxyz").should == "/repository/#{URI.escape repository}/commitxyz/diff"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghoul
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000Z
+date: 2011-11-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70285958232360 !ruby/object:Gem::Requirement
+  requirement: &70332330649780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70285958232360
+  version_requirements: *70332330649780
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70285958231320 !ruby/object:Gem::Requirement
+  requirement: &70332330648980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70285958231320
+  version_requirements: *70332330648980
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70285958230340 !ruby/object:Gem::Requirement
+  requirement: &70332330648320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285958230340
+  version_requirements: *70332330648320
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70285958228580 !ruby/object:Gem::Requirement
+  requirement: &70332330647500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285958228580
+  version_requirements: *70332330647500
 - !ruby/object:Gem::Dependency
   name: georgedrummond_sinatra_helpers
-  requirement: &70285958228000 !ruby/object:Gem::Requirement
+  requirement: &70332330647060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285958228000
+  version_requirements: *70332330647060
 - !ruby/object:Gem::Dependency
   name: ghoul_grack
-  requirement: &70285958226980 !ruby/object:Gem::Requirement
+  requirement: &70332330646520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70285958226980
+  version_requirements: *70332330646520
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70285958225980 !ruby/object:Gem::Requirement
+  requirement: &70332330645960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285958225980
+  version_requirements: *70332330645960
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70285958224700 !ruby/object:Gem::Requirement
+  requirement: &70332330645280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285958224700
+  version_requirements: *70332330645280
 description: Ghoul is a simple yet good looking interface for your git repositories
   written in sinatra. It is currently only for demonstration purposes and use on your
   secure local machine as it does not enforce any authentication as of yet.