dugway 0.8.1 → 0.8.2

data/dugway.gemspec

@@ -29,8 +29,7 @@ Gem::Specification.new do |s|
   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.2')
+  s.add_dependency('better_errors', '~> 0.9.0')
   s.add_dependency('will_paginate', '~> 3.0.4')
   s.add_dependency('i18n', '0.6.4')
   s.add_dependency('htmlentities', '~> 4.3.1')

data/lib/dugway/application.rb

@@ -140,7 +140,7 @@ module Dugway
       render_file('theme.js')
     end
 
-    get %r{^/images/.+\.(jpg|jpeg|gif|png|ico)$} do
+    get %r{^/images/.+\.(jpg|jpeg|gif|png|ico|svg)$} do
       Rack::File.new(Dugway.source_dir).call(request.env)
     end
   end

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

@@ -23,3 +23,6 @@ body#home, body#products
 
     div.pagination
       clear: both
+
+    .pagination span.disabled
+      display: none

data/lib/dugway/liquid/drops/page_drop.rb

@@ -8,6 +8,14 @@ module Dugway
       def meta_keywords
         'example, key, words'
       end
+
+      def full_url
+        @request.url
+      end
+
+      def full_path
+        @request.path
+      end
     end
   end
 end

data/lib/dugway/liquid/drops/products_drop.rb

@@ -28,7 +28,8 @@ module Dugway
       private
 
       def order
-        begin case @context['internal']['order']
+        if @context['internal']
+          case @context['internal']['order']
           when 'newest', 'date'
             'date'
           # We don't pass these in the API, so fake it
@@ -37,6 +38,8 @@ module Dugway
           else
             'position'
           end
+        else
+          'position'
         end
       end
 
@@ -49,24 +52,44 @@ module Dugway
           array.sort_by! { |p| p[order] }
         end
 
-        array.paginate({
-          :page => (@context.registers[:params][:page] || 1).to_i,
-          :per_page => @context['internal']['per_page']
-        })
+       array.paginate({
+         :page => (page || 1),
+         :per_page => per_page
+       })
       end
 
       def artist
-        @context.registers[:artist]['permalink'] rescue nil
+        @context.registers[:artist]['permalink'] rescue @context.registers[:params]['artist']
       end
 
       def category
-        @context.registers[:category]['permalink'] rescue nil
+        @context.registers[:category]['permalink'] rescue @context.registers[:params]['category']
       end
 
       def search_terms
         params[:search]
       end  
 
+      def page
+        if @context['internal'].present? && @context['internal'].has_key?('page') # has_key? here because 'page' will be nil for get blocks
+          @context['internal']['page']
+        else
+          @context.registers[:params][:page] if @context.registers[:params]
+        end
+      end
+
+      def per_page
+        per_page = if @context['internal'] and @context['internal']['per_page'].present?
+          @context['internal']['per_page']
+        elsif theme.settings['products_per_page']
+          theme.settings['products_per_page']
+        else
+          100
+        end
+
+        per_page.to_i
+      end
+
       def dropify(products)
         products.map { |p| ProductDrop.new(p) }
       end

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

@@ -9,20 +9,11 @@ module Dugway
       end
 
       def product_image_url(image=nil, size=nil)
-        unless image.blank?
-          url = image['url']
-
-          unless size.blank?
-            size = size.to_s.downcase
-
-            if thumb_size_in_pixels = thumb_size_in_pixels_for(size)
-              dir = url[0..url.rindex('/')]
-              ext = File.extname(url)
-              url = "#{ dir }#{ thumb_size_in_pixels }#{ ext }"
-            end
-          end
+        thumb_size_in_pixels = thumb_size_in_pixels_for(size)
+        if image.blank?
+          url = "http://images.cdn.bigcartel.com/missing/max_h-#{thumb_size_in_pixels || 300}+max_w-#{thumb_size_in_pixels || 300}/missing.png"
         else
-          url = "http://bigcartel.com/images/common/noimage-#{ (size || 'large').to_s }.gif"
+          url = image['url'].sub(/\/-\//, "/max_h-#{thumb_size_in_pixels || 1000}+max_w-#{thumb_size_in_pixels || 1000}/")
         end
 
         url

data/lib/dugway/theme.rb

@@ -70,7 +70,7 @@ module Dugway
     end
 
     def image_files
-      Dir.glob(File.join(source_dir, 'images', '**', '*.{png,jpg,jpeg,gif,ico}')).map { |i|
+      Dir.glob(File.join(source_dir, 'images', '**', '*.{png,jpg,jpeg,gif,ico,svg}')).map { |i|
         i.gsub(source_dir, '')[1..-1]
       }
     end

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 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://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"}]

data/spec/fixtures/theme/images/small.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="25px" height="25px" viewBox="0 0 25 25" xmlns="http://www.w3.org/2000/svg" version="1.1">
+  <desc>Missing Image Placeholder</desc>
+  <rect x="0" y="0" width="25" height="25" fill="gray" />
+  <line x1="10" y1="10" x2="15" y2="15" stroke-width="1" stroke="black"/>
+  <line x1="10" y1="15" x2="15" y2="10" stroke-width="1" stroke="black"/>
+</svg>

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://cache1.bigcartel.com/product_images/92599166/-/mens_tee_1.jpg'
     end
   end
 

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

@@ -3,9 +3,11 @@ require 'spec_helper'
 describe Dugway::Drops::PageDrop do
   let(:page) { 
     page = Dugway.store.page('about-us')
-    page['full_url'] = 'http://test.bigcartel.com/about-us'
-    page['full_path'] = '/about-us'
-    Dugway::Drops::PageDrop.new(page)
+    Dugway::Drops::PageDrop.new(page).tap { |drop|
+      drop.context = Liquid::Context.new({}, {}, {
+        :request => Rack::Request.new({'PATH_INFO' => '/about-us', 'rack.url_scheme' => 'http', 'HTTP_HOST' => 'test.bigcartel.com', 'SERVER_PORT' => 80})
+      })
+    }
   }
 
   describe "#id" do

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

@@ -26,4 +26,10 @@ describe Dugway::Drops::PagesDrop do
       pages.blah.should be_nil
     end
   end
+
+  private
+
+  def rendered_template(template, assigns={}, registers={})
+    Liquid::Template.parse(template).render(assigns, :registers => { :currency => Dugway.store.currency }.merge(registers))
+  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://cache1.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://cache1.bigcartel.com/product_images/92599166/-/mens_tee_1.jpg'
     end
   end
 

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

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Dugway::Filters::UrlFilters do
+  describe "#product_image_url" do
+    let(:product) { Dugway.store.products.first }
+    let(:product_image) { Dugway::Drops::ImageDrop.new(product['images'].first) }
+    let(:image_url) { product['images'].first['url'] }
+
+    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))}/
+      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))}/
+      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))}/
+      end
+    end
+
+    describe "when image is missing" do
+      it "should show missing image with default large size" do
+        template = rendered_template("{{ image | product_image_url }}", 'image' => nil)
+        template.should =~ /max_h-300\+max_w-300/
+        template.should =~ /missing\.png/
+      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/
+      end
+
+      it "should show missing image with default size when its random crap" do
+        template = rendered_template("{{ image | product_image_url: 'snarble' }}", 'image' => nil)
+        template.should =~ /max_h-300\+max_w-300/
+        template.should =~ /missing\.png/
+      end
+    end
+  end
+
+  private
+
+  def rendered_template(template, assigns={})
+    Liquid::Template.parse(template).render(assigns, :registers => { :currency => Dugway.store.currency })
+  end
+end

data/spec/units/dugway/liquid/misc/for_loop_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "For Loops" do
+  let(:products) { Dugway.store.products }
+  let(:products_drop) { Dugway::Drops::ProductsDrop.new(products) }
+
+  it "should render each product name" do
+    template = rendered_template("{% for product in products.all %} {{product.name}} {% endfor %}", 'products' => products_drop)
+    products.each do |product|
+      template.should =~ /#{Regexp.escape(product['name'])}/
+    end
+  end
+
+  private
+
+  def rendered_template(template, assigns={})
+    Liquid::Template.parse(template).render(assigns, :registers => { :currency => Dugway.store.currency })
+  end
+end

data/spec/units/dugway/theme_spec.rb

@@ -102,13 +102,13 @@ describe Dugway::Theme do
 
   describe "#files" do
     it "should return an array of all files" do
-      theme.files.should == ["cart.html", "checkout.html", "contact.html", "home.html", "layout.html", "maintenance.html", "product.html", "products.html", "screenshot.jpg", "settings.json", "success.html", "theme.css", "theme.js", "images/bc_badge.png"]
+      theme.files.should == ["cart.html", "checkout.html", "contact.html", "home.html", "layout.html", "maintenance.html", "product.html", "products.html", "screenshot.jpg", "settings.json", "success.html", "theme.css", "theme.js", "images/bc_badge.png", "images/small.svg"]
     end
   end
 
   describe "#image_files" do
     it "should return an array of all image files" do
-      theme.image_files.should == ["images/bc_badge.png"]
+      theme.image_files.should == ["images/bc_badge.png", "images/small.svg"]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,23 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: binding_of_caller
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -557,6 +541,7 @@ files:
 - spec/fixtures/theme/contact.html
 - spec/fixtures/theme/home.html
 - spec/fixtures/theme/images/bc_badge.png
+- spec/fixtures/theme/images/small.svg
 - spec/fixtures/theme/javascripts/one.js
 - spec/fixtures/theme/javascripts/two.js.coffee
 - spec/fixtures/theme/layout.html
@@ -591,6 +576,8 @@ files:
 - spec/units/dugway/liquid/drops/shipping_option_drop_spec.rb
 - spec/units/dugway/liquid/drops/theme_drop_spec.rb
 - 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/request_spec.rb
 - spec/units/dugway/store_spec.rb
 - spec/units/dugway/template_spec.rb
@@ -608,12 +595,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4314149561505291275
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4314149561505291275
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -632,6 +625,7 @@ test_files:
 - spec/fixtures/theme/contact.html
 - spec/fixtures/theme/home.html
 - spec/fixtures/theme/images/bc_badge.png
+- spec/fixtures/theme/images/small.svg
 - spec/fixtures/theme/javascripts/one.js
 - spec/fixtures/theme/javascripts/two.js.coffee
 - spec/fixtures/theme/layout.html
@@ -666,8 +660,9 @@ test_files:
 - spec/units/dugway/liquid/drops/shipping_option_drop_spec.rb
 - spec/units/dugway/liquid/drops/theme_drop_spec.rb
 - 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/request_spec.rb
 - spec/units/dugway/store_spec.rb
 - spec/units/dugway/template_spec.rb
 - spec/units/dugway/theme_spec.rb
-has_rdoc: