mirror of
https://github.com/kemko/liquid.git
synced 2026-01-01 15:55:40 +03:00
Rubocop
This commit is contained in:
@@ -6,7 +6,7 @@ profiler = ThemeRunner.new
|
||||
profiler.run
|
||||
|
||||
[:cpu, :object].each do |profile_type|
|
||||
puts "Profiling in #{profile_type.to_s} mode..."
|
||||
puts "Profiling in #{profile_type} mode..."
|
||||
results = StackProf.run(mode: profile_type) do
|
||||
200.times do
|
||||
profiler.run
|
||||
|
||||
@@ -28,6 +28,6 @@ class CommentForm < Liquid::Block
|
||||
end
|
||||
|
||||
def wrap_in_form(article, input)
|
||||
%Q{<form id="article-#{article.id}-comment-form" class="comment-form" method="post" action="">\n#{input}\n</form>}
|
||||
%(<form id="article-#{article.id}-comment-form" class="comment-form" method="post" action="">\n#{input}\n</form>)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -39,7 +39,7 @@ module Database
|
||||
end
|
||||
end
|
||||
|
||||
if __FILE__ == $0
|
||||
if __FILE__ == $PROGRAM_NAME
|
||||
p Database.tables['collections']['frontpage'].keys
|
||||
#p Database.tables['blog']['articles']
|
||||
# p Database.tables['blog']['articles']
|
||||
end
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
require 'json'
|
||||
|
||||
module JsonFilter
|
||||
|
||||
def json(object)
|
||||
JSON.dump(object.reject {|k,v| k == "collections" })
|
||||
JSON.dump(object.reject { |k, v| k == "collections" })
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
module MoneyFilter
|
||||
|
||||
def money_with_currency(money)
|
||||
return '' if money.nil?
|
||||
sprintf("$ %.2f USD", money/100.0)
|
||||
sprintf("$ %.2f USD", money / 100.0)
|
||||
end
|
||||
|
||||
def money(money)
|
||||
return '' if money.nil?
|
||||
sprintf("$ %.2f", money/100.0)
|
||||
sprintf("$ %.2f", money / 100.0)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -42,23 +42,22 @@ class Paginate < Liquid::Block
|
||||
page_count = (collection_size.to_f / @page_size.to_f).to_f.ceil + 1
|
||||
|
||||
pagination['items'] = collection_size
|
||||
pagination['pages'] = page_count -1
|
||||
pagination['previous'] = link('« Previous', current_page-1 ) unless 1 >= current_page
|
||||
pagination['next'] = link('Next »', current_page+1 ) unless page_count <= current_page+1
|
||||
pagination['pages'] = page_count - 1
|
||||
pagination['previous'] = link('« Previous', current_page - 1) unless 1 >= current_page
|
||||
pagination['next'] = link('Next »', current_page + 1) unless page_count <= current_page + 1
|
||||
pagination['parts'] = []
|
||||
|
||||
hellip_break = false
|
||||
|
||||
if page_count > 2
|
||||
1.upto(page_count-1) do |page|
|
||||
|
||||
1.upto(page_count - 1) do |page|
|
||||
if current_page == page
|
||||
pagination['parts'] << no_link(page)
|
||||
elsif page == 1
|
||||
pagination['parts'] << link(page, page)
|
||||
elsif page == page_count -1
|
||||
elsif page == page_count - 1
|
||||
pagination['parts'] << link(page, page)
|
||||
elsif page <= current_page - @attributes['window_size'] or page >= current_page + @attributes['window_size']
|
||||
elsif page <= current_page - @attributes['window_size'] || page >= current_page + @attributes['window_size']
|
||||
next if hellip_break
|
||||
pagination['parts'] << no_link('…')
|
||||
hellip_break = true
|
||||
@@ -78,11 +77,11 @@ class Paginate < Liquid::Block
|
||||
private
|
||||
|
||||
def no_link(title)
|
||||
{ 'title' => title, 'is_link' => false}
|
||||
{ 'title' => title, 'is_link' => false }
|
||||
end
|
||||
|
||||
def link(title, page)
|
||||
{ 'title' => title, 'url' => current_url + "?page=#{page}", 'is_link' => true}
|
||||
{ 'title' => title, 'url' => current_url + "?page=#{page}", 'is_link' => true }
|
||||
end
|
||||
|
||||
def current_url
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
module ShopFilter
|
||||
|
||||
def asset_url(input)
|
||||
"/files/1/[shop_id]/[shop_id]/assets/#{input}"
|
||||
end
|
||||
@@ -16,16 +15,16 @@ module ShopFilter
|
||||
%(<script src="#{url}" type="text/javascript"></script>)
|
||||
end
|
||||
|
||||
def stylesheet_tag(url, media="all")
|
||||
def stylesheet_tag(url, media = "all")
|
||||
%(<link href="#{url}" rel="stylesheet" type="text/css" media="#{media}" />)
|
||||
end
|
||||
|
||||
def link_to(link, url, title="")
|
||||
%|<a href="#{url}" title="#{title}">#{link}</a>|
|
||||
def link_to(link, url, title = "")
|
||||
%(<a href="#{url}" title="#{title}">#{link}</a>)
|
||||
end
|
||||
|
||||
def img_tag(url, alt="")
|
||||
%|<img src="#{url}" alt="#{alt}" />|
|
||||
def img_tag(url, alt = "")
|
||||
%(<img src="#{url}" alt="#{alt}" />)
|
||||
end
|
||||
|
||||
def link_to_vendor(vendor)
|
||||
@@ -53,7 +52,6 @@ module ShopFilter
|
||||
end
|
||||
|
||||
def product_img_url(url, style = 'small')
|
||||
|
||||
unless url =~ /\Aproducts\/([\w\-\_]+)\.(\w{2,4})/
|
||||
raise ArgumentError, 'filter "size" can only be called on product images'
|
||||
end
|
||||
@@ -69,7 +67,6 @@ module ShopFilter
|
||||
end
|
||||
|
||||
def default_pagination(paginate)
|
||||
|
||||
html = []
|
||||
html << %(<span class="prev">#{link_to(paginate['previous']['title'], paginate['previous']['url'])}</span>) if paginate['previous']
|
||||
|
||||
@@ -106,5 +103,4 @@ module ShopFilter
|
||||
result.gsub!(/\A-+/, '') if result[0] == '-'
|
||||
result
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
module TagFilter
|
||||
|
||||
def link_to_tag(label, tag)
|
||||
"<a title=\"Show tag #{tag}\" href=\"/collections/#{@context['handle']}/#{tag}\">#{label}</a>"
|
||||
end
|
||||
|
||||
def highlight_active_tag(tag, css_class='active')
|
||||
def highlight_active_tag(tag, css_class = 'active')
|
||||
if @context['current_tags'].include?(tag)
|
||||
"<span class=\"#{css_class}\">#{tag}</span>"
|
||||
else
|
||||
@@ -21,5 +20,4 @@ module TagFilter
|
||||
tags = (@context['current_tags'] - [tag]).uniq
|
||||
"<a title=\"Show tag #{tag}\" href=\"/collections/#{@context['handle']}/#{tags.join("+")}\">#{label}</a>"
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
module WeightFilter
|
||||
|
||||
def weight(grams)
|
||||
sprintf("%.2f", grams / 1000)
|
||||
end
|
||||
@@ -7,5 +6,4 @@ module WeightFilter
|
||||
def weight_with_unit(grams)
|
||||
"#{weight(grams)} kg"
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -11,7 +11,6 @@ require_relative 'shopify/database'
|
||||
|
||||
class ThemeRunner
|
||||
class FileSystem
|
||||
|
||||
def initialize(path)
|
||||
@path = path
|
||||
end
|
||||
@@ -38,7 +37,6 @@ class ThemeRunner
|
||||
# Dup assigns because will make some changes to them
|
||||
|
||||
@tests.each do |liquid, layout, template_name|
|
||||
|
||||
tmpl = Liquid::Template.new
|
||||
tmpl.parse(liquid)
|
||||
tmpl = Liquid::Template.new
|
||||
@@ -46,20 +44,17 @@ class ThemeRunner
|
||||
end
|
||||
end
|
||||
|
||||
def run
|
||||
def run
|
||||
# Dup assigns because will make some changes to them
|
||||
assigns = Database.tables.dup
|
||||
|
||||
@tests.each do |liquid, layout, template_name|
|
||||
|
||||
# Compute page_tempalte outside of profiler run, uninteresting to profiler
|
||||
page_template = File.basename(template_name, File.extname(template_name))
|
||||
compile_and_render(liquid, layout, assigns, page_template, template_name)
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def compile_and_render(template, layout, assigns, page_template, template_file)
|
||||
tmpl = Liquid::Template.new
|
||||
tmpl.assigns['page_title'] = 'Page title'
|
||||
|
||||
Reference in New Issue
Block a user