garaj 0.0.1 → 0.1.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## head
 
+## v0.1.0
+
+* Add syntax highlighting via pygments.rb
+* Minor code refactoring
+
 ## v0.0.1
 
 Initial public release

data/README.md

@@ -31,7 +31,6 @@ http://127.0.0.1:9988
 
 ## Roadmap
 
-* Syntax highlighting
 * File, page icons
 * Readme.md support
 * Markdown support

data/garaj.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency('sinatra', '~> 1.3')
+  gem.add_dependency('pygments.rb', '~> 0.3')
 end

data/lib/garaj/project.rb

@@ -20,15 +20,6 @@ module Garaj
       "#{@root_path}/#{relative_path.chomp('/')}"
     end
 
-    # Returns the url for the given relative path
-    def url_for(entry, relative_path)
-      if !relative_path.empty?
-        "/#{relative_path}/#{entry}" 
-      else
-        "/#{entry}" 
-      end
-    end
-
     # Checks if the given file is ignored
     def not_ignored?(entry)
       true unless IGNORED_ENTRIES.include?(entry)
@@ -53,8 +44,8 @@ module Garaj
     def files_at(relative_path)
       files = []
       Dir.foreach(full_path_to(relative_path)) do |entry|
-        if !File.directory?("#{full_path_to(relative_path)}/#{entry}") and not_ignored?(entry)
-          files << {:url => url_for(entry, relative_path), :name => entry} 
+        if !path_is_dir?("#{relative_path)}/#{entry}") and not_ignored?(entry)
+          files << entry 
         end
       end
       files
@@ -64,8 +55,8 @@ module Garaj
     def dirs_at(relative_path)
       dirs = []
       Dir.foreach(full_path_to(relative_path)) do |entry|
-        if File.directory?("#{full_path_to(relative_path)}/#{entry}") and not_ignored?(entry)
-          dirs << {:url => url_for(entry, relative_path), :name => entry} 
+        if path_is_dir?("#{relative_path)}/#{entry}") and not_ignored?(entry)
+          dirs << entry 
         end
       end
       dirs

data/lib/garaj/version.rb

@@ -1,3 +1,3 @@
 module Garaj
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/garaj/web/public/css/styles.css

@@ -3,7 +3,7 @@ html {
   font-size: 14px;
 }
 
-p, ul, pre {
+p, ul, pre, table, tbody, tr, td {
   margin: 0;
   padding: 0;
 }
@@ -70,12 +70,21 @@ a {
   color: #555;
 }
 
-.file-content {
-  padding: 12px;
-  display: block;
+.highlighttable {
+  font-size: 13px;
+  border-spacing: 0;
+}
+
+.code {
+  padding: 8px;
   background-color: #fff;
-  overflow: auto;
-  overflow-y: hidden;
+  width: 100%;
+}
+
+.linenodiv { 
+  padding: 10px 6px;
+  color: #AAA;
+  border-right: 1px solid #bbb;
 }
 
 /** Footer**/

data/lib/garaj/web/public/css/syntax.css

@@ -0,0 +1,61 @@
+.hll { background-color: #ffffcc }
+.c { color: #999988; font-style: italic } /* Comment */
+.err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.k { color: #000000; font-weight: bold } /* Keyword */
+.o { color: #000000; font-weight: bold } /* Operator */
+.cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.cp { color: #999999; font-weight: bold; font-style: italic } /* Comment.Preproc */
+.c1 { color: #999988; font-style: italic } /* Comment.Single */
+.cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.ge { color: #000000; font-style: italic } /* Generic.Emph */
+.gr { color: #aa0000 } /* Generic.Error */
+.gh { color: #999999 } /* Generic.Heading */
+.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.go { color: #888888 } /* Generic.Output */
+.gp { color: #555555 } /* Generic.Prompt */
+.gs { font-weight: bold } /* Generic.Strong */
+.gu { color: #aaaaaa } /* Generic.Subheading */
+.gt { color: #aa0000 } /* Generic.Traceback */
+.kc { color: #000000; font-weight: bold } /* Keyword.Constant */
+.kd { color: #000000; font-weight: bold } /* Keyword.Declaration */
+.kn { color: #000000; font-weight: bold } /* Keyword.Namespace */
+.kp { color: #000000; font-weight: bold } /* Keyword.Pseudo */
+.kr { color: #000000; font-weight: bold } /* Keyword.Reserved */
+.kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.m { color: #009999 } /* Literal.Number */
+.s { color: #d01040 } /* Literal.String */
+.na { color: #008080 } /* Name.Attribute */
+.nb { color: #0086B3 } /* Name.Builtin */
+.nc { color: #445588; font-weight: bold } /* Name.Class */
+.no { color: #008080 } /* Name.Constant */
+.nd { color: #3c5d5d; font-weight: bold } /* Name.Decorator */
+.ni { color: #800080 } /* Name.Entity */
+.ne { color: #990000; font-weight: bold } /* Name.Exception */
+.nf { color: #990000; font-weight: bold } /* Name.Function */
+.nl { color: #990000; font-weight: bold } /* Name.Label */
+.nn { color: #555555 } /* Name.Namespace */
+.nt { color: #000080 } /* Name.Tag */
+.nv { color: #008080 } /* Name.Variable */
+.ow { color: #000000; font-weight: bold } /* Operator.Word */
+.w { color: #bbbbbb } /* Text.Whitespace */
+.mf { color: #009999 } /* Literal.Number.Float */
+.mh { color: #009999 } /* Literal.Number.Hex */
+.mi { color: #009999 } /* Literal.Number.Integer */
+.mo { color: #009999 } /* Literal.Number.Oct */
+.sb { color: #d01040 } /* Literal.String.Backtick */
+.sc { color: #d01040 } /* Literal.String.Char */
+.sd { color: #d01040 } /* Literal.String.Doc */
+.s2 { color: #d01040 } /* Literal.String.Double */
+.se { color: #d01040 } /* Literal.String.Escape */
+.sh { color: #d01040 } /* Literal.String.Heredoc */
+.si { color: #d01040 } /* Literal.String.Interpol */
+.sx { color: #d01040 } /* Literal.String.Other */
+.sr { color: #009926 } /* Literal.String.Regex */
+.s1 { color: #d01040 } /* Literal.String.Single */
+.ss { color: #990073 } /* Literal.String.Symbol */
+.bp { color: #999999 } /* Name.Builtin.Pseudo */
+.vc { color: #008080 } /* Name.Variable.Class */
+.vg { color: #008080 } /* Name.Variable.Global */
+.vi { color: #008080 } /* Name.Variable.Instance */
+.il { color: #009999 } /* Literal.Number.Integer.Long */

data/lib/garaj/web/views/dir.erb

@@ -3,11 +3,11 @@
     <% if @dirs.empty? and @files.empty? %>
       <li class="path">This folder is empty</li>
     <% else %>
-      <% @dirs.each do |path| %>
-        <li class="path dir-path"><a href="<%= path[:url] %>"><%= path[:name] %>/</a></li>
+      <% @dirs.each do |entry| %>
+        <li class="path dir-path"><a href="<%= url_for(entry, @current_path) %>"><%= entry %>/</a></li>
       <% end %>
-      <% @files.each do |path| %>
-        <li class="path file-path"><a href="<%= path[:url] %>"><%= path[:name] %></a></li>
+      <% @files.each do |entry| %>
+        <li class="path file-path"><a href="<%= url_for(entry, @current_path) %>"><%= entry %></a></li>
       <% end %>
     <% end %>
   </ul>

data/lib/garaj/web/views/file.erb

@@ -1,6 +1,7 @@
 <div class="box">
   <div class="file">
     <span class="file-name"><%= @file_name %></span>
-    <pre class="file-content"><%= @file_content %></pre>
+    <%= syntax_highlight(@file_content, @file_name) %>
+  </div>
   </div>
 </div>

data/lib/garaj/web/views/layout.erb

@@ -2,7 +2,9 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <link href="/css/styles.css" media="screen" rel="stylesheet" type="text/css"> <title><%= @project_name %> - garaj</title>
+    <link href="/css/styles.css" media="screen" rel="stylesheet" type="text/css">
+    <link href="/css/syntax.css" media="screen" rel="stylesheet" type="text/css">
+    <title><%= @project_name %> - garaj</title>
   </head>
 
   <body>

data/lib/garaj/web.rb

@@ -1,10 +1,9 @@
 require 'sinatra/base'
+require 'pygments'
 
 module Garaj
   class Web < Sinatra::Base
 
-    attr_accessor :project
-
     configure do 
       set :port, '9988' 
       set :logging, false 
@@ -13,15 +12,37 @@ module Garaj
       set :views, File.expand_path('../web/views', __FILE__)
     end
 
+    helpers do
+      # Returns the url for the given relative path
+      def url_for(entry, relative_path)
+        if !relative_path.empty?
+          "/#{relative_path}/#{entry}" 
+        else
+          "/#{entry}" 
+        end
+      end
+
+      def syntax_highlight(file_content, file_name)
+        options = { :encoding => 'utf-8', :linenos => 'True' }
+        lexer = file_name.split('.').last
+
+        begin
+          ::Pygments.highlight(file_content, :lexer => lexer.downcase, :options => options)
+        rescue
+          ::Pygments.highlight(file_content, :options => options)
+        end
+      end
+    end
+
     def self.start(project_root)
       set :project, Garaj::Project.new(project_root)
       run!
     end
-    
+
     get '/*?' do |relative_path|
       @project_name = settings.project.name
       @current_path = relative_path
-      
+   
       if settings.project.path_is_dir?(relative_path)
         @dirs = settings.project.dirs_at(relative_path)
         @files = settings.project.files_at(relative_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garaj
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: pygments.rb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Browse through your project's source code
 email:
 - fisyonet@gmail.com
@@ -48,6 +64,7 @@ files:
 - lib/garaj/version.rb
 - lib/garaj/web.rb
 - lib/garaj/web/public/css/styles.css
+- lib/garaj/web/public/css/syntax.css
 - lib/garaj/web/views/dir.erb
 - lib/garaj/web/views/file.erb
 - lib/garaj/web/views/layout.erb