shopifydev 0.0.1 → 0.0.2

data/.pryrc

@@ -1,3 +1,3 @@
 require 'bundler/setup'
 require 'shopifydev'
-require 'shopifydev/pry/commands'
+require 'shopifydev/console'

data/NEXTSTEPS.md

@@ -20,10 +20,66 @@ apps (heroku):
 1. metafieldseditor
 2. shipping
 
+_pry_.switch
+  Switch is a class, and every instance of Pry has an instance of Switch. This way we can
+  access _pry_.switch. In the global scope there will be an object called 'switch' that will
+  be an alias to _pry_.switch so that we can call its public methods. There will also be a 
+  command 'switch' that will be a wrapper for the _pry_.switch methods for displaying and
+  handling a menu.
 
+  So we can do
 
-when you choose 
+  `[1] pry(main)> switch`
 
+  to present a menu of options and then
+
+  `[1] pry(main)> switch 3`
+
+  to choose one of them. This command just refers to methods on Pry.Switch in its process definition
+
+  Or we can use tab completion to present the menu by invoking switch as a global object.
+
+````
+  [1] pry(main)> switch.m[TAB]
+  switch.metafieldseditor switch.morfars-metafields
+  [2] pry(main)> switch.mo[TAB]rfars-metafields
+````
+
+  to accomplish the same.
+
+   - When you use switch by itself, with no args, then _pry_.switch gets reset to the first menu
+   - each time you make a choice, this advances _pry_.switch to the next menu
+
+  So in a deep menu we might see:
+
+````
+  [1] pry(main)> switch
+  current shop: none
+
+  Heroku Apps
+  1. right app
+  2. wrong app
+  [1] pry(main)> switch 2
+  current shop: none
+
+  Wrong App
+  1. not ok
+  2. something
+  [1] pry(main)> switch
+  current shop: none
+
+  Heroku Apps
+  1. right app
+  2. wrong app
+  [1] pry(main)> switch 1
+  current shop: none
+
+  Wrong App
+  1. another thing
+  2. the thing you wanted
+  [1] pry(main)> switch 2
+  current shop: none switching to "the thing you wanted"...
+````
 
 # To check out
 
@@ -31,3 +87,21 @@ https://github.com/pry/pry-coolline
 https://github.com/cldwalker/bond
 
 
+# Menu of Shops in local apps
+- [x] run rake shops in chosen local app
+- [ ] display result of rake shops in a menu
+  - how do we handle this? do we use letters? or does switch command remember state (which menu was displayed last)? ie, what does ```switch 1``` mean? 
+- [ ] memoize results of rake shops in a hash with same keys as the apps have in config (I would put this in config). This is because running rake shops is slow enough to be annoying.
+- [ ] add -r,--refresh option to switch command to tell it to get fresh data
+- [ ] deploy apps with shopify_dev gem
+  - [ ] metafieldseditor              richard@webifytechnology.com
+  - [ ] morfars-metafields            richard@webifytechnology.com
+  - [ ] red-pepper-shipping           richard@webifytechnology.com
+  - [ ] shipping-lifemap-bioreagents  richard@webifytechnology.com
+  - [ ] shipping-staging              richard@webifytechnology.com
+
+
+# Using pry features
+https://github.com/ConradIrwin/pry-rescue
+-- we **really** want to be using this in test/development environments in rails apps. 
+https://github.com/envygeeks/pry-vterm_aliases

data/README.md

@@ -69,6 +69,37 @@ you won't upload a file twice unless it gets changed twice in the same commit)
 
 One final tip: `alias upify='shopifydev upload'`
 
+# Caches
+
+Caches are defined on ```ShopifyAPI```.
+Assuming you ```cd ShopifyAPI```:
+
+        products
+        => lazily fetched cached products
+        
+        products.r
+        => reload products cache
+        
+        products(product_type: 'xxxx')
+        => reload products cache with params {product_type: 'xxxx'}
+        
+        products.params
+        => shows params the caches were fetched with
+        
+        products.since
+        => shows when the products cache was last fetched
+        
+        caches
+        => lists status of all the caches & when they were last
+           reloaded. Will show an ! next to records that were fetched
+           with params.
+        
+        caches true
+        => shows params the caches were loaded with
+        
+
+
+
 ## Contributing
 
 1. Fork it

data/bin/shopify_console

@@ -1,15 +1,8 @@
 #!/usr/bin/env ruby
 require 'pry'
 require 'shopifydev'
-require 'shopifydev/pry/commands'
+require 'shopifydev/console'
 
-
-MY_OBJ = []
-
-def bob
-  "yo, bob here"
-end
-# start a REPL session
-binding.pry
+Pry.start
 
 puts "Thank you for using Shopify Console. Enjoy your day."

data/lib/shopifydev/console.rb

@@ -0,0 +1,15 @@
+require 'shopifydev/pry/commands'
+require 'shopifydev/shopify_api/caches'
+
+require 'term/ansicolor'
+class Color
+  if Pry.config.color
+    extend Term::ANSIColor
+  else
+    class << self
+      def method_missing
+        ''
+      end
+    end
+  end
+end

data/lib/shopifydev/pry/commands.rb

@@ -1,16 +1,4 @@
-require 'term/ansicolor'
 require 'oj'
-class Color
-  if Pry.config.color
-    extend Term::ANSIColor
-  else
-    class << self
-      def method_missing
-        ''
-      end
-    end
-  end
-end
 
 class LocalShopifyApp
   attr_accessor :path
@@ -19,15 +7,14 @@ class LocalShopifyApp
   end
 
   def shops
-    json = `/bin/bash -l -c "unset BUNDLE_GEMFILE; cd #{path}; bundle exec rake shops 2>/dev/null"`
+    json = `/bin/bash -l -c "unset BUNDLE_GEMFILE; cd #{path} 2> /dev/null; bundle exec rake shops 2>/dev/null"`
     json = json.split("----snip----\n").last
+    json = json.split("\n").last
     Oj.load json
   end
-
 end
 
 class ConfigMenu
-
   attr_accessor :cfg
 
   def initialize(cfg)
@@ -35,6 +22,7 @@ class ConfigMenu
     @menu_choices = [:do_nothing]
     @menu_display = []
   end
+
   def build
     header("Test Shops")
     cfg[:test_shops].keys.each do |k|
@@ -103,8 +91,6 @@ shopifydev_command_set = Pry::CommandSet.new do
 
       config_menu = ConfigMenu.new(Shopifydev::Config.config).build
 
-      
-
       case true
       when args.empty?
         config_menu.print(output)
@@ -137,7 +123,7 @@ shopifydev_command_set = Pry::CommandSet.new do
           output.puts "you picked #{path.join('.')}"
           output.puts cfg.inspect
           app = LocalShopifyApp.new(cfg)
-          output.puts Color.yellow{ app.shops.inspect }          
+          output.puts Color.yellow{ app.shops.inspect }
         when :heroku
           output.puts "you picked #{path.join('.')}"
           output.puts cfg.inspect
@@ -188,7 +174,6 @@ shopifydev_command_set = Pry::CommandSet.new do
       ix += output_menu_choices(cfg[:apps][:heroku].keys.sort, ix)
     end
   end
-
 end
 
 Pry::Commands.import shopifydev_command_set

data/lib/shopifydev/shopify_api/caches.rb

@@ -0,0 +1,176 @@
+puts "yo, included"
+
+module Shopifydev
+  module ShopifyAPI
+    module DirtyCache
+      def dirty!
+        ShopifyAPI.dirty!
+      end
+
+      def site=(uri)
+        ShopifyAPI.dirty!
+        super uri
+      end
+    end
+  end
+end
+
+module ShopifyAPI
+  class Base
+    include Shopifydev::ShopifyAPI::DirtyCache
+  end
+end
+
+module ShopifyAPI
+  class << self
+
+    def cache_status(cache, show_opts=false)
+      dirty?
+      subset = ''
+      opts = ''
+      length = Color.black{'unloaded'}
+      since = ''
+      unless cache.nil?
+        if !show_opts && (cache.params.keys.to_set != Set[:limit])
+          subset = Color.red('!')
+        end
+        if show_opts
+          opts = cache.params.map{|k, v| Color.magenta{k.to_s} + Color.black{':'} + Color.green{v.to_s}}.join(Color.black{', '})
+          opts = "\n  #{opts}"
+        end
+        length = (cache.length > 0) ? "#{cache.length.to_s}#{subset} #{Color.black{cache.label}}" : 'empty'
+        since = "#{Color.black{'on:'}}#{cache.since.strftime("%a %H:%M:%S")}"
+      end
+      "#{length.ljust(18)} #{since}#{opts}"
+    end
+
+    def caches(show_opts=false)
+      return if warn_site
+      dirty?
+      puts <<-EOF
+#{Color.blue{'products'}}:           #{cache_status(@@products, show_opts)}
+#{Color.blue{'variants'}}:           #{cache_status(@@variants, show_opts)}
+#{Color.blue{'metafields'}}:         #{cache_status(@@metafields, show_opts)}
+#{Color.blue{'orders'}}:             #{cache_status(@@orders, show_opts)}
+#{Color.blue{'customers'}}:          #{cache_status(@@customers, show_opts)}
+#{Color.blue{'custom_collections'}}: #{cache_status(@@custom_collections, show_opts)}
+#{Color.blue{'smart_collections'}}:  #{cache_status(@@smart_collections, show_opts)}
+EOF
+    end
+
+    def dirty?
+      @@products ||= nil
+      @@variants ||= nil
+      @@metafields ||= nil
+      @@orders ||= nil
+      @@customers ||= nil
+      @@custom_collections ||= nil
+      @@smart_collections ||= nil
+    end
+
+    def dirty!
+      @@products = nil
+      @@variants = nil
+      @@metafields = nil
+      @@orders = nil
+      @@customers = nil
+      @@custom_collections = nil
+      @@smart_collections = nil
+    end
+
+    def add_cache_methods(obj, opts, entity)
+      obj.singleton_class.class_eval{define_method(:label){entity.collection_name}}
+      obj.singleton_class.class_eval{define_method(:since=){|t| @since = t }}
+      obj.singleton_class.class_eval{define_method(:since){ @since }}
+      obj.singleton_class.class_eval{attr_accessor :params}
+      obj.since = Time.now
+      obj.singleton_class.class_eval{define_method(:r) { |msg = 'reloading'| 
+        puts "#{msg}..."
+        self.replace(entity.find(:all, params: self.params))
+        self.since = Time.now
+        puts "#{self.length} records."
+        nil
+      }}
+    end
+
+    def warn_site
+      if ::ShopifyAPI::Base.site.nil? || ::ShopifyAPI::Base.site.blank?
+        puts "No active Shopify session"
+        true
+      else
+        false
+      end
+    end
+
+    def fetch_cache(entity, opts, obj)
+      msg = nil
+      refresh = opts.delete(:r)
+      if obj.nil? || refresh
+        obj = []
+        add_cache_methods(obj, opts, entity)
+        obj.params = opts
+        msg = refresh ? "reloading #{entity.collection_name}" : "loading #{entity.collection_name}"
+        obj.r(msg)
+      elsif (obj.params != opts)
+        msg = "reloading #{entity.collection_name} with new params..."
+        obj.params = opts
+        obj.r(msg)
+      end
+      obj
+    end
+
+    def products(opts={limit: 250})
+      return if warn_site
+      @@products ||= nil
+      @@products = fetch_cache(ShopifyAPI::Product, opts, @@products)
+      @@products
+    end
+
+    def variants(opts={limit: 250})
+      return if warn_site
+      @@variants ||= nil
+      @@variants = fetch_cache(ShopifyAPI::Variant, opts, @@variants)
+      @@variants
+
+    end
+
+    def orders(opts={limit: 250})
+      return if warn_site
+      @@orders ||= nil
+      @@orders = fetch_cache(ShopifyAPI::Order, opts, @@orders)
+      @@orders
+    end
+
+    def customers(opts={limit: 250})
+      return if warn_site
+      @@customers ||= nil
+      @@customers = fetch_cache(ShopifyAPI::Customer, opts, @@customers)
+      @@customers
+    end
+
+    def metafields(opts={limit: 250})
+      return if warn_site
+      @@metafields ||= nil
+      @@metafields = fetch_cache(ShopifyAPI::Metafield, opts, @@metafields)
+      @@metafields
+    end
+
+    def custom_collections(opts={limit: 250})
+      return if warn_site
+      @@custom_collections ||= nil
+      @@custom_collections = fetch_cache(ShopifyAPI::CustomCollection, opts, @@custom_collections)
+      @@custom_collections
+    end
+
+    def smart_collections(opts={limit: 250})
+      return if warn_site
+      @@smart_collections ||= nil
+      @@smart_collections = fetch_cache(ShopifyAPI::SmartCollection, opts, @@smart_collections)
+      @@smart_collections
+    end
+
+
+
+
+  end
+end

data/lib/shopifydev/version.rb

@@ -1,3 +1,3 @@
 module Shopifydev
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/shopifydev/console_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "Console" do
+  it "needs to have tests written"
+end

data/spec/shopifydev/shopifyapi/caches_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "Caches" do
+  it "needs to have tests written"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopifydev
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shopify_api
@@ -215,6 +215,7 @@ files:
 - lib/shopifydev/asset.rb
 - lib/shopifydev/commands.rb
 - lib/shopifydev/config.rb
+- lib/shopifydev/console.rb
 - lib/shopifydev/generators/shop.rb
 - lib/shopifydev/generators/templates/Gemfile
 - lib/shopifydev/generators/templates/gitignore
@@ -223,19 +224,16 @@ files:
 - lib/shopifydev/pry/commands.rb
 - lib/shopifydev/railtie.rb
 - lib/shopifydev/shop.rb
+- lib/shopifydev/shopify_api/caches.rb
 - lib/shopifydev/template.rb
 - lib/shopifydev/version.rb
 - shopifydev.gemspec
 - spec/shopifydev/config_spec.rb
+- spec/shopifydev/console_spec.rb
 - spec/shopifydev/generators/shopifydev/shopifydev_generator_spec.rb
 - spec/shopifydev/pry/commands_spec.rb
 - spec/shopifydev/railtie_spec.rb
-- templates/customers/order.liquid
-- templates/customers/register.liquid
-- templates/page.support.liquid
-- templates/page.verbose.liquid
-- templates/product.liquid
-- templates/search.liquid
+- spec/shopifydev/shopifyapi/caches_spec.rb
 - test_driver.rb
 homepage: ''
 licenses: []
@@ -251,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1632061386653175643
+      hash: -20439056481340104
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -260,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1632061386653175643
+      hash: -20439056481340104
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -270,6 +268,8 @@ summary: Abstract out and port to ruby the functionality of the shopify textmate
   for use in other editors.
 test_files:
 - spec/shopifydev/config_spec.rb
+- spec/shopifydev/console_spec.rb
 - spec/shopifydev/generators/shopifydev/shopifydev_generator_spec.rb
 - spec/shopifydev/pry/commands_spec.rb
 - spec/shopifydev/railtie_spec.rb
+- spec/shopifydev/shopifyapi/caches_spec.rb

data/templates/customers/order.liquid

@@ -1,109 +0,0 @@
-{% layout settings.customer_layout %}
-
-<div id="admin_header">
-  <h2 class="title">Order {{ order.name }}</h2>
-</div>
-
-{% if order.cancelled %}
-<div id="order_cancelled" class="flash notice">
-  <h5 id="order_cancelled_title">Order Cancelled <span class="note">on {{ order.cancelled_at | date: "%B %d, %Y %I:%M%p" }}</span></h5>
-  <span class="note">{{ order.cancel_reason }}</span>
-</div>
-{% endif %}
-
-<div class="note order_date">Placed on {{ order.created_at | date: "%B %d, %Y %I:%M%p" }}</div>
-
-<div id="order_address" class="group">
-  <div id="order_payment">
-    <h3>Billing Address</h3>
-    <p><span class="note">Payment Status:</span> <span class="status_{{ order.financial_status }}">{{ order.financial_status }}</span></p>
-    <div class="address note">
-      <p>{{ order.billing_address.name }}</p>
-      <p>{{ order.billing_address.company }}</p>
-      <p>{{ order.billing_address.street }}</p>
-      <p>{{ order.billing_address.city }}, {{ order.billing_address.province }}</p>
-      <p>{{ order.billing_address.country }} {{ order.billing_address.zip }}</p>
-      <p>{{ order.billing_address.phone }}</p>
-    </div>
-  </div>
-  {% if order.shipping_address %}
-    <div id="order_shipping">
-      <h3>Shipping Address</h3>
-      <p><span class="note">Fulfillment Status:</span> <span class="status_{{ order.fulfillment_status }}">{{ order.fulfillment_status }}</span></p>
-      <div class="address note">
-        <p>{{ order.shipping_address.name }}</p>
-        <p>{{ order.shipping_address.company }}</p>
-        <p>{{ order.shipping_address.street }}</p>
-        <p>{{ order.shipping_address.city }}, {{ order.shipping_address.province }}</p>
-        <p>{{ order.shipping_address.country }} {{ order.shipping_address.zip }}</p>
-        <p>{{ order.shipping_address.phone }}</p>
-      </div>
-    </div>
-  {% endif %}
-</div>
-
-<table id="order_details">
-  <thead>
-    <tr id="cart-heading">
-      <th class="cart-header first" id="product"><h3>Product</h3></th>
-      <th class="cart-header first" id="sku"><h3>SKU</h3></th>
-      <th class="cart-header first" id="price"><h3>Price</h3></th>
-      <th class="cart-header first" id="quantity"><h3>Quantity</h3></th>
-      <th class="cart-header first" id="total"><h3>Total</h3></th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for line_item in order.line_items %}
-    <tr id="{{ line_item.id }}" class="order cart-item {% cycle 'odd', 'even' %}">
-      <td class="product">
-        {{ line_item.title | link_to: line_item.product.url }} 
-        {% if line_item.fulfillment %}
-          <div class="note">
-            Fulfilled {{ line_item.fulfillment.created_at | date: "%b %d" }}
-            {% if line_item.fulfillment.tracking_number %}
-              <a href="{{ line_item.fulfillment.tracking_url }}">{{ line_item.fulfillment.tracking_company }} #{{ line_item.fulfillment.tracking_number}}</a>
-            {% endif %}
-          </div>
-        {% endif %}
-      </td>
-      <td class="sku note">{{ line_item.sku }}</td>
-      <td class="money">{{ line_item.price | money }}</td>
-      <td class="quantity cente">{{ line_item.quantity }}</td>
-      <td class="total money">{{ line_item.quantity | times: line_item.price | money }}</td>
-    </tr>
-    {% endfor %}
-  </tbody>  
-  <tfoot>
-    <tr class="order_summary note">
-      <td class="label" colspan="4">Subtotal:</td>
-      <td class="total money">{{ order.subtotal_price | money }}</td>
-    </tr>   
-
-    {% for discount in order.discounts %}
-      <tr class="order_summary discount">
-        <td class="label" colspan="4">{{ discount.code }} Discount:</td>
-        <td class="total money">{{ discount.savings | money }}</td>
-      </tr>
-    {% endfor %}
-
-    {% for shipping_method in order.shipping_methods %}
-    <tr class="order_summary note">
-      <td class="label" colspan="4">Shipping ({{ shipping_method.title }}):</td>
-      <td class="total money">{{ shipping_method.price | money }}</td>
-    </tr>
-    {% endfor %}
-    
-    {% for tax_line in order.tax_lines %}
-      <tr class="order_summary note">
-        <td class="label" colspan="4">Tax ({{ tax_line.title }} {{ tax_line.rate | times: 100 }}%):</td>
-        <td class="total money">{{ tax_line.price | money }}</td>
-      </tr>
-    {% endfor %}    
-            
-    <tr class="order_summary order_total">
-      <td class="label" colspan="4">Total:</td>
-      <td class="total money">{{ order.total_price | money }} {{ order.currency }}</td>
-    </tr>   
-  </tfoot>  
-</table>
-

data/templates/customers/register.liquid

@@ -1,42 +0,0 @@
-{% layout settings.customer_layout %}
-
-<div id="template">
-  <div id="customer">
-	  <!-- Create Customer -->
-	  <div id="create-customer">
-	    <div class="template_header">
-	      <h2 class="title">Create Account</h2>
-	    </div>
-
-	    {% form 'create_customer' %}
-	      {{ form.errors | default_errors }}
-
-	      <div id="first_name" class="clearfix large_form">
-	        <label for="first_name" class="login">First Name</label>
-	        <input type="text" value="" name="customer[first_name]" id="first_name" class="large" size="30" />
-	      </div>
-
-	      <div id="last_name" class="clearfix large_form">
-	        <label for="last_name" class="login">Last Name</label>
-	        <input type="text" value="" name="customer[last_name]" id="last_name" class="large" size="30" />
-	      </div>
-
-	      <div id="email" class="clearfix large_form">
-	        <label for="email" class="login">Email Address</label>
-	        <input type="email" value="" name="customer[email]" id="email" class="large" size="30" />
-	      </div>
-
-	      <div id="password" class="clearfix large_form">
-	        <label for="password" class="login">Password</label>
-	        <input type="password" value="" name="customer[password]" id="password" class="large password" size="30" />
-	      </div>
-
-	      <div class="action_bottom">
-	        <input class="btn" type="submit" value="Create" />
-	        <span class="note"> {{ 'Login' | customer_login_link }}</span>
-	        <span class="note">or <a href="{{ shop.url }}">Return to Store</a></span>
-	      </div>	      
-	    {% endform %}
-	  </div><!-- /#create-customer -->
-  </div>
-</div>

data/templates/page.support.liquid

@@ -1,78 +0,0 @@
-
-
-
-
-<div id="page" class="clearfix">
-
-  <div id="header">
-    <div class="wrapper">
-      <p><h1>{{ page.title }}</h1></p>
-    </div>
-  </div>
-
-  <div class="content">
-    <div class="wrapper">
-
-      <div id="contact-menu">
-        {% for link in linklists['footer-support'].links %}
-        {% if link.title == page.title %}
-        <p><a href="{{ link.url }}" id="active"><h4>{{ link.title }}</h4></a></p>
-        {% else %}
-        <p><a href="{{ link.url }}"><h4>{{ link.title }}</h4></a></p>
-        {% endif %}
-        {% endfor %}
-      </div>
-
-      <div id="contact-form">
-
-        {% if page.title == "Contact" %}
-
-          {% form 'contact' %}
-
-          {% if form.posted_successfully? %}
-          Thanks for contacting us! We'll get back to you as soon as possible.
-          {% endif %}
-
-          {% if form.errors %}
-          {% for field in form.errors %}
-          <div>
-            <p id="error_message">{{ field }} - {{ form.errors.messages[field] }}</p>
-          </div>
-          {% endfor %}
-          {% endif %}
-
-          <div id="getintouch" style="float:left">
-            <h3>Get In Touch</h3>
-            <hr>
-            <small>* indicates a required field</small><br>
-            <input type="text" value="Full Name" name="contact[name]"> <br>
-            <input type="text" value="Email Address" name="contact[email]"> <span class="required">&nbsp;*</span> <br>
-            <textarea cols="38" rows="5" type="text" name="contact[message]">your message</textarea>
-            <input type="image" src="{{ 'getintouch.png' | asset_url }}" class="submit">
-          </div>
-          {% endform %}
-
-
-          <div id="contact-info">
-            <h3>Visit Our Store</h3>
-            <hr>
-            <p>Suite A - 123 Something Street <br>
-            Vancouver, BC Postal Code <br>
-            Canada</p>
-          </div>
-
-          <div id="contact-info">
-            <h3>Customer Support</h3>
-            <hr>
-            <p>(800)123-1234 <br>
-            support@elroy.com</p>
-          </div>
-        {% else %}
-          {{ page.content }}
-        {% endif %}
-
-      </div>
-
-    </div>
-  </div>
-</div> <!-- /#page -->

data/templates/page.verbose.liquid

@@ -1,18 +0,0 @@
-<div id="page" class="clearfix">
-
-  <div id="header">
-    <div class="wrapper">
-      <p><h1>{{ page.title }}</h1></p>
-    </div>
-  </div>
-
-  <div class="content">
-    <div class="wrapper">
-
-      <div id="contact-form">
-          {{ page.content }}
-      </div>
-
-    </div>
-  </div>
-</div> <!-- /#page -->

data/templates/product.liquid

@@ -1,284 +0,0 @@
-{% include 'breadcrumbs' %}
-
-<div id="product" class="content {{ product.handle }}{% if product.images.size == 1 %} one_image{% endif %} clearfix">
-
-  <div class="wrapper">
-    <div id="product-image">
-      {% if product.images.size > 1 %}
-        <div id="product-image-icons">
-          {% for image in product.images %}
-            <!-- CC attribution
-            magnifying-glass.ico
-            http://www.wpzoom.com
-            Designed by David Ferreira.
-            -->
-            <div class="image">
-              <a href="{{ image.src | product_img_url: 'original' }}" class="cloud-zoom-gallery" rel="useZoom: 'placeholder', smallImage: '{{ image.src | product_img_url: 'grande' }}', tint: '#ffffff'">
-                <img src="{{ image.src | product_img_url: 'small' }}" alt="{{ image.alt | escape }}" />
-              </a>
-            </div>
-          {% endfor %}
-        </div><!-- /.thumbs -->
-      {% endif %}
-      <div id="product-image-large">
-        <div class="image">
-          <a href="{{ product.featured_image.src | product_img_url: 'original' }}" class="cloud-zoom" rel="position: 'inside', showTitle: 'false'" id="placeholder">
-            <img src="{{ product.featured_image.src | product_img_url: 'grande' }}" alt="{{ product.featured_image.alt | escape }}" />
-          </a>
-        </div>
-
-      </div> <!-- /.featured -->
-      <div id="product-image-zoom">Hover over image to zoom</div>
-    </div> <!-- /.images -->
-
-    <div id="product-content">
-      {% if collection %}
-        <div class="more-info clearfix">
-          {% if collection.previous_product %}
-            <div class="fl">
-              <a href="{{ collection.previous_product }}" class="previous_product"><span class="upper">Previous</span> <span class="lower">Product</span></a>
-            </div>
-          {% endif %}
-          {% if collection.next_product %}
-            <div class="fr">
-              <a href="{{ collection.next_product }}" class="next_product"><span class="upper">Next</span> <span class="lower">Product</span></a>
-            </div>
-          {% endif %}
-        </div>
-      {% endif %}
-
-      <div id="product-full-description">
-        <div id="product-category">{{ collection.title | split: ' -- ' | last }}</div>
-        <h2 class="title">{{ product.title }}</h2>
-        {% if product.price_min < product.compare_at_price_min %}
-          <div id="product-price">{{ product.price_min | money }}</div>
-          <div id="product-price-old"><strike>{{ product.compare_at_price_min | money }}</strike></div>
-        {% else %}
-          <div id="product-price">{{ product.price_min | money }}</div>
-        {% endif %}
-
-        {% if settings.product_description_position == "top" %}
-
-          {% include 'shipping-and-return-tabs' %}
-
-        {% endif %}
-
-        <form id="add-item-form" action="/cart/add" method="post" class="variants clearfix">
-          {% if product.options.size > 1 %}
-            <div class="select clearfix">
-
-              <div id="product-color">
-                <div id="variant_details"></div>
-                <h4 style="color:#333">Please choose a color:</h4>
-                {% include 'swatches' %}
-              </div>
-
-              <div id="product-size" class="product-info">
-                <select id="product-select" name='id'>
-                  {% for variant in product.variants %}
-                    <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
-                  {% endfor %}
-                </select>
-              </div>
-            </div>
-          {% elsif product.options.size == 1 and product.variants.size > 1 %}
-            <div class="select clearfix">
-              <label>{{ product.options[0] }}</label>
-              <select id="product-select" name='id'>
-                {% for variant in product.variants %}
-                  <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
-                {% endfor %}
-              </select>
-            </div>
-          {% else %}
-            <input type="hidden" name="id" value="{{ product.variants.first.id }}" />
-          {% endif %}
-
-          <div id="product-quantity">
-            <label for="quantity"><h5 style="float:left">Quantity:</h5></label>
-            <input min="1" type="number" id="quantity" name="quantity" value="1" />
-          </div>
-
-
-          {% if product.available %}
-            <div class="purchase clearfix">
-              <span><input type="image" src="{{ 'cart.png' | asset_url }}" name="add" id="add-to-cart" value="Add to Cart" class="cart cufon" /></span>
-            </div>
-          {% else %}
-            <div class="purchase clearfix">
-              <span><input type="submit" name="add" id="add-to-cart" value="Sold Out" class="cart cufon disabled" disabled="disabled" /></span>
-            </div>
-          {% endif %}
-
-        </form>
-
-        <hr />
-
-        {% if settings.product_description_position == "bottom" %}
-
-          {% include 'shipping-and-return-tabs' %}
-
-          <div id="social-media">
-            {% include 'pinterest' %}
-            {% include 'like' %}
-            {% include 'amazon-wish-list' %}
-          </div>
-        {% endif %}
-
-      </div>
-    </div>
-
-    {% comment %} Related Products {% endcomment %}
-    {% include 'related-products' %}
-
-  </div>
-
-</div> <!-- /#product -->
-
-<script type="text/javascript">
-
-  // <![CDATA[
-    var selectCallback = function(variant, selector) {
-
-      // #variant_details is in snippets/shipping-and-return-tabs
-      var description = jQuery('#variant_details')
-
-      // if we have product variants with details
-      {% if product.metafields.variants.variant_details %}
-
-        // make an array of the details
-        var metafields = {{ product.metafields.variants.variant_details | json }}.split(':')
-
-        // match the details against the selected variant
-        var match = true
-        for (i = 0; i < variant.options.length; i++) {
-
-          if (variant.options[i].toLowerCase().trim() === metafields[i].trim()) {
-            // NOP
-          } else {
-            match = false;
-          }
-        } // post: if a metafield matched the current variant exactly, match is true
-
-        // if it was a complete match, then post the last detail
-        if (match === true) {
-          description.text(metafields.pop().trim())
-          description.addClass('active')
-        } else {
-          description.text('')
-          description.removeClass('active')
-        }
-      {% endif %}
-
-      if (variant && variant.available == true) {
-        // selected a valid variant
-        jQuery('#add-to-cart').removeClass('disabled').removeAttr('disabled').val('Add to Cart'); // remove unavailable class from add-to-cart button, and re-enable button
-        if(variant.price < variant.compare_at_price){
-          jQuery('#price-preview').html('<span class="money">'
-            + Shopify.formatMoney(variant.price, "{{ shop.money_format }}")
-            + '</span>'
-            + ' was <span class="money">'
-            + Shopify.formatMoney(variant.compare_at_price, "{{ shop.money_format }}")
-          + "</span>");
-        } else {
-          jQuery('#price-preview').html('<span class="money">' + Shopify.formatMoney(variant.price, "{{ shop.money_format }}") + '</span>');
-        }
-
-      } else {
-        // variant doesn't exist
-        var message = variant ? "Sold Out" : "Unavailable";
-        jQuery('#add-to-cart').addClass('disabled').attr('disabled', 'disabled').val('Sold Out');      // set add-to-cart button to unavailable class and disable button
-        jQuery('#product .variants .price').text(message); // update price-field message
-      }
-    };
-
-    function remove(s, t) {
-      /*
-      **  Remove all occurrences of a token in a string
-      **    s  string to be processed
-      **    t  token to be removed
-      **  returns new string
-      */
-      i = s.indexOf(t);
-      r = "";
-      if (i == -1) return s;
-      r += s.substring(0,i) + remove(s.substring(i + t.length), t);
-      return r;
-    }
-
-    // initialize multi selector for product
-    jQuery(function() {
-      /* NOTE we are not using recently-viewed, so I am removing the related code
-      if(jQuery.cookie("viewed-products") != null){ // if cookie exists...
-      var products = jQuery.cookie("viewed-products");
-      var productHandles = products.split(" ");
-      var matches = 0;
-      var limit = 4;
-      for(var i = (productHandles.length - 1); i >= 0; i--) {
-      if(productHandles[i] != "{{ product.handle }}" && productHandles[i] != "" && (matches < limit)){
-      Shopify.getProduct(productHandles[i]);
-      matches++;
-      }
-      }
-
-      if(products.indexOf("{{ product.handle }}") == -1){ // add current product to list if it isn't already there
-      products += " {{ product.handle }}";
-      jQuery.cookie("viewed-products", products, {path: "/"});
-      } else { // if it is already there, push it to the end of the string
-      var newstring = remove(products, '{{ product.handle }}');
-      newstring += " {{ product.handle }}";
-      jQuery.cookie("viewed-products", newstring.replace(/ /g,' '), {path: "/"});
-      }
-      } else { // create cookie if it doesn't already exist
-      jQuery.cookie("viewed-products", "{{ product.handle }}", {path: "/"});
-      } */
-
-      // create the multi-selector
-      {% if product.variants.size > 1 or product.options.size > 1 %}
-        new Shopify.OptionSelectors("product-select", { product: {{ product | json }}, onVariantSelected: selectCallback });
-
-        // wrap the labels for Cufon styling
-        var labels = jQuery('#product-size .selector-wrapper label')
-        labels.wrapInner('<h4 class="selector-label" />')
-
-        // add classes to each option for chaining
-        {% for variant in product.variants %}
-
-          var colour = '{{ variant.option1 }}'
-          var size = '{{ variant.option2 }}'
-
-          jQuery('#product-select-option-1'
-          + ' option[value="' + size + '"]').addClass(colour)
-
-        {% endfor %}
-
-        // choose a default value for each selector in the cluster
-        {% assign found_one_in_stock = false %}
-        {% for variant in product.variants %}
-          {% if variant.available and found_one_in_stock == false %}
-
-            // for the first variant that is in stock
-            {% assign found_one_in_stock = true %}
-            {% for option in product.options %}
-              jQuery('#product-select-option-' + {{ forloop.index0 }}).val({{ variant.options[forloop.index0] | json }}).trigger('change');
-
-            {% endfor %}
-          {% endif %}
-        {% endfor %}
-
-      {% endif %}
-
-      $("#product-select-option-1").chained("#product-select-option-0"); /* or $("#series").chainedTo("#mark"); */
-
-    });
-
-    /* NOTE we are not using recently-viewed so I am removing the related code
-    Shopify.onProduct = function(product) {
-      jQuery("#recently-viewed").css('display', 'block');
-      jQuery("#recently-viewed .products").append('<div class="product"><div class="image"><a href="' + product.url + '"><img src="' + Shopify.resizeImage(product.featured_image, 'large') + '" alt="' + product.title + '" /></a></div><div class="details clearfix"><a href="' + product.url + '"><span class="title">' + product.title + '</span></a></div></div>');
-      jQuery("#recently-viewed .products .product:nth-child(4)").addClass("last");
-      jQuery("#content-slide .product .details, #content-table .product .details").css({opacity:0.0});
-    }; */
-    // ]]>
-  </script>
-

data/templates/search.liquid

@@ -1,63 +0,0 @@
-<div id="search" class="clearfix">
-  {% if search.performed %}
-  <div class="main">
-    {% paginate search.results by settings.pagination_limit %}  
-    <div class="more-info clearfix">
-      <div class="fl">
-        <span class="upper">Search Results</span>
-        <span class="lower">{{ search.results_count }} {{ search.results_count | pluralize: 'Match', 'Matches' }} </span>
-      </div>
-      <div class="fr">
-        <span class="upper">&nbsp;</span>
-        <span class="lower">{% include 'pagination' %}</span>
-      </div>
-    </div>
-    {% if search.terms == "" %}
-    <p>Your search query was empty.</p>
-    {% else %}
-    {% if search.results == empty %}  
-    <div class="empty">
-      Your search for "{{search.terms | escape}}" did not yield any results
-    </div>              
-    {% else %}  
-
-    <div class="results">
-      {% for item in search.results %}
-      <div class="item clearfix">
-        <div class="thumbnail">
-          <a href="{{ item.url }}">{{ item.featured_image.src | product_img_url: 'thumb' | img_tag: item.featured_image.alt }}</a>
-        </div>
-        <div class="content">
-          <h4>{{ item.title | link_to: item.url }}</h4>
-          {{ item.content | strip_html | truncatewords: 40 | highlight: search.terms }}
-        </div>
-      </div> <!-- /.item -->
-      {% endfor %}
-    </div> <!-- /.results -->
-
-    {% endif %}
-    {% endif %}
-    
-    <div class="more-info clearfix">
-      <div class="fr">
-        <span class="upper">&nbsp;</span>
-        <span class="lower">{% include 'pagination' %}</span>
-      </div>
-    </div>
-
-    {% endpaginate %}
-  </div> <!-- /.main -->
-  {% include "sidebar" %}
-
-  {% else %}
-
-  <div id="not_found">
-    <h2>Search our shop</h2>
-    <form id="search_form" class="searchform" name="search" action="/search">
-      <input type="text" class="replace" name="q" value="Search..." />
-    </form>
-  </div> <!-- /#not_found -->
-
-  {% endif %}
-</div> <!-- /#search -->
-{% include 'featured-products' %}