doop 0.0.4.2 → 0.0.5

data/demo/README.md

@@ -0,0 +1,50 @@
+# Doop Demo
+An example doop-rails project which is used as the template for the doopgovuk generator.
+
+
+## Development
+
+   git clone git@github.com:coder36/doop.git
+   cd doop
+   git submodule init
+   cd ..
+   git clone git@github.com:coder36/doop_demo.git
+   cd doop_demo
+   bundle install
+   rails s
+
+
+## Publishing to Heroku
+
+    touch heroku
+    bundle install
+    git add .
+    git commit -m"Heroku build"
+    heroku login     (provide email and password)
+    git push heroku
+
+
+# Testing
+
+I've used cucmber extensively in the past, but found that inveitably the customer would never actually read the gherkin, so immediatly the rational
+for using gherkins would be invalid.  One of the issues that I found with gherkins was the lure towards writing hundreds of different flows, but
+all that would happen is that the testing feedback loop increased to hours!  Also cucmber matchers feel very artificial and can lead you down a
+rabbit hole!
+
+
+I would suggest to use (capybara)[https://github.com/jnicklas/capybara] with rspec, along with a headless browser.  Rspec gives much more control to the developer, so that accurate and concise testing can be done, without the overhead of creating cucumber matchers.
+
+
+## Headless web driver
+
+    sudo apt-get install qt4-dev-tools libqt4-dev libqt4-core libqt4-gui xvfb
+
+
+## Chromedriver
+
+Download the (chromedriver)[http://chromedriver.storage.googleapis.com/index.html].  
+
+    chromdriver --white-listed-ips 192.168.33.11
+
+This allows the chromedriver to be used remotely from 192.168.33.11.  This type of setup is ideal for a CI pipeline.  
+

data/demo/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/demo/app/assets/javascripts/application.js

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require turbolinks
+//= require_tree .

data/demo/app/assets/javascripts/demo/application.js

@@ -0,0 +1,8 @@
+//
+//= require jquery-ui/dialog
+//= require_tree .
+//= require blueimp-gallery
+//= require jquery.blueimp-gallery
+//= require jquery-fileupload/basic
+//= require jquery-fileupload/vendor/load-image
+//= require jquery-fileupload/vendor/canvas-to-blob

data/demo/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/{lib/generators/doopgovuk/templates → demo}/app/assets/stylesheets/demo.css.scss

@@ -137,6 +137,12 @@ button {
 
 }
 
+.button {
+  @include button;
+  margin: 16px 0 0 0;
+
+}
+
 .button-secondary{
   @include button($grey-3);
 }
@@ -288,3 +294,36 @@ select {
     @include core-16();
 }
 
+.bar {
+  height: 18px;
+  background: green;
+}
+
+.uploaded_image {
+  float: left;
+  padding: 0 0 5px 0;
+  margin: 0 2px 0 0;
+  width: auto;
+  border: 1px solid #ccc;
+  img {
+    padding: 0 0 0 0;
+    margin: 8px 0 0 0;
+  }
+  button {
+
+    margin: 0 0 0 0;
+
+  }
+}
+
+.clear {
+  clear: both;
+}
+
+.progress-bar {
+  margin: 10px 0 0 0;
+  height: 20px;
+  width: 0;
+  background: url(progressbar.gif);
+  display: none;
+}

data/{lib/generators/doopgovuk/templates → demo}/app/assets/stylesheets/demo/application.css

@@ -1,3 +1,4 @@
 /*
  *= require jquery-ui/dialog
+ *= require blueimp-gallery
  */

data/demo/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/{lib/generators/doopgovuk/templates → demo}/app/controllers/demo_controller.rb

@@ -9,18 +9,16 @@ class DemoController < ApplicationController
   delegate :index, :answer, to: :@doop_controller
   before_filter :setup_doop
 
+  def harness
+    return if request.get?
+    @doop_controller.inject_yaml params["yaml"]
+    index
+  end
+  
   def setup_doop
     @doop_controller = Doop::DoopController.new self do |doop|
 
-      load_yaml do
-        data = params["doop_data"] 
-        if data != nil
-          if Rails.env.development? || Rails.env.test? || params.include?("harness")
-            next data
-          else
-            next ActiveSupport::MessageEncryptor.new(Rails.application.secrets.secret_key_base).decrypt_and_verify data if !Rails.env.development?
-          end
-        end
+      yaml do
 
         <<-EOS
           page: {
@@ -37,7 +35,12 @@ class DemoController < ApplicationController
               },
               do_you_still_want_to_apply: {
                 _question: "Do you still want to apply for child benefit?"
+              },
+              proof_of_id: {
+                _question: "We need proof of your identity",
+                _answer: {}
               }
+
             },
             about_you: {
               _page: "about_you",
@@ -82,9 +85,6 @@ class DemoController < ApplicationController
             children: {
               _page: "children",
               _nav_name: "Children",
-              how_many_birth_certs: {
-                _question: "How many birth certificates are you sending us?"
-              },
               #{child_yaml}
             },
             declaration: {
@@ -112,23 +112,18 @@ class DemoController < ApplicationController
                 },
                 own_child: {
                   _question: "Is this child your own child ?"
+                },
+                birth_certificate: {
+                  _question: "We need a photo of the birth certificate",
+                  _answer: {}
                 }
              }
           EOS
       end
 
-      save_yaml do |yaml|
-        if Rails.env.development? || Rails.env.test?
-          request["doop_data"] = yaml
-        else
-          crypt = ActiveSupport::MessageEncryptor.new(Rails.application.secrets.secret_key_base)
-          data = crypt.encrypt_and_sign(yaml)
-          request["doop_data"] = data
-        end
-      end
-
 
       # PREAMBLE callbacks
+     
 
       on_answer "/page/preamble/income_more_than_50000"  do |question,path, params, answer|
         answer_with( question, { "_summary" => answer } )
@@ -139,6 +134,9 @@ class DemoController < ApplicationController
         answer_with( question, { "_summary" => "Yes" } )
       end
 
+      on_answer "/page/preamble/proof_of_id"  do |question,path, params, answer|
+        file_upload_control question, path, params, answer
+      end
 
 
       # ABOUT YOU callbacks
@@ -207,15 +205,6 @@ class DemoController < ApplicationController
         answer_with( question, { "_summary" => answer } )
       end
 
-      on_answer "/page/children/how_many_birth_certs"  do |question,path, params, answer|
-        res = validate( answer )
-        next res if !res.empty?
-        next { :answer_error => "Must be a number" } if !is_number answer
-
-
-        answer_with( question, { "_summary" => answer } )
-      end
-
       on_answer "/page/children/child__(\\d+)/name"  do |question,path, params, answer|
         res = validate( answer, ["firstname", "surname"] )
         next res if !res.empty?
@@ -239,6 +228,10 @@ class DemoController < ApplicationController
         answer_with( question, { "_summary" => answer } )
       end
 
+      on_answer "/page/children/child__(\\d+)/birth_certificate"  do |question,path, params, answer|
+        file_upload_control question, path, params, answer
+      end
+
       on_answer "/page/children/child__(\\d+)"  do |question,path, params, answer|
         if params.include?("remove_child")
           remove path
@@ -259,38 +252,76 @@ class DemoController < ApplicationController
       end
 
       on_answer "/page/declaration" do |question, path, params, answer |
-        { :redirect => "https://github.com/coder36/doop" }
+        #{ :redirect => "https://github.com/coder36/doop" }
       end
 
-    end
-  end
 
-end
 
 
-def format_date d
-  begin
-    return nil if d.length != 10
-    Date.strptime( d, "%d/%m/%Y" ).strftime( "%-d %B %Y" )
-  rescue
-    nil
+      def file_upload_control question, path, params, answer
+        
+        if params.include? "remove_file"
+          answer.delete( params["remove_file"] )
+        end
+
+        a = answer.values
+        if params.include? "files"
+          params["files"].each do |uploaded_io|
+            if File.directory? Rails.root.join('public','uploads')
+              ext = uploaded_io.original_filename[/.*\.(\w+)/,1]
+              filename = (0...16).map { (65 + rand(26)).chr }.join + ".#{ext}"
+              filename.downcase!
+
+              File.open(Rails.root.join('public', 'uploads', filename), 'wb') do |file|
+                file.write(uploaded_io.read)
+              end
+              a << "/uploads/#{filename}"
+            else
+              a <<  view_context.image_path("cert_sample.jpg")
+            end
+          end
+        end
+        file_count = 0
+        answer.clear
+        a.each do  |n|
+          file_count += 1
+          answer[ "file__#{file_count}" ] = n
+        end
+
+        if params.include? "continue"
+          summary = file_count==0 ? "None provided" : "#{file_count} image#{file_count>1 ? 's' : ''} provided"
+          answer_with( question, { "_summary" => summary } )
+        end
+      end
+
+    end
   end
-end
 
-def validate answer,fields=nil
-  res = {}
+  def format_date d
+    begin
+      return nil if d.length != 10
+      Date.strptime( d, "%d/%m/%Y" ).strftime( "%-d %B %Y" )
+    rescue
+      nil
+    end
+  end
+
+  def validate answer,fields=nil
+    res = {}
+
+    if fields == nil
+        res["answer_error".to_sym] = "Can not be empty" if answer.squish.empty?
+        return res
+    end
 
-  if fields == nil
-      res["answer_error".to_sym] = "Can not be empty" if answer.squish.empty?
-      return res
+    fields.each do |f|
+      res["#{f}_error".to_sym] = "Can not be empty" if answer[f].squish.empty?
+    end
+    res
   end
 
-  fields.each do |f|
-    res["#{f}_error".to_sym] = "Can not be empty" if answer[f].squish.empty?
+  def is_number num
+    num =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
   end
-  res
-end
 
-def is_number num
-  num =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
 end

data/demo/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/demo/app/helpers/demo_helper.rb

@@ -0,0 +1,2 @@
+module DemoHelper
+end

data/{lib/generators/doopgovuk/templates → demo}/app/views/demo/_before_you_begin.html.erb

@@ -15,9 +15,9 @@
     <h2>The code</h2>
     <p>As you progress through the questionnaire, you can follow along in the code:<br/><br/>
     <%
-      view_url = "https://github.com/coder36/doop/tree/master/lib/generators/doopgovuk/templates/app/views/demo"
-      cont_url = "https://github.com/coder36/doop/tree/master/lib/generators/doopgovuk/templates/app/controllers"
-      rspec_url = "https://github.com/coder36/doop/blob/master/lib/generators/doopgovuk/templates/spec/features/demo_spec.rb"
+      view_url = "https://github.com/coder36/doop/tree/master/demo/app/views/demo"
+      cont_url = "https://github.com/coder36/doop/tree/master/demo/app/controllers"
+      rspec_url = "https://github.com/coder36/doop/blob/master/demo/spec/features/demo_spec.rb"
     %>
 
     <strong><a href='<%="#{cont_url}/demo_controller.rb"%>'>demo_controller.rb</a></strong><br/>

data/{lib/generators/doopgovuk/templates → demo}/app/views/demo/_children.html.erb

@@ -13,12 +13,6 @@
     <% end %>
     <p>You don't need to tell us about any children you already get Child Benefit for.</p>
 
-    <%=question "/page/children/how_many_birth_certs" do |root,answer| %>
-      <p>We don't need to see a birth certificate for a child that has been claimed for by you or someone else in the past</p>
-      <%=doop_textfield "answer", answer, res %>
-      <button>Continue</button>
-    <% end %>
-
     <% list "/page/children/child__(\\d+)" do |path,index| %>
 
       <%=question "#{path}", :title => "Child #{index}" do |root,answer| %>
@@ -46,6 +40,14 @@
           <button name="b_answer" value="No">No, this is someone elses child</button>
         <% end %>
 
+        <%=question "#{path}/birth_certificate" do |root,answer| %>
+          <%=info_box do %>
+            <p>Please upload a photo, of the birth certificate or adoption papers.</p>
+            <p>If you are applying using a mobile device with a camera, when you click the upload button, your camera will be activated.</p>
+          <% end %>
+          <%=file_uploader answer%>
+        <% end %>
+
         <% when_answered path do %>
            <% if index > 1 %>
              <button class="button-secondary" name="remove_child">Remove child</button><br/>

data/{lib/generators/doopgovuk/templates → demo}/app/views/demo/_preamble.html.erb

@@ -14,6 +14,7 @@
       <h3>Your information</h3>
     <p>By applying for child benefit online, you consent that we may process your personal data (including sensitive personal data) that we collect from you.</p>
 
+
     <% when_question :changed => "/page/preamble/income_more_than_50000" do |current_answer, id| %>
       <%=change_answer_tooltip id do %>
         <p>If you change this answer, additional questions may be asked</p>
@@ -48,6 +49,15 @@
       <button name="b_answer" value="Yes">Yes, I still want to apply for child benefit</button><br/>
     <% end %>
 
+    <%=question "/page/preamble/proof_of_id" do |root,answer| %>
+      <%=info_box do %>
+        <p>Please upload a photo, of either your passport, driving license and a utility bill 
+        with your name and address visible.</p>
+        <p>If you are applying using a mobile device with a camera, when you click the upload button, your camera will be activated.</p>
+      <% end %>
+      <%=file_uploader answer%>
+    <% end %>
+
     <% when_answered "/page/preamble" do %>
       <button>Continue and Save</button>
     <% end %>