dugway 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f099f817529d66f6c897e1dbe324ba22504e6c2
-  data.tar.gz: 492282f622f2e037fedd35adb918ca0daf6a81fb
+  metadata.gz: 4aa4d00f294e385c239b2ca19ac986ab92d7343e
+  data.tar.gz: 339a42084c991bfd813c67ea32ef849bb7a140f3
 SHA512:
-  metadata.gz: 8e1fa93b84b030e97db5e17df116a684acad3b13a7b12c08c144b07da996006ae9e03023ea15e45581862a562126446e18e7e8547bd7f76d34032eea825115ff
-  data.tar.gz: 9e33c4385b035813b3a6a00e8f4909d77cf72de867dd255cdf6fbc7ff0d0a96af39361304b308c9ebedff7e49dfe80abc1b7925254868f93df903bdcb0e181da
+  metadata.gz: d835a5519e9758ab24d58ef2599f82a9d998f561fc054fd7b87d818016a025b2c0cea4927bb2dd188924cab8f9e951197cb3671b2bf7be856706eb2ffe51bb0b
+  data.tar.gz: ea7107d656188add5161e929886940cdfb2b15169ddd82723430d2138cb24502a348500b66c610e0e04fc9874ec3f5efa66ee2e56311c494a642bb1c34cfb7c5

data/README.md

@@ -76,9 +76,11 @@ All CSS for your theme is handled by the **styles.css** file, and all JavaScript
     //= require javascripts/example_1
     //= require javascripts/example_2
 
-#### Using Sass, LESS, and CoffeeScript
+#### Using Sass, Compass, LESS, and CoffeeScript
 
-Sprockets also allows you to use [Sass](http://sass-lang.com) in your separate files by appending the **.sass** or **.scss** extension after **.css**. Prefer [LESS](http://lesscss.org)? No problem, just append the **.less** extension instead. For you JavaScript folks, you can use [CoffeeScript](http://coffeescript.org) in your separate files by appending the **.coffee** extension after **.js**.
+Sprockets also allows you to use [Sass](http://sass-lang.com) in your separate files by appending the **.sass** or **.scss** extension after **.css**. You can even use [Compass](http://compass-style.org/) right out of the box to help author your stylesheets by utilizing its mixins for CSS3, typography, and its utilities. Prefer [LESS](http://lesscss.org)? No problem, just append the **.less** extension instead.
+
+For you JavaScript folks, you can use [CoffeeScript](http://coffeescript.org) in your separate files by appending the **.coffee** extension after **.js**.
 
 #### Embedding CSS & JavaScript
 

data/lib/dugway/liquid/filters/core_filters.rb

@@ -18,8 +18,8 @@ module Dugway
       end
 
       def paragraphs(text)
-        tags   = '(table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|input|p|h[1-6]|hr|script|embed|object|param|code|center|dir|fieldset|menu|noframes|noscript|frameset|applet|button|del|iframe|ins)' 
-        text   = text.to_s.gsub(/\r\n?/, "\n") # \r\n and \r -> \n          
+        tags   = '(table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|input|p|h[1-6]|hr|script|embed|object|param|code|center|dir|fieldset|menu|noframes|noscript|frameset|applet|button|del|iframe|ins)'
+        text   = text.to_s.gsub(/\r\n?/, "\n") # \r\n and \r -> \n
         blocks = text.split(/\n\n+/) # split on double newlines
         blocks.inject('') do | result, block |
           block.strip!
@@ -75,10 +75,10 @@ module Dugway
         option_tags = options.inject('') { |t,o| t += option_tag((o['name'] + (o['has_custom_price'] ? " - #{ money_with_sign(o['price']) }" : '')), o['id']) }
         select_tag('cart[add][id]', option_tags, { :id => id, :class => class_name })
       end
-      
+
       def options_radio(options, id = 'option', class_name = nil)
         list = ''
-        
+
         for o in options
           list += '<li>'
           list += radio_button_tag('cart[add][id]', o['id'], o['default'], { :id => "option_#{o['id']}", :class => class_name })
@@ -87,7 +87,7 @@ module Dugway
           list += %{</label>}
           list += '</li>'
         end
-        
+
         %{<ul id="#{id}">#{list}</ul>}
       end
 
@@ -100,13 +100,14 @@ module Dugway
       end
 
       def country_select(country, label = 'Select your country...', id = 'country', class_name = nil)
-        found     = false
-        countries = [[label, ''], ['------------',''], [country['name'], country['id']], ['------------','']] + Country.options
-        options   = countries.inject('') do |t,c|
-          select  = !found && c[1] == cart.country_id
-          found   = true if select
-          t += option_tag(c[0], c[1], select)
+        divider = '------------'
+        countries = [label, divider, country['name'], divider, 'Åland Islands', 'Afghanistan', 'Albania', 'Algeria', 'American Samoa', 'Andorra', 'Angola', 'Anguilla', 'Antarctica', 'Antigua And Barbuda', 'Argentina', 'Armenia', 'Aruba', 'Australia', 'Austria', 'Azerbaijan', 'Bahamas', 'Bahrain', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin', 'Bermuda', 'Bhutan', 'Bolivia', 'Bosnia and Herzegovina', 'Botswana', 'Bouvet Island', 'Brazil', 'British Indian Ocean Territory', 'British Virgin Islands', 'Brunei Darussalam', 'Bulgaria', 'Burkina Faso', 'Burundi', 'Cambodia', 'Cameroon', 'Canada', 'Cape Verde', 'Cayman Islands', 'Central African Republic', 'Chad', 'Chile', 'China', 'Christmas Island', 'Cocos (Keeling) Islands', 'Colombia', 'Comoros', 'Congo', 'Cook Islands', 'Costa Rica', 'Croatia (Hrvatska)', 'Cuba', 'Cyprus', 'Czech Republic', 'Democratic Republic of the Congo', 'Denmark', 'Djibouti', 'Dominica', 'Dominican Republic', 'East Timor', 'Ecuador', 'Egypt', 'El Salvador', 'Equatorial Guinea', 'Eritrea', 'Estonia', 'Ethiopia', 'Falkland Islands (Malvinas)', 'Faroe Islands', 'Fiji', 'Finland', 'France', 'France, Metropolitan', 'French Guiana', 'French Polynesia', 'French Southern Territories', 'Gabon', 'Gambia', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Greece', 'Greenland', 'Grenada', 'Guadeloupe', 'Guam', 'Guatemala', 'Guernsey', 'Guinea', 'Guinea-Bissau', 'Guyana', 'Haiti', 'Heard and McDonald Islands', 'Honduras', 'Hong Kong', 'Hungary', 'Iceland', 'India', 'Indonesia', 'Iran', 'Iraq', 'Ireland', 'Isle of Man', 'Israel', 'Italy', 'Jamaica', 'Japan', 'Jersey', 'Jordan', 'Kazakhstan', 'Kenya', 'Kiribati', 'Kuwait', 'Kyrgyzstan (Kyrgyz Republic)', 'Laos', 'Latvia', 'Lebanon', 'Lesotho', 'Liberia', 'Libya', 'Liechtenstein', 'Lithuania', 'Luxembourg', 'Macau', 'Macedonia', 'Madagascar', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Marshall Islands', 'Martinique', 'Mauritania', 'Mauritius', 'Mayotte', 'Mexico', 'Micronesia', 'Moldova', 'Monaco', 'Mongolia', 'Montserrat', 'Morocco', 'Mozambique', 'Myanmar', 'Namibia', 'Nauru', 'Nepal', 'Netherlands', 'Netherlands Antilles', 'Neutral Zone (Saudia Arabia/Iraq)', 'New Caledonia', 'New Zealand', 'Nicaragua', 'Niger', 'Nigeria', 'Niue', 'Norfolk Island', 'Northern Mariana Islands', 'Norway', 'Oman', 'Pakistan', 'Palau', 'Palestine', 'Panama', 'Papua New Guinea', 'Paraguay', 'Peru', 'Philippines', 'Pitcairn', 'Poland', 'Portugal', 'Puerto Rico', 'Qatar', 'Reunion', 'Romania', 'Russian Federation', 'Rwanda', 'S. Georgia and S. Sandwich Isls.', 'Saint Kitts and Nevis', 'Saint Lucia', 'Saint Vincent and The Grenadines', 'Samoa', 'San Marino', 'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Seychelles', 'Sierra Leone', 'Singapore', 'Slovakia (Slovak Republic)', 'Slovenia', 'Solomon Islands', 'Somalia', 'South Africa', 'South Korea', 'Soviet Union (former)', 'Spain', 'Sri Lanka', 'St. Helena', 'St. Pierre and Miquelon', 'Sudan', 'Suriname', 'Svalbard and Jan Mayen Islands', 'Swaziland', 'Sweden', 'Switzerland', 'Syria', 'Taiwan', 'Tajikistan', 'Tanzania', 'Thailand', 'Timore-Leste', 'Togo', 'Tokelau', 'Tonga', 'Trinidad and Tobago', 'Tunisia', 'Turkey', 'Turkmenistan', 'Turks and Caicos Islands', 'Tuvalu', 'Uganda', 'Ukraine', 'United Arab Emirates', 'United Kingdom', 'United States', 'United States Minor Outlying Islands', 'Uruguay', 'Uzbekistan', 'Vanuatu', 'Vatican City State (Holy See)', 'Venezuela', 'Viet Nam', 'Virgin Islands (US)', 'Wallis and Futuna Islands', 'Western Sahara', 'Yemen', 'Yugoslavia', 'Zaire', 'Zambia', 'Zimbabwe']
+
+        options = countries.inject('') do |t, c|
+          v = c == label || c == divider ? '' : Digest::SHA1.hexdigest(c) # give it a random ID that'll be consistent
+          t += option_tag(c, v)
         end
+
         select_tag('cart[country_id]', options, { :id => id, :class => class_name })
       end
 
@@ -134,7 +135,7 @@ module Dugway
       def contact_tab_index
         @contact_tab_index ||= 0
         @contact_tab_index += 1
-      end  
+      end
     end
   end
 end

data/lib/dugway/liquifier.rb

@@ -14,17 +14,10 @@ Liquid::Template.register_tag(:paginate, Dugway::Tags::Paginate)
 
 module Dugway
   class Liquifier
-    ESCAPE_CSS = {
-      '{{' => '"<<',
-      '}}' => '>>"',
-      '{%' => '"<',
-      '%}' => '">'
-    }
-    
     def initialize(request)
       @request = request
     end
-    
+
     def render(content, variables={})
       variables.symbolize_keys!
 
@@ -44,24 +37,14 @@ module Dugway
       context = Liquid::Context.new([ assigns, shared_context ], {}, registers)
       Liquid::Template.parse(content).render!(context)
     end
-    
+
     def self.render_styles(css)
       Liquid::Template.parse(css).render!(
-        { 'theme' => Drops::ThemeDrop.new(Dugway.theme.customization) }, 
+        { 'theme' => Drops::ThemeDrop.new(Dugway.theme.customization) },
         :registers => { :settings => Dugway.theme.settings }
       )
     end
-    
-    def self.escape_styles(css)
-      ESCAPE_CSS.each_pair { |k,v| css.gsub!(k,v) }
-      css
-    end
-    
-    def self.unescape_styles(css)
-      ESCAPE_CSS.each_pair { |k,v| css.gsub!(v,k) }
-      css
-    end
-    
+
     private
 
     def store
@@ -79,7 +62,7 @@ module Dugway
     def shared_context
       @shared_context ||= { 'errors' => [] }
     end
-    
+
     def shared_assigns
       {
         'store' => Drops::AccountDrop.new(store.account),
@@ -94,7 +77,7 @@ module Dugway
         'bigcartel_credit' => bigcartel_credit
       }
     end
-    
+
     def shared_registers
       {
         :request => @request,
@@ -103,18 +86,18 @@ module Dugway
         :currency => store.currency,
         :settings => theme.settings
       }
-    end    
-    
+    end
+
     def head_content
       content = %{<meta name="generator" content="Big Cartel">}
-      
+
       if google_font_url = ThemeFont.google_font_url_for_theme
         content << %{\n<link rel="stylesheet" type="text/css" href="#{ google_font_url }">}
       end
-      
+
       content
     end
-    
+
     def bigcartel_credit
       '<a href="http://bigcartel.com/" title="Start your own store at Big Cartel now">Online Store by Big Cartel</a>'
     end

data/lib/dugway/theme.rb

@@ -103,23 +103,8 @@ module Dugway
 
         Sprockets::Sass.options[:line_comments] = false
 
-        # CSS engines like Sass and LESS choke on Liquid variables, so here we render the Liquid
-        # if we're viewing the file, or escape and unescape it if we're building the file.
-
         sprockets.register_preprocessor 'text/css', :liquifier do |context, data|
-          if @building
-            Liquifier.escape_styles(data)
-          else
-            Liquifier.render_styles(data)
-          end
-        end
-
-        sprockets.register_postprocessor 'text/css', :liquifier do |context, data|
-          if @building
-            Liquifier.unescape_styles(data)
-          else
-            data
-          end
+          @building ? data : Liquifier.render_styles(data)
         end
 
         sprockets

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/spec/features/page_rendering_spec.rb

@@ -59,6 +59,7 @@ feature 'Page rendering' do
     visit '/styles.css'
     expect(page).to have_content('height: 100%;') # one.css
     expect(page).to have_content('color: red;') # two.css.sass
+    expect(page).to have_content('url(/images/bc_badge.png)') # two.css.sass
   end
 
   scenario 'scripts.js' do

data/spec/fixtures/theme/stylesheets/two.css.sass

@@ -1,7 +1,10 @@
 @import 'partial'
 
-$link_color: {{ theme.link_color }}
+$link_color: #{"{{ theme.link_color }}"}
 
 a
   background: $color
   color: $link_color
+
+footer cite a
+  background: url(#{"{{ 'bc_badge.png' | theme_image_url }}"}) no-repeat

data/spec/units/dugway/theme_spec.rb

@@ -80,7 +80,7 @@ describe Dugway::Theme do
     end
 
     it "should sprocketize and liquify styles.css" do
-      theme.file_content('styles.css').gsub(/\s+/, '').should == %{html,body{height:100%;}a{background:lime;color:red;}/**/}
+      theme.file_content('styles.css').gsub(/\s+/, '').should == %{html,body{height:100%;}a{background:lime;color:red;}footercitea{background:url(/images/bc_badge.png)no-repeat;}/**/}
     end
   end
 
@@ -96,7 +96,7 @@ describe Dugway::Theme do
     end
 
     it "should sprocketize and not liquify styles.css" do
-      theme.build_file('styles.css').gsub(/\s+/, '').should == %{html,body{height:100%;}a{background:lime;color:{{theme.link_color}};}/**/}
+      theme.build_file('styles.css').gsub(/\s+/, '').should == %{html,body{height:100%;}a{background:lime;color:{{theme.link_color}};}footercitea{background:url({{'bc_badge.png'|theme_image_url}})no-repeat;}/**/}
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler