Improve partial rendering and Haml performance (Haml->Hamlit)
This commit is contained in:
		
							parent
							
								
									95d72b2249
								
							
						
					
					
						commit
						57583f3fb8
					
				
							
								
								
									
										2
									
								
								Gemfile
								
								
								
								
							
							
						
						
									
										2
									
								
								Gemfile
								
								
								
								
							| 
						 | 
					@ -10,7 +10,7 @@ gem 'jbuilder', '~> 2.0'
 | 
				
			||||||
gem 'sdoc', '~> 0.4.0', group: :doc
 | 
					gem 'sdoc', '~> 0.4.0', group: :doc
 | 
				
			||||||
gem 'puma'
 | 
					gem 'puma'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gem 'haml-rails'
 | 
					gem 'hamlit-rails'
 | 
				
			||||||
gem 'pg'
 | 
					gem 'pg'
 | 
				
			||||||
gem 'dotenv-rails'
 | 
					gem 'dotenv-rails'
 | 
				
			||||||
gem 'font-awesome-rails'
 | 
					gem 'font-awesome-rails'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										20
									
								
								Gemfile.lock
								
								
								
								
							
							
						
						
									
										20
									
								
								Gemfile.lock
								
								
								
								
							| 
						 | 
					@ -110,21 +110,17 @@ GEM
 | 
				
			||||||
      addressable (~> 2.4)
 | 
					      addressable (~> 2.4)
 | 
				
			||||||
      http (~> 1.0)
 | 
					      http (~> 1.0)
 | 
				
			||||||
      nokogiri (~> 1.6)
 | 
					      nokogiri (~> 1.6)
 | 
				
			||||||
    haml (4.0.7)
 | 
					    hamlit (2.7.2)
 | 
				
			||||||
 | 
					      temple (~> 0.7.6)
 | 
				
			||||||
 | 
					      thor
 | 
				
			||||||
      tilt
 | 
					      tilt
 | 
				
			||||||
    haml-rails (0.9.0)
 | 
					    hamlit-rails (0.1.0)
 | 
				
			||||||
      actionpack (>= 4.0.1)
 | 
					      actionpack (>= 4.0.1)
 | 
				
			||||||
      activesupport (>= 4.0.1)
 | 
					      activesupport (>= 4.0.1)
 | 
				
			||||||
      haml (>= 4.0.6, < 5.0)
 | 
					      hamlit (>= 1.2.0)
 | 
				
			||||||
      html2haml (>= 1.0.1)
 | 
					 | 
				
			||||||
      railties (>= 4.0.1)
 | 
					      railties (>= 4.0.1)
 | 
				
			||||||
    hashdiff (0.3.0)
 | 
					    hashdiff (0.3.0)
 | 
				
			||||||
    hiredis (0.6.1)
 | 
					    hiredis (0.6.1)
 | 
				
			||||||
    html2haml (2.0.0)
 | 
					 | 
				
			||||||
      erubis (~> 2.7.0)
 | 
					 | 
				
			||||||
      haml (~> 4.0.0)
 | 
					 | 
				
			||||||
      nokogiri (~> 1.6.0)
 | 
					 | 
				
			||||||
      ruby_parser (~> 3.5)
 | 
					 | 
				
			||||||
    htmlentities (4.3.4)
 | 
					    htmlentities (4.3.4)
 | 
				
			||||||
    http (1.0.4)
 | 
					    http (1.0.4)
 | 
				
			||||||
      addressable (~> 2.3)
 | 
					      addressable (~> 2.3)
 | 
				
			||||||
| 
						 | 
					@ -282,8 +278,6 @@ GEM
 | 
				
			||||||
      ruby-progressbar (~> 1.7)
 | 
					      ruby-progressbar (~> 1.7)
 | 
				
			||||||
      unicode-display_width (~> 1.0, >= 1.0.1)
 | 
					      unicode-display_width (~> 1.0, >= 1.0.1)
 | 
				
			||||||
    ruby-progressbar (1.8.1)
 | 
					    ruby-progressbar (1.8.1)
 | 
				
			||||||
    ruby_parser (3.8.2)
 | 
					 | 
				
			||||||
      sexp_processor (~> 4.1)
 | 
					 | 
				
			||||||
    safe_yaml (1.0.4)
 | 
					    safe_yaml (1.0.4)
 | 
				
			||||||
    sass (3.4.22)
 | 
					    sass (3.4.22)
 | 
				
			||||||
    sass-rails (5.0.6)
 | 
					    sass-rails (5.0.6)
 | 
				
			||||||
| 
						 | 
					@ -295,7 +289,6 @@ GEM
 | 
				
			||||||
    sdoc (0.4.1)
 | 
					    sdoc (0.4.1)
 | 
				
			||||||
      json (~> 1.7, >= 1.7.7)
 | 
					      json (~> 1.7, >= 1.7.7)
 | 
				
			||||||
      rdoc (~> 4.0)
 | 
					      rdoc (~> 4.0)
 | 
				
			||||||
    sexp_processor (4.7.0)
 | 
					 | 
				
			||||||
    sidekiq (4.2.1)
 | 
					    sidekiq (4.2.1)
 | 
				
			||||||
      concurrent-ruby (~> 1.0)
 | 
					      concurrent-ruby (~> 1.0)
 | 
				
			||||||
      connection_pool (~> 2.2, >= 2.2.0)
 | 
					      connection_pool (~> 2.2, >= 2.2.0)
 | 
				
			||||||
| 
						 | 
					@ -317,6 +310,7 @@ GEM
 | 
				
			||||||
      actionpack (>= 4.0)
 | 
					      actionpack (>= 4.0)
 | 
				
			||||||
      activesupport (>= 4.0)
 | 
					      activesupport (>= 4.0)
 | 
				
			||||||
      sprockets (>= 3.0.0)
 | 
					      sprockets (>= 3.0.0)
 | 
				
			||||||
 | 
					    temple (0.7.7)
 | 
				
			||||||
    therubyracer (0.12.2)
 | 
					    therubyracer (0.12.2)
 | 
				
			||||||
      libv8 (~> 3.16.14.0)
 | 
					      libv8 (~> 3.16.14.0)
 | 
				
			||||||
      ref
 | 
					      ref
 | 
				
			||||||
| 
						 | 
					@ -362,7 +356,7 @@ DEPENDENCIES
 | 
				
			||||||
  font-awesome-rails
 | 
					  font-awesome-rails
 | 
				
			||||||
  fuubar
 | 
					  fuubar
 | 
				
			||||||
  goldfinger
 | 
					  goldfinger
 | 
				
			||||||
  haml-rails
 | 
					  hamlit-rails
 | 
				
			||||||
  hiredis
 | 
					  hiredis
 | 
				
			||||||
  htmlentities
 | 
					  htmlentities
 | 
				
			||||||
  http
 | 
					  http
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,10 +5,9 @@
 | 
				
			||||||
= render partial: 'header'
 | 
					= render partial: 'header'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.accounts-grid
 | 
					.accounts-grid
 | 
				
			||||||
  - @followers.each do |f|
 | 
					 | 
				
			||||||
    = render partial: 'grid_card', locals: { account: f }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  - if @followers.empty?
 | 
					  - if @followers.empty?
 | 
				
			||||||
    = render partial: 'nothing_here'
 | 
					    = render partial: 'nothing_here'
 | 
				
			||||||
 | 
					  - else
 | 
				
			||||||
 | 
					    = render partial: 'grid_card', collection: @followers, as: :account
 | 
				
			||||||
 | 
					
 | 
				
			||||||
= will_paginate @followers, pagination_options
 | 
					= will_paginate @followers, pagination_options
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,10 +6,9 @@
 | 
				
			||||||
= render partial: 'header'
 | 
					= render partial: 'header'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.accounts-grid
 | 
					.accounts-grid
 | 
				
			||||||
  - @following.each do |f|
 | 
					 | 
				
			||||||
    = render partial: 'grid_card', locals: { account: f }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  - if @following.empty?
 | 
					  - if @following.empty?
 | 
				
			||||||
    = render partial: 'nothing_here'
 | 
					    = render partial: 'nothing_here'
 | 
				
			||||||
 | 
					  - else
 | 
				
			||||||
 | 
					    = render partial: 'grid_card', collection: @following, as: :account
 | 
				
			||||||
 | 
					
 | 
				
			||||||
= will_paginate @following, pagination_options
 | 
					= will_paginate @following, pagination_options
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,6 @@
 | 
				
			||||||
    = render partial: 'nothing_here'
 | 
					    = render partial: 'nothing_here'
 | 
				
			||||||
- else
 | 
					- else
 | 
				
			||||||
  .activity-stream
 | 
					  .activity-stream
 | 
				
			||||||
    - @statuses.each do |status|
 | 
					    = render partial: 'stream_entries/status', collection: @statuses, as: :status
 | 
				
			||||||
      = render partial: 'stream_entries/status', locals: { status: status }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
= will_paginate @statuses, pagination_options
 | 
					= will_paginate @statuses, pagination_options
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue