dugway 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826b2f5eb8927caa43d20178107cad6e51811bb4
-  data.tar.gz: 04baf16d2887144b19ae7664f7079df41f496577
+  metadata.gz: c7dcecd0162a10e803937e86ecc97601bf6ee155
+  data.tar.gz: 2586fa50d420763edfea6fe51effea36382efd50
 SHA512:
-  metadata.gz: 3c1e3f431703966b86aedb8e8291c0b8d315e28e6f60f54577d589704dc6214f0bed02eb125776816abe59c94149accae6e16a1dd189cef86216292434e95de3
-  data.tar.gz: f596dfb2520ea4f54e306c6b28ca94f676b6b1b789f1250b1676c417099c4e7593c19db3798e7b3775898cbf0b9a7f2d870c1be930d90ef42ae9371510b5b0e6
+  metadata.gz: 41f5dc95f6de48a0617e8cb684cb5a017d0780e872d670ef1f9da81c186cd968ccf1599dc4a5796eff931b3cb70bd5abc00484ee6503b4b33ae90adde4f69477
+  data.tar.gz: 8da215f70a623699c2907b8cf1a08efae0b5b0114650621310ea4534519f70d3eccfe49f9a38c4ae8df640da70307c515f799f866e934b99c014859054e9ad9b

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
+  - 2.2
 notifications:
   email: false

data/README.md

@@ -2,23 +2,33 @@
 
 **_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.
+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.
-
-### Known Issues & Limitations
-
-* *You can't currently upload a Dugway build/zip to Big Cartel.* This is next on our list, and is what we built Dugway in preparation for. For now you'll still need to copy/paste theme pages individually in the Big Cartel admin, and host images, fonts, and JavaScript assets separately.
-* *Big Cartel doesn't currently support custom settings.json.* Since we don't support fully uploadable themes yet (as mentioned above), you can't currently use a custom settings.json. For now you'll need to base your theme off of one of our [default themes](https://github.com/bigcartel-themes) and its settings.json.
-* *Dugway doesn't currently support all discounts and shipping features.* For now it's best to test those with a live store so it can interact with actual discount and shipping information.
+## Known Issues & Limitations
+
+* *You can't currently upload a Dugway build/zip to Big Cartel.* This is next
+  on our list, and is what we built Dugway in preparation for. For now you'll
+  still need to copy/paste theme pages individually in the Big Cartel admin,
+  and host images, fonts, and JavaScript assets separately.
+* *Big Cartel doesn't currently support custom settings.json.* Since we don't
+  support fully uploadable themes yet (as mentioned above), you can't currently
+  use a custom settings.json. For now you'll need to base your theme off of one
+  of our [default themes](https://github.com/bigcartel-themes) and its
+  settings.json.
+* *Dugway doesn't currently support all discounts and shipping features.* For
+  now it's best to test those with a live store so it can interact with actual
+  discount and shipping information.
 
 ## Install
 
-Dugway is Ruby gem so you'll need to have Ruby 1.9.3+ installed. Ruby is usually pre-installed on Mac OS X and Linux, and Windows users can install it using [RubyInstaller](http://rubyinstaller.org). From there, simply install the **dugway** gem from the terminal.
+Dugway is Ruby gem so you'll need to have Ruby 2.0+ installed. Ruby is
+usually pre-installed on Mac OS X and Linux, and Windows users can install it
+using [RubyInstaller](http://rubyinstaller.org). From there, simply install the
+**dugway** gem from the terminal.
 
 ```
 gem install dugway
@@ -32,7 +42,8 @@ With Dugway installed, you can now create a new theme, simply give it a name.
 dugway create mytheme
 ```
 
-This will create a new directory named *mytheme* that contains a few configuration files and a starter theme to get you going.
+This will create a new directory named *mytheme* that contains a few
+configuration files and a starter theme to get you going.
 
 ```
 mytheme
@@ -67,15 +78,30 @@ All of the assets and source code for your theme goes in the **source** director
 
 ### HTML
 
-Develop the HTML for your theme using our [Theme API](http://help.bigcartel.com/developers/themes/). Barebones versions of all of the required HTML pages for your theme are provided by default, so feel free to expand on those or replace them entirely.
+Develop the HTML for your theme using our [Theme
+API](http://help.bigcartel.com/developers/themes/). Barebones versions of all
+of the required HTML pages for your theme are provided by default, so feel free
+to expand on those or replace them entirely. Note that the **checkout.html**
+and **success.html** pages are only used when
+[PayPal Standard checkout](https://help.bigcartel.com/basics/settings/#paypal-standard) is enabled.
 
 ### CSS & JavaScript
 
-All CSS for your theme is handled by the **theme.css** file, and all JavaScript by **theme.js**. If you don't have much CSS or JavaScript, or you're just a glutton for punishment, you could simply put all of your code in these two files. However, we recommend you use [Sprockets](#using-sprockets) to break your code into multiple files in separate directories.
+All CSS for your theme is handled by the **theme.css** file, and all JavaScript
+by **theme.js**. If you don't have much CSS or JavaScript, or you're just a
+glutton for punishment, you could simply put all of your code in these two
+files. However, we recommend you use [Sprockets](#using-sprockets) to break
+your code into multiple files in separate directories.
 
 #### Using Sprockets
 
-[Sprockets](https://github.com/sstephenson/sprockets) allows you to bring in CSS and JavaScript from different directories into a single file. We've created **stylesheets** and **javascripts** directories by default that you can put your code in, but you could delete those and put files anywhere you'd like. After that, use [Sprockets directives](https://github.com/sstephenson/sprockets#the-directive-processor) to package them into **theme.css** and **theme.js**.
+[Sprockets](https://github.com/sstephenson/sprockets) allows you to bring in
+CSS and JavaScript from different directories into a single file. We've created
+**stylesheets** and **javascripts** directories by default that you can put
+your code in, but you could delete those and put files anywhere you'd like.
+After that, use [Sprockets
+directives](https://github.com/sstephenson/sprockets#the-directive-processor)
+to package them into **theme.css** and **theme.js**.
 
 ##### theme.css
 
@@ -95,39 +121,59 @@ All CSS for your theme is handled by the **theme.css** file, and all JavaScript
 
 #### Using Sass, Compass, LESS, and CoffeeScript
 
-Dugway 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.
+Dugway 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, you'll just need to create a [Gemfile like this one](https://gist.github.com/ihearithurts/5569898) in the root directory of your theme, run ```bundle install```, and append the **.less** extension to your CSS files.
+Prefer [LESS](http://lesscss.org)? No problem, you'll just need to create a
+[Gemfile like this one](https://gist.github.com/mattwigham/5569898) in the
+root directory of your theme, run ```bundle install```, and append the
+**.less** extension to your CSS files.
 
-And finally, for you JavaScript folks, we've baked [CoffeeScript](http://coffeescript.org) support right in. Just append the **.coffee** extension after **.js** to your separate JS files.
+And finally, for you JavaScript folks, we've baked
+[CoffeeScript](http://coffeescript.org) support right in. Just append the
+**.coffee** extension after **.js** to your separate JS files.
 
 #### Embedding CSS & JavaScript
 
-You can embed the CSS and JavaScript into your theme by passing the theme variable to the [theme_css_url](http://help.bigcartel.com/developers/themes/#themecssurltheme) and [theme_js_url](http://help.bigcartel.com/developers/themes/#themejsurlname) filters.
+You can embed the CSS and JavaScript into your theme by passing the theme
+variable to the
+[theme_css_url](http://help.bigcartel.com/developers/themes/#themecssurltheme)
+and [theme_js_url](http://help.bigcartel.com/developers/themes/#themejsurlname)
+filters.
 
 ##### CSS (theme.css)
 
-```html
-<link href="{{ theme | theme_css_url }}" media="screen" rel="stylesheet" type="text/css">
-```
+```html <link href="{{ theme | theme_css_url }}" media="screen"
+rel="stylesheet" type="text/css"> ```
 
 ##### JavaScript (theme.js)
 
-```html
-<script src="{{ theme | theme_js_url }}" type="text/javascript"></script>
-```
+```html <script src="{{ theme | theme_js_url }}"
+type="text/javascript"></script> ```
 
 ### Images
 
-And as you've probably guessed by now, all images for your theme go in the **images** directory. You can reference an image in your code by passing its name to the [theme_image_url](http://help.bigcartel.com/developers/themes/#themeimageurlname) filter.
+And as you've probably guessed by now, all images for your theme go in the
+**images** directory. You can reference an image in your code by passing its
+name to the
+[theme_image_url](http://help.bigcartel.com/developers/themes/#themeimageurlname)
+filter.
 
-```
-{{ 'sample.png' | theme_image_url }}
-```
+``` {{ 'sample.png' | theme_image_url }} ```
 
 ### Fonts
 
-Fonts work more or less the same as images. Place font files (say if you have created a custom icon font) in the **fonts** directory. Reference them by passing its name to the `theme_font_url` filter. Please be aware of licensing restrictions. If you're using a font from a forge and don't have permission to host the files directly or have restrictions about only making them available to certain domains, you will need to use another mechanism for hosting your fonts. Any font uploaded as part of a Dugway bundle will essentialy be publicly available and not CORS-restricted to specific domains.
+Fonts work more or less the same as images. Place font files (say if you have
+created a custom icon font) in the **fonts** directory. Reference them by
+passing its name to the `theme_font_url` filter. Please be aware of licensing
+restrictions. If you're using a font from a forge and don't have permission to
+host the files directly or have restrictions about only making them available
+to certain domains, you will need to use another mechanism for hosting your
+fonts. Any font uploaded as part of a Dugway bundle will essentialy be publicly
+available and not CORS-restricted to specific domains.
 
 ```
 {{ 'myfont.woff' | theme_font_url }}
@@ -135,31 +181,46 @@ Fonts work more or less the same as images. Place font files (say if you have cr
 
 ### Settings
 
-Set your theme's name, version, and customizable options in the **settings.json** file. We'll be documenting more about this soon, but for now see the starter file generated for you, and check out our [default themes](https://github.com/bigcartel-themes).
+Set your theme's name, version, and customizable options in the
+**settings.json** file. We'll be documenting more about this soon, but for now
+see the starter file generated for you, and check out our [default
+themes](https://github.com/bigcartel-themes).
 
 ## Running your theme
 
 Run your theme in any browser by starting the Dugway server:
 
-```
-dugway server
-```
+``` dugway server ```
 
-By default this will serve your theme at http://0.0.0.0:9292. You can then stop the server by hitting CTRL+C.
+By default this will serve your theme at http://0.0.0.0:9292. You can then stop
+the server by hitting CTRL+C.
 
 ### Pow
 
-Tired of all the manual starting and stopping? Good news, Dugway is built on top of Rack, which means you can use [Pow](http://pow.cx) on Mac. This also allows you to access your theme at a pretty URL like _mytheme.dev_.
+Tired of all the manual starting and stopping? Good news, Dugway is built on
+top of Rack, which means you can use [Pow](http://pow.cx) on Mac. This also
+allows you to access your theme at a pretty URL like _mytheme.dev_.
 
 ## Testing your theme
 
-Part of building a great theme is making sure it works well in a variety of contexts and with a variety of content. Dugway makes it easy to test your theme's versatility by utilizing the **.dugway.json** file. This file will be specific to your computer for your own testing, and shouldn't be checked into source control.
+Part of building a great theme is making sure it works well in a variety of
+contexts and with a variety of content. Dugway makes it easy to test your
+theme's versatility by utilizing the **.dugway.json** file. This file will be
+specific to your computer for your own testing, and shouldn't be checked into
+source control.
 
-*Note:* changing **.dugway.json** will require you to restart the [server](#running-your-theme).
+*Note:* changing **.dugway.json** will require you to restart the
+[server](#running-your-theme).
 
 ### Store content
 
-The best way to see your theme under a different light is by previewing it with a different store's products, categories, pages, currency, and other content. To do this, simply set the **store.subdomain** variable in **.dugway.json** to any Big Cartel store's subdomain, and Dugway will bring in their content using the standard [Big Cartel API](http://help.bigcartel.com/developers/api/). By default we use **dugway** for [dugway.bigcartel.com](http://dugway.bigcartel.com).
+The best way to see your theme under a different light is by previewing it with
+a different store's products, categories, pages, currency, and other content.
+To do this, simply set the **store.subdomain** variable in **.dugway.json** to
+any Big Cartel store's subdomain, and Dugway will bring in their content using
+the standard [Big Cartel API](http://help.bigcartel.com/developers/api/). By
+default we use **dugway** for
+[dugway.bigcartel.com](http://dugway.bigcartel.com).
 
 ```json
 "store": {
@@ -171,7 +232,11 @@ The best way to see your theme under a different light is by previewing it with
 
 ### Store customization
 
-Another important thing to consider is how store owners will customize your theme. You establish what can be customized in your [settings.json](#settings) file, and Dugway allows you to simulate potential values people could choose by setting them in the **customization** variable in **.dugway.json**. By default we use the **default** values from your **[settings.json](#settings)** file.
+Another important thing to consider is how store owners will customize your
+theme. You establish what can be customized in your [settings.json](#settings)
+file, and Dugway allows you to simulate potential values people could choose by
+setting them in the **customization** variable in **.dugway.json**. By default
+we use the **default** values from your **[settings.json](#settings)** file.
 
 ```json
 "customization": {
@@ -194,4 +259,5 @@ When you're finished with a new version of your theme, it's time to build it.
 dugway build
 ```
 
-This will create a zip file for the current version in your **build** directory containing all HTML, images, fonts, and packaged JS and CSS.
+This will create a zip file for the current version in your **build** directory
+containing all HTML, images, fonts, and packaged JS and CSS.

data/lib/dugway/application.rb

@@ -1,15 +1,13 @@
 require 'dugway/controller'
+require 'dugway/contact_form_validator'
 
 module Dugway
   class Application < Controller
-    # Home
 
     get '/' do
       render_page
     end
 
-    # Products
-
     get '/products(.js)' do
       if request.html?
         render_page
@@ -19,66 +17,35 @@ module Dugway
     end
 
     get '/category/:category(.js)' do
-      if category = store.category(params[:category])
-        if request.html?
-          page['name'] = category['name']
-          render_page(:category => category)
-        elsif request.js?
-          render_json(store.category_products(params[:category]))
-        end
-      else
-        render_not_found
-      end
+      render_not_found unless category = store.category(params[:category])
+      render_artist_category_response(category, :category)
     end
 
     get '/artist/:artist(.js)' do
-      if artist = store.artist(params[:artist])
-        if request.html?
-          page['name'] = artist['name']
-          render_page(:artist => artist)
-        elsif request.js?
-          render_json(store.artist_products(params[:artist]))
-        end
-      else
-        render_not_found
-      end
+      render_not_found unless artist = store.artist(params[:artist])
+      render_artist_category_response(artist, :artist)
     end
 
-    # Product
-
     get '/product/:product(.js)' do
-      if product = store.product(params[:product])
-        if request.html?
-          page['name'] = product['name']
-          render_page(:product => product)
-        elsif request.js?
-          render_json(product)
-        end
-      else
-        render_not_found
+      render_not_found unless product = store.product(params[:product])
+      if request.html?
+        set_page_name_and_render_page(product, :product)
+      elsif request.js?
+        render_json(product)
       end
     end
 
-    # Cart
-
     any '/cart(.js)' do
-      if cart_params = params[:cart].try(:with_indifferent_access)
-        cart.update(cart_params)
-      end
+      cart.update(cart_params) if cart_params
+      redirect_to('/checkout') if params[:checkout]
 
-      if params[:checkout]
-        redirect_to('/checkout')
-      else
-        if request.html?
-          render_page
-        elsif request.js?
-          render_json(cart)
-        end
+      if request.html?
+        render_page
+      elsif request.js?
+        render_json(cart)
       end
     end
 
-    # Checkout
-
     any '/checkout' do
       if cart.empty?
         error('Must have at least one product to checkout')
@@ -88,8 +55,6 @@ module Dugway
       end
     end
 
-    # Success
-
     get '/success' do
       render_page
     end
@@ -100,38 +65,23 @@ module Dugway
       render_page
     end
 
-    # Contact
-
     get '/contact' do
       render_page
     end
 
     post '/contact' do
-      if [ :name, :email, :subject, :message, :captcha ].any? { |f| params[f].blank? }
-        error('All fields are required')
-      elsif !(params[:email] =~ /^([^@\s]+)@((?:[-a-zA-Z0-9]+\.)+[a-zA-Z]{2,})$/)
-        error('Invalid email address')
-      elsif !(params[:captcha] =~ /^rQ9pC$/i)
-        error('Spam check was incorrect')
-      end
-
+      error(contact_form_error) if contact_form_error
       render_page
     end
 
-    # Maintenance
-
     get '/maintenance' do
       render_page
     end
 
-    # Custom page
-
     get '/:permalink' do
       render_page
     end
 
-    # Assets
-
     get '/theme.css' do
       render_file('theme.css')
     end
@@ -143,5 +93,29 @@ module Dugway
     get %r{^/images|fonts/.+$} do
       Rack::File.new(Dugway.source_dir).call(request.env)
     end
+
+    private
+
+    def self.cart_params
+      params[:cart].try(:with_indifferent_access)
+    end
+
+    def self.contact_form_error
+      ContactFormValidator.new(params).error_message
+    end
+
+    def self.render_artist_category_response(object, type)
+      if request.html?
+        set_page_name_and_render_page(object, type)
+      elsif request.js?
+        render_json(store.send("#{type}_products", params[type]))
+      end
+    end
+
+    def self.set_page_name_and_render_page(object, type)
+      page['name'] = object['name']
+      render_page(type => object)
+    end
+
   end
 end

data/lib/dugway/cli/build.rb

@@ -4,50 +4,50 @@ module Dugway
   module Cli
     class Build < Thor::Group
       include Thor::Actions
-      
+
       def self.source_root
         File.join(Dir.pwd, 'source')
       end
-      
+
       def self.destination_root
         File.join(Dir.pwd, 'build')
       end
-      
+
       def validate
         unless theme.valid?
           theme.errors.each { |error| say(error, :red) }
           raise "Theme is invalid"
         end
       end
-      
+
       def create_destination
         empty_directory self.class.destination_root
       end
-      
+
       def build
-        Zip::ZipFile.open(build_file, Zip::ZipFile::CREATE) { |zipfile|
-          theme.files.each { |file|
-            zipfile.get_output_stream(file) { |f|
+        Zip::ZipFile.open(build_file, Zip::ZipFile::CREATE) do |zipfile|
+          theme.files.each do |file|
+            zipfile.get_output_stream(file) do |f|
               f << theme.build_file(file)
-            }
-          }
-        }
+            end
+          end
+        end
       end
-      
+
       def success
         say_status(:create, "build/#{ build_name }")
       end
-      
+
       private
-      
+
       def theme
         @theme ||= Dugway.theme
       end
-      
+
       def build_name
         @build_name ||= "#{ theme.name.parameterize }-#{ theme.version }.zip"
       end
-      
+
       def build_file
         @build_file ||= File.join(self.class.destination_root, build_name)
       end

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

@@ -10,7 +10,7 @@
   {% endif %}
 </section>
 
-<section>
+<div>
   <aside>
     {% case product.status %}
 

data/lib/dugway/contact_form_validator.rb

@@ -0,0 +1,39 @@
+module Dugway
+  class ContactFormValidator
+
+    attr_accessor :params
+
+    def initialize(params)
+      @params = params
+    end
+
+    def error_message
+      if required_fields.any? { |f| params[f].blank? }
+        'All fields are required'
+      elsif param_does_not_match(:email, email_format)
+        'Invalid email address'
+      elsif param_does_not_match(:captcha, captcha_format)
+        'Spam check was incorrect'
+      end
+    end
+
+    private
+
+    def required_fields
+      [ :name, :email, :subject, :message, :captcha ]
+    end
+
+    def email_format
+      /^([^@\s]+)@((?:[-a-zA-Z0-9]+\.)+[a-zA-Z]{2,})$/
+    end
+
+    def captcha_format
+      /^rQ9pC$/i
+    end
+
+    def param_does_not_match(param_name, regex)
+      !(params[param_name.to_sym] =~ regex)
+    end
+
+  end
+end

data/lib/dugway/controller.rb

@@ -1,9 +1,8 @@
 require 'rack/mount'
+require 'dugway/path_interpreter'
 
 module Dugway
   class Controller
-    PERMALINK_REGEX = %r{[a-z0-9\-_]+}
-    FORMAT_REGEX = %r{(\.(?<format>js))?}
 
     class << self
       def routes
@@ -25,33 +24,12 @@ module Dugway
           end
         }, {
           :request_method => method,
-          :path_info => interpret_path(path)
+          :path_info => PathInterpreter.new(path).call
         })
 
         routes.rehash
       end
 
-      def interpret_path(path)
-        if path.is_a?(String)
-          case path
-          # category/artist/product
-          when %r{^/(\w+)/:(#{ PERMALINK_REGEX })\(\.js\)}
-            %r{^/#{ $1 }/(?<#{ $2 }>#{ PERMALINK_REGEX })#{ FORMAT_REGEX }$}
-          # products/cart
-          when %r{^/(\w+)\(\.js\)$}
-            %r{^/#{ $1 }#{ FORMAT_REGEX }$}
-          # custom pages
-          when %r{^/:(#{ PERMALINK_REGEX })}
-            %r{^/(?<#{ $1 }>#{ PERMALINK_REGEX })$}
-          # everything else
-          else
-            %r{^#{ path }$}
-          end
-        else
-          path
-        end
-      end
-
       def get(path, &block)
         route('GET', path, &block)
       end
@@ -142,4 +120,5 @@ module Dugway
       self.class.routes.call(env)
     end
   end
+
 end

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

@@ -12,13 +12,13 @@ module Dugway
             html << %(<span class="previous disabled">#{ prev_label }</span>)
           end
 
-          paginate['parts'].each { |part|
+          paginate['parts'].each do |part|
             if part['is_link']
               html << %(<a href="#{ part['url'] }">#{ part['title'] }</a>)
             else
               html << %(<span class="#{ part['title'] == paginate['current_page'].to_s ? 'current' : 'gap' }">#{ part['title'] }</span>)
             end
-          }
+          end
 
           next_label = next_label.blank? ? paginate['next']['title'] : next_label
           if paginate['next']['is_link']

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

@@ -8,47 +8,14 @@ module Dugway
         content_tag :a, text, options
       end
 
-      # To get max_w-100
-      # Eg product.primary_image | product_image_url | constrain : '100'
-      # To get max_h-100
-      # Eg product.primary_image | product_image_url | constrain : '-', '100'
-      # To get max_h-100+max_w-100
-      # Eg product.primary_image | product_image_url | constrain : '100', '100'
       def constrain(url = nil, width = 0, height = 0)
-        if url
-          parsed_url = URI.parse(url)
-          path_parts = parsed_url.path.split('/')
-
-          width = width.to_i
-          height = height.to_i
-
-          path_parts.slice(-2).tap do |size|
-            unless width == 0 && height == 0
-              size.gsub!(/(max_w-)\d+/) do |match|
-                width == 0 ? '' : "#{ $1 }#{ width }"
-              end
-
-              size.gsub!(/(max_h-)\d+/) do |match|
-                height == 0 ? '' : "#{ $1 }#{ height }"
-              end
-
-              size.gsub!(/\+/, '') if width == 0 || height == 0
-            end
-          end
-
-          parsed_url.path = path_parts.join('/')
-          parsed_url.to_s
-        end
+        image_url url, width, height if url
       end
 
       def product_image_url(image = nil, size = nil)
-        width, height = legacy_size_for(size)
-
-        if image.blank?
-          image_url_hash('http://images.cdn.bigcartel.com/missing/-/missing.png', height, width)
-        else
-          image_url_hash(image['url'], height, width)
-        end
+        url = image ? image['url'] : 'http://images.bigcartel.com/missing.png'
+        size = legacy_size_for(size)
+        image_url url, size, size
       end
 
       def theme_js_url(name)
@@ -85,20 +52,20 @@ module Dugway
         options
       end
 
-      protected
-      def image_url_hash(url, max_h = 1000, max_w = 1000)
-        url = url.gsub(/\/-\//, "/max_h-#{ max_h }+max_w-#{ max_w }/")
-        url
+      def image_url(url, width, height)
+        uri = URI.parse(url)
+        query_hash = Rack::Utils.parse_nested_query uri.query
+        uri.query = query_hash.update('w' => width, 'h' => height).to_query
+        uri.to_s
       end
 
       def legacy_size_for(size)
-        size = size.present? ? size : :original
-
-        Hash.new([ 1000, 1000 ]).merge({
-          thumb: [ 75, 75 ],
-          medium: [ 175, 175 ],
-          large: [ 300, 300 ]
-        })[size.to_sym]
+        case size
+        when 'large'  then 300
+        when 'medium' then 175
+        when 'thumb'  then 75
+        else 1000
+        end
       end
     end
   end

data/lib/dugway/path_interpreter.rb

@@ -0,0 +1,45 @@
+module Dugway
+  class PathInterpreter
+    attr_accessor :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def call
+      return path unless path.is_a?(String)
+      case path
+      when category_artist_or_product_path
+        %r{^/#{$1}/(?<#{$2}>#{permalink_regex})#{format_regex}$}
+      when product_or_cart_path
+        %r{^/#{$1}#{format_regex}$}
+      when custom_page_path
+        %r{^/(?<#{$1}>#{permalink_regex})$}
+      else
+        %r{^#{path}$}
+      end
+    end
+
+    private
+
+    def permalink_regex
+      %r{[a-z0-9\-_]+}
+    end
+
+    def format_regex
+      %r{(\.(?<format>js))?}
+    end
+
+    def category_artist_or_product_path
+      %r{^/(\w+)/:(#{permalink_regex})\(\.js\)}
+    end
+
+    def product_or_cart_path
+      %r{^/(\w+)\(\.js\)$}
+    end
+
+    def custom_page_path
+      %r{^/:(#{permalink_regex})}
+    end
+  end
+end

data/lib/dugway/store.rb

@@ -78,33 +78,33 @@ module Dugway
     end
 
     def product_and_option(option_id)
-      products.each { |product|
-        product['options'].each { |option|
+      products.each do |product|
+        product['options'].each do |option|
           if option['id'] == option_id
             return product, option
           end
-        }
-      }
+        end
+      end
 
       nil
     end
 
     def previous_product(permalink)
-      products.each_with_index { |product, index|
+      products.each_with_index do |product, index|
         if product['permalink'] == permalink && index > 0 && previous_product = products[index - 1]
           return previous_product
         end
-      }
+      end
 
       nil
     end
 
     def next_product(permalink)
-      products.each_with_index { |product, index|
+      products.each_with_index do |product, index|
         if product['permalink'] == permalink && (index + 1) < products.size && next_product = products[index + 1]
           return next_product
         end
-      }
+      end
 
       nil
     end

data/lib/dugway/theme.rb

@@ -36,13 +36,13 @@ module Dugway
     end
 
     def customization
-      Hash.new.tap { |customization|
-        %w( fonts colors options images image_sets ).each { |type|
+      Hash.new.tap do |customization|
+        %w( fonts colors options images image_sets ).each do |type|
           customization.update(customization_for_type(type))
-        }
+        end
 
         customization.update(@overridden_customization)
-      }
+      end
     end
 
     def name
@@ -78,23 +78,23 @@ module Dugway
     end
 
     def image_files
-      Dir.glob(File.join(source_dir, 'images', '**', '*.{png,jpg,jpeg,gif,ico,svg}')).map { |i|
+      Dir.glob(File.join(source_dir, 'images', '**', '*.{png,jpg,jpeg,gif,ico,svg}')).map do |i|
         i.gsub(source_dir, '')[1..-1]
-      }
+      end
     end
 
     def font_files
-      Dir.glob(File.join(source_dir, 'fonts', '**', '*.{eot,ttf,otf,woff,svg}')).map { |i|
+      Dir.glob(File.join(source_dir, 'fonts', '**', '*.{eot,ttf,otf,woff,svg}')).map do |i|
         i.gsub(source_dir, '')[1..-1]
-      }
+      end
     end
 
     def valid?
       @errors = []
 
-      REQUIRED_FILES.each { |file|
+      REQUIRED_FILES.each do |file|
         @errors << "Missing source/#{ file }" if read_source_file(file).nil?
-      }
+      end
 
       @errors << 'Missing theme name in source/settings.json' if name.blank?
       @errors << 'Invalid theme version in source/settings.json (ex: 1.0.3)' unless !!(version =~ /\d+\.\d+\.\d+/)
@@ -135,31 +135,31 @@ module Dugway
     end
 
     def customization_for_type(type)
-      Hash.new.tap { |hash|
+      Hash.new.tap do |hash|
         if settings.has_key?(type)
           case type
           when 'images'
-            settings[type].each { |setting|
+            settings[type].each do |setting|
               if name = setting['default']
                 hash[setting['variable']] = { :url => image_path_from_setting_name(name), :width => 1, :height => 1 }
               end
-            }
+            end
           when 'image_sets'
-            settings[type].each { |setting|
+            settings[type].each do |setting|
               if defaults = setting['default'] || setting['defaults']
                 hash[setting['variable']] ||= []
                 defaults.each do |name|
                   hash[setting['variable']] << { :url => image_path_from_setting_name(name), :width => 1, :height => 1 }
                 end
               end
-            }
+            end
           else
-            settings[type].each { |setting|
+            settings[type].each do |setting|
               hash[setting['variable']] = setting['default']
-            }
+            end
           end
         end
-      }
+      end
     end
 
     def image_path_from_setting_name(name)

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

data/spec/fixtures/store/products.json

@@ -1 +1 @@
-[{"price":10.0,"status":"active","created_at":"2013-02-10T19:28:11-07:00","tax":0.0,"position":1,"artists":[{"permalink":"artist-one","name":"Artist One","id":176141,"url":"/artist/artist-one"}],"shipping":[{"amount_with_others":5.0,"country":{"name":"United States","id":43,"code":"US"},"amount_alone":10.0},{"amount_with_others":10.0,"amount_alone":20.0}],"images":[{"width":475,"height":500,"secure_url":"https://s3.amazonaws.com/bigcartel/product_images/92599166/-/mens_tee_1.jpg","url":"http://cache1.bigcartel.com/product_images/92599166/-/mens_tee_1.jpg"},{"width":475,"height":475,"secure_url":"https://s3.amazonaws.com/bigcartel/product_images/92599178/-/mens_tee_2.jpg","url":"http://cache1.bigcartel.com/product_images/92599178/-/mens_tee_2.jpg"},{"width":475,"height":475,"secure_url":"https://s3.amazonaws.com/bigcartel/product_images/92599196/-/mens_tee_3.jpg","url":"http://cache1.bigcartel.com/product_images/92599196/-/mens_tee_3.jpg"},{"width":475,"height":475,"secure_url":"https://s3.amazonaws.com/bigcartel/product_images/92599214/-/mens_tee_4.jpg","url":"http://cache0.bigcartel.com/product_images/92599214/-/mens_tee_4.jpg"},{"width":475,"height":475,"secure_url":"https://s3.amazonaws.com/bigcartel/product_images/92599226/-/mens_tee_5.jpg","url":"http://cache1.bigcartel.com/product_images/92599226/-/mens_tee_5.jpg"}],"categories":[{"permalink":"tees","name":"Tees","id":4615193,"url":"/category/tees"}],"on_sale":false,"permalink":"my-product","name":"My Product","default_price":10.0,"id":9422939,"description":"This is a description of my product.","options":[{"price":10.0,"sold_out":false,"has_custom_price":false,"name":"Small","id":29474321},{"price":10.0,"sold_out":false,"has_custom_price":false,"name":"Medium","id":29474324},{"price":10.0,"sold_out":true,"has_custom_price":false,"name":"Large","id":29474327},{"price":15.0,"sold_out":false,"has_custom_price":true,"name":"X-Large","id":29474330}],"url":"/product/my-product"},{"price":10.0,"status":"active","created_at":"2013-03-02T10:05:34-07:00","tax":0.0,"position":2,"artists":[{"permalink":"artist-two","name":"Artist Two","id":176144,"url":"/artist/artist-two"}],"images":[{"width":475,"height":475,"secure_url":"https://s3.amazonaws.com/bigcartel/product_images/95272745/-/mens_tee_8.jpg","url":"http://cache0.bigcartel.com/product_images/95272745/-/mens_tee_8.jpg"}],"categories":[{"permalink":"tees","name":"Tees","id":4615193,"url":"/category/tees"}],"on_sale":false,"permalink":"my-tee","name":"My Tee","default_price":10.0,"id":9696017,"description":"This is my cool tee shirt.","options":[{"price":10.0,"sold_out":false,"has_custom_price":false,"name":"Small","id":30344519},{"price":10.0,"sold_out":false,"has_custom_price":false,"name":"Medium","id":30344522},{"price":15.0,"sold_out":false,"has_custom_price":true,"name":"Large","id":30344525}],"url":"/product/my-tee"},{"price":20.0,"status":"active","created_at":"2013-03-02T10:06:22-07:00","tax":0.0,"position":3,"artists":[],"categories":[{"permalink":"prints","name":"Prints","id":4615190,"url":"/category/prints"}],"on_sale":true,"permalink":"print","name":"Print","default_price":20.0,"id":9696032,"description":"This is my print.","options":[{"price":20.0,"sold_out":false,"has_custom_price":false,"name":"Default","id":30344567}],"url":"/product/print"}]
+[{"price":10.0,"status":"active","created_at":"2013-02-10T19:28:11-07:00","tax":0.0,"position":1,"artists":[{"permalink":"artist-one","name":"Artist One","id":176141,"url":"/artist/artist-one"}],"shipping":[{"amount_with_others":5.0,"country":{"name":"United States","id":43,"code":"US"},"amount_alone":10.0},{"amount_with_others":10.0,"amount_alone":20.0}],"images":[{"width":475,"height":500,"secure_url":"https://images.bigcartel.com/product_images/92599166/mens_tee_1.jpg","url":"http://images.bigcartel.com/product_images/92599166/mens_tee_1.jpg"},{"width":475,"height":475,"secure_url":"https://images.bigcartel.com/product_images/92599178/mens_tee_2.jpg","url":"http://images.bigcartel.com/product_images/92599178/mens_tee_2.jpg"},{"width":475,"height":475,"secure_url":"https://images.bigcartel.com/product_images/92599196/mens_tee_3.jpg","url":"http://images.bigcartel.com/product_images/92599196/mens_tee_3.jpg"},{"width":475,"height":475,"secure_url":"https://images.bigcartel.com/product_images/92599214/mens_tee_4.jpg","url":"http://images.bigcartel.com/product_images/92599214/mens_tee_4.jpg"},{"width":475,"height":475,"secure_url":"https://images.bigcartel.com/product_images/92599226/mens_tee_5.jpg","url":"http://images.bigcartel.com/product_images/92599226/mens_tee_5.jpg"}],"categories":[{"permalink":"tees","name":"Tees","id":4615193,"url":"/category/tees"}],"on_sale":false,"permalink":"my-product","name":"My Product","default_price":10.0,"id":9422939,"description":"This is a description of my product.","options":[{"price":10.0,"sold_out":false,"has_custom_price":false,"name":"Small","id":29474321},{"price":10.0,"sold_out":false,"has_custom_price":false,"name":"Medium","id":29474324},{"price":10.0,"sold_out":true,"has_custom_price":false,"name":"Large","id":29474327},{"price":15.0,"sold_out":false,"has_custom_price":true,"name":"X-Large","id":29474330}],"url":"/product/my-product"},{"price":10.0,"status":"active","created_at":"2013-03-02T10:05:34-07:00","tax":0.0,"position":2,"artists":[{"permalink":"artist-two","name":"Artist Two","id":176144,"url":"/artist/artist-two"}],"images":[{"width":475,"height":475,"secure_url":"https://images.bigcartel.com/product_images/95272745/mens_tee_8.jpg","url":"http://images.bigcartel.com/product_images/95272745/mens_tee_8.jpg"}],"categories":[{"permalink":"tees","name":"Tees","id":4615193,"url":"/category/tees"}],"on_sale":false,"permalink":"my-tee","name":"My Tee","default_price":10.0,"id":9696017,"description":"This is my cool tee shirt.","options":[{"price":10.0,"sold_out":false,"has_custom_price":false,"name":"Small","id":30344519},{"price":10.0,"sold_out":false,"has_custom_price":false,"name":"Medium","id":30344522},{"price":15.0,"sold_out":false,"has_custom_price":true,"name":"Large","id":30344525}],"url":"/product/my-tee"},{"price":20.0,"status":"active","created_at":"2013-03-02T10:06:22-07:00","tax":0.0,"position":3,"artists":[],"categories":[{"permalink":"prints","name":"Prints","id":4615190,"url":"/category/prints"}],"on_sale":true,"permalink":"print","name":"Print","default_price":20.0,"id":9696032,"description":"This is my print.","options":[{"price":20.0,"sold_out":false,"has_custom_price":false,"name":"Default","id":30344567}],"url":"/product/print"}]

data/spec/units/dugway/contact_form_validator_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'dugway/contact_form_validator'
+
+describe Dugway::ContactFormValidator do
+
+  let(:validator) { described_class.new(params) }
+
+  let(:params) do
+    {
+      :name => "name",
+      :email => "name@example.com",
+      :subject => "subject",
+      :message => "message",
+      :captcha => "rQ9pc",
+    }
+  end
+
+  describe "#error_message" do
+    it "returns an error for a missing name" do
+      validator.params[:name] = " "
+      assert_required_fields_error
+    end
+
+    it "returns an error for a missing email" do
+      validator.params[:email] = ""
+      assert_required_fields_error
+    end
+
+    it "returns an error for a missing subject" do
+      validator.params[:subject] = nil
+      assert_required_fields_error
+    end
+
+    it "returns an error for a missing message" do
+      validator.params[:message] = nil
+      assert_required_fields_error
+    end
+
+    it "returns an error for a missing captcha" do
+      validator.params[:captcha] = "   "
+      assert_required_fields_error
+    end
+
+    it "returns an error for invalid email format" do
+      validator.params[:email] = "foo-at-foo-dot-net"
+      expect(validator.error_message).to eq "Invalid email address"
+    end
+
+    it "returns an error for incorrect captcha" do
+      validator.params[:captcha] = "oops"
+      expect(validator.error_message).to eq "Spam check was incorrect"
+    end
+
+    def assert_required_fields_error
+      expect(validator.error_message).to eql "All fields are required"
+    end
+
+  end
+
+end

data/spec/units/dugway/liquid/drops/image_drop_spec.rb

@@ -5,7 +5,7 @@ describe Dugway::Drops::ImageDrop do
 
   describe "#url" do
     it "should return the image's url" do
-      image.url.should == 'http://cache1.bigcartel.com/product_images/92599166/-/mens_tee_1.jpg'
+      image.url.should == 'http://images.bigcartel.com/product_images/92599166/mens_tee_1.jpg'
     end
   end
 

data/spec/units/dugway/liquid/drops/product_drop_spec.rb

@@ -213,7 +213,7 @@ describe Dugway::Drops::ProductDrop do
     it "should return the product's first image" do
       image = product.image
       image.should be_an_instance_of(Dugway::Drops::ImageDrop)
-      image.url.should == 'http://cache1.bigcartel.com/product_images/92599166/-/mens_tee_1.jpg'
+      image.url.should == 'http://images.bigcartel.com/product_images/92599166/mens_tee_1.jpg'
     end
   end
 
@@ -225,7 +225,7 @@ describe Dugway::Drops::ProductDrop do
 
       image = images.first
       image.should be_an_instance_of(Dugway::Drops::ImageDrop)
-      image.url.should == 'http://cache1.bigcartel.com/product_images/92599166/-/mens_tee_1.jpg'
+      image.url.should == 'http://images.bigcartel.com/product_images/92599166/mens_tee_1.jpg'
     end
   end
 

data/spec/units/dugway/liquid/filters/url_filters_spec.rb

@@ -10,48 +10,42 @@ describe Dugway::Filters::UrlFilters do
       describe "when image is not missing" do
         it "should show image with default size" do
           template = rendered_template("{{ image | product_image_url }}", 'image' => product_image)
-          template.should =~ /max_h-1000\+max_w-1000/
-          template.should =~ /#{Regexp.escape(File.basename(image_url))}/
+          template.should include("#{image_url}?h=1000&w=1000")
         end
 
         it "should show a image with custom size" do
           template = rendered_template("{{ image | product_image_url: 'thumb' }}", 'image' => product_image)
-          template.should =~ /max_h-75\+max_w-75/
-          template.should =~ /#{Regexp.escape(File.basename(image_url))}/
+          template.should include("#{image_url}?h=75&w=75")
         end
 
         it "should show image with default size when its random crap" do
           template = rendered_template("{{ image | product_image_url: 'snarble' }}", 'image' => product_image)
-          template.should =~ /max_h-1000\+max_w-1000/
-          template.should =~ /#{Regexp.escape(File.basename(image_url))}/
+          template.should include("#{image_url}?h=1000&w=1000")
         end
       end
 
       describe "when image is missing" do
         it "should show missing image with default 1000x1000" do
           template = rendered_template("{{ image | product_image_url }}", 'image' => nil)
-          template.should =~ /max_h-1000\+max_w-1000/
-          template.should =~ /missing\.png/
+          template.should include("http://images.bigcartel.com/missing.png?h=1000&w=1000")
         end
 
         it "should show missing image with custom size" do
           template = rendered_template("{{ image | product_image_url: 'thumb' }}", 'image' => nil)
-          template.should =~ /max_h-75\+max_w-75/
-          template.should =~ /missing\.png/
+          template.should include("http://images.bigcartel.com/missing.png?h=75&w=75")
         end
 
         it "should show missing image with default 1000x1000 when its random crap" do
           template = rendered_template("{{ image | product_image_url: 'snarble' }}", 'image' => nil)
-          template.should =~ /max_h-1000\+max_w-1000/
-          template.should =~ /missing\.png/
+          template.should include("http://images.bigcartel.com/missing.png?h=1000&w=1000")
         end
       end
     end
 
     describe "#constrain" do
       it 'should constrain the image to the specified size' do
-        template = rendered_template("{{ image | product_image_url | constrain: '222', '222' }}", 'image' => product_image)
-        template.should =~ /max_h-222\+max_w-222/
+        template = rendered_template("{{ image | product_image_url | constrain: '123', '456' }}", 'image' => product_image)
+        template.should include("#{image_url}?h=456&w=123")
       end
     end
   end

data/spec/units/dugway/path_interpreter_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'dugway/path_interpreter'
+
+describe Dugway::PathInterpreter do
+  let(:path) { double 'path' }
+  let(:interpreter) { described_class.new(path) }
+
+  it "initializes with arguements" do
+    expect(interpreter.path).to eq path
+  end
+
+  describe "#call" do
+    it "handles non-string paths" do
+      expect(described_class.new(/regex/).call).to eql /regex/
+    end
+
+    it "handles category, artist, and product type paths" do
+      expect(described_class.new("/product/:product(.js)").call).to eq(
+        %r{^/product/(?<product>(?-mix:[a-z0-9\-_]+))(?-mix:(\.(?<format>js))?)$}
+      )
+    end
+
+    it "handles products and cart type paths" do
+      expect(described_class.new("/products(.js)").call).to eq(
+        %r{^/products(?-mix:(\.(?<format>js))?)$}
+      )
+    end
+
+    it "handles custom pages" do
+      expect(described_class.new("/:custom-page").call).to eq(
+        %r{^/(?<custom-page>(?-mix:[a-z0-9\-_]+))$}
+      )
+    end
+
+    it "handles everything else" do
+      expect(described_class.new("/checkout").call).to eq(
+        %r{^/checkout$}
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -440,6 +440,7 @@ files:
 - lib/dugway/cli/templates/source/success.html
 - lib/dugway/cli/templates/source/theme.css
 - lib/dugway/cli/templates/source/theme.js
+- lib/dugway/contact_form_validator.rb
 - lib/dugway/controller.rb
 - lib/dugway/extensions/time.rb
 - lib/dugway/liquid/drops/account_drop.rb
@@ -474,6 +475,7 @@ files:
 - lib/dugway/liquid/tags/paginate.rb
 - lib/dugway/liquifier.rb
 - lib/dugway/logger.rb
+- lib/dugway/path_interpreter.rb
 - lib/dugway/request.rb
 - lib/dugway/store.rb
 - lib/dugway/template.rb
@@ -515,6 +517,7 @@ files:
 - spec/fixtures/theme/theme.js
 - spec/spec_helper.rb
 - spec/units/dugway/cart_spec.rb
+- spec/units/dugway/contact_form_validator_spec.rb
 - spec/units/dugway/liquid/drops/account_drop_spec.rb
 - spec/units/dugway/liquid/drops/artist_drop_spec.rb
 - spec/units/dugway/liquid/drops/artists_drop_spec.rb
@@ -537,6 +540,7 @@ files:
 - spec/units/dugway/liquid/filters/core_filters_spec.rb
 - spec/units/dugway/liquid/filters/url_filters_spec.rb
 - spec/units/dugway/liquid/misc/for_loop_spec.rb
+- spec/units/dugway/path_interpreter_spec.rb
 - spec/units/dugway/request_spec.rb
 - spec/units/dugway/store_spec.rb
 - spec/units/dugway/template_spec.rb
@@ -602,6 +606,7 @@ test_files:
 - spec/fixtures/theme/theme.js
 - spec/spec_helper.rb
 - spec/units/dugway/cart_spec.rb
+- spec/units/dugway/contact_form_validator_spec.rb
 - spec/units/dugway/liquid/drops/account_drop_spec.rb
 - spec/units/dugway/liquid/drops/artist_drop_spec.rb
 - spec/units/dugway/liquid/drops/artists_drop_spec.rb
@@ -624,7 +629,9 @@ test_files:
 - spec/units/dugway/liquid/filters/core_filters_spec.rb
 - spec/units/dugway/liquid/filters/url_filters_spec.rb
 - spec/units/dugway/liquid/misc/for_loop_spec.rb
+- spec/units/dugway/path_interpreter_spec.rb
 - spec/units/dugway/request_spec.rb
 - spec/units/dugway/store_spec.rb
 - spec/units/dugway/template_spec.rb
 - spec/units/dugway/theme_spec.rb
+has_rdoc: