decorators & tree model

Dmitriy Zaporozhets
1 parent 6721ef01
Showing 12 changed files with 120 additions and 29 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/javascripts/projects.js
app/assets/stylesheets/projects.css.scss
app/controllers/application_controller.rb
app/controllers/refs_controller.rb
app/decorators/application_decorator.rb
app/decorators/commit_decorator.rb
app/decorators/tree_decorator.rb
app/models/commit.rb
app/models/tree.rb
app/views/refs/_tree.html.haml
@@ -21,6 +21,7 @@ gem &quot;git&quot;
 gem "acts_as_list"
 gem 'rdiscount'
 gem 'acts-as-taggable-on', '~> 2.1.0'
+gem 'drapper'
  
 group :assets do
   gem 'sass-rails',   "~> 3.1.0"
@@ -86,6 +86,7 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
     diff-lcs (1.1.3)
+    drapper (0.8.4)
     erubis (2.7.0)
     eventmachine (0.12.10)
     execjs (1.2.9)
@@ -254,6 +255,7 @@ DEPENDENCIES
   coffee-rails (~> 3.1.0)
   database_cleaner
   devise (= 1.5.0)
+  drapper
   faker
   git
   grit!
@@ -6,7 +6,8 @@ $(document).ready(function(){
   $("#tree-slider tr.tree-item").live('click', function(e){
     if(e.target.nodeName != "A") {
       e.stopPropagation();
-      $(this).find("td.tree-item-file-name a").click();
+      link = $(this).find("td.tree-item-file-name a")
+      link.click();
       return false;
     }
   });
@@ -378,5 +378,3 @@ body.dashboard.project-page .news-feed .project-updates a.project-update span.up
 body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
 body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
 /* eo Dashboard Page */
-
-
@@ -84,4 +84,10 @@ class ApplicationController &lt; ActionController::Base
       nil
     end
   end
+
+  def no_cache_headers
+    response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
+    response.headers["Pragma"] = "no-cache"
+    response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
+  end
 end
@@ -25,16 +25,14 @@ class RefsController &lt; ApplicationController
     @repo = project.repo
  
     @commit = @repo.commits(@ref).first
-    @tree = @commit.tree
-    @tree = @tree / params[:path] if params[:path]
+    @tree = Tree.new(@commit.tree, project, @ref, params[:path])
+    @tree = TreeDecorator.new(@tree)
  
     respond_to do |format|
-      format.html # show.html.erb
+      format.html
       format.js do
-        # diasbale cache to allow back button works
-        response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
-        response.headers["Pragma"] = "no-cache"
-        response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
+        # disable cache to allow back button works
+        no_cache_headers
       end
     end
   rescue
@@ -0,0 +1,28 @@
+class ApplicationDecorator < Drapper::Base
+  # Lazy Helpers
+  #   PRO: Call Rails helpers without the h. proxy
+  #        ex: number_to_currency(model.price)
+  #   CON: Add a bazillion methods into your decorator's namespace
+  #        and probably sacrifice performance/memory
+  #  
+  #   Enable them by uncommenting this line:
+  #   lazy_helpers
+
+  # Shared Decorations
+  #   Consider defining shared methods common to all your models.
+  #   
+  #   Example: standardize the formatting of timestamps
+  #
+  #   def formatted_timestamp(time)
+  #     h.content_tag :span, time.strftime("%a %m/%d/%y"), 
+  #                   :class => 'timestamp' 
+  #   end
+  # 
+  #   def created_at
+  #     formatted_timestamp(model.created_at)
+  #   end
+  # 
+  #   def updated_at
+  #     formatted_timestamp(model.updated_at)
+  #   end
+end
@@ -0,0 +1,7 @@
+class CommitDecorator < ApplicationDecorator
+  decorates :commit
+
+  def breadcrumbs
+
+  end
+end
@@ -0,0 +1,33 @@
+class TreeDecorator < ApplicationDecorator
+  decorates :tree
+
+  def breadcrumbs(max_links = 2)
+    if path
+      part_path = ""
+      parts = path.split("\/")
+
+      yield(h.link_to("..", "#", :remote => :true)) if parts.count > max_links
+
+      parts.each do |part|
+        part_path = File.join(part_path, part) unless part_path.empty?
+        part_path = part if part_path.empty?
+
+        next unless parts.last(2).include?(part) if parts.count > max_links
+        yield(h.link_to(h.truncate(part, :length => 40), h.tree_file_project_ref_path(project, ref, :path => part_path), :remote => :true))
+      end
+    end
+  end
+
+  def up_dir?
+    !!path
+  end
+
+  def up_dir_path
+    file = File.join(path, "..")
+    h.tree_file_project_ref_path(project, ref, file)
+  end
+
+  def history_path
+    h.project_commits_path(project, :path => path, :ref => ref)
+  end
+end
@@ -0,0 +1,2 @@
+class Commit
+end
@@ -0,0 +1,24 @@
+class Tree
+  attr_accessor :path, :tree, :project, :ref
+
+  delegate :contents,
+    :basename,
+    :name,
+    :data,
+    :text?,
+    :colorize,
+    :to => :tree
+
+  def initialize(raw_tree, project, ref = nil, path = nil)
+    @project, @ref, @path = project, ref, path,
+    @tree = if path
+              raw_tree / path
+            else
+              raw_tree
+            end
+  end
+
+  def is_blob?
+    tree.is_a?(Grit::Blob)
+  end
+end
--#%a.right.button{:href => "#"} Download
--#-if can? current_user, :admin_project, @project
-  %a.right.button.blue{:href => "#"} EDIT
 #tree-breadcrumbs
   %h2.icon
     %span
     %d
       = link_to tree_project_ref_path(@project, @ref, :path => nil), :remote => true do
         = @project.name
-      - if params[:path]
-        - part_path = ""
-        - params[:path].split("\/").each do |part|
-          - part_path = File.join(part_path, part) unless part_path.empty?
-          - if part_path.empty?
-            - part_path = part
-          \/
-          = link_to truncate(part, :length => 40), tree_file_project_ref_path(@project, @ref, :path => part_path), :remote => :true
-        &nbsp;
+      - tree.breadcrumbs(2) do |link|
+        \/
+        = link
+      &nbsp;
   .right= render :partial => "projects/refs", :locals => { :destination => :tree }
 .clear
-
 #tree-content-holder
-  - if tree.is_a?(Grit::Blob)
+  - if tree.is_blob?
     = render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
   - else
     - contents = tree.contents
@@ -30,13 +21,13 @@
         %th Last Update
         %th
           Last commit
-          = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right"
-      - if params[:path]
-        - file = File.join(params[:path], "..")
-        %tr{ :class => "tree-item", :url => tree_file_project_ref_path(@project, @ref, file) }
+          = link_to "history", tree.history_path, :class => "right"
+      
+      - if tree.up_dir?
+        %tr{ :class => "tree-item", :url => tree.up_dir_path }
           %td.tree-item-file-name
             = image_tag "dir.png"
-            = link_to "..", tree_file_project_ref_path(@project, @ref, file), :remote => :true
+            = link_to "..", tree.up_dir_path, :remote => :true
           %td
           %td
...	...	@@ -21,6 +21,7 @@ gem "git"
21	21	gem "acts_as_list"
22	22	gem 'rdiscount'
23	23	gem 'acts-as-taggable-on', '~> 2.1.0'
	24	+gem 'drapper'
24	25
25	26	group :assets do
26	27	gem 'sass-rails', "~> 3.1.0"
...	...
...	...	@@ -86,6 +86,7 @@ GEM
86	86	orm_adapter (~> 0.0.3)
87	87	warden (~> 1.1)
88	88	diff-lcs (1.1.3)
	89	+ drapper (0.8.4)
89	90	erubis (2.7.0)
90	91	eventmachine (0.12.10)
91	92	execjs (1.2.9)
...	...	@@ -254,6 +255,7 @@ DEPENDENCIES
254	255	coffee-rails (~> 3.1.0)
255	256	database_cleaner
256	257	devise (= 1.5.0)
	258	+ drapper
257	259	faker
258	260	git
259	261	grit!
...	...
...	...	@@ -6,7 +6,8 @@ $(document).ready(function(){
6	6	$("#tree-slider tr.tree-item").live('click', function(e){
7	7	if(e.target.nodeName != "A") {
8	8	e.stopPropagation();
9		- $(this).find("td.tree-item-file-name a").click();
	9	+ link = $(this).find("td.tree-item-file-name a")
	10	+ link.click();
10	11	return false;
11	12	}
12	13	});
...	...
...	...	@@ -378,5 +378,3 @@ body.dashboard.project-page .news-feed .project-updates a.project-update span.up
378	378	body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
379	379	body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
380	380	/* eo Dashboard Page */
381		-
382		-
...	...
...	...	@@ -84,4 +84,10 @@ class ApplicationController < ActionController::Base
84	84	nil
85	85	end
86	86	end
	87	+
	88	+ def no_cache_headers
	89	+ response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
	90	+ response.headers["Pragma"] = "no-cache"
	91	+ response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
	92	+ end
87	93	end
...	...
...	...	@@ -25,16 +25,14 @@ class RefsController < ApplicationController
25	25	@repo = project.repo
26	26
27	27	@commit = @repo.commits(@ref).first
28		- @tree = @commit.tree
29		- @tree = @tree / params[:path] if params[:path]
	28	+ @tree = Tree.new(@commit.tree, project, @ref, params[:path])
	29	+ @tree = TreeDecorator.new(@tree)
30	30
31	31	respond_to do \|format\|
32		- format.html # show.html.erb
	32	+ format.html
33	33	format.js do
34		- # diasbale cache to allow back button works
35		- response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
36		- response.headers["Pragma"] = "no-cache"
37		- response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
	34	+ # disable cache to allow back button works
	35	+ no_cache_headers
38	36	end
39	37	end
40	38	rescue
...	...
...	...	@@ -0,0 +1,28 @@
	1	+class ApplicationDecorator < Drapper::Base
	2	+ # Lazy Helpers
	3	+ # PRO: Call Rails helpers without the h. proxy
	4	+ # ex: number_to_currency(model.price)
	5	+ # CON: Add a bazillion methods into your decorator's namespace
	6	+ # and probably sacrifice performance/memory
	7	+ #
	8	+ # Enable them by uncommenting this line:
	9	+ # lazy_helpers
	10	+
	11	+ # Shared Decorations
	12	+ # Consider defining shared methods common to all your models.
	13	+ #
	14	+ # Example: standardize the formatting of timestamps
	15	+ #
	16	+ # def formatted_timestamp(time)
	17	+ # h.content_tag :span, time.strftime("%a %m/%d/%y"),
	18	+ # :class => 'timestamp'
	19	+ # end
	20	+ #
	21	+ # def created_at
	22	+ # formatted_timestamp(model.created_at)
	23	+ # end
	24	+ #
	25	+ # def updated_at
	26	+ # formatted_timestamp(model.updated_at)
	27	+ # end
	28	+end
...	...
...	...	@@ -0,0 +1,7 @@
	1	+class CommitDecorator < ApplicationDecorator
	2	+ decorates :commit
	3	+
	4	+ def breadcrumbs
	5	+
	6	+ end
	7	+end
...	...
...	...	@@ -0,0 +1,33 @@
	1	+class TreeDecorator < ApplicationDecorator
	2	+ decorates :tree
	3	+
	4	+ def breadcrumbs(max_links = 2)
	5	+ if path
	6	+ part_path = ""
	7	+ parts = path.split("\/")
	8	+
	9	+ yield(h.link_to("..", "#", :remote => :true)) if parts.count > max_links
	10	+
	11	+ parts.each do \|part\|
	12	+ part_path = File.join(part_path, part) unless part_path.empty?
	13	+ part_path = part if part_path.empty?
	14	+
	15	+ next unless parts.last(2).include?(part) if parts.count > max_links
	16	+ yield(h.link_to(h.truncate(part, :length => 40), h.tree_file_project_ref_path(project, ref, :path => part_path), :remote => :true))
	17	+ end
	18	+ end
	19	+ end
	20	+
	21	+ def up_dir?
	22	+ !!path
	23	+ end
	24	+
	25	+ def up_dir_path
	26	+ file = File.join(path, "..")
	27	+ h.tree_file_project_ref_path(project, ref, file)
	28	+ end
	29	+
	30	+ def history_path
	31	+ h.project_commits_path(project, :path => path, :ref => ref)
	32	+ end
	33	+end
...	...
...	...	@@ -0,0 +1,24 @@
	1	+class Tree
	2	+ attr_accessor :path, :tree, :project, :ref
	3	+
	4	+ delegate :contents,
	5	+ :basename,
	6	+ :name,
	7	+ :data,
	8	+ :text?,
	9	+ :colorize,
	10	+ :to => :tree
	11	+
	12	+ def initialize(raw_tree, project, ref = nil, path = nil)
	13	+ @project, @ref, @path = project, ref, path,
	14	+ @tree = if path
	15	+ raw_tree / path
	16	+ else
	17	+ raw_tree
	18	+ end
	19	+ end
	20	+
	21	+ def is_blob?
	22	+ tree.is_a?(Grit::Blob)
	23	+ end
	24	+end
...	...