dugway 0.12.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 027c6ffe1a9e8833dc30179327049c7aa2607712df02610c5a2667828432a84b
-  data.tar.gz: b2c2e63788189f94637c8d977e969337b31b5922728e3119c522a39ae4f10002
+  metadata.gz: 3abee167dcd274b478a4e4b968547a267d43d02e61738e157dc15f90a8df7c78
+  data.tar.gz: 72c64774f1783f2c545570a44affe4a58592b92486b4c66d242d390239eee8ca
 SHA512:
-  metadata.gz: 6ef192dcc976bf691486856528970cfee3e746aa82086730ee7104ce0abd5174f574a8dd199cf20cd1f72943c524ac0dba26f894c21946f051e4783f94402c64
-  data.tar.gz: df22ae822edb930f937152806a74389ccd253ec7902834101c42cd8996822ab61bdd12f86dcb3c16d47efb5d91060a459dccb9ae33cbf5ea6c829da6406d3c89
+  metadata.gz: 95c00a871fdb4e1d8c66b51a14378bdd93e03b28a92a610f26858116918168c53c0af1963228a5c8dae5de7bbe618f11136b6744da392020fc9e6cd5d1617790
+  data.tar.gz: 1f5081eb808765394c6e4e1dfd285adab2a966cee94554f1bddcb2495cdc5f5d1d639396aa314da122d8343475e061e5a36c63c8c7e509b61d8efd8823cb9d61

data/README.md

@@ -182,7 +182,7 @@ Run your theme in any browser by starting the Dugway server:
 dugway server
 ```
 
-By default this will serve your theme at http://0.0.0.0:9292. You can then stop
+By default this will serve your theme at http://127.0.0.1:9292/. You can then stop
 the server by hitting CTRL+C.
 
 ### Pow

data/dugway.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_dependency('thor', '~> 0.20.3')
   s.add_dependency('rubyzip', '~> 0.9.9')
   s.add_dependency('uglifier', '~> 4.1')
-  s.add_dependency('thin', '~> 1.7.2')
+  s.add_dependency('thin', '~> 1.8.0')
   s.add_dependency('bigcartel-theme-fonts')
   s.add_dependency('bigcartel-currency-locales')
 

data/lib/dugway/cart.rb

@@ -31,7 +31,7 @@ module Dugway
     end
 
     def shipping
-      { 
+      {
         'enabled' => false,
         'amount' => 0.0,
         'strict' => false,
@@ -40,14 +40,14 @@ module Dugway
     end
 
     def tax
-      { 
+      {
         'enabled' => false,
         'amount' => 0.0
       }
     end
 
     def discount
-      { 
+      {
         'enabled' => false,
         'pending' => false,
         'amount' => 0.0

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

@@ -22,14 +22,9 @@
       <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>
+      <div>{{ contact.recaptcha }}</div>
     </li>
   </ul>
 </form>

data/lib/dugway/contact_form_validator.rb

@@ -12,25 +12,19 @@ module Dugway
         'All fields are required'
       elsif param_does_not_match(:email, email_format)
         'Invalid email address'
-      elsif param_does_not_match(:captcha, captcha_format)
-        'Spam check was incorrect'
       end
     end
 
     private
 
     def required_fields
-      [ :name, :email, :subject, :message, :captcha ]
+      [ :name, :email, :subject, :message ]
     end
 
     def email_format
       /^([^@\s]+)@((?:[-a-zA-Z0-9]+\.)+[a-zA-Z]{2,})$/
     end
 
-    def captcha_format
-      /^rQ9pC$/i
-    end
-
     def param_does_not_match(param_name, regex)
       !(params[param_name.to_sym] =~ regex)
     end

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

@@ -42,7 +42,7 @@ module Dugway
 
         nil
       end
-      
+
       def method_missing(method, *args, &block)
         before_method(method.to_s)
       end

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

@@ -21,6 +21,15 @@ module Dugway
         %{<img id="captcha_image" src="https://s3.amazonaws.com/bigcartel/captcha/28e3d1288cbc70c0cd1a2d10845f8e11e1a90d14.png">}
       end
 
+      def recaptcha
+        @recaptcha ||= begin
+          html = "This site is protected by reCAPTCHA and the Google "
+          html += '<a href="https://policies.google.com/privacy">Privacy Policy</a> and '
+          html += '<a href="https://policies.google.com/terms">Terms of Service</a> apply.'
+          html
+        end
+      end
+
       def sent
         request.path == '/contact' && request.post? && errors.blank?
       end

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

@@ -4,6 +4,10 @@ module Dugway
       def all
         @all ||= source.select { |page| page['category'] == 'custom' }
       end
+
+      def cart
+        @cart ||= source.find { |page| page['permalink'] == 'cart' }
+      end
     end
   end
 end

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

@@ -68,7 +68,7 @@ module Dugway
 
       def search_terms
         params[:search]
-      end  
+      end
 
       def page
         if @context['internal'].present? && @context['internal'].has_key?('page') # has_key? here because 'page' will be nil for get blocks

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

@@ -7,22 +7,22 @@ module Dugway
 
           prev_label = prev_label.blank? ? paginate['previous']['title'] : prev_label
           if paginate['previous']['is_link']
-            html << %(<a class="previous" href="#{ paginate['previous']['url'] }">#{ prev_label }</a>)
+            html << %(<a class="previous" href="#{ paginate['previous']['url'] }" aria-label="Go to previous page">#{ prev_label }</a>)
           else
             html << %(<span class="previous disabled">#{ prev_label }</span>)
           end
 
           paginate['parts'].each do |part|
             if part['is_link']
-              html << %(<a href="#{ part['url'] }">#{ part['title'] }</a>)
+              html << %(<a href="#{ part['url'] }" aria-label="Go to page #{part['title']}">#{ part['title'] }</a>)
             else
-              html << %(<span class="#{ part['title'] == paginate['current_page'].to_s ? 'current' : 'gap' }">#{ part['title'] }</span>)
+              html << build_non_link_span(part, paginate)
             end
           end
 
           next_label = next_label.blank? ? paginate['next']['title'] : next_label
           if paginate['next']['is_link']
-            html << %(<a class="next" href="#{ paginate['next']['url'] }">#{ next_label }</a>)
+            html << %(<a class="next" href="#{ paginate['next']['url'] }" aria-label="Go to next page">#{ next_label }</a>)
           else
             html << %(<span class="next disabled">#{ next_label }</span>)
           end
@@ -30,6 +30,24 @@ module Dugway
           html << %(</div>)
         }.join(' ')
       end
+
+      private
+
+      def build_non_link_span(part, paginate)
+        is_current = is_current_page?(part, paginate)
+        span_class = is_current ? 'current' : 'gap'
+
+        span = %(<span )
+        span << %(class="#{span_class}" )
+        span << %(aria-label="Current page, page #{part['title']}") if is_current
+        span << %(>)
+        span << %(#{ part['title'] }</span>)
+        span
+      end
+
+      def is_current_page?(part, paginate)
+        part['title'] == paginate['current_page'].to_s
+      end
     end
   end
 end

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

@@ -28,7 +28,7 @@ module Dugway
         if name.is_a?(Drops::ThemeDrop)
           '/theme.js'
         elsif name == 'api'
-          'http://cache0.bigcartel.com/api/1/api.usd.js'
+          'http://cache0.bigcartel.com/api/5/api.usd.js'
         else
           name
         end

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "0.12.1"
+  VERSION = "1.0.2"
 end

data/spec/features/contact_form_spec.rb

@@ -16,18 +16,12 @@ feature 'Contact form' do
     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'
@@ -36,7 +30,6 @@ feature 'Contact form' do
     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

data/spec/features/page_rendering_spec.rb

@@ -50,7 +50,7 @@ feature 'Page rendering' do
     visit '/contact'
     expect(page).to have_content('Dugway') # layout.html
     expect(page).to have_content('Contact')
-    expect(page).to have_content('Spam check')
+    expect(page).to have_content('protected by reCAPTCHA')
   end
 
   scenario 'maintenance.html' do

data/spec/fixtures/store/page/about-us.json

@@ -1 +1 @@
-{"category":"custom","content":"<p>We're really cool!</p>","permalink":"about-us","name":"About Us","id":95821979,"url":"/about-us"}
+{"category":"custom","content":"<p>We're really cool!</p>","permalink":"about-us","name":"About Us","id":95821979,"url":"/about-us"}

data/spec/fixtures/theme/contact.html

@@ -22,14 +22,9 @@
       <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>
+      <div>{{ contact.recaptcha }}</div>
     </li>
   </ul>
 </form>

data/spec/units/dugway/contact_form_validator_spec.rb

@@ -11,7 +11,6 @@ describe Dugway::ContactFormValidator do
       :email => "name@example.com",
       :subject => "subject",
       :message => "message",
-      :captcha => "rQ9pc",
     }
   end
 
@@ -36,21 +35,11 @@ describe Dugway::ContactFormValidator do
       assert_required_fields_error
     end
 
-    it "returns an error for a missing captcha" do
-      validator.params[:captcha] = "   "
-      assert_required_fields_error
-    end
-
     it "returns an error for invalid email format" do
       validator.params[:email] = "foo-at-foo-dot-net"
       expect(validator.error_message).to eq "Invalid email address"
     end
 
-    it "returns an error for incorrect captcha" do
-      validator.params[:captcha] = "oops"
-      expect(validator.error_message).to eq "Spam check was incorrect"
-    end
-
     def assert_required_fields_error
       expect(validator.error_message).to eql "All fields are required"
     end

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

@@ -13,7 +13,7 @@ describe Dugway::Drops::ContactDrop do
     Rack::MockRequest::DEFAULT_ENV.update({
     'PATH_INFO' => '/contact'
   })}
-  
+
   let(:request) { Dugway::Request.new(env) }
 
   let(:errors) {
@@ -96,6 +96,12 @@ describe Dugway::Drops::ContactDrop do
     end
   end
 
+  describe "#recaptcha" do
+    it "returns the recaptcha branding text" do
+      contact.recaptcha.should == %{This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy">Privacy Policy</a> and <a href="https://policies.google.com/terms">Terms of Service</a> apply.}
+    end
+  end
+
   describe "#sent" do
     it "should return false before the form has been sent" do
       contact.sent.should be(false)

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

@@ -1,7 +1,18 @@
 require 'spec_helper'
 
 describe Dugway::Drops::PagesDrop do
-  let(:pages) { Dugway::Drops::PagesDrop.new(Dugway.store.pages.map { |p| Dugway::Drops::PageDrop.new(p) }) }
+  let(:pages) do
+    Dugway::Drops::PagesDrop.new(
+      Dugway.store.pages.map do |p|
+        case p["permalink"]
+        when "cart"
+          Dugway::Drops::CartDrop.new(p)
+        else
+          Dugway::Drops::PageDrop.new(p)
+        end
+      end
+    )
+  end
 
   describe "#all" do
     it "should return an array of all pages" do
@@ -15,6 +26,14 @@ describe Dugway::Drops::PagesDrop do
     end
   end
 
+  describe "#cart" do
+    it "returns the cart drop instead of the cart class instance" do
+      cart = pages.cart
+      cart.should be_an_instance_of(Dugway::Drops::CartDrop)
+      cart.name.should == 'Cart'
+    end
+  end
+
   describe "#permalink" do
     it "should return the page by permalink" do
       page = pages.contact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Big Cartel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: bigcartel-theme-fonts
   requirement: !ruby/object:Gem::Requirement
@@ -545,7 +545,7 @@ homepage: https://github.com/bigcartel/dugway
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -560,8 +560,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Easily build and test Big Cartel themes.
 test_files: