dugway 0.5.3 → 0.5.4

data/spec/fixtures/store/products.js

@@ -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":475,"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":false,"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":false,"permalink":"my-print","name":"My 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/my-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/store/store.js

@@ -1 +1 @@
-{"website":"","artists":[{"permalink":"artist-one","name":"Artist One","id":176141,"url":"/artist/artist-one"},{"permalink":"artist-two","name":"Artist Two","id":176144,"url":"/artist/artist-two"}],"products_count":3,"currency":{"sign":"$","name":"U.S. Dollar","id":1,"code":"USD"},"country":{"name":"United States","id":43,"code":"US"},"categories":[{"permalink":"cds","name":"CDs","id":4615184,"url":"/category/cds"},{"permalink":"hats","name":"Hats","id":4615187,"url":"/category/hats"},{"permalink":"prints","name":"Prints","id":4615190,"url":"/category/prints"},{"permalink":"tees","name":"Tees","id":4615193,"url":"/category/tees"}],"name":"Dugway","pages":[{"permalink":"about-us","name":"About Us"}],"url":"http://dugway.bigcartel.com","description":""}
+{"website":"https://github.com/bigcartel/dugway","artists":[{"permalink":"artist-one","name":"Artist One","id":176141,"url":"/artist/artist-one"},{"permalink":"artist-two","name":"Artist Two","id":176144,"url":"/artist/artist-two"},{"permalink":"threezer","name":"Threezer","id":176151,"url":"/artist/threezer"}],"products_count":3,"currency":{"sign":"$","name":"U.S. Dollar","id":1,"code":"USD"},"country":{"name":"United States","id":43,"code":"US"},"categories":[{"permalink":"cds","name":"CDs","id":4615184,"url":"/category/cds"},{"permalink":"hats","name":"Hats","id":4615187,"url":"/category/hats"},{"permalink":"prints","name":"Prints","id":4615190,"url":"/category/prints"},{"permalink":"tees","name":"Tees","id":4615193,"url":"/category/tees"}],"name":"Dugway","pages":[{"permalink":"about-us","name":"About Us"}],"url":"http://dugway.bigcartel.com","description":"A really cool store."}

data/spec/fixtures/theme/cart.html

@@ -6,21 +6,36 @@
     <ul>
       {% for item in cart.items %}
       <li>
-        <a href="{{ item.product.url }}" style="background-image: url({{ item.product.image | product_image_url size:"thumb" }});">{{ item.name }}</a>
-        <span><a href="{{ item.product.url }}">{{ item.product.name }}</a></span>
-        {% unless item.product.has_default_option %}
-        <span>{{ item.option.name }}</span>
-        {% endunless %}
-      </li>
+      <a href="{{ item.product.url }}">
+        <img src="{{ item.product.image | product_image_url size:"thumb" }}">
+      </a>
+      <h2>
+        <a href="{{ item.product.url }}">
+          {{ item.product.name }}
+          {% unless item.product.has_default_option %}
+            <em>{{ item.option.name }}</em>
+          {% endunless %}
+        </a>
+      </h2>
+      <p>
+        {{ item | item_quantity_input }}
+        {{ item.price | money_with_sign }}
+        <a href="#" class="remove">&times;</a>
+      </p>
+    </li>
       {% endfor %}
       
       <li>
         <label>Total:</label>
         <span>{{ cart.total | money_with_sign }}</span>
       </li>
+
+      <li>
+        <button type="submit">Update</button>
+      </li>
       
       <li>
-        <button type="submit"name="checkout" title="Checkout" class="button">Checkout Now</button>
+        <button type="submit" name="checkout">Checkout</button>
       </li>
     </ul>
   </form>

data/spec/fixtures/theme/contact.html

@@ -1,37 +1,37 @@
-<div>
-  {% if contact.sent %}
-  <h1>Thank You!</h1>
-  <p>Your message has been sent and we will try to respond within 24 business hours.</p>      
-  {% else %}
-  <h1>{{ page.name }}</h1>
-  <form method="post" action="/contact">
-    <ul>
-      <li>
-        <label>Your Name:</label>
-        {{ contact | contact_input: 'name' }}
-      </li>
-      <li>
-        <label>Your Email:</label>
-        {{ contact | contact_input: 'email' }}                
-      </li>
-      <li>
-        <label>Subject:</label>
-        {{ contact | contact_input: 'subject' }}
-      </li>
-      <li>
-        <label>Message:</label>
-        {{ contact | contact_input: 'message' }}
-      </li>
-      <li id="captcha_img" class="clearfix">
-        <label>Spam Check:</label>
-        <p>Please enter the characters from the image.</p> 
-        {{ contact | contact_input: 'captcha' }}
-        <div id="captcha_phrase">{{ contact.captcha }}</div>       
-      </li>
-      <li>
-        <button type="submit" name="submit" class="button">Send Message</button>
-      </li>
-    </ul>
-  </form>
-  {% endif %}
-</div>
+{% if contact.sent %}
+
+<p>Your message has been sent and we&#8217;ll get back to you soon.</p>      
+
+{% else %}
+
+<form method="post" action="/contact">
+  <ul>
+    <li>
+      <label for="name">Name</label>
+      {{ contact | contact_input: 'name' }}
+    </li>
+    <li>
+      <label for="email">Email</label>
+      {{ contact | contact_input: 'email' }}
+    </li>
+    <li>
+      <label for="subject">Subject</label>
+      {{ contact | contact_input: 'subject' }}
+    </li>
+    <li>
+      <label for="message">Message</label>
+      {{ contact | contact_input: 'message' }}
+    </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' }}      
+    </li>
+    <li>
+      <button type="submit" name="submit" title="Send us an email">Send</button>
+    </li>
+  </ul>
+</form>
+
+{% endif %}

data/spec/fixtures/theme/layout.html

@@ -60,6 +60,14 @@
         </ul>
       </nav>
     </aside>
+
+    {% if errors != blank %}
+    <ul class="errors">
+      {% for error in errors %}
+      <li>{{ error }}</li>
+      {% endfor %}
+    </ul>
+    {% endif %}
     
     <section>
     {% if page.category == 'custom' %}

data/spec/fixtures/theme/settings.json

@@ -1,5 +1,6 @@
 {
   "name": "Test Theme",
+  "version": "1.2.3",
   "images": [
     {
       "variable": "logo",

data/spec/fixtures/theme/styles.css

@@ -1,4 +1,4 @@
 /*
-*= require stylesheets/reset
-*= require stylesheets/base
+*= require stylesheets/one
+*= require stylesheets/two
 */

data/spec/spec_helper.rb

@@ -1,4 +1,9 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'webmock/rspec'
+require 'json_expressions/rspec'
+require 'capybara/rspec'
 require 'dugway'
 
 RSpec.configure do |config|
@@ -20,5 +25,8 @@ RSpec.configure do |config|
     Dugway.stub(:theme) { 
       Dugway::Theme.new
     }
+
+    # Setup Capybara
+    Capybara.app = Dugway.application
   end
 end

data/spec/units/dugway/cart_spec.rb

@@ -0,0 +1,204 @@
+require 'spec_helper'
+
+describe Dugway::Cart do
+  let(:cart) { Dugway::Cart.new }
+  let(:store) { Dugway::Store.new('dugway') }
+  
+  let(:product) { store.products.first }
+  let(:product_option) { product['options'].first }
+
+  let(:product_2) { store.products.last }
+  let(:product_option_2) { product_2['options'].first }
+
+  describe "#new" do
+    it "should have a blank items array" do
+      cart.items.should be_an_instance_of(Array)
+      cart.items.should be_empty
+    end
+  end
+
+  describe "#reset" do
+    before(:each) do
+      cart.update(add: { id: product_option['id'] })
+    end
+
+    it "should empty the items array" do
+      expect { cart.reset }.to change { cart.items.size }.from(1).to(0)
+    end
+  end
+
+  describe "#item_count" do
+    it "should return the number of items in the cart times their quantity" do
+      cart.item_count.should == 0
+      cart.update(add: { id: product_option['id'] })
+      cart.item_count.should == 1
+      cart.update(add: { id: product_option_2['id'], quantity: 2 })
+      cart.item_count.should == 3
+    end
+  end
+
+  describe "#empty?" do
+    it "should return true or false if there are items in the cart" do
+      cart.should be_empty
+      cart.update(add: { id: product_option['id'] })
+      cart.should_not be_empty
+    end
+  end
+
+  describe "#subtotal" do
+    it "should return the total of all item prices times their quantity" do
+      cart.subtotal.should == 0.0
+      
+      cart.update(add: { id: product_option['id'], quantity: 1 })
+      cart.subtotal.should == product_option['price']
+
+      cart.update(add: { id: product_option_2['id'], quantity: 2 })
+      cart.subtotal.should == product_option['price'] + (product_option_2['price'] * 2)
+    end
+  end
+
+  describe "#total" do
+    it "should return the total of all item prices times their quantity" do
+      cart.total.should == 0.0
+      
+      cart.update(add: { id: product_option['id'], quantity: 1 })
+      cart.total.should == product_option['price']
+
+      cart.update(add: { id: product_option_2['id'], quantity: 2 })
+      cart.total.should == product_option['price'] + (product_option_2['price'] * 2)
+    end
+  end
+
+  describe "#country" do
+    it "should return nil to disable it" do
+      cart.country.should be_nil
+    end
+  end
+
+  describe "#shipping" do
+    it "should return a hash that disables it" do
+      cart.shipping.should == { 
+        'enabled' => false,
+        'amount' => 0.0,
+        'strict' => false,
+        'pending' => false
+      }
+    end
+  end
+
+  describe "#tax" do
+    it "should return a hash that disables it" do
+      cart.tax.should == { 
+        'enabled' => false,
+        'amount' => 0.0
+      }
+    end
+  end
+
+  describe "#discount" do
+    it "should return a hash that disables it" do
+      cart.discount.should == { 
+        'enabled' => false,
+        'pending' => false,
+        'amount' => 0.0
+      }
+    end
+  end
+
+  describe "#update" do
+    describe "when adding individual items" do
+      it "should add an item" do
+        cart.items.should be_empty
+        cart.update(add: { id: product_option['id'], quantity: 2 })
+        cart.items.should_not be_empty
+
+        item = cart.items.first
+        item.product['id'].should == product['id']
+        item.option['id'].should == product_option['id']
+        item.quantity.should == 2
+      end
+
+      it "should default to quantity 1" do
+        cart.items.should be_empty
+        cart.update(add: { id: product_option['id'] })
+        cart.items.should_not be_empty
+
+        item = cart.items.first
+        item.product['id'].should == product['id']
+        item.option['id'].should == product_option['id']
+        item.quantity.should == 1
+      end
+
+      it "should update the existing item when re-adding the same thing" do
+        cart.items.should be_empty
+        cart.update(add: { id: product_option['id'] })
+        cart.items.should_not be_empty
+
+        item = cart.items.first
+        item.product['id'].should == product['id']
+        item.option['id'].should == product_option['id']
+        item.quantity.should == 1
+
+        cart.update(add: { id: product_option['id'], quantity: 2 })
+
+        item = cart.items.first
+        item.product['id'].should == product['id']
+        item.option['id'].should == product_option['id']
+        item.quantity.should == 3
+      end
+    end
+
+    describe "when adding multiple items at once" do
+      it "should add multiple items" do
+        cart.items.should be_empty
+        cart.update(adds: [{ id: product_option['id'] }, { id: product_option_2['id'], quantity: 2 }])
+        cart.item_count.should == 3
+
+        item = cart.items.first
+        item.product['id'].should == product['id']
+        item.option['id'].should == product_option['id']
+        item.quantity.should == 1
+
+        item = cart.items.last
+        item.product['id'].should == product_2['id']
+        item.option['id'].should == product_option_2['id']
+        item.quantity.should == 2
+      end
+    end
+
+    describe "when updating items already in the cart" do
+      before(:each) do
+        cart.update(adds: [{ id: product_option['id'] }, { id: product_option_2['id'], quantity: 2 }])
+      end
+
+      it "should update the quanitities" do
+        cart.item_count.should == 3
+        
+        item_1 = cart.items.first
+        item_2 = cart.items.last
+
+        cart.update(:update => { item_1.id => 3, item_2.id => 1 })
+        cart.item_count.should == 4
+      end
+    end
+  end
+
+  describe "#as_json" do
+    before(:each) do
+      cart.update(adds: [{ id: product_option['id'] }, { id: product_option_2['id'], quantity: 2 }])
+    end
+
+    it "should output the cart as JSON" do
+      cart.as_json.should match_json_expression({
+        :item_count => cart.item_count,
+        :subtotal => cart.subtotal,
+        :price => cart.subtotal,
+        :total => cart.total,
+        :items => cart.items,
+        :country => cart.country,
+        :shipping => cart.shipping,
+        :discount => cart.discount
+      })
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Dugway::Drops::AccountDrop do
+  let(:account) { Dugway::Drops::AccountDrop.new(Dugway.store.account) }
+
+  describe "#name" do
+    it "should return the store's name" do
+      account.name.should == 'Dugway'
+    end
+  end
+
+  describe "#description" do
+    it "should return the store's description" do
+      account.description.should == 'A really cool store.'
+    end
+  end
+
+  describe "#url" do
+    it "should return the store's url" do
+      account.url.should == 'http://dugway.bigcartel.com'
+    end
+  end
+
+  describe "#website" do
+    it "should return the store's website" do
+      account.website.should == 'https://github.com/bigcartel/dugway'
+    end
+  end
+
+  describe "#currency" do
+    it "should return the store's currency" do
+      currency = account.currency
+      currency.should be_an_instance_of(Dugway::Drops::CurrencyDrop)
+      currency.name.should == 'U.S. Dollar'
+      currency.code.should == 'USD'
+      currency.sign.should == '$'
+    end
+  end
+
+  describe "#country" do
+    it "should return the store's country" do
+      country = account.country
+      country.should be_an_instance_of(Dugway::Drops::CountryDrop)
+      country.name.should == 'United States'
+      country.code.should == 'US'
+    end
+  end
+
+  describe "#logged_in" do
+    it "should return false" do
+      account.logged_in.should be(false)
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Dugway::Drops::ArtistDrop do
+  let(:artist) { Dugway::Drops::ArtistDrop.new(Dugway.store.artists.first) }
+
+  describe "#id" do
+    it "should return the artist's id" do
+      artist.id.should == 176141
+    end
+  end
+
+  describe "#name" do
+    it "should return the artist's name" do
+      artist.name.should == 'Artist One'
+    end
+  end
+
+  describe "#permalink" do
+    it "should return the artist's permalink" do
+      artist.permalink.should == 'artist-one'
+    end
+  end
+
+  describe "#url" do
+    it "should return the artist's url" do
+      artist.url.should == '/artist/artist-one'
+    end
+  end
+
+  describe "#products" do
+    it "should return the artist's products" do
+      products = artist.products
+      products.should be_an_instance_of(Array)
+
+      product = products.first
+      product.should be_an_instance_of(Dugway::Drops::ProductDrop)
+      product.name.should == 'My Product'
+    end
+  end
+end