gitdocs 0.3.1 → 0.3.2

data/lib/gitdocs/cli.rb

@@ -60,7 +60,6 @@ module Gitdocs
 
     desc "create PATH REMOTE", "Creates a new gitdoc root based on an existing remote"
     def create(path, remote)
-      path = self.config.normalize_path(path)
       FileUtils.mkdir_p(File.dirname(path))
       system("git clone -q #{remote} #{path}") or raise "Unable to clone into #{path}"
       self.add(path)

data/lib/gitdocs/configuration.rb

@@ -39,12 +39,14 @@ module Gitdocs
     end
 
     def add_path(path, opts = nil)
+      path = self.normalize_path(path)
       path_opts = {:path => path}
       path_opts.merge!(opts) if opts
       Share.new(path_opts).save!
     end
 
     def remove_path(path)
+      path = self.normalize_path(path)
       Share.where(:path => path).destroy_all
     end
 

data/lib/gitdocs/server.rb

@@ -38,8 +38,6 @@ module Gitdocs
               gd = gds[idx]
               halt 404 if gd.nil?
               file_path = request.path_info
-              file_path = request.path_info.gsub('/save', '') if save_file = request.path_info =~ %r{/save$}
-              file_path = request.path_info.gsub('/upload', '') if upload_file = request.path_info =~ %r{/upload$}
               file_ext  = File.extname(file_path)
               expanded_path = File.expand_path(".#{file_path}", gd.root)
               halt 400 unless expanded_path[/^#{Regexp.quote(gd.root)}/]
@@ -48,10 +46,10 @@ module Gitdocs
               parent = nil if parent == '.'
               locals = {:idx => idx, :parent => parent, :root => gd.root, :file_path => expanded_path}
               mode, mime = request.params['mode'], `file -I #{expanded_path}`.strip
-              if save_file # Saving
+              if mode == 'save' # Saving
                 File.open(expanded_path, 'w') { |f| f.print request.params['data'] }
                 redirect! "/" + idx.to_s + file_path
-              elsif upload_file # Uploading
+              elsif mode == 'upload'  # Uploading
                 halt 404 unless file = request.params['file']
                 tempfile, filename = file[:tempfile], file[:filename]
                 FileUtils.mv(tempfile.path, File.expand_path(filename, expanded_path))

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/gitdocs/views/dir.haml

@@ -23,7 +23,7 @@
   %input{:type => 'text', :name => "path", :class => "edit" }
   %input{:type => 'submit', :value => "New file" }
 
-%form.upload{ :method => "post", :enctype => "multipart/form-data", :action => "/#{idx}#{request.path_info}/upload" }
+%form.upload{ :method => "post", :enctype => "multipart/form-data", :action => "/#{idx}#{request.path_info}?mode=upload" }
   %p Upload a file to this directory
   %input{:type => 'file', :value => "Select a file", :name => "file", :class => "uploader" }
   %input{:type => 'submit', :value => "Upload file"}

data/lib/gitdocs/views/edit.haml

@@ -13,7 +13,7 @@
   %a{ :href => "?mode=edit" } (edit)
   %a{ :href => "?mode=delete", :onclick => "javascript:return confirm('Are you sure?')" } (delete)
 
-%form{ :class => "edit", :action => "/#{idx}#{request.path_info}/save", :method => "post", :style => "display:none;" }
+%form{ :class => "edit", :action => "/#{idx}#{request.path_info}?mode=save", :method => "post", :style => "display:none;" }
   #editor
   %textarea{ :id => 'data', :name => "data" }= preserve contents
   %input{ :type => 'submit', :value => "Save" }

data/test/configuration_test.rb

@@ -14,7 +14,7 @@ describe "gitdocs configuration" do
   end
 
   it "can have a path added" do
-    @config.add_path('/my/path')
+    @config.add_path('/my/../my/path') # normalized test
     assert_equal "/my/path", @config.shares.first.path
     assert_equal 15.0, @config.shares.first.polling_interval
   end
@@ -22,7 +22,7 @@ describe "gitdocs configuration" do
   it "can have a path removed" do
     @config.add_path('/my/path')
     @config.add_path('/my/path/2')
-    @config.remove_path('/my/path/2')
+    @config.remove_path('/my/../my/path/2') # normalized test
     assert_equal ["/my/path"], @config.shares.map(&:path)
   end
 

metadata

@@ -2,7 +2,7 @@
 name: gitdocs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Josh Hull
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-05 00:00:00 -08:00
+date: 2011-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency