dugway 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2625aace16555a5b683e997a7a0e445ba02a07418eb40b711ea03604c8a82c2b
-  data.tar.gz: 28e23d4592a86308e3297a6595077913585e8108cfd8ad41dda633ccea57cca6
+  metadata.gz: 164c11d13a392a70b8827996b897125e0669211fe85cb5463445d86d41d53a4d
+  data.tar.gz: e4d2171b77593472fc50be05842b091d83c4c0c6fa28d2ebe9e7c54de9bc115a
 SHA512:
-  metadata.gz: 93c9c354790dca5dbcc2f14a4bb8c5b75ae82c43283f27c8a1c2509478b9c75c6583f315b247cc7e82aa793ee476d67ae19c6c489cf9bb5e5f3c3a79d09f8097
-  data.tar.gz: 75fd66e26e0b8d5490c7dd066d734d794f5df9f2cb5babc873bf18f539abea836a5b7a70347efbb1051b46f95469381e499e29db4e33c9a7a5dbf2d0a7fcff33
+  metadata.gz: 935b7f6c7af148e55df7a3f20e52a37d0aa317f3033f991a4c1f21a9d03b0c5fc6665658e4990c7d293b64203fde70e68e23dce3be750477da0802ab1848ef31
+  data.tar.gz: 5f85b9baa1c340cead3ad92b503d90cb619f3b66e9a08bec983300df80a7ec057c3651b681c29e1cb4beacf569961322638a0ec52bce21add32aeed550567043

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/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "1.0.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Big Cartel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler