dugway 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c231b405dd8a4bf6580a5e7c09027feb22774b7a
-  data.tar.gz: e55aa9df136334d78341b1ae45f029960ba83638
+  metadata.gz: 6f099f817529d66f6c897e1dbe324ba22504e6c2
+  data.tar.gz: 492282f622f2e037fedd35adb918ca0daf6a81fb
 SHA512:
-  metadata.gz: be73796ce8b53718029ac4fdb24ddf52a638b1ab7864ebc96c1d2587c6a4e68842a58ae0b63b3eb58f3abb4850ac6a1a47f3c6a3cdc568d741701bddbc6c5788
-  data.tar.gz: 31c14d6d11316c39eaaf88b3b20421b33f8d595ddd76c2afc6411d8cd327dd445b4984c071d68a0cf304a06980d4a341d993bee122f775b0cd9ebe0860bdc5d3
+  metadata.gz: 8e1fa93b84b030e97db5e17df116a684acad3b13a7b12c08c144b07da996006ae9e03023ea15e45581862a562126446e18e7e8547bd7f76d34032eea825115ff
+  data.tar.gz: 9e33c4385b035813b3a6a00e8f4909d77cf72de867dd255cdf6fbc7ff0d0a96af39361304b308c9ebedff7e49dfe80abc1b7925254868f93df903bdcb0e181da

data/.gitignore

@@ -7,3 +7,5 @@ coverage
 *.gem
 *.tmproj
 *.sublime*
+
+.sass-cache

data/README.md

@@ -1,9 +1,11 @@
-# Dugway [![Build Status](https://travis-ci.org/bigcartel/dugway.png)](https://travis-ci.org/bigcartel/dugway) [![Gem Version](https://badge.fury.io/rb/dugway.png)](http://badge.fury.io/rb/dugway)
+# Dugway [![Build Status](https://travis-ci.org/bigcartel/dugway.png?branch=master)](https://travis-ci.org/bigcartel/dugway) [![Gem Version](https://badge.fury.io/rb/dugway.png)](http://badge.fury.io/rb/dugway)
 
 **_The easy way to build Big Cartel themes._**
 
 Dugway allows you to run your Big Cartel theme on your computer, test it in any browser, write code in your favorite editor, and use fancy new tools like CoffeeScript, Sass, and LESS. It's awesome.
 
+[![Walkthrough](http://cl.ly/image/101e1z3Y3B1w/Screen%20Shot%202013-04-01%20at%205.04.40%20PM.png)](https://vimeo.com/bigcartel/dugway)
+
 ## Disclaimer
 
 **Dugway is a very new project and likely has several bugs, rough edges, and missing features.** If you run into something weird or have a cool idea, see if it's a [known issue](https://github.com/bigcartel/dugway/issues), and otherwise [report it](https://github.com/bigcartel/dugway/issues/new) and we'll do our best to hook you up. Thanks.

data/dugway.gemspec

@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
   s.add_dependency('sass', '~> 3.2.5')
   s.add_dependency('less', '~> 2.2.2')
   s.add_dependency('sprockets', '~> 2.0')
+  s.add_dependency('sprockets-sass', '~> 0.9.1')
+  s.add_dependency('compass', '~> 0.12.2')
   s.add_dependency('httparty', '~> 0.10.0')
   s.add_dependency('better_errors', '~> 0.6.0')
   s.add_dependency('binding_of_caller', '~> 0.7.1')

data/lib/dugway.rb

@@ -29,12 +29,12 @@ module Dugway
       Rack::Builder.app do
         use Rack::Session::Cookie, :secret => 'stopwarningmeaboutnothavingasecret'
         use BetterErrors::Middleware
-        
+
         if options[:log]
           BetterErrors.logger = Dugway.logger
           use Rack::CommonLogger, Dugway.logger
         end
-        
+
         run Application.new
       end
     end
@@ -54,7 +54,7 @@ module Dugway
     def source_dir
       @source_dir ||= File.join(Dir.pwd, 'source')
     end
-    
+
     def logger
       @logger ||= Logger.new
     end

data/lib/dugway/cli/templates/source/cart.html

@@ -1,7 +1,7 @@
 {% if cart.items != blank %}
 
 <form method="post" action="/cart">
-  <ul>
+  <ul class="unstyled">
     {% for item in cart.items %}
     <li>
       <a href="{{ item.product.url }}">

data/lib/dugway/cli/templates/source/contact.html

@@ -1,11 +1,11 @@
 {% if contact.sent %}
 
-<p>Your message has been sent and we&#8217;ll get back to you soon.</p>      
+<p>Your message has been sent and we&#8217;ll get back to you soon.</p>
 
 {% else %}
 
 <form method="post" action="/contact">
-  <ul>
+  <ul class="unstyled">
     <li>
       <label for="name">Name</label>
       {{ contact | contact_input: 'name' }}
@@ -24,9 +24,9 @@
     </li>
     <li>
       <label for="captcha">Spam check</label>
-      <p>Please enter the characters from the image.</p> 
-      <div>{{ contact.captcha }}</div>       
-      {{ contact | contact_input: 'captcha' }}      
+      <p>Please enter the characters from the image.</p>
+      <div>{{ contact.captcha }}</div>
+      {{ contact | contact_input: 'captcha' }}
     </li>
     <li>
       <button type="submit" name="submit" title="Send us an email">Send</button>

data/lib/dugway/cli/templates/source/home.html

@@ -1,8 +1,8 @@
 {% paginate products from products.current by theme.products_per_page %}
 
   {% if products != blank %}
-    <ul>
-      {% for product in products %}  
+    <ul class="unstyled">
+      {% for product in products %}
       <li class="{{ product.css_class }}">
         <a href="{{ product.url }}">
           <img alt="Image of {{ product.name | escape }}" src="{{ product.image | product_image_url size: theme.product_image_size }}">

data/lib/dugway/cli/templates/source/layout.html

@@ -1,19 +1,19 @@
 <!DOCTYPE html>
   <head>
     <title>{{ store.name }} &mdash; {{ page.name }}</title>
-    
+
     <meta charset="utf-8">
     <meta name="description" content="{{ page.meta_description }}">
     <meta name="keywords" content="{{ page.meta_keywords }}">
-    
+
     <link href="{{ theme | theme_css_url }}" media="screen" rel="stylesheet" type="text/css">
-    
+
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
     <script src="{{ theme | theme_js_url }}" type="text/javascript"></script>
-    
+
     {{ head_content }}
   </head>
-  
+
   <body id="{{ page.permalink }}" class="{{ page.category }}">
     <header>
       <a href="/" title="{{ store.name | escape }}">
@@ -24,13 +24,13 @@
         {% endif %}
       </a>
     </header>
-    
+
     <div class="wrap">
       <aside>
         <section>
           <a href="/cart">Cart ({{ cart.total | money_with_sign }})</a>
         </section>
-        
+
         {% if theme.show_search %}
         <section>
           <form action="/products" method="get">
@@ -38,28 +38,28 @@
           </form>
         </section>
         {% endif %}
-        
+
         <nav>
           <h3>Products</h3>
-          <ul>
+          <ul class="unstyled">
             <li><a href="/products">All</a></li>
             {% for category in categories.active %}
             <li>{{ category | link_to }}</li>
             {% endfor %}
           </ul>
-          
+
           {% if artists.active != blank %}
           <h3>Artists</h3>
-          <ul>
+          <ul class="unstyled">
             <li><a href="/products">All</a></li>
             {% for artist in artists.active %}
             <li>{{ artist | link_to }}</li>
             {% endfor %}
           </ul>
           {% endif %}
-          
+
           <h3>Info</h3>
-          <ul>
+          <ul class="unstyled">
             {% for page in pages.all %}
             <li>{{ page | link_to }}</li>
             {% endfor %}
@@ -72,18 +72,18 @@
 
         <cite>{{ bigcartel_credit }}</cite>
       </aside>
-      
+
       <section class="content">
         <h1>{{ page.name }}</h1>
 
         {% if errors != blank %}
-        <ul class="errors">
+        <ul class="unstyled errors">
           {% for error in errors %}
           <li>{{ error }}</li>
           {% endfor %}
         </ul>
         {% endif %}
-        
+
         {% if page.category == 'custom' %}
           {{ page_content | paragraphs }}
         {% else %}
@@ -91,11 +91,11 @@
         {% endif %}
       </section>
     </div>
-    
+
     <footer>
       {% if theme.twitter_username != blank %}
       <p><a href="http://twitter/{{ theme.twitter_username }}">Follow @{{ theme.twitter_username }}</a></p>
-      {% endif %}      
+      {% endif %}
     </footer>
   </body>
 </html>

data/lib/dugway/cli/templates/source/product.html

@@ -1,8 +1,8 @@
 <section class="product_images">
   <img src="{{ product.image | product_image_url }}" alt="Image of {{ product.name | escape }}" class="primary_image">
-  
+
   {% if product.images.size > 1 %}
-  <ul>
+  <ul class="unstyled">
     {% for image in product.images %}
     <li{% if forloop.first %} class="selected"{% endif %}><a href="{{ image | product_image_url }}"><img src="{{ image | product_image_url size:"thumb" }}" alt="Image of {{ product.name | escape }}"></a></li>
     {% endfor %}
@@ -13,18 +13,18 @@
 <section>
   <aside>
     {% case product.status %}
-      
+
       {% when 'sold-out' %}
         <h5>{{ product.default_price | money_with_sign }} <em>Sold Out</em></h5>
 
       {% when 'coming-soon' %}
         <h5>{{ product.default_price | money_with_sign }} <em>Coming Soon</em></h5>
 
-      {% when 'active' %}    
+      {% when 'active' %}
         <h5>{{ product.default_price | money_with_sign }}{% if product.on_sale %} <em>On Sale{% endif %}</em></h5>
         <h5>Availability</h5>
-        
-        <ul class="availability">
+
+        <ul class="unstyled availability">
           {% for option in product.options %}
           <li>
             {% unless product.has_default_option %}<span>{{ option.name }}</span>{% endunless %}
@@ -35,16 +35,16 @@
           </li>
           {% endfor %}
         </ul>
-        
+
         <form method="post" action="/cart">
-          {% if product.has_default_option %}    
+          {% if product.has_default_option %}
           {{ product.option | hidden_option_input }}
           {% else %}
           <div>
           {{ product.options_in_stock | options_select }}
-          </div>      
+          </div>
           {% endif %}
-          
+
           <button name="submit" type="submit" title="Add to Cart">Add to Cart</button>
         </form>
     {% endcase %}
@@ -57,10 +57,10 @@
     {% elsif forloop.last %}
       <h5>and {{ artist.name }}</h5>
     {% else %}
-      <h5>{{ artist.name }}</h5>, 
+      <h5>{{ artist.name }}</h5>,
     {% endif %}
   {% endfor %}
-  
+
   {% if product.description != blank %}
     {{ product.description | paragraphs }}
   {% endif %}

data/lib/dugway/cli/templates/source/products.html

@@ -1,8 +1,8 @@
 {% paginate products from products.current by theme.products_per_page %}
 
 {% if products != blank %}
-<ul>
-  {% for product in products %}  
+<ul class="unstyled">
+  {% for product in products %}
   <li class="{{ product.css_class }}">
     <a href="{{ product.url }}">
       <img alt="Image of {{ product.name | escape }}" src="{{ product.image | product_image_url size: theme.product_image_size }}">
@@ -22,4 +22,4 @@
 <p>No products found.</p>
 {% endif %}
 
-{% endpaginate %}
+{% endpaginate %}

data/lib/dugway/cli/templates/source/styles.css

@@ -14,7 +14,7 @@
  * ------------------------------------------------------------------------------------------------
  */
 
-/* 
+/*
  * Here we're including a 3rd-party stylesheet we put in stylesheets/vendor written in normal CSS,
  * as well as a few custom Sass stylesheets we've written for different areas of the store
  *

data/lib/dugway/cli/templates/source/stylesheets/_config.css.sass

@@ -0,0 +1,2 @@
+$marginSize: 30px
+$border: dashed 1px #ddd

data/lib/dugway/cli/templates/source/stylesheets/layout.css.sass

@@ -1,5 +1,4 @@
-$marginSize: 30px
-$border: dashed 1px #ddd
+@import 'config'
 
 body
   background: {{ theme.background_color }}
@@ -14,8 +13,19 @@ a
   &:hover
     color: #60AA85
 
+ul
+  list-style-type: disc
+
+ol
+  list-style-type: decimal
+
 ul, ol
-  list-style: none
+  margin-left: $marginSize
+
+ul.unstyled,
+ol.unstyled
+  list-style-type: none
+  margin-left: 0
   padding: 0
 
 header
@@ -48,7 +58,7 @@ aside
   section
     margin-bottom: 1.5em
 
-  ul 
+  ul
     margin-bottom: 1.5em
     margin-top: 0
 
@@ -100,4 +110,4 @@ form
     background: #D97576
     border-bottom: 1px soldi #A65A5A
     color: #fff
-    padding: 3px 10px
+    padding: 3px 10px

data/lib/dugway/cli/templates/source/stylesheets/products.css.sass

@@ -1,20 +1,25 @@
-$marginSize: 30px
-$border: dashed 1px #ddd
+@import 'config'
 
 body#home, body#products
   section.content
     ul
+      list-style-type: none
       overflow: hidden
-    
+
     li.product
+      box-sizing: border-box
       float: left
-      margin-bottom: $marginSize 
-      margin-right: $marginSize
+      padding-bottom: $marginSize
+      padding-right: $marginSize
+      max-width: 30%
+
+      &:nth-child(3n+1)
+        clear: left
 
     img
       display: block
       margin-bottom: $marginSize / 2
+      max-width: 100%
 
     div.pagination
       clear: both
-

data/lib/dugway/theme.rb

@@ -2,6 +2,8 @@ require 'coffee-script'
 require 'sass'
 require 'less'
 require 'sprockets'
+require 'sprockets-sass'
+require 'compass'
 require 'uglifier'
 
 module Dugway
@@ -99,6 +101,8 @@ module Dugway
         sprockets = Sprockets::Environment.new
         sprockets.append_path source_dir
 
+        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.
 

data/lib/dugway/version.rb

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

data/spec/fixtures/theme/stylesheets/_partial.css

@@ -0,0 +1 @@
+$color: #0f0;

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

@@ -1,4 +1,7 @@
+@import 'partial'
+
 $link_color: {{ theme.link_color }}
 
 a
+  background: $color
   color: $link_color

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{color:red;}/**/}
+      theme.file_content('styles.css').gsub(/\s+/, '').should == %{html,body{height:100%;}a{background:lime;color:red;}/**/}
     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{color:{{theme.link_color}};}/**/}
+      theme.build_file('styles.css').gsub(/\s+/, '').should == %{html,body{height:100%;}a{background:lime;color:{{theme.link_color}};}/**/}
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -417,6 +445,7 @@ files:
 - lib/dugway/cli/templates/source/scripts.js
 - lib/dugway/cli/templates/source/settings.json
 - lib/dugway/cli/templates/source/styles.css
+- lib/dugway/cli/templates/source/stylesheets/_config.css.sass
 - lib/dugway/cli/templates/source/stylesheets/cart.css.sass
 - lib/dugway/cli/templates/source/stylesheets/layout.css.sass
 - lib/dugway/cli/templates/source/stylesheets/product.css.sass
@@ -503,6 +532,7 @@ files:
 - spec/fixtures/theme/scripts.js
 - spec/fixtures/theme/settings.json
 - spec/fixtures/theme/styles.css
+- spec/fixtures/theme/stylesheets/_partial.css
 - spec/fixtures/theme/stylesheets/one.css
 - spec/fixtures/theme/stylesheets/two.css.sass
 - spec/fixtures/theme/success.html
@@ -577,6 +607,7 @@ test_files:
 - spec/fixtures/theme/scripts.js
 - spec/fixtures/theme/settings.json
 - spec/fixtures/theme/styles.css
+- spec/fixtures/theme/stylesheets/_partial.css
 - spec/fixtures/theme/stylesheets/one.css
 - spec/fixtures/theme/stylesheets/two.css.sass
 - spec/fixtures/theme/success.html