dugway 0.5.3 → 0.5.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 753ddf37dd59de0812e32500da4fcf189b9d2f89
+  data.tar.gz: be0e35b01e22f044c8da70bc6888647476e38cac
+SHA512:
+  metadata.gz: 9898d404fa7127e8163d712d12448052bbb845c40b03c5382a7c8b0e0bb302514dc0c5a8918c6492533f7d876e9f359f35b09dc923a30039353a515bcb72b150
+  data.tar.gz: ec25ce081aee329d90e937a5d40a21dd599362416a7c0a568e520e2cb825395066888faea7f4e5bcb20373a8141d1df0c6e77d3fa5157f904e0541820aeff104

data/.gitignore

@@ -2,6 +2,8 @@
 
 Gemfile.lock
 
+coverage
+
 *.gem
 *.tmproj
 *.sublime*

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -1,3 +1,6 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0
+notifications:
+  email: false

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Big Cartel, LLC
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/dugway.gemspec

@@ -41,4 +41,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake', '~> 10.0.3')
   s.add_development_dependency('rspec', '~> 2.12.0')
   s.add_development_dependency('webmock', '~> 1.9.3')
+  s.add_development_dependency('json_expressions', '~> 0.8.2')
+  s.add_development_dependency('capybara', '~> 2.0.2')
+  s.add_development_dependency('simplecov', '~> 0.7.1')
 end

data/lib/dugway/cart.rb

@@ -10,6 +10,10 @@ module Dugway
       self.items = []
     end
 
+    def empty?
+      items.empty?
+    end
+
     def item_count
       items.map { |item| item.quantity }.inject(:+) || 0
     end
@@ -53,14 +57,10 @@ module Dugway
     def update(params)
       add, adds, updates = params.delete(:add), params.delete(:adds), params.delete(:update)
       add_item(add) if add
-      add_item(adds) if adds
+      add_items(adds) if adds
       update_quantities(updates) if updates
     end
 
-    def empty?
-      items.empty?
-    end
-
     def as_json(options=nil)
       {
         :item_count => item_count,
@@ -83,7 +83,7 @@ module Dugway
         product, option = Dugway.store.product_and_option(id)
 
         if product && option
-          item = CartItem.new
+          item = Item.new
           item.id = items.size + 1
           item.name = option['name'] == 'Default' ? product['name'] : "#{ product['name'] } - #{ option['name'] }"
           item.unit_price = option['price']
@@ -103,11 +103,7 @@ module Dugway
     end
 
     def add_items(adds)
-      if adds.kind_of?(Array)
-        adds.each { |add| add_item(add) }
-      elsif adds.kind_of?(Hash)
-        adds.each_pair { |key, add| add_item(add.reverse_merge(:id => key)) }
-      end
+      adds.each { |add| add_item(add) }
     end
 
     def update_quantities(updates)
@@ -121,7 +117,7 @@ module Dugway
     end
   end
 
-  CartItem = Struct.new(:id, :name, :unit_price, :quantity, :product, :option) do
+  Item = Struct.new(:id, :name, :unit_price, :quantity, :product, :option) do
     def price
       unit_price * quantity
     end

data/lib/dugway/cli/templates/Gemfile.tt

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gem 'dugway'

data/lib/dugway/cli/templates/gitignore.tt

@@ -1,3 +1,4 @@
+.bundle
 .DS_Store
 
 build

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

@@ -24,12 +24,14 @@
         <h5>{{ product.default_price | money_with_sign }}{% if product.on_sale %} <em>On Sale{% endif %}</em></h5>
         <h5>Availability</h5>
         
-        <ul>
+        <ul class="availability">
           {% for option in product.options %}
           <li>
             {% unless product.has_default_option %}<span>{{ option.name }}</span>{% endunless %}
-            <span>{% if option.sold_out %}Sold Out{% else %}{{ option.inventory }}%{% endif %}</span>
-            <div style="width:{{ option.inventory }}%"></div>
+            <span>{% if option.sold_out %}Sold Out{% endif %}</span>
+            <b>
+              <b style="width:{{ option.inventory }}%"></b>
+            </b>
           </li>
           {% endfor %}
         </ul>

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

@@ -1,8 +1,16 @@
 body#cart
   form
     ul
+      border-bottom: dashed 1px #ddd
       margin-bottom: 2em
 
+    ul + p
+      float: left
+
+    button
+      float: right
+      margin: 1.2em 0
+
     li
       overflow: hidden
 

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

@@ -8,6 +8,9 @@ body#product
         margin-right: 18px
         border: 3px solid #eee
 
+        img
+          float: left
+
       li.selected
         border-color: #72c29b
 
@@ -17,3 +20,32 @@ body#product
       border-right: none
       margin-left: 30px
       padding-left: 30px
+      width: 30%
+
+      form
+        div
+          float: left
+          margin-right: 5px
+        button
+          font-size: 12px
+
+    .availability
+      li
+        height: 16px
+        font-size: 11px
+        margin-bottom: 5px
+
+        span
+          display: block
+          float: left
+          width: 20%
+
+        > b
+          display: block
+          margin-left: 20%
+          width: 80%
+        
+          b 
+            background: #eee
+            display: block
+            height: 16px

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

@@ -5,6 +5,10 @@ module Dugway
         unit_price * quantity
       end
 
+      def total
+        price + shipping
+      end
+
       def product
         ProductDrop.new(source['product'])
       end

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

@@ -1,6 +1,10 @@
 module Dugway
   module Drops
     class ProductDrop < BaseDrop
+      def created_at
+        Time.parse(source['created_at'])
+      end
+
       def price
         nil # price is deprecated in favor of default_price
       end
@@ -18,7 +22,7 @@ module Dugway
       end
 
       def has_default_option
-        @has_default_option ||= options.size == 1 && option.default
+        @has_default_option ||= options.size == 1 && option.name.downcase == 'default'
       end
 
       def option
@@ -30,11 +34,11 @@ module Dugway
       end
 
       def options_in_stock
-        @options_in_stock ||= options
+        @options_in_stock ||= options.reject { |o| o.sold_out }
       end
 
       def shipping
-        @shipping ||= source['shipping'].map { |o| ShippingOptionDrop.new(o.update('product' => self)) }
+        @shipping ||= source['shipping'].present? ? source['shipping'].map { |o| ShippingOptionDrop.new(o.update('product' => self)) } : []
       end
 
       def image
@@ -70,15 +74,15 @@ module Dugway
       end
 
       def edit_url
-        "http://bigcartel.com"
+        'http://bigcartel.com'
       end
 
       def categories
-        @categories ||= CategoriesDrop.new(source['categories'].map { |c| CategoryDrop.new(c) }) rescue []
+        @categories ||= source['categories'].map { |c| CategoryDrop.new(c) } rescue []
       end
 
       def artists
-        @artists ||= ArtistsDrop.new(source['artists'].map { |a| ArtistDrop.new(a) }) rescue []
+        @artists ||= source['artists'].map { |a| ArtistDrop.new(a) } rescue []
       end
 
       def css_class

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

@@ -2,7 +2,7 @@ module Dugway
   module Drops
     class ProductOptionDrop < BaseDrop
       def default
-        name.downcase == 'default'
+        position == 1
       end
 
       def has_custom_price

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

@@ -5,6 +5,8 @@ module Dugway
         @country ||= CountryDrop.new(source['country'])
       end
 
+      # internal
+
       def strict
         @strict ||= product.shipping.size > 1 || product.shipping.first.country.name.present?
       end

data/lib/dugway/liquid/tags/checkout_form.rb

@@ -2,7 +2,7 @@ module Dugway
   module Tags
     class CheckoutForm < ::Liquid::Block
       def render(context)
-        %{<form id="checkout_form" name="checkout_form" method="post" action="/success"></form>}
+        %{<form id="checkout_form" name="checkout_form" method="post" action="/success">#{ render_all(@nodelist, context) }</form>}
       end
     end
   end

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/spec/features/contact_form_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+feature 'Contact form' do
+  scenario 'submitting the form' do
+    submit_contact_form
+    expect(page).to have_content('Your message has been sent')
+  end
+
+  scenario 'with a missing field' do
+    submit_contact_form(:name => '')
+    expect(page).to have_content('All fields are required')
+  end
+
+  scenario 'with an invalid email' do
+    submit_contact_form(:email => 'blah')
+    expect(page).to have_content('Invalid email address')
+  end
+
+  scenario 'with an invalid captcha' do
+    submit_contact_form(:captcha => 'blah')
+    expect(page).to have_content('Spam check was incorrect')
+  end
+
+  def submit_contact_form(fields={})
+    fields.reverse_merge!(
+      :name => 'Joe',
+      :email => 'joe@example.com',
+      :subject => 'Testing',
+      :message => 'Hi there',
+      :captcha => 'rQ9pC'
+    )
+
+    visit '/contact'
+
+    fill_in 'Name', :with => fields[:name]
+    fill_in 'Email', :with => fields[:email]
+    fill_in 'Subject', :with => fields[:subject]
+    fill_in 'Message', :with => fields[:message]
+    fill_in 'Spam check', :with => fields[:captcha]
+
+    click_button 'Send'
+  end
+end

data/spec/features/page_rendering_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+feature 'Page rendering' do
+  scenario 'home.html' do
+    visit '/'
+    expect(page).to have_content('Dugway') # layout.html
+    expect(page).to have_content('My Product')
+    expect(page).to have_content('$10.00')
+  end
+
+  scenario 'products.html' do
+    visit '/products'
+    expect(page).to have_content('Dugway') # layout.html
+    expect(page).to have_content('Products')
+    expect(page).to have_content('My Product')
+    expect(page).to have_content('$10.00')
+  end
+
+  scenario 'product.html' do
+    visit '/product/my-product'
+    expect(page).to have_content('Dugway') # layout.html
+    expect(page).to have_content('My Product')
+    expect(page).to have_content('$10.00')
+  end
+
+  scenario 'cart.html' do
+    visit '/cart'
+    expect(page).to have_content('Dugway') # layout.html
+    expect(page).to have_content('Cart')
+    expect(page).to have_content('Your cart is empty')
+  end
+
+  scenario 'success.html' do
+    visit '/success'
+    expect(page).to have_content('Dugway') # layout.html
+    expect(page).to have_content('Thank You. Your order has been placed.')
+  end
+
+  scenario 'contact.html' do
+    visit '/contact'
+    expect(page).to have_content('Dugway') # layout.html
+    expect(page).to have_content('Contact')
+    expect(page).to have_content('Spam check')
+  end
+
+  scenario 'maintenance.html' do
+    visit '/maintenance'
+    expect(page).to have_content('Please check back soon.')
+  end
+
+  scenario 'custom page' do
+    visit '/about-us'
+    expect(page).to have_content('Dugway') # layout.html
+    expect(page).to have_content('About Us')
+    expect(page).to have_content("We're really cool!")
+  end
+
+  scenario 'styles.css' do
+    visit '/styles.css'
+    expect(page).to have_content('height: 100%;') # one.css
+    expect(page).to have_content('color: red;') # two.css.sass
+  end
+
+  scenario 'scripts.js' do
+    visit '/scripts.js'
+    expect(page).to have_content("console.log('One')") # one.js
+    expect(page).to have_content("console.log('Two')") # two.js.coffee
+  end
+end

data/spec/features/shopping_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+feature 'Shopping' do
+  scenario 'buying a product' do
+    visit '/'
+    expect(page).to have_content('Cart ($0.00)')
+
+    add_product_to_cart
+    expect(page).to have_content('Cart ($10.00)')
+
+    click_button 'Checkout'
+    expect(page).to have_content('One moment...')
+
+    click_button 'Checkout'
+    expect(page).to have_content('Thank You. Your order has been placed.')
+    expect(page).to have_content('Cart ($0.00)')
+  end
+
+  scenario 'updating a cart' do
+    add_product_to_cart
+    fill_in 'item_1_qty', :with => 3
+    click_button 'Update'
+    expect(page).to have_content('Cart ($30.00)')
+  end
+
+  scenario 'removing a product' do
+    add_product_to_cart
+    fill_in 'item_1_qty', :with => 0
+    click_button 'Update'
+    expect(page).to have_content('Cart ($0.00)')
+    expect(page).to have_content('Your cart is empty')
+  end
+
+  def add_product_to_cart
+    visit '/product/my-product'
+    click_button 'Add to Cart'
+  end
+end