dugway 0.6.7 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7e47d709cb5f76d05c027d2fc10b98213ae1974f
+  data.tar.gz: b433d613b1bc2698655855873a292c35abc44902
+SHA512:
+  metadata.gz: 4eb8c91e8a8feece607e54d14a7135db6b7dbb5213352576f44976a435a50a47355be11aa90063650b7e12a792a3727ec63998ea2b3dbe378bc5ce7d6e9435d0
+  data.tar.gz: 8d54a52bdf322b60a40aeb25a63ecde8cb9d4f4ef672b4abcbef0e46a5b929e046af8606f959b21848368ee7044050d936b6d24b935c571d57c8d1e5ee37f326

data/README.md

@@ -41,10 +41,10 @@ This will create a new directory named *mytheme* that contains a few configurati
     │   ├── product.html
     │   ├── products.html
     │   ├── screenshot.jpg
-    │   ├── scripts.js
     │   ├── settings.json
-    │   ├── styles.css
-    │   └── success.html
+    │   ├── success.html
+    │   ├── theme.css
+    │   └── theme.js
     └── config.ru
 
 
@@ -58,20 +58,20 @@ Develop the HTML for your theme using our [Theme API](http://help.bigcartel.com/
 
 ### CSS & JavaScript
 
-All CSS for your theme is handled by the **styles.css** file, and all JavaScript by **scripts.js**. If you don't have much CSS or JavaScript, or you're just a glutton for punishment, you could simply put all of your code in these two files. However, we recommend you use [Sprockets](http://getsprockets.org) to break your code into multiple files in separate directories.
+All CSS for your theme is handled by the **theme.css** file, and all JavaScript by **theme.js**. If you don't have much CSS or JavaScript, or you're just a glutton for punishment, you could simply put all of your code in these two files. However, we recommend you use [Sprockets](http://getsprockets.org) to break your code into multiple files in separate directories.
 
 #### Using Sprockets
 
-[Sprockets](http://getsprockets.org) allows you to bring in CSS and JavaScript from different directories into a single file. We've created **stylesheets** and **javascripts** directories by default that you can put your code in, but you could delete those and put files anywhere you'd like. After that, use [Sprockets directives](https://github.com/sstephenson/sprockets#the-directive-processor) to package them into **styles.css** and **scripts.js**.
+[Sprockets](http://getsprockets.org) allows you to bring in CSS and JavaScript from different directories into a single file. We've created **stylesheets** and **javascripts** directories by default that you can put your code in, but you could delete those and put files anywhere you'd like. After that, use [Sprockets directives](https://github.com/sstephenson/sprockets#the-directive-processor) to package them into **theme.css** and **theme.js**.
 
-##### styles.css
+##### theme.css
 
     /*
      *= require stylesheets/example_1
      *= require stylesheets/example_2
      */
 
-##### scripts.js
+##### theme.js
 
     //= require javascripts/example_1
     //= require javascripts/example_2
@@ -88,11 +88,11 @@ And finally, for you JavaScript folks, we've baked [CoffeeScript](http://coffees
 
 You can embed the CSS and JavaScript into your theme by passing the theme variable to the [theme_css_url](http://help.bigcartel.com/customer/portal/articles/772749-filters#url) and [theme_js_url](http://help.bigcartel.com/customer/portal/articles/772749-filters#url) filters.
 
-##### CSS (styles.css)
+##### CSS (theme.css)
 
     <link href="{{ theme | theme_css_url }}" media="screen" rel="stylesheet" type="text/css">
 
-##### JavaScript (scripts.js)
+##### JavaScript (theme.js)
 
     <script src="{{ theme | theme_js_url }}" type="text/javascript"></script>
 

data/dugway.gemspec

@@ -38,6 +38,8 @@ Gem::Specification.new do |s|
   s.add_dependency('rubyzip', '~> 0.9.9')
   s.add_dependency('uglifier', '~> 1.3.0')
   s.add_dependency('thin', '~> 1.5.0')
+  s.add_dependency('bigcartel-theme-fonts')
+  s.add_dependency('bigcartel-currency-locales')
 
   s.add_development_dependency('rake', '~> 10.0.3')
   s.add_development_dependency('rspec', '~> 2.12.0')

data/lib/dugway.rb

@@ -7,6 +7,8 @@ $VERBOSE = old_verbose
 
 require 'active_support/all'
 require 'i18n'
+require 'bigcartel-currency-locales'
+require 'bigcartel/theme/fonts'
 
 require 'rack/builder'
 require 'rack/commonlogger'
@@ -21,7 +23,6 @@ require 'dugway/request'
 require 'dugway/store'
 require 'dugway/template'
 require 'dugway/theme'
-require 'dugway/theme_font'
 require 'dugway/extensions/time'
 
 module Dugway
@@ -29,7 +30,7 @@ module Dugway
     def application(options={})
       @options = options
 
-      I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'dugway', 'data', 'locales', '*.yml').to_s]
+      BigCartel::CurrencyLocales.insert
       I18n.default_locale = 'en-US'
       I18n.locale = Dugway.store.locale
 

data/lib/dugway/application.rb

@@ -132,12 +132,12 @@ module Dugway
 
     # Assets
 
-    get '/styles.css' do
-      render_file('styles.css')
+    get '/theme.css' do
+      render_file('theme.css')
     end
 
-    get '/scripts.js' do
-      render_file('scripts.js')
+    get '/theme.js' do
+      render_file('theme.js')
     end
 
     get %r{^/images/.+\.(jpg|jpeg|gif|png|ico)$} do

data/lib/dugway/controller.rb

@@ -23,11 +23,11 @@ module Dugway
           else
             yield
           end
-        }, { 
-          :request_method => method, 
-          :path_info => interpret_path(path) 
+        }, {
+          :request_method => method,
+          :path_info => interpret_path(path)
         })
-        
+
         routes.rehash
       end
 
@@ -43,9 +43,6 @@ module Dugway
           # custom pages
           when %r{^/:(#{ PERMALINK_REGEX })}
             %r{^/(?<#{ $1 }>#{ PERMALINK_REGEX })$}
-          # styles/scripts
-          when %r{^/(\w+)\.(js|css)}
-            %r{^/#{ $1 }\.(?<format>(js|css))$}
           # everything else
           else
             %r{^#{ path }$}

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

@@ -30,7 +30,7 @@ module Dugway
 
       def theme_js_url(name)
         if name.is_a?(Drops::ThemeDrop)
-          '/scripts.js'
+          '/theme.js'
         elsif name == 'api'
           'http://cache0.bigcartel.com/api/1/api.usd.js'
         else
@@ -39,7 +39,7 @@ module Dugway
       end
 
       def theme_css_url(theme)
-        '/styles.css'
+        '/theme.css'
       end
 
       def theme_image_url(filename)

data/lib/dugway/liquifier.rb

@@ -91,7 +91,7 @@ module Dugway
     def head_content
       content = %{<meta name="generator" content="Big Cartel">}
 
-      if google_font_url = ThemeFont.google_font_url_for_theme
+      if google_font_url = ThemeFont.google_font_url_for_theme(Dugway.theme.fonts, Dugway.theme.customization)
         content << %{\n<link rel="stylesheet" type="text/css" href="#{ google_font_url }">}
       end
 

data/lib/dugway/theme.rb

@@ -7,7 +7,7 @@ require 'uglifier'
 
 module Dugway
   class Theme
-    REQUIRED_FILES = %w( layout.html home.html products.html product.html cart.html checkout.html success.html contact.html maintenance.html scripts.js styles.css settings.json screenshot.jpg )
+    REQUIRED_FILES = %w( 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 )
 
     attr_reader :errors
 
@@ -47,13 +47,13 @@ module Dugway
 
     def file_content(name)
       case name
-      when 'scripts.js'
+      when 'theme.js'
         if @building
           Uglifier.new.compile(sprockets[name].to_s)
         else
           sprockets[name].to_s
         end
-      when 'styles.css'
+      when 'theme.css'
         sprockets[name].to_s
       else
         read_source_file(name)

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/spec/features/page_rendering_spec.rb

@@ -16,6 +16,22 @@ feature 'Page rendering' do
     expect(page).to have_content('$10.00')
   end
 
+  scenario 'products.html via artist' do
+    visit '/artist/artist-one'
+    expect(page).to have_content('Dugway') # layout.html
+    expect(page).to have_content('Artist One')
+    expect(page).to have_content('My Product')
+    expect(page).to have_content('$10.00')
+  end
+
+  scenario 'products.html via category' do
+    visit '/category/tees'
+    expect(page).to have_content('Dugway') # layout.html
+    expect(page).to have_content('Tees')
+    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
@@ -55,16 +71,16 @@ feature 'Page rendering' do
     expect(page).to have_content("We're really cool!")
   end
 
-  scenario 'styles.css' do
-    visit '/styles.css'
+  scenario 'theme.css' do
+    visit '/theme.css'
     expect(page).to have_content('height: 100%;') # one.css
     expect(page).to have_content('color: red;') # two.css.sass
     expect(page).to have_content('url(/images/bc_badge.png)') # 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
+  scenario 'theme.js' do
+    visit '/theme.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/fixtures/theme/javascripts/one.js

@@ -1,3 +1 @@
-$(function() {
-  console.log('One')
-});
+console.log('One');

data/spec/fixtures/theme/javascripts/two.js.coffee

@@ -1,2 +1 @@
-$ ->
-  console.log 'Two'
+console.log 'Two'

data/spec/units/dugway/request_spec.rb

@@ -9,9 +9,9 @@ describe Dugway::Request do
     'PATH_INFO' => path.split('?').first,
     'QUERY_STRING' => path.split('?').last
   })}
-  
+
   let(:request) { Dugway::Request.new(env) }
-  
+
   before(:each) do
     request.stub(:params) { params }
   end
@@ -19,97 +19,97 @@ describe Dugway::Request do
   describe "#page_permalink" do
     describe "on the home page" do
       let(:path) { '/' }
-      
+
       it "returns the correct page_permalink" do
         request.page_permalink.should == 'home'
       end
     end
-    
+
     describe "on the products page" do
       let(:path) { '/products' }
-      
+
       it "returns the correct page_permalink" do
         request.page_permalink.should == 'products'
       end
     end
-    
+
     describe "on the products page with params" do
       let(:path) { '/products?search=test' }
-      
+
       it "returns the correct page_permalink" do
         request.page_permalink.should == 'products'
       end
     end
-    
+
     describe "on the categories page" do
       let(:path) { '/category/tees' }
-      
+
       it "returns the correct page_permalink" do
         request.page_permalink.should == 'products'
       end
     end
-    
+
     describe "on the artists page" do
       let(:path) { '/artist/beatles' }
-      
+
       it "returns the correct page_permalink" do
         request.page_permalink.should == 'products'
       end
     end
-    
+
     describe "on the product page" do
       let(:path) { '/product/my-thing' }
-      
+
       it "returns the correct page_permalink" do
         request.page_permalink.should == 'product'
       end
     end
-    
+
     describe "on the a known page" do
       let(:path) { '/cart' }
-      
+
       it "returns the correct page_permalink" do
         request.page_permalink.should == 'cart'
       end
     end
-    
+
     describe "on the a custom page" do
       let(:path) { '/about-us' }
-      
+
       it "returns the correct page_permalink" do
         request.page_permalink.should == 'about-us'
       end
     end
   end
-  
+
   describe "#extension" do
     describe "on HTML with no extension" do
       let(:path) { '/cart' }
-      
+
       it "returns the correct extension" do
         request.extension.should == '.html'
       end
     end
-    
+
     describe "on HTML with an extension" do
       let(:path) { '/cart.html' }
-      
+
       it "returns the correct extension" do
         request.extension.should == '.html'
       end
     end
-    
+
     describe "on CSS" do
-      let(:path) { '/styles.css' }
-      
+      let(:path) { '/theme.css' }
+
       it "returns the correct extension" do
         request.extension.should == '.css'
       end
     end
-    
+
     describe "on JS" do
-      let(:path) { '/scripts.js' }
-      
+      let(:path) { '/theme.js' }
+
       it "returns the correct extension" do
         request.extension.should == '.js'
       end
@@ -135,7 +135,7 @@ describe Dugway::Request do
       end
 
       describe "and there is an extension in the path" do
-        let(:path) { '/styles.css' }
+        let(:path) { '/theme.css' }
 
         it "should return the extension" do
           request.format.should == 'css'
@@ -143,35 +143,35 @@ describe Dugway::Request do
       end
     end
   end
-  
+
   describe "#html?" do
     describe "on HTML with no extension" do
       let(:path) { '/cart' }
-      
+
       it "returns true" do
         request.html?.should be_true
       end
     end
-    
+
     describe "on HTML with an extension" do
       let(:path) { '/cart.html' }
-      
+
       it "returns true" do
         request.html?.should be_true
       end
     end
-    
+
     describe "on CSS" do
-      let(:path) { '/styles.css' }
-      
+      let(:path) { '/theme.css' }
+
       it "returns false" do
         request.html?.should be_false
       end
     end
-    
+
     describe "on JS" do
-      let(:path) { '/scripts.js' }
-      
+      let(:path) { '/theme.js' }
+
       it "returns false" do
         request.html?.should be_false
       end
@@ -181,7 +181,7 @@ describe Dugway::Request do
   describe "#js?" do
     describe "on JS" do
       let(:path) { '/products.js' }
-      
+
       it "returns true" do
         request.js?.should be_true
       end
@@ -189,15 +189,15 @@ describe Dugway::Request do
 
     describe "on no extension" do
       let(:path) { '/cart' }
-      
+
       it "returns false" do
         request.js?.should be_false
       end
     end
-    
+
     describe "on non-JS extension" do
       let(:path) { '/cart.html' }
-      
+
       it "returns false" do
         request.js?.should be_false
       end