gitdocs 0.5.0.pre7 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTBiOGM2MTgxYWMwYTBlZTkzMTRhNTAxYTMyMTgyYTM1NjdmNjgyMQ==
+    NDc4ZmI3MTc1YjRjZjE4ZmNmNDFmNjgwMDEzY2YzZTkwY2Q5MWI4Yw==
   data.tar.gz: !binary |-
-    ZTc1ZTFiNWVjZjVlYjk0MDgyYmE4NGNiNzJjZTQzNzdjY2Q2YTgwMg==
+    YmRjMzViNzc0MzgwMDVkMDgxOGNmMDI3MDZmYjhlMTU3OGUxMDg2ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yzk2NDFmMmJkYmM4MDllOTVmOWZhYjM0NDM3MzFjNzY1NzUyNGE3Mzk5ZGE5
-    MWNhODBjN2U5YTA5YjkzZjIwZDI5YzAyNzIyM2RiZTYwYTMzYjIwYjhkYTY0
-    MmExYjFlNzFlN2VkOWUyNGYwNTg1MjUyYjU2ZmM5YTk1MTU0MzE=
+    MjMzNzJlNGY3YmMzMWY2YWY2ZTE1ZjBjYTJmZDYwMWZmM2NjMTYyOTM0YzUw
+    ODkwZmFmY2NkYmVkZTI3MjYxNmZhNjUwZDliYjJmODAzOGY2YTc3M2UwZjRk
+    MTZiNGYwNmVmMjU5ZDkyM2U1MjcwODdlZmQ1ODJhODJjZjA4ODQ=
   data.tar.gz: !binary |-
-    OWZiZjNkOGZiYjc4NzcwNjAxYmRmNmExOTQwMTAzODYzYjBhNzRlYzI5ZjMy
-    MjczNTJlMDcwYjQwZGM0Y2NlMTg4N2MyYzlhMGIyOWY0N2M3MTQ2NDJhODJi
-    MDNhMzEyZDcxYjlhNTRhZDU2NGQxOTQwNDA2NGZiNDYwNjdjYWM=
+    MWM2Yjk4ZGE1ODIzMTg4YTEyYTg1YTNhZTc1MWI1NWFlMTczMWFlMjg5Y2Jh
+    NmRhYTAzYWNmMzI4MTZhNTdjN2QwMzA3MzZhMTI5ZDRmMGFhZWE3YTdhMWVk
+    ZTAwODA3OWZkMDdkMDEwZThlZDQyM2ZjZDMzMzA1ZjJiNDZhOTg=

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.5.0 (May 2nd 2015)
+ * upgrade gems activerecord, minitest, haml-lint, redcarpet (@acant)
+ * convert web interface to use Sinatra instead of renee (@acant)
+ * add rake task to run the web interface standalone using the shotgun gem (@acant)
+ * add fenced code (and syntax highlighting) into Markdown parsing (@acant)
+
 0.5.0.pre7 (August 3rd 2014)
 
  * UI improvements to repo browser (@acant)

data/README.md

@@ -59,6 +59,7 @@ gem install gitdocs
 If you have Growl installed on Max OSX, you'll probably want to run:
 
 ```
+brew install caskroom/cask/brew-cask
 brew install growlnotify
 ```
 

data/Rakefile

@@ -26,4 +26,22 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
+desc 'Start the web interface for development'
+task server: 'server:start'
+
+namespace :server do
+  task :start do
+    sh('shotgun config.ru')
+  end
+
+  desc 'Copy the current configuration for use with the development web interface'
+  task :copy_config do
+    FileUtils.mkdir_p('./tmp/web')
+    FileUtils.copy(
+      File.expand_path('.gitdocs/config.db', ENV['HOME']),
+      './tmp/web/config.db'
+    )
+  end
+end
+
 task default: 'test:integration'

data/config.ru

@@ -0,0 +1,21 @@
+require './lib/gitdocs'
+require './lib/gitdocs/manager'
+require './lib/gitdocs/settings_app'
+require './lib/gitdocs/browser_app'
+require './lib/gitdocs/repository'
+require './lib/gitdocs/configuration'
+
+use Rack::Static,
+  urls: %w(/css /js /img /doc),
+  root: './lib/gitdocs/public'
+use Rack::MethodOverride
+
+config_root = './tmp/web'
+FileUtils.mkdir_p(config_root)
+Gitdocs::SettingsApp.set :manager, Gitdocs::Manager.new(config_root, true)
+Gitdocs::SettingsApp.set :logging, true
+map('/settings') { run Gitdocs::SettingsApp }
+
+Gitdocs::BrowserApp.set :repositories, Gitdocs::Configuration.new(config_root).shares.map { |x| Gitdocs::Repository.new(x) }
+Gitdocs::BrowserApp.set :logging, true
+map('/') { run Gitdocs::BrowserApp }

data/gitdocs.gemspec

@@ -7,7 +7,8 @@ Gem::Specification.new do |s|
   s.version     = Gitdocs::VERSION
   s.authors     = ['Josh Hull', 'Nathan Esquenazi']
   s.email       = ['joshbuddy@gmail.com', 'nesquena@gmail.com']
-  s.homepage    = 'http://engineering.gomiso.com/2011/11/30/collaborate-and-track-tasks-with-ease-using-gitdocs/'
+  s.homepage    = 'https://github.com/nesquena/gitdocs'
+
   s.summary     = 'Open-source Dropbox using Ruby and Git.'
   s.description = 'Open-source Dropbox using Ruby and Git.'
   s.license     = 'MIT'
@@ -23,15 +24,15 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'joshbuddy-guard', '~> 0.10.0'
   s.add_dependency 'thin',            '~> 1.6.2'
-  s.add_dependency 'renee',           '~> 0.3.11'
-  s.add_dependency 'redcarpet',       '~> 3.1.1'
+  s.add_dependency 'sinatra',         '~> 1.4.5'
+  s.add_dependency 'redcarpet',       '~> 3.2.2'
   s.add_dependency 'thor',            '~> 0.14.6'
   s.add_dependency 'coderay',         '~> 1.1.0'
   s.add_dependency 'dante',           '~> 0.1.2'
   s.add_dependency 'growl',           '~> 1.0.3'
   s.add_dependency 'haml',            '~> 4.0.5'
   s.add_dependency 'sqlite3',         '~> 1.3.4'
-  s.add_dependency 'activerecord',    '~> 4.1.4'
+  s.add_dependency 'activerecord',    '~> 4.2.0'
   s.add_dependency 'grit',            '~> 2.5.0'
   s.add_dependency 'shell_tools',     '~> 0.1.0'
   s.add_dependency 'mimetype-fu',     '~> 0.1.2'
@@ -40,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rugged',          '~> 0.19.0'
   s.add_dependency 'table_print',     '~> 1.5.1'
 
-  s.add_development_dependency 'minitest',               '~> 5.4.0'
+  s.add_development_dependency 'minitest',               '~> 5.5.0'
   s.add_development_dependency 'capybara_minitest_spec', '~> 1.0.2'
   s.add_development_dependency 'poltergeist',            '~> 1.5.1'
   s.add_development_dependency 'rake'
@@ -49,7 +50,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'metric_fu'
   s.add_development_dependency 'aruba'
   s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'haml-lint',              '~> 0.6.0'
+  s.add_development_dependency 'haml-lint',              '~> 0.10.0'
   s.add_development_dependency 'jslint_on_rails',        '~> 1.1.1'
-  s.add_development_dependency 'coveralls',              '~> 0.7.0'
+  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'shotgun'
 end

data/lib/gitdocs/browser_app.rb

@@ -0,0 +1,150 @@
+# -*- encoding : utf-8 -*-
+
+require 'sinatra/base'
+require 'uri'
+require 'haml'
+require 'mimetype_fu'
+require 'gitdocs/rendering_helper'
+
+module Gitdocs
+  class BrowserApp < Sinatra::Base
+    set :haml, format: :html5
+
+    helpers Gitdocs::RenderingHelper
+
+    get('/') do
+      if settings.repositories.size == 1
+        redirect to('/0/')
+      else
+        haml(
+          :home,
+          locals: {
+            shares:    settings.repositories,
+            nav_state: 'home'
+          }
+        )
+      end
+    end
+
+    get('/search') do
+      haml(
+        :search,
+        locals: {
+          results: Gitdocs::Search.new(settings.repositories).search(params[:q]),
+          nav_state: nil
+        }
+      )
+    end
+
+    helpers do
+      # @return [Integer]
+      def id
+        @id ||= params[:id].to_i
+      end
+
+      # @return [Gitdocs::Repository::Path]
+      def path
+        halt(404) unless settings.repositories[id]
+        @path ||= Gitdocs::Repository::Path.new(
+          settings.repositories[id], URI.unescape(params[:splat].first)
+        )
+      end
+    end
+
+    get('/:id*') do
+      default_locals = {
+        idx:       id,
+        root:      settings.repositories[id].root,
+        nav_state: nil
+      }
+
+      case params[:mode]
+      when 'meta'
+        begin
+          content_type :json
+          path.meta.to_json
+        rescue
+          halt(404)
+        end
+      when 'edit'
+        halt(404) unless path.text?
+        haml(
+          :edit,
+          locals: default_locals.merge(contents: path.content)
+        )
+      when 'revisions'
+        haml(
+          :revisions,
+          locals: default_locals.merge(revisions: path.revisions)
+        )
+      when 'raw'
+        send_file(path.absolute_path)
+      else
+        if path.directory?
+          haml(
+            :dir,
+            locals: default_locals.merge(
+              contents:        path.file_listing,
+              rendered_readme: file_content_render(path.readme_path)
+            )
+          )
+        else
+          haml(
+            :file,
+            locals: default_locals.merge(
+              contents: file_content_render(
+                path.absolute_path(params[:revision])
+              )
+            )
+          )
+        end
+      end
+    end
+
+    post('/:id*') do
+      redirect_path =
+        if params[:file] # upload
+          path.join(params[:file][:filename])
+          FileUtils.mv(params[:file][:tempfile].path, path.absolute_path)
+          "/#{id}/#{path.relative_path}"
+        elsif params[:filename] # add file/directory
+          path.join(params[:filename])
+          if params[:new_file]
+            path.touch
+            "/#{id}/#{path.relative_path}?mode=edit"
+          elsif params[:new_directory]
+            path.mkdir
+            "/#{id}/#{path.relative_path}"
+          else
+            halt(400)
+          end
+        else
+          halt(400)
+        end
+      redirect to(redirect_path)
+    end
+
+    put('/:id*') do
+      redirect_path =
+        if params[:revision] # revert
+          path.revert(params[:revision])
+          "/#{id}/#{path.relative_path}"
+        elsif params[:data] && params[:message] # save
+          path.write(params[:data], params[:message])
+          "/#{id}/#{path.relative_path}"
+        else
+          # No valid inputs, do nothing and redirect.
+          "/#{id}/#{path.relative_path}"
+        end
+      redirect to(redirect_path)
+    end
+
+    delete('/:id*') do
+      path.remove
+      parent = File.dirname(path.relative_path)
+      parent = '' if parent == '/'
+      parent = nil if parent == '.'
+      redirect to("/#{id}#{parent}")
+    end
+  end
+end

data/lib/gitdocs/public/js/app.js

