doop 0.0.3.1 → 0.0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTJlNzA0M2EyMWRkMGNhNjIwMzc5YWM2ZmQzNTBiYWFhOGFiYjE4ZA==
+    YThjZGUzODA4ZDUzMzM2YWYyMTI5NDk0Yjc1NDUwZWZhYmYzMGYyMQ==
   data.tar.gz: !binary |-
-    NWMzODdlOWE2ZWMyMWJiZmEwODg2Zjk4MzM3NDNiZjk1NTdmOTM4ZA==
+    Yjc2YTZjMDU0ZWQ1NjU0ZWI1ODVhZTQ5MDQyOThiMzI5ZGFmOTZhZQ==
 SHA512:
   metadata.gz: !binary |-
-    YmVhODM2ZjRmNDJiMTllYjM4MjQyMzZkM2ViMGVmYmQzZjE1MzQ3YzA5NjVj
-    MjYzZjAxYTEwNTJkZTc0N2VmNzliYmMwNDRkMDY0MjM0YjgzZTFiOTI3Mjc0
-    YjI5N2JhZjgwYjMyZjQ2NThkZDI1MTA0ZTNiZWVhYWUxM2YwZjg=
+    YTYwNGJjYzkxOTAzYjQzMGI0OGE5MzdiZTI1ZjQzMmNmN2YxYzUyMmNmOWFi
+    M2Y3MGVlNGM4ZWNlM2Q3MWQzZThmOTU1NzA5MWU2MjA3NDAyZTZiZjAzN2U4
+    ZDcyYTBiZDJlNWE5NjI1ZmY2MDM2MjEyMDNmNTJmMjQ1NDI2YWE=
   data.tar.gz: !binary |-
-    MDZmNzBlYzBjMDk0Zjk4OGI2OGExMjEwMDQ0MDIxNjkzOGM1MjlmMzNmMzYx
-    NDlmZDRmOGRlZTQ0YTdhY2MwMjRkZWI0OTA5YjUwNDI0OTIzYThhOTAwY2E0
-    NDE2NWMxODFlNTA4NzNmMzk2YWViM2Y4ZTg5YTg0MjMwZDVmYjU=
+    YTAxMDk5MzBkMTM4NjBkNmFlOGZlYzI0MjhlMDNhNTBiYjc0OWM1ZGM5NTQ2
+    ZjQ5Y2U5ZTI4ZTg5ZWRmNjQ5NmQ3NTI0ZGViZTAwNTRmNWY5ZWFhNjkzOGJm
+    YzYyNzc5ZWM4Yzg0YWY0ODEwYTA3NGVmOTVkZWQyM2Q4ODg3NDU=

data/app/helpers/doop_helper.rb

@@ -23,7 +23,7 @@ module DoopHelper
     root = doop[path]
     s = ""
     if question_visible? path
-      s = render( "doop/question", :content => block, :root => root, :path => path, :answer => root["_answer"], :title => opts[:title], :indent => opts[:indent] )
+      s = render( "doop/question", :content => block, :root => root, :path => path, :answer => root["_answer"], :title => opts[:title], :indent => opts[:indent], :id => question_id(path) )
     end
     s
   end
@@ -53,23 +53,30 @@ module DoopHelper
     if options.include? :last_answered
       path = options[:last_answered]
       if doop.last_answered == path 
-        block.call doop[path]["_answer"]
+        block.call doop[path]["_answer"], question_id(path)
       end
     elsif options.include? :changed
       path = options[:changed]
       if doop.is_being_changed(path)
-        block.call doop[path]["_answer"]
+        block.call doop[path]["_answer"], question_id(path)
       end
     end
   end
 
-  def tooltip &block
-    render( "doop/tooltip", :content => block )
+  def tooltip id, &block
+    render( "doop/tooltip", :content => block, :id => id )
   end
 
-  def change_answer_tooltip &block
-    render( "doop/change_answer_tooltip", :content => block )
+  def change_answer_tooltip id, &block
+    render( "doop/change_answer_tooltip", :content => block, :id => id )
   end
 
+  def question_id path
+    path.split("/").last
+  end
+
+  def doop_textfield name, answer, res, options = {}
+    s = render "doop/textfield", :answer => answer, :name => name, :res => res, :label => options[:label]
+  end
 
 end

data/doop.gemspec

@@ -8,7 +8,9 @@ require 'fileutils'
 if !Dir['doop_demo/*'].empty?
   dest = "lib/generators/doopgovuk/templates"
   FileUtils.cp "doop_demo/app/assets/stylesheets/demo.css.scss", "#{dest}/app/assets/stylesheets/demo.css.scss"
+  FileUtils.cp "doop_demo/app/assets/stylesheets/demo/application.css", "#{dest}/app/assets/stylesheets/demo/application.css"
   FileUtils.cp "doop_demo/app/assets/javascripts/demo.js.coffee", "#{dest}/app/assets/javascripts/demo.js.coffee"
+  FileUtils.cp "doop_demo/app/assets/javascripts/demo/application.js", "#{dest}/app/assets/javascripts/demo/application.js"
   FileUtils.cp "doop_demo/app/controllers/demo_controller.rb", "#{dest}/app/controllers/demo_controller.rb"
   FileUtils.cp "doop_demo/app/views/layouts/application.html.erb", "#{dest}/app/views/layouts/application.html.erb"
   FileUtils.cp_r "doop_demo/app/views/doop", "#{dest}/app/views"
@@ -33,8 +35,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.1"
 
-  spec.add_runtime_dependency "rails"
+  spec.add_runtime_dependency "rails", "~> 4.1"
 end
 

data/lib/doop-rspec.rb

@@ -0,0 +1,82 @@
+
+    RSpec::Matchers.define :be_asked do 
+      match do |q_title|
+        page.find_by_id( "#{q_title}-open" )
+      end
+
+      failure_message do |q_title|
+        "Expected question with id #{q_title} to be asked"
+      end
+
+    end
+
+    RSpec::Matchers.define :be_enabled do 
+      match do |q_title|
+        page.find_by_id( q_title )
+      end
+    end
+
+    RSpec::Matchers.define :be_disabled do 
+      match do |q_title|
+        expect(page).to have_no_selector( "##{q_title}" )
+      end
+    end
+
+    RSpec::Matchers.define :be_visible do 
+      match do |id|
+        page.find_by_id( id )
+      end
+    end
+
+    def question text
+      text
+    end
+
+    def change_question q_title, &block
+      @q_title = q_title
+      page.find_by_id( "#{q_title}-change" ).click
+      expect( question q_title ).to be_asked
+      yield block
+    end
+
+    def answer_question q_title, &block
+      @q_title = q_title
+      expect( question q_title ).to be_asked
+      yield block
+      page.find_by_id( "#{q_title}-closed" )
+    end
+
+    def rollup_text
+      page.find_by_id( "#{@q_title}-change" ).text
+    end
+
+    def change_answer_tooltip_for q_id
+      "#{q_id}-change-answer-tooltip"
+    end
+
+    def tooltip
+      "#{@q_title}-tooltip"
+    end
+
+    def change_answer_tooltip
+      "#{@q_title}-change-answer-tooltip"
+    end
+
+    def wait_for_page p_title
+      page.find_by_id( "#{p_title}-page" )
+    end
+
+    def page_title
+      page.find_by_id( "page_title").text
+    end
+
+    def b_fill_in options = {}
+      options.keys.each do |key|
+        page.fill_in( "b_#{key}", :with => options[key] )
+      end
+    end
+
+    def change_page page_name
+      page.find_by_id( "#{page_name}-nav" ).click
+      wait_for_page page_name
+    end

data/lib/doop.rb

@@ -117,6 +117,7 @@ module Doop
     end
 
     def each_path_elem(path)
+      return if path == nil
       p = ""
       path.split("/").select{|r| !r.empty?}.each do |n|
         p += "/" + n
@@ -163,7 +164,7 @@ module Doop
           next
         end
 
-        q = path if path.start_with?(q) && root["_answered"] == false
+        q = path if path.start_with?("#{q}/") && root["_answered"] == false
       end
 
       each_path_elem( q )  { |n| self[n]["_open"] = true } 
@@ -257,6 +258,7 @@ module Doop
       # open all parent questions
       each_path_elem_reverse(path) do |p|
         self[p + "/_open"] = true
+        self[p + "/_answered"] = false if p != path
       end
     end
 

data/lib/doop/version.rb

@@ -1,3 +1,3 @@
 module Doop
-  VERSION = "0.0.3.1"
+  VERSION = "0.0.4.1"
 end

data/lib/doop_controller.rb

@@ -12,7 +12,6 @@ module Doop
     def initialize application_controller, &block
       @controller = application_controller
       @block = block
-      @debug_on_block = nil
       @current_page_block = method( :default_current_page )
       @all_pages_block = method( :default_all_pages )
     end
@@ -25,9 +24,9 @@ module Doop
       back_val = @controller.params["back_a_page"]
       nav_path = @controller.params["nav_path"]
       change_answer_path = @controller.params["change_answer_path"]
-      return back if back_val != nil && !back_val.empty?
-      return change_page nav_path if nav_path != nil && !nav_path.empty?
-      return change change_answer_path if change_answer_path != nil && !change_answer_path.empty?
+      return back if back_val != nil 
+      return change_page nav_path if nav_path != nil
+      return change change_answer_path if change_answer_path != nil
 
       render_page in_doop { |doop| doop.answer( @controller.params ) }
     end
@@ -80,11 +79,21 @@ module Doop
     end
 
     def render_page res = {}
+
+      redirect_url = res[:redirect]
+
+      if ! redirect_url.nil?
+        @controller.respond_to do |format|
+          format.js { @controller.render :js => "window.location.href='#{redirect_url}'" }
+          format.html { redirect_to redirect_url }
+        end
+        return
+      end
+
       res[:page] = get_page
       res[:page_path] = get_page_path
       res[:page_title] = @doop[res[:page_path]]["_nav_name"]
       res[:all_pages] = get_all_pages
-      res[:debug_on] = @debug_on_block != nil ? @debug_on_block.call : false
       @controller.render "index", :locals => { :res => res, :doop => @doop }
     end
 
@@ -136,10 +145,6 @@ module Doop
       @all_pages_block.call
     end
 
-    def debug_on &block
-      @debug_on_block = block
-    end
-
     def load_yaml &block
       @load_yaml_block = block
     end

data/lib/generators/doopgovuk/doopgovuk_generator.rb

@@ -5,7 +5,9 @@ class DoopgovukGenerator < Rails::Generators::Base
 
   def generate_layout
     copy_file "app/assets/stylesheets/demo.css.scss", "app/assets/stylesheets/#{name}.css.scss"
+    copy_file "app/assets/stylesheets/demo/application.css", "app/assets/stylesheets/#{name}/application.css"
     copy_file "app/assets/javascripts/demo.js.coffee", "app/assets/javascripts/#{name}.js.coffee"
+    copy_file "app/assets/javascripts/demo/application.js", "app/assets/javascripts/#{name}/application.js"
     template "app/controllers/demo_controller.rb", "app/controllers/#{name}_controller.rb"
     copy_file "app/views/layouts/application.html.erb",  "app/views/layouts/application.html.erb"
     directory "app/views/doop"
@@ -25,6 +27,7 @@ class DoopgovukGenerator < Rails::Generators::Base
 
     gem 'govuk_frontend_toolkit'
     gem 'govuk_template'
+    gem 'jquery-ui-rails'
 
     gem_group :development do
       gem 'rspec-rails'

data/lib/generators/doopgovuk/templates/app/assets/javascripts/demo.js.coffee

@@ -6,4 +6,11 @@ $( () ->
       history.pushState('back', null, null);
       $( "#back_a_page" ).val( "pressed" )
       $( "#back_a_page" ).click()
+
+  $('#doop_debug').dialog( { autoOpen: false, height: 400, width: 400, position: { my: 'right top', at: 'right top' } })
+  $("body").keydown (e) ->
+    if e.ctrlKey && e.keyCode == 89
+      $('#doop_debug').dialog( "open")
+    
+  
 )

data/lib/generators/doopgovuk/templates/app/assets/javascripts/demo/application.js

@@ -0,0 +1,2 @@
+//
+//= require jquery-ui/dialog

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

@@ -48,6 +48,10 @@ $question-fg-color: #014c73;
     margin: 0.75em 0.75em 0.75em 0.75em;
   }
 
