dugway 0.12.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa69a92506b519c6dd328f384ab87c65faf9b333668d2343663205497a95cd4c
-  data.tar.gz: 7486855a255a217a533480e16a5b4e84984f1e1bb06d2ebe4df8d381f79aae67
+  metadata.gz: 164c11d13a392a70b8827996b897125e0669211fe85cb5463445d86d41d53a4d
+  data.tar.gz: e4d2171b77593472fc50be05842b091d83c4c0c6fa28d2ebe9e7c54de9bc115a
 SHA512:
-  metadata.gz: 5bec30a1d3f6553e582150ec9ce3e783b2f2cb0c4f8dbfb03219c060591766449dce91e5817e716d8d40e55786629c3d5312b42b9ee0dd4e57dd5ac251282059
-  data.tar.gz: d2789c469c34a62db955bf20c7b11a8842b6b6caac9a76421bddb634023d06a4b7d58e18ad711d5872f92c80c33ad06d3b1a64aa182f4f362930b375df8ea32f
+  metadata.gz: 935b7f6c7af148e55df7a3f20e52a37d0aa317f3033f991a4c1f21a9d03b0c5fc6665658e4990c7d293b64203fde70e68e23dce3be750477da0802ab1848ef31
+  data.tar.gz: 5f85b9baa1c340cead3ad92b503d90cb619f3b66e9a08bec983300df80a7ec057c3651b681c29e1cb4beacf569961322638a0ec52bce21add32aeed550567043

data/README.md

@@ -120,7 +120,7 @@ utilities.
 
 Prefer [LESS](http://lesscss.org)? No problem, you'll just need to create a
 [Gemfile like this one](https://gist.github.com/mattwigham/5569898) in the
-root directory of your theme, run ```bundle install```, and append the
+root directory of your theme, run `bundle install`, and append the
 **.less** extension to your CSS files.
 
 And finally, for you JavaScript folks, we've baked

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/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/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/liquid/filters/util_filters.rb

@@ -86,13 +86,13 @@ module Dugway
             digits, rounded_number = 1, 0
           else
             digits = (Math.log10(number.abs) + 1).floor
-            rounded_number = (BigDecimal.new(number.to_s) / BigDecimal.new((10 ** (digits - precision)).to_f.to_s)).round.to_f * 10 ** (digits - precision)
+            rounded_number = (BigDecimal(number.to_s) / BigDecimal((10 ** (digits - precision)).to_f.to_s)).round.to_f * 10 ** (digits - precision)
             digits = (Math.log10(rounded_number.abs) + 1).floor # After rounding, the number of digits may have changed
           end
           precision -= digits
           precision = precision > 0 ? precision : 0  #don't let it be negative
         else
-          rounded_number = BigDecimal.new(number.to_s).round(precision).to_f
+          rounded_number = BigDecimal(number.to_s).round(precision).to_f
         end
         formatted_number = number_with_delimiter("%01.#{precision}f" % rounded_number, options)
         if strip_insignificant_zeros

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "0.12.0"
+  VERSION = "1.0.1"
 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/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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Big Cartel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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,9 +560,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Easily build and test Big Cartel themes.
 test_files: