doop 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDZjODg0NTdlY2FkODllYmE3YzhhMmJkYzhjNGFhOTUyZDAxYWJhMg==
+    ZTllNmZkNDU1YzY3ODNlY2QyYWM4YjVkNmMzYmJiY2I4MzFjM2I1NQ==
   data.tar.gz: !binary |-
-    MmI1MGNlMWVmNWQ0NTBiMDYzMjVlMzJhYzRhMmNhNWE5NDQ5MWQxNQ==
+    ZjY5ZjhhYzY3MjQ0NzhhMzgyYzNmZTA1OTkzYjU0ZDkzNTE3YmUzMg==
 SHA512:
   metadata.gz: !binary |-
-    ZWI3Y2UwYmUzNjhhNGI0YjU5ZTk2YmZiMTBhMDhlY2U2Nzk1Y2I2ZWNiNzY5
-    ZjA4OTNkNmI0YWNjMmIzMzIyZWNiMGFjZjE5OTlmMjJmZTZmMzYxMmZlODhl
-    ZTljMGRiODdkMDM2YWM5YjY1NmJiNjY1NzJhM2ZmYTQwNTI0N2I=
+    ZWMyNzg0MjliNmNkOWQyNDEzNWUyMTEzMjliMGZkOTUzMzBjNmU0NjQyMDg1
+    NDUwMDJmOWIzYzUyOTFjZGM2YmRmZmIxZjAxNmQ5ZDg1ZWMzY2U5ZDgxOTNm
+    OTE2OTM3NzNjODg4YjBmMmZmMDEwOWRlMDczN2IwNGFmOWQ1MzM=
   data.tar.gz: !binary |-
-    YmI5M2ViZDkzYjYyNzAwYmFlNjQzMmFjZGJkMTdjZmI5YzBiNmUwZGQzZDBi
-    YmE4ZGQyNjQ2M2RkMjg1ZjdkZWYyZmEyMTQzMmIxYTFmMTZhN2M0YmE2MTIz
-    NjQyYjkwNTI0MTllOWYxY2U1NmNmZmY2NzU3MGVhY2JhYmU1ZmE=
+    ZTU3YjUwNDllYjljMTk0ZjhmMDUyZTcxZjcxNzYxZGNhODE3MDY1MTVkN2Nj
+    YmE5YzI2OGQ4MGIyZTk4MzExODg1OWMwNjk0ZmE5MzU0YmU4MTFlZjgxOGRl
+    ODc3NzQ4MjgxYTVkYmVjMWJkMDk1ZmUzZTIzYzU3ZDE1YWM3NDM=

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 *.swp
+doop_demo/

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "doop_demo"]
+	path = doop_demo
+	url = git://github.com/coder36/doop_demo.git

data/README.md

@@ -2,6 +2,10 @@
 
 A question framework for govuk sites, inspired by the great work GDS have done to standardize the cross government internet presence.
 
+Try out a demo... it's hosted on heroku so there may be a initial pause while heroku fires up the demo:
+
+## [Doopgovuk demo](http://blooming-wave-8670.herokuapp.com)
+
 # Quick start
 
 Assuming ruby, rails and nodejs is installed:
@@ -192,6 +196,7 @@ Don't forget to deal with database drivers.  In your Gemfile, you will need to u
 
 * Refactor -  make the code, simpler and read better
 * Doop-Rspec - it would be nice to have a DSL to drive answering questions.  This could be extended to capybara.
+* Responsive - on the whole the govuk frontend is responsive, fonts resize etc.  But there is still some work to be done.
 
 
 ## Contributing

data/app/helpers/doop_helper.rb

@@ -48,4 +48,28 @@ module DoopHelper
     l.keys.sort.each { |k| block.call( l[k], k.to_i ) }
   end
 
+  def when_question options = {}, &block
+    doop = request[:doop]
+    if options.include? :last_answered
+      path = options[:last_answered]
+      if doop.last_answered == path 
+        block.call doop[path]["_answer"]
+      end
+    elsif options.include? :changed
+      path = options[:changed]
+      if doop.is_being_changed(path)
+        block.call doop[path]["_answer"]
+      end
+    end
+  end
+
+  def tooltip &block
+    render( "doop/tooltip", :content => block )
+  end
+
+  def change_answer_tooltip &block
+    render( "doop/change_answer_tooltip", :content => block )
+  end
+
+
 end

data/doop.gemspec

@@ -2,6 +2,18 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'doop/version'
+require 'fileutils'
+
+# Copy files for rails doopgovuk template:
+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/javascripts/demo.js.coffee", "#{dest}/app/assets/javascripts/demo.js.coffee"
+  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"
+  FileUtils.cp_r "doop_demo/app/views/demo", "#{dest}/app/views"
+end
 
 Gem::Specification.new do |spec|
   spec.name          = "doop"
@@ -9,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Mark Middleton"]
   spec.email         = ["markymiddleton@gmail.com"]
   spec.summary       = %q{Question framework for govuk websites.}
-  spec.description   = %q{A question framework for govuk sites, inspired by the great work GDS have done to standardize the cross government internet presence.}
+  spec.description   = %q{A question framework for govuk sites, inspired by the work GDS have done to standardize the cross government internet presence.}
   spec.homepage      = "https://github.com/coder36/doop"
   spec.license       = "MIT"
 
@@ -24,3 +36,4 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rails"
 end
+

data/lib/doop.rb

@@ -43,10 +43,12 @@ module Doop
     end
 
     def default_on_answer( root, path, context, answer )
+
       self[path + "/_answer"] = context["answer"] if context["answer"] != nil
       self[path + "/_summary"] = context["summary"] if context["summary"] != nil
       self[path + "/_answered"] = true
       self[path + "/_open"] = false
+      get_top["_last_answered"] = root["_path"]
       {}
     end
 
@@ -144,6 +146,7 @@ module Doop
         root["_enabled"] = true if !root.has_key?("_enabled")
         root["_answered"] = false if !root.has_key?("_answered")
         root["_answer"] = nil if !root.has_key?("_answer")
+        root["_path"] = path
       end
     end
 
@@ -246,6 +249,7 @@ module Doop
     end
 
     def change path
+      get_top["_last_answered"] = nil
       each_path_elem_reverse(currently_asked) do |p|
         self[p + "/_open"] = false
       end
@@ -268,12 +272,14 @@ module Doop
       self[path]["_answer"] = a
       self[path]["_answered"] = true
       self[path]["_summary"] = summary == nil ? a : summary
+      get_top["_last_answered"] = root["_path"]
       {}
     end
 
     def answer_with root, hash
       root["_answered"] = true
       hash.keys.each { |k| root[k] = hash[k] }
+      get_top["_last_answered"] = root["_path"]
     end
 
     def unanswer_path path
@@ -307,6 +313,19 @@ module Doop
       end
     end
 
+    def get_top
+      @hash[@hash.first[0]]
+    end
+
+    def last_answered
+      get_top[ "_last_answered"]
+    end
+
+    def is_being_changed path
+      question = self[path]
+      question[ "_enabled" ] && question[ "_answered" ] && question[ "_open" ]
+    end
+
 
   end
 

data/lib/doop/version.rb

@@ -1,3 +1,3 @@
 module Doop
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/generators/doopgovuk/doopgovuk_generator.rb

@@ -5,18 +5,12 @@ 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/javascripts/demo.js.coffee", "app/assets/javascripts/#{name}.js.coffee"
     template "app/controllers/demo_controller.rb", "app/controllers/#{name}_controller.rb"
-    copy_file "app/views/demo/index.html.erb",  "app/views/#{name}/index.html.erb"
-    copy_file "app/views/demo/index.js.erb",  "app/views/#{name}/index.js.erb"
-    copy_file "app/views/demo/_preamble.html.erb",  "app/views/#{name}/_preamble.html.erb"
-    copy_file "app/views/demo/_summary.html.erb",  "app/views/#{name}/_summary.html.erb"
-    copy_file "app/views/demo/_your_details.html.erb",  "app/views/#{name}/_your_details.html.erb"
     copy_file "app/views/layouts/application.html.erb",  "app/views/layouts/application.html.erb"