+  li {
+    margin: 0.75em 0.75em 0.75em 0.75em;
+  }
+
   .info_img {
     float: right;
     margin: 10px 10px 10px 10px;
@@ -75,16 +79,14 @@ $question-fg-color: #014c73;
   .title {
      padding: 0 0 0 0;
      display: table-cell;
-     width: 80%;
      vertical-align: middle;
   }
 
   .answer {
     display: table-cell;
-    max-width: 20%;
     text-align: right;
     vertical-align: middle;
-    .button {
+    .button-change-answer {
       @include button($question-fg-color);
       margin: 0 0 0 0;
     }
@@ -144,15 +146,13 @@ button {
 }
 
 .error {
-  margin: 0 0 10px 0;
-  span {
     color: red;
     border: 1px solid #B01117;
     background-color: #FFF3CF;
-    padding: 5px 5px 5px 5px;
+    padding: 2px 5px 2px 5px;
     border-radius: 5px;
-
-  }
+    margin: 10px 0 10px 0;
+    width: auto;
 }
 
 .navbar {
@@ -234,6 +234,18 @@ button {
 
 }
 
+.summary_box {
+  display: block;
+  margin: 15px 0 15px 0;
+  max-width: 100%;
+  min-height: 60px;
+  border: solid #d1e4f2 5px;
+  box-shadow: 0 0 7px #ccc;
+  padding: 0.75em 0.75em 0.75em 0.75em;
+  background: #e1effa;
+  border-radius: 0.15em;
+}
+
 .change_answer_tooltip {
   border: 1px solid #F8C830;
   background-color: #FFF4B5;
@@ -244,4 +256,34 @@ button {
 }
 
 
+.before_you_begin {
+
+  ul { 
+    padding: 0;
+    margin: 0;
+
+  }
+
+  li {
+    padding: 32px 0 32px 88px;
+    border-bottom: 1px solid #ccc;
+    list-style-type: none;
+  }
+
+  li.nino {
+    background: url(image_path('nino-icon.png')) left center no-repeat;
+  }
+
+  li.passport {
+    background: url(image_path('passport-icon.png')) left center no-repeat;
+  }
+  li.time {
+    background: url(image_path('time-icon.png')) left center no-repeat;
+  }
+
+}
+
+select {
+    @include core-16();
+}
 

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

@@ -0,0 +1,3 @@
+/*
+ *= require jquery-ui/dialog
+ */

data/lib/generators/doopgovuk/templates/app/controllers/demo_controller.rb

@@ -1,6 +1,8 @@
+# encoding: utf-8
 
 require 'doop'
 require 'yaml'
+require 'date'
 
 class DemoController < ApplicationController
 
@@ -13,7 +15,7 @@ class DemoController < ApplicationController
       load_yaml do
         data = params["doop_data"] 
         if data != nil
-          if Rails.env.development? || Rails.env.test?
+          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?
@@ -22,45 +24,72 @@ class DemoController < ApplicationController
 
         <<-EOS
           page: {
+            before_you_begin: {
+              _page: "before_you_begin",
+              _nav_name: "Before you begin",
+            },
             preamble: {
               _page: "preamble",
-              _nav_name: "Apply Online",
+              _nav_name: "Preamble",
 
-              debug_on: {
-                _question: "Turn debug on ?",
-                _answer: "No"
-              },
-              enrolled_before: {
-                _question: "Have you enrolled for this service before ?"
-              },
-              year_last_applied: {
-                _question: "What year did you last apply?"
+              income_more_than_50000: {
+                _question: "Does you or your partner have an individual income of more than £50,000 a year ?"
               },
-              reason_for_applying: {
-                _question: "Why are you applying?"
+              do_you_still_want_to_apply: {
+                _question: "Do you still want to apply for child benefit?"
               }
             },
-            your_details: {
-              _page: "your_details",
-              _nav_name: "Your Details",
+            about_you: {
+              _page: "about_you",
+              _nav_name: "About You",
 
               your_name: {
                 _question: "What is your name?",
-                _answer: {},
+                _answer: {}
+              },
+              known_by_other_name: {
+                _question: "Have you ever been known by another surname ?"
+              },
+              previous_name: {
+                _question: "What name were you previously known by ?"
+              },
+              dob: {
+                _question: "Your date of birth"
+              },
+              your_address: {
+                _question: "Your address",
+                _answer: {}
+              },
+              lived_at_address_for_more_than_12_months: {
+                _question: "Have you lived at this address for more than 12 months ?"
+              },
+              last_address: {
+                _question: "What was your last address ?",
+                _answer: {}
               },
-              address_history: {
-                _question: "What is your address ?",
-                address__1: { _answer: {} }
+              your_phone_numbers: {
+                _question: "What numbers can we contact you on ?",
+                _answer: {}
+              },
+              have_nino: {
+                _question: "Do you have a national insurance number ?"
+              },
+              nino: {
+                _question: "What is your national insurance number ?"
               }
 
             },
-            summary: {
-              _page: "summary",
-              _nav_name: "Summary",
-
-              terms_and_conditions: {
-                _question: "Terms and conditions"
-              }
+            children: {
+              _page: "children",
+              _nav_name: "Children",
+              how_many_birth_certs: {
+                _question: "How many birth certificates are you sending us?"
+              },
+              #{child_yaml}
+            },
+            declaration: {
+              _page: "declaration",
+              _nav_name: "Declaration",
             }
 
           }
@@ -68,6 +97,26 @@ class DemoController < ApplicationController
 
       end
 
+      def child_yaml 
+        <<-EOS
+              child__1: {
+                name: {
+                  _question: "Child's name",
+                  _answer: {}
+                },
+                gender: {
+                  _question: "Is this child male or female ?"
+                },
+                dob: {
+                  _question: "Child's date of birth"
+                },
+                own_child: {
+                  _question: "Is this child your own child ?"
+                }
+             }
+          EOS
+      end
+
       save_yaml do |yaml|
         if Rails.env.development? || Rails.env.test?
           request["doop_data"] = yaml
@@ -78,85 +127,170 @@ class DemoController < ApplicationController
         end
       end
 
-      debug_on do 
-        doop["/page/preamble/debug_on/_answer"] == "Yes"
+
+      # PREAMBLE callbacks
+
+      on_answer "/page/preamble/income_more_than_50000"  do |question,path, params, answer|
+        answer_with( question, { "_summary" => answer } )
+        enable( "/page/preamble/do_you_still_want_to_apply", answer == 'Yes' )
+      end
+
+      on_answer "/page/preamble/do_you_still_want_to_apply"  do |question,path, params, answer|
+        answer_with( question, { "_summary" => "Yes" } )
       end
 
-      # On answer call backs
 
-      on_answer "/page/preamble/debug_on"  do |question,path, params, answer|
+
+      # ABOUT YOU callbacks
+
+      on_answer "/page/about_you/your_name"  do |question,path, params, answer|
+        res = validate( answer, ["title", "firstname", "surname"] )
+        next res if !res.empty?
+
+        name = "#{answer['title']} #{answer['firstname']} #{answer['middlenames']} #{answer['surname']}".squish
+        formatted_name = name.split( " ").map{ |n| n.capitalize }.join( " ")
+        answer_with( question, { "_summary" => formatted_name } )
+      end
+
+      on_answer "/page/about_you/known_by_other_name"  do |question,path, params, answer|
         answer_with( question, { "_summary" => answer } )
+        enable( "/page/about_you/previous_name", answer == 'Yes' )
       end
 
-      on_answer "/page/preamble/enrolled_before"  do |question,path, params, answer|
+      on_answer "/page/about_you/previous_name"  do |question,path, params, answer|
+        res = validate( answer )
+        next res if !res.empty?
         answer_with( question, { "_summary" => answer } )
-        enable( "/page/preamble/year_last_applied", answer == "Yes" )
       end
 
-      on_answer "/page/preamble/year_last_applied" do |question,path,params,answer|
+      on_answer "/page/about_you/dob"  do |question,path, params, answer|
+        d = format_date answer
+        next { :answer_error => "Date of birth must be formated as dd/mm/yyyy" } if d.nil?
+        answer_with( question, { "_summary" => d } )
+      end
+
+      on_answer "/page/about_you/your_address"  do |question,path, params, answer|
+        res = validate( answer, ["address1", "address2", "address3", "postcode"] )
+        next res if !res.empty?
+
+        a = "#{answer['address1']}, #{answer['postcode']}"
+        answer_with( question, { "_summary" => a } )
+      end
+
+      on_answer "/page/about_you/lived_at_address_for_more_than_12_months" do |question, path, params, answer|
         answer_with( question, { "_summary" => answer } )
+        enable( "/page/about_you/last_address", answer == 'No' )
       end
 
-      on_answer "/page/preamble/reason_for_applying" do |question,path,params,answer|
-        if answer.empty? 
-          next { :reason_for_applying_error => "This can not be blank" }
-        end
+      on_answer "/page/about_you/last_address"  do |question,path, params, answer|
+        res = validate( answer, ["address1", "address2", "address3", "postcode"] )
+        next res if !res.empty?
 
-        answer_with( question, { "_summary" => "Provided" } )
+        a = "#{answer['address1']}, #{answer['postcode']}"
+        answer_with( question, { "_summary" => a } )
       end
 
-      on_answer( "/page/preamble" ) do |question, path, params, answer|
+      on_answer "/page/about_you/your_phone_numbers"  do |question,path, params, answer|
+        res = validate( answer, ["daytime", "evening"] )
+        next res if !res.empty?
         answer_with( question, { "_summary" => "Provided" } )
       end
 
-      on_answer( "/page/your_details/your_name" ) do |question, path, params, answer|
-        firstname = answer["firstname"].capitalize
-        surname = answer["surname"].capitalize
-        answer_with( question, { "_summary" => "#{firstname} #{surname}" } )
+      on_answer "/page/about_you/have_nino" do |question, path, params, answer|
+        answer_with( question, { "_summary" => answer } )
+        enable( "/page/about_you/nino", answer == 'Yes' )
       end
 
-      on_answer( "/page/your_details/address_history/address__(\\d+)" ) do |question, path, params, answer|
+      on_answer "/page/about_you/nino" do |question, path, params, answer|
+        res = validate( answer )
+        next res if !res.empty?
+        answer_with( question, { "_summary" => answer } )
+      end
 
-        if params.include?("remove_address")
-          remove path
-          next
-        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
 
-        address1 = answer["address1"]
-        address2 = answer["address2"]
-        address3 = answer["address3"]
-        postcode = answer["postcode"]
-        summary = [address1, address2, address3, postcode].select{ |n| !n.empty? }.join( ", ")
-        answer_with( question, { "_summary" => summary } )
 
+        answer_with( question, { "_summary" => answer } )
       end
 
-      on_answer( "/page/your_details/address_history" ) do |question, path, params, answer|
-        if params.include?("add_address")
-          address = YAML.load("{ _answer: {}}")
-          add( "/page/your_details/address_history/address__99", address )
-          renumber( "/page/your_details/address_history" )
-          next
-        end
+      on_answer "/page/children/child__(\\d+)/name"  do |question,path, params, answer|
+        res = validate( answer, ["firstname", "surname"] )
+        next res if !res.empty?
 
-        answer_with( question, { "_summary" => "Provided" } )
+        name = "#{answer['firstname']} #{answer['middlenames']} #{answer['surname']}".squish
+        formatted_name = name.split( " ").map{ |n| n.capitalize }.join( " ")
+        answer_with( question, { "_summary" => formatted_name } )
       end
 
-      on_answer( "/page/your_details" ) do |question, path, params, answer|
-        answer_with( question, { "_summary" => "Provided" } )
+      on_answer "/page/children/child__(\\d+)/gender"  do |question,path, params, answer|
+        answer_with( question, { "_summary" => answer } )
+      end
+
+      on_answer "/page/children/child__(\\d+)/dob"  do |question,path, params, answer|
+        d = format_date answer
+        next { :answer_error => "Date of birth must be formated as dd/mm/yyyy" } if d.nil?
+        answer_with( question, { "_summary" => d } )
+      end
+
+      on_answer "/page/children/child__(\\d+)/own_child"  do |question,path, params, answer|
+        answer_with( question, { "_summary" => answer } )
       end
 
-      on_answer( "/page/your_details" ) do |question, path, params, answer|
+      on_answer "/page/children/child__(\\d+)"  do |question,path, params, answer|
+        if params.include?("remove_child")
+          remove path
+          renumber "/page/children"
+          next
+        end
+        name = doop["#{path}/name/_answer"]
+        answer_with( question, { "_summary" => doop["#{path}/name/_summary"] } )
+      end
+
+      on_answer "/page/children" do |question, path, params, answer|
+        if params.include?("add_child")
+          add( "/page/children/child__99", YAML.load( child_yaml )["child__1"] )
+          renumber( "/page/children" )
+          next
+        end
         answer_with( question, { "_summary" => "Provided" } )
       end
 
-      on_answer( "/page/summary/terms_and_conditions" ) do |question, path, params, answer|
-        answer_with( question, { "_summary" => "Accepted" } )
+      on_answer "/page/declaration" do |question, path, params, answer |
+        { :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
+  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
+
+  fields.each do |f|
+    res["#{f}_error".to_sym] = "Can not be empty" if answer[f].squish.empty?
+  end
+  res
 end
 
+def is_number num
+  num =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
+end