@@ -8,7 +8,7 @@ GitDocs = {
     var paths = fullPath.split("/");
     $(paths).each(function(idx, subpath) {
       var relPath = paths.slice(0, idx+1).join("/");
-      var link = "<a href='/" + docIdx[1] + relPath + "'>" + subpath + "/</a>";
+      var link = "<a href='" + relPath + "'>" + subpath + "/</a>";
       fullPath = fullPath.replace(subpath + "/", link);
     });
     $('span.path').html(fullPath);
@@ -74,29 +74,6 @@ $(document).ready(function() {
   StringFormatter.autoLink();
 });
 
-// Redirect to edit page for new file when new file form is submitted
-$('form.add').live('submit', function(e){
-  return false;
-});
-
-$('form.add input.file').live('click', function(e) {
-  var docIdx = window.location.pathname.match(/\/(\d+)/);
-  if (!docIdx) { return false; }
-  var fullPath = $('span.path').text();
-  var newPath = "/" + docIdx[1] + (fullPath == "/" ? "/" : fullPath + "/") + $(this).parents('form').find('input.edit').val();
-  window.location = newPath;
-  e.preventDefault(); return false;
-});
-
-$('form.add input.directory').live('click', function(e) {
-  var docIdx = window.location.pathname.match(/\/(\d+)/);
-  if (!docIdx) { return false; }
-  var fullPath = $('span.path').text();
-  var newPath = "/" + docIdx[1] + (fullPath == "/" ? "/" : fullPath + "/") + $(this).parents('form').find('input.edit').val() + '?dir=true';
-  window.location = newPath;
-  e.preventDefault(); return false;
-});
-
 // Link method redirection
 $('a[data-method]').live('click', function(e) {
   e.preventDefault();
@@ -111,12 +88,7 @@ $('a[data-method]').live('click', function(e) {
   form.submit();
 });
 
-// Deletion tab
-$('ul.tabs a.delete').live('click', function(e) {
-  return confirm('Are you sure?')
-});
-
-// Revert a revision from the revision table
-$('#revisions td.revert a').live('click', function(e) {
-  return confirm('Are you sure?')
+// Confirm form submission when specified by data attribute.
+$('form[data-confirm-submit]').live('submit', function(e) {
+  return confirm($(this).attr('data-confirm-submit'));
 });

data/lib/gitdocs/rendering_helper.rb

@@ -0,0 +1,48 @@
+# -*- encoding : utf-8 -*-
+
+require 'redcarpet'
+require 'coderay'
+require 'tilt'
+
+module Gitdocs
+  module RenderingHelper
+    # @param [String, nil] pathname
+    #
+    # @return [nil] if the pathname is nil
+    # @return [String]
+    def file_content_render(pathname)
+      return unless pathname
+
+      tilt = Tilt.new(
+        pathname,
+        1, # line number
+        fenced_code_blocks: true,
+        renderer:           CodeRayify.new(filter_html: true, hard_wrap: true)
+      )
+      %(<div class="tilt">#{tilt.render}</div>)
+    rescue LoadError, RuntimeError # No tilt support
+      if path.text?
+        code_ray = CodeRay.scan_file(pathname)
+        %(<pre class="CodeRay">#{code_ray.encode(:html)}</pre>)
+      else
+        %(<embed class="inline-file" src="#{request.path_info}?mode=raw"></embed>)
+      end
+    end
+
+    class CodeRayify < ::Redcarpet::Render::Safe
+      # Override the safe #block_code with CodeRay, if a language is present.
+      #
+      # @param [String] code
+      # @param [String] langauge
+      #
+      # @return [String]
+      def block_code(code, language)
+        if language
+          CodeRay.scan(code, language).div
+        else
+          super(code, language)
+        end
+      end
+    end
+  end
+end

data/lib/gitdocs/repository/path.rb

@@ -15,6 +15,11 @@ class Gitdocs::Repository::Path
     )
   end
 
+  def join(path_fragment)
+    @relative_path = File.join(@relative_path, path_fragment)
+    @absolute_path = File.join(@absolute_path, path_fragment)
+  end
+
   # Write the content to the path and create any necessary directories.
   #
   # @param [String] content

data/lib/gitdocs/search.rb

@@ -19,7 +19,7 @@ class Gitdocs::Search
   private
 
   def search_repository(repository, term)
-    return [] if term.empty?
+    return [] if term.nil? || term.empty?
 
     results = []
     repository.grep(term) do |file, context|

data/lib/gitdocs/server.rb

@@ -1,18 +1,8 @@
 # -*- encoding : utf-8 -*-
 
-# Disable style checks that are invalid for Renee
-# rubocop:disable Blocks, MultilineBlockChain
-#
-# TODO: extract the WebApp into its own class but until then...
-# rubocop:disable LineLength, ClassLength, CyclomaticComplexity, BlockNesting
-
 require 'thin'
-require 'renee'
-require 'coderay'
-require 'uri'
-require 'haml'
-require 'mimetype_fu'
-require 'launchy'
+require 'gitdocs/browser_app'
+require 'gitdocs/settings_app'
 
 module Gitdocs
   class Server
@@ -34,152 +24,18 @@ module Gitdocs
     end
 
     def start
-      repositories = @repositories
-      manager      = @manager
+      Gitdocs::SettingsApp.set :manager, @manager
+      Gitdocs::BrowserApp.set :repositories, @repositories
+
       Thin::Logging.debug = @manager.debug
       Thin::Server.start('127.0.0.1', @port) do
-        use Rack::Static, urls: %w(/css /js /img /doc), root: File.expand_path('../public', __FILE__)
+        use Rack::Static,
+          urls: %w(/css /js /img /doc),
+          root: File.expand_path('../public', __FILE__)
         use Rack::MethodOverride
-        run Renee {
-          if request.path_info == '/'
-            if manager.shares.size == 1
-              redirect! '/0'
-            else
-              render!(
-                'home',
-                layout: 'app',
-                locals: { shares: manager.shares, nav_state: 'home' }
-              )
-            end
-          else
-            path 'settings' do
-              get.render!(
-                'settings',
-                layout: 'app',
-                locals: { conf: manager, nav_state: 'settings' }
-              )
-              post do
-                manager.update_all(request.POST)
-                redirect! '/settings'
-              end
-            end
-
-            path('search').get do
-              render!(
-                'search',
-                layout: 'app',
-                locals: { results: @search.search(request.GET['q']), nav_state: nil }
-              )
-            end
 
-            path('shares') do
-              var(:int) do |id|
-                delete do
-                  halt(404) unless manager.remove_by_id(id)
-                  redirect!('/settings')
-                end
-              end
-            end
-
-            var :int do |idx|
-              halt(404) unless repositories[idx]
-              path = Gitdocs::Repository::Path.new(
-                repositories[idx], URI.unescape(request.path_info)
-              )
-
-              mode   = request.params['mode']
-              default_locals = {
-                idx:       idx,
-                root:      repositories[idx].root,
-                nav_state: nil
-              }
-
-              if mode == 'meta' # Meta
-                halt 200, { 'Content-Type' => 'application/json' }, [path.meta.to_json]
-              elsif mode == 'save' # Saving
-                path.write(request.params['data'], request.params['message'])
-                redirect!("/#{idx}/#{path.relative_path}")
-              elsif mode == 'upload'  # Uploading
-                file = request.params['file']
-                halt 404 unless file
-                tempfile = file[:tempfile]
-                filename = file[:filename]
-                FileUtils.mv(tempfile.path, path.absolute_path)
-                redirect!("/#{idx}/#{path.relative_path}/#{filename}")
-              elsif !path.exist? && !request.params['dir'] # edit for non-existent file
-                path.touch
-                redirect!("/#{idx}/#{path.relative_path}?mode=edit")
-              elsif !path.exist? && request.params['dir'] # create directory
-                path.mkdir
-                redirect!("/#{idx}/#{path.relative_path}")
-              elsif path.directory? # list directory
-                rendered_readme =
-                  if path.readme_path
-                    <<-EOS.gusb(/^\s+/, '')
-                      <h3>#{File.basename(path.readme_path)}</h3>
-                      <div class="tilt">#{render(path.readme_path)}</div>
-                    EOS
-                  else
-                    nil
-                  end
-                render!(
-                  'dir',
-                  layout: 'app',
-                  locals: default_locals.merge(
-                    contents:        path.file_listing,
-                    rendered_readme: rendered_readme
-                  )
-                )
-              elsif mode == 'revisions' # list revisions
-                render!(
-                  'revisions',
-                  layout: 'app',
-                  locals: default_locals.merge(revisions: path.revisions)
-                )
-              elsif mode == 'revert' # revert file
-                path.revert(request.params['revision'])
-                redirect!("/#{idx}/#{path.relative_path}")
-              elsif mode == 'delete' # delete file
-                path.remove
-                parent = File.dirname(path.relative_path)
-                parent = '' if parent == '/'
-                parent = nil if parent == '.'
-                redirect!("/#{idx}#{parent}")
-              elsif mode == 'edit' && path.text? # edit file
-                render!(
-                  'edit',
-                  layout: 'app',
-                  locals: default_locals.merge(contents: path.content)
-                )
-              elsif mode != 'raw' # render file
-                revision_path = path.absolute_path(request.params['revision'])
-                contents =
-                  begin # attempting to render file
-                    %(<div class="tilt">#{render(revision_path)}</div>)
-                  rescue RuntimeError # not tilt supported
-                    if path.text?
-                      <<-EOS.gsub(/^\s+/, '')
-                        <pre class="CodeRay">
-                          #{CodeRay.scan_file(revision_path).encode(:html)}
-                        </pre>
-                      EOS
-                    else
-                      %(<embed class="inline-file" src="/#{idx}#{request.path_info}?mode=raw"></embed>)
-                    end
-                  end
-                render!(
-                  'file',
-                  layout: 'app',
-                  locals: default_locals.merge(contents: contents)
-                )
-              else # other file
-                run! Rack::File.new(repositories[idx].root)
-              end
-            end
-          end
-        }.setup {
-          views_path(File.expand_path('../views', __FILE__))
-        }
+        map('/settings') { run Gitdocs::SettingsApp }
+        map('/') { run Gitdocs::BrowserApp }
       end
     end
 

data/lib/gitdocs/settings_app.rb

@@ -0,0 +1,28 @@
+# -*- encoding : utf-8 -*-
+
+require 'sinatra/base'
+require 'haml'
+require 'yaml'
+require 'mimetype_fu'
+
+module Gitdocs
+  class SettingsApp < Sinatra::Base
+    get('/') do
+      haml(
+        :settings,
+        locals: { conf: settings.manager, nav_state: 'settings' }
+      )
+    end
+
+    post('/') do
+      settings.manager.update_all(request.POST)
+      redirect to('/')
+    end
+
+    delete('/:id') do
+      id = params[:id].to_i
+      halt(404) unless settings.manager.remove_by_id(id)
+      redirect to('/')
+    end
+  end
+end

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = '0.5.0.pre7'
+  VERSION = '0.5.0'
 end

data/lib/gitdocs/views/_header.haml

@@ -11,4 +11,6 @@
     %li
       %a{ href: '?mode=revisions' } Revisions
     %li
-      %a.delete{ href: '?mode=delete' } Delete
+      %form{ method: 'POST', :'data-confirm-submit' => 'Are you sure?' }
+        %input{ name: '_method', type: 'hidden', value: 'delete' }
+        %input.btn.danger{ type: 'submit', value: 'Delete' }

data/lib/gitdocs/views/dir.haml

@@ -1,6 +1,6 @@
 - @title = root
 
-= partial('header', locals: { file: false, idx: idx })
+= haml(:_header, locals: { file: false, idx: idx })
 
 - if contents && contents.any?
   %table#fileListing.condensed-table.zebra-striped
@@ -16,7 +16,7 @@
         %tr
           %td
             %img{ src: "/img/#{f.is_directory ? 'folder' : 'file'}.png", width: 16, height: 16 }
-            %a{ href: "/#{idx}#{request.path_info}/#{f.name}" }
+            %a{ href: "#{request.path_info}/#{f.name}" }
               = f.name
           %td.author
           %td.modified
@@ -27,16 +27,16 @@
 
 .row
   .span6
-    %form.upload{ method: 'POST', enctype: 'multipart/form-data', action: "/#{idx}#{request.path_info}?mode=upload" }
+    %form.upload{ method: 'POST', enctype: 'multipart/form-data' }
       %p Upload file to this directory
-      %input.uploader{ type: 'file',   value: 'Select a file', name: 'file', size: 12 }
+      %input.uploader{ type: 'file', value: 'Select a file', name: 'file', size: 12 }
       %input.btn.secondary{ type: 'submit', value: 'Upload file' }
   .span8
-    %form.add
+    %form.add{ method: 'POST' }
       %p Add new file or directory
-      %input.edit{ type: 'text',   name: 'path', placeholder: 'somefile.md or somedir' }
-      %input.btn.secodary.file{ type: 'submit', value: 'New file' }
-      %input.btn.secondary.directory{ type: 'submit', value: 'New directory' }
+      %input{ type: 'text',   name: 'filename', placeholder: 'somefile.md or somedir' }
+      %input.btn.secondary{ type: 'submit', name: 'new_file', value: 'New file' }
+      %input.btn.secondary{ type: 'submit', name: 'new_directory', value: 'New directory' }
 
 - if rendered_readme
   .contents

data/lib/gitdocs/views/edit.haml

@@ -1,14 +1,15 @@
 - @title = root
 
-= partial('header', locals: { file: true, idx: idx })
+= haml(:_header, locals: { file: true, idx: idx })
 
-%form.edit{ action: "/#{idx}#{request.path_info}?mode=save", method: 'POST', style: 'display:none;' }
+%form.edit{ method: 'POST', style: 'display:none;' }
   #editor
   %textarea#data{ name: 'data' }= preserve contents
   .clearfix
     %textarea.span16#message{ name: 'message', placeholder: 'Optional commit message.' }
+  %input{ name: '_method', type: 'hidden', value: 'put' }
   %input.btn.primary{ type: 'submit', value: 'Save' }
-  %a.btn.secondary{ href: "/#{idx}#{request.path_info}" } Cancel
+  %a.btn.secondary{ href: request.path_info } Cancel
   %input.filename{ type: 'hidden', value: request.path_info }
 
-= partial('ace_scripts')
+= erb(:_ace_scripts)

data/lib/gitdocs/views/file.haml

@@ -1,6 +1,6 @@
 - @title = root
 
-= partial('header', locals: { file: true, idx: idx })
+= haml(:_header, locals: { file: true, idx: idx })
 
 .contents
   = preserve contents

data/lib/gitdocs/views/home.haml

@@ -7,4 +7,4 @@
     %tr
       %td
         %a{ href: "/#{idx}" }
-          = share.path
+          = share.root

data/lib/gitdocs/views/revisions.haml

@@ -1,6 +1,6 @@
 - @title = root
 
-= partial('header', locals: { file: true, idx: idx })
+= haml(:_header, locals: { file: true, idx: idx })
 
 - if revisions && revisions.any?
   %table#revisions.condensed-table.zebra-striped
@@ -22,7 +22,8 @@
           %td.author= r[:author]
           %td.date.reldate= r[:date].iso8601
           %td.revert
-            %a{ href: "?mode=revert&revision=#{r[:commit]}" }
-              = r[:commit]
+            %form{ method: 'POST', :'data-confirm-submit' => 'Are you sure?' }
+              %input{ name: '_method', type: 'hidden', value: 'put' }
+              %input.btn{ type: 'submit', name: 'revision', value: r[:commit] }
 - if revisions.empty?
   %p No revisions for this file could be found.

data/lib/gitdocs/views/search.haml

@@ -1,4 +1,4 @@
-- @title = "Matches for #{request.params['q'].inspect}"
+- @title = "Matches for "#{request.params['q']}""
 %script{ src: '/js/search.js', type: 'text/javascript', charset: 'utf-8' }
 
 .results{ 'data-query' => request.params['q'] }

data/lib/gitdocs/views/settings.haml

@@ -1,7 +1,7 @@
 - @title = 'Settings'
 %script{ src: '/js/settings.js', type: 'text/javascript', charset: 'utf-8' }
 
-%form#settings{ method: 'POST', action: '/settings' }
+%form#settings{ method: 'POST', action: url('/') }
   %h2 Gitdocs
   #config.field.config
     %dl
@@ -51,7 +51,7 @@
         %input{ type: 'checkbox', value: '1', name: "share[#{idx}][notification]", checked: share.notification ? 'checked' : nil }
         %span Notifications?
       .delete
-        %a.remote_share.btn.danger{ href: "/shares/#{share.id}", :'data-method' => 'delete' }
+        %a.remote_share.btn.danger{ href: url("/#{share.id}"), :'data-method' => 'delete' }
           Delete
 
   %input.btn.primary{ value: 'Save', type: 'submit' }

data/lib/gitdocs.rb

@@ -15,7 +15,6 @@ require 'gitdocs/runner'
 require 'gitdocs/server'
 require 'gitdocs/cli'
 require 'gitdocs/manager'
-require 'gitdocs/rendering'
 require 'gitdocs/notifier'
 require 'gitdocs/repository'
 require 'gitdocs/repository/path'

data/test/integration/browse_test.rb

@@ -20,6 +20,8 @@ describe 'browse and edit repository file through the UI' do
     repository.commit
     write_file('local/file2', 'A5A5A5A5')
     repository.commit
+    write_file('local/README.md', 'hello i am a README')
+    repository.commit
 
     start_daemon
 
@@ -32,10 +34,14 @@ describe 'browse and edit repository file through the UI' do
     end
   end
 
+  it 'should show the README' do
+    page.must_have_content('hello i am a README')
+  end
+
   it 'should browse text files' do
     within('table#fileListing') do
       within('tbody') do
-        page.must_have_css('tr', count: 2)
+        page.must_have_css('tr', count: 3)
         click_link('file1')
       end
     end
@@ -80,7 +86,7 @@ describe 'browse and edit repository file through the UI' do
           page.must_have_css('tr', count: 2)
           within(:xpath, '//tr[2]') do
             within('td.revert') do
-              find('a').click
+              find('input.btn').click
             end
           end
         end
@@ -107,7 +113,7 @@ describe 'browse and edit repository file through the UI' do
   describe 'creation' do
     it 'should allow directory creation' do
       within('form.add') do
-        fill_in('path', with: 'new_directory')
+        fill_in('filename', with: 'new_directory')
         click_button('directory')
       end
       within('h2') { page.must_have_content('/new_directory') }
@@ -116,7 +122,7 @@ describe 'browse and edit repository file through the UI' do
 
     it 'should allow file creation' do
       within('form.add') do
-        fill_in('path', with: 'new_file')
+        fill_in('filename', with: 'new_file')
         click_button('file')
       end
 
@@ -137,10 +143,10 @@ describe 'browse and edit repository file through the UI' do
 
   it 'should allow file deletion' do
     within('table#fileListing') { within('tbody') { click_link('file1') } }
-    click_link('Delete')
+    click_on('Delete')
     within('table#fileListing') do
       within('tbody') do
-        page.must_have_css('tr', count: 1)
+        page.must_have_css('tr', count: 2)
         page.wont_have_content('file1')
         page.must_have_content('file2')
       end

data/test/unit/repository_path_test.rb

@@ -12,6 +12,13 @@ describe Gitdocs::Repository::Path do
     FileUtils.rm_rf('tmp/unit')
   end
 
+  describe '#join' do
+    subject { path.join('new_file') }
+    before { subject }
+    it { path.relative_path.must_equal('directory/file/new_file') }
+    it { path.absolute_path.must_equal(absolute_local_path('new_file')) }
+  end
+
   describe '#write' do
     subject { path.write('foobar', :message) }
     before { repository.expects(:write_commit_message).with(:message) }

data/test/unit/search_test.rb

@@ -18,6 +18,11 @@ describe Gitdocs::Search do
       repository2.stubs(:root).returns('root')
     end
 
+    describe 'term is missing' do
+      let(:term) { nil }
+      it { subject.must_equal({}) }
+    end
+
     describe 'term is empty' do
       let(:term) { '' }
       it { subject.must_equal({}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitdocs
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre7
+  version: 0.5.0
 platform: ruby
 authors:
 - Josh Hull
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: joshbuddy-guard
@@ -40,33 +40,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.2
 - !ruby/object:Gem::Dependency
-  name: renee
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
@@ -269,14 +269,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.5.0
 - !ruby/object:Gem::Dependency
   name: capybara_minitest_spec
   requirement: !ruby/object:Gem::Requirement
@@ -395,14 +395,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: jslint_on_rails
   requirement: !ruby/object:Gem::Requirement
@@ -421,16 +421,30 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shotgun
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Open-source Dropbox using Ruby and Git.
 email:
 - joshbuddy@gmail.com
@@ -451,8 +465,10 @@ files:
 - README.md
 - Rakefile
 - bin/gitdocs
+- config.ru
 - gitdocs.gemspec
 - lib/gitdocs.rb
+- lib/gitdocs/browser_app.rb
 - lib/gitdocs/cli.rb
 - lib/gitdocs/configuration.rb
 - lib/gitdocs/manager.rb
@@ -512,20 +528,21 @@ files:
 - lib/gitdocs/public/js/search.js
 - lib/gitdocs/public/js/settings.js
 - lib/gitdocs/public/js/util.js
-- lib/gitdocs/rendering.rb
+- lib/gitdocs/rendering_helper.rb
 - lib/gitdocs/repository.rb
 - lib/gitdocs/repository/path.rb
 - lib/gitdocs/runner.rb
 - lib/gitdocs/search.rb
 - lib/gitdocs/server.rb
+- lib/gitdocs/settings_app.rb
 - lib/gitdocs/version.rb
 - lib/gitdocs/views/_ace_scripts.erb
 - lib/gitdocs/views/_header.haml
-- lib/gitdocs/views/app.haml
 - lib/gitdocs/views/dir.haml
 - lib/gitdocs/views/edit.haml
 - lib/gitdocs/views/file.haml
 - lib/gitdocs/views/home.haml
+- lib/gitdocs/views/layout.haml
 - lib/gitdocs/views/revisions.haml
 - lib/gitdocs/views/search.haml
 - lib/gitdocs/views/settings.haml
@@ -543,7 +560,7 @@ files:
 - test/unit/runner_test.rb
 - test/unit/search_test.rb
 - test/unit/test_helper.rb
-homepage: http://engineering.gomiso.com/2011/11/30/collaborate-and-track-tasks-with-ease-using-gitdocs/
+homepage: https://github.com/nesquena/gitdocs
 licenses:
 - MIT
 metadata: {}
@@ -558,9 +575,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: gitdocs
 rubygems_version: 2.0.7

data/lib/gitdocs/rendering.rb

@@ -1,28 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# rubocop:disable LineLength
-
-# This should not exist but I cannot find any other way to prevent redcarpet
-# from complaining
-# > WARN: tilt autoloading 'redcarpet' in a non thread-safe way; explicit require'redcarpet' suggested.
-# > !! Unexpected error while processing request: Input must be UTF-8 or US-ASCII, ASCII-8BIT given
-# > Input must be UTF-8 or US-ASCII, ASCII-8BIT given
-# >  gems/redcarpet-2.0.1/lib/redcarpet.rb:70:in `render'
-# >  gems/redcarpet-2.0.1/lib/redcarpet.rb:70:in `to_html'
-# >  gems/tilt-1.3.3/lib/tilt/markdown.rb:38:in `evaluate'
-# >  gems/tilt-1.3.3/lib/tilt/markdown.rb:61:in `evaluate'
-# >  gems/tilt-1.3.3/lib/tilt/template.rb:76:in `render'
-
-require 'redcarpet'
-
-# Compatibility class;
-# Creates a instance of Redcarpet with the RedCloth
-# API. This instance has no extensions enabled whatsoever,
-# and no accessors to change this. 100% pure, standard
-# Markdown.
-class RedcarpetCompat
-  def to_html(*_dummy)
-    @text = @text.force_encoding('utf-8') if @text.respond_to?(:force_encoding)
-    @markdown.render(@text)
-  end
-end