-    copy_file "app/views/doop/_error.html.erb",  "app/views/doop/_error.html.erb"
-    copy_file "app/views/doop/_info_box.html.erb",  "app/views/doop/_info_box.html.erb"
-    copy_file "app/views/doop/_navbar.html.erb",  "app/views/doop/_navbar.html.erb"
-    copy_file "app/views/doop/_question_form.html.erb",  "app/views/doop/_question_form.html.erb"
-    copy_file "app/views/doop/_question.html.erb",  "app/views/doop/_question.html.erb"
+    directory "app/views/doop"
+    directory "app/views/demo", "app/views/#{name}"
+    gsub_file "app/controllers/#{name}_controller.rb", /DemoController/, "#{name.capitalize}Controller"
 
 
     route "root '#{name}#index'"

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

@@ -0,0 +1,9 @@
+$( () ->
+  history.pushState("back", null, null);
+  if typeof history.pushState == "function"
+    history.pushState("back", null, null);
+    window.onpopstate = (evt) ->
+      history.pushState('back', null, null);
+      $( "#back_a_page" ).val( "pressed" )
+      $( "#back_a_page" ).click()
+)

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

@@ -157,32 +157,91 @@ button {
 
 .navbar {
 
-  border-width: 0 0 1px 0;
-  border-style: dotted;
-  border-color: #bfc1c3;
-
-  ol {
-    list-style-type: none;
-    margin: 0;
-    padding: 10px;
-    text-align: center;
+  
+  @include media($min-width: 500px) {
+
+    border-width: 0 0 1px 0;
+    border-style: dotted;
+    border-color: #bfc1c3;
+
+    ol {
+      list-style-type: none;
+      margin: 0;
+      padding: 10px;
+      text-align: center;
+    }
+    li.todo {
+      display: inline;
+      margin: 0 30px 0 0;
+      @include core-16();
+    }
+
+    li.doing {
+      display: inline;
+      margin: 0 30px 0 0;
+      @include bold-16();
+    }
+
+    li.done {
+      display: inline;
+      margin: 0 30px 0 0;
+      @include core-16();
+    }
   }
-  li.todo {
-    display: inline;
-    margin: 0 30px 0 0;
-    @include core-16();
+
+  @include media($max-width: 500px) {
+
+    ol {
+      list-style-type: none;
+      text-align: left;
+      padding: 0;
+    }
+    li.todo {
+      @include core-16();
+      padding: 6px 0 0 0;
+    }
+
+    li.doing {
+      @include bold-16();
+      padding: 6px 0 0 0;
+    }
+
+    li.done {
+      @include core-16();
+      padding: 6px 0 0 0;
+    }
   }
+}
 
-  li.doing {
-    display: inline;
-    margin: 0 30px 0 0;
-    @include bold-16();
+
+.tooltip {
+  border: 1px solid #666;
+  color: #000;
+  box-shadow: 0 0 7px #ccc;
+  border-radius: 0.75em;
+  background-color: #FFF3CE;
+  p {
+    margin: 10px;
+  }
+  @include media($max-width: 700px) {
+    width: 100%;
+    margin: 4px 0 20px 0;
+  }
+  @include media($min-width: 700px) {
+    width: 700px;
+    margin: 4px 0 20px auto;
   }
 
-  li.done {
-    display: inline;
-    margin: 0 30px 0 0;
-    @include core-16();
+}
+
+.change_answer_tooltip {
+  border: 1px solid #F8C830;
+  background-color: #FFF4B5;
+  margin: 20px 0 0 0;
+  p {
+    margin: 10px;
   }
 }
 
+
+

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

@@ -2,7 +2,7 @@
 require 'doop'
 require 'yaml'
 
-class <%=name.capitalize%>Controller < ApplicationController
+class DemoController < ApplicationController
 
   delegate :index, :answer, to: :@doop_controller
   before_filter :setup_doop

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

@@ -6,6 +6,20 @@
       <button name="b_answer" value="No">No, turn debugging off</button>
     <% end %>
 
+    <% when_question :last_answered => "/page/preamble/debug_on" do |answer|%>
+      <% if answer == "No" %>
+        <%=tooltip do %>
+          <p><strong>Are you sure ?</strong></p>
+          <p>By selecting no, you will not be able to see the yaml which doop generates behind the scenes</p>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <% when_question :changed => "/page/preamble/enrolled_before" do |current_answer| %>
+      <%=change_answer_tooltip do %>
+        <p>If you change this answer, additional questions may be asked</p>
+      <% end %>
+    <% end %>
     <%=question "/page/preamble/enrolled_before" do |root,answer| %>
       <button name="b_answer" value="Yes">Yes, I've applied before</button><br/>
       <button name="b_answer" value="No">No, I haven't applied before</button>

data/lib/generators/doopgovuk/templates/app/views/doop/_change_answer_tooltip.html.erb

@@ -0,0 +1,3 @@
+<div class="change_answer_tooltip">
+  <% content.call %>
+</div>

data/lib/generators/doopgovuk/templates/app/views/doop/_tooltip.html.erb

@@ -0,0 +1,3 @@
+<div class="tooltip">
+  <% content.call %>
+</div>

data/spec/doop_spec.rb

@@ -160,6 +160,16 @@ describe "Doop" do
       q
     }
 
+    it "remembers that last question to be answered" do
+      expect(question.currently_asked).to eq( "/root/age" )
+      question.answer( { "answer" => 36 } )
+      expect(question.last_answered).to eq( "/root/age" )
+      expect(question.currently_asked).to eq( "/root/address/address_line__1" )
+      question.answer( { "answer" => "address1" } )
+      expect(question.last_answered).to eq( "/root/address/address_line__1" )
+
+    end
+
     it "gets the next unaswered question" do
       expect(question.currently_asked).to eq( "/root/age" )
     end
@@ -214,6 +224,15 @@ describe "Doop" do
       expect(question.currently_asked).to eq( "/root/address/address_line__3" )
     end
 
+    it "tells you if a question is being changed rather than just answered for the first time" do
+      expect(question.currently_asked).to eq( "/root/age" )
+      expect( question.is_being_changed("/root/age") ).to eq(false)
+      question.answer( {"answer" => 36} )
+      question.change( "/root/age" )
+      expect( question.is_being_changed("/root/age") ).to eq(true)
+
+    end
+
     it "provides a mechanism to see if all questions are answered under a given path" do
 
       expect(question.currently_asked).to eq( "/root/age" )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doop
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mark Middleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,8 +66,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A question framework for govuk sites, inspired by the great work GDS
-  have done to standardize the cross government internet presence.
+description: A question framework for govuk sites, inspired by the work GDS have done
+  to standardize the cross government internet presence.
 email:
 - markymiddleton@gmail.com
 executables:
@@ -76,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .gitmodules
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -91,6 +92,7 @@ files:
 - lib/doop_controller.rb
 - lib/generators/doopgovuk/USAGE
 - lib/generators/doopgovuk/doopgovuk_generator.rb
+- lib/generators/doopgovuk/templates/app/assets/javascripts/demo.js.coffee
 - lib/generators/doopgovuk/templates/app/assets/stylesheets/demo.css.scss
 - lib/generators/doopgovuk/templates/app/controllers/demo_controller.rb
 - lib/generators/doopgovuk/templates/app/views/demo/_preamble.html.erb
@@ -98,11 +100,13 @@ files:
 - lib/generators/doopgovuk/templates/app/views/demo/_your_details.html.erb
 - lib/generators/doopgovuk/templates/app/views/demo/index.html.erb
 - lib/generators/doopgovuk/templates/app/views/demo/index.js.erb
+- lib/generators/doopgovuk/templates/app/views/doop/_change_answer_tooltip.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_error.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_info_box.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_navbar.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_question.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_question_form.html.erb
+- lib/generators/doopgovuk/templates/app/views/doop/_tooltip.html.erb
 - lib/generators/doopgovuk/templates/app/views/layouts/application.html.erb
 - spec/doop_spec.rb
 - spec/spec_helper.rb