doop 0.0.4.2 → 0.0.5

data/demo/test/test_helper.rb

@@ -0,0 +1,10 @@
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/doop.gemspec

@@ -2,22 +2,6 @@
 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/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/assets/javascripts/demo/analytics.js.erb", "#{dest}/app/assets/javascripts/demo/analytics.js.erb"
-  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"
-  FileUtils.cp_r "doop_demo/spec", "#{dest}"
-end
 
 Gem::Specification.new do |spec|
   spec.name          = "doop"
@@ -38,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1"
 
-  spec.add_runtime_dependency "rails", "~> 4.1"
+  spec.add_runtime_dependency "rails", "~> 4"
 end
 

data/lib/doop-rspec.rb

@@ -80,3 +80,7 @@
       page.find_by_id( "#{page_name}-nav" ).click
       wait_for_page page_name
     end
+
+    def back_a_page
+      page.execute_script( "$('#back_a_page').click()" )
+    end

data/lib/doop/version.rb

@@ -1,3 +1,3 @@
 module Doop
-  VERSION = "0.0.4.2"
+  VERSION = "0.0.5"
 end

data/lib/doop_controller.rb

@@ -12,8 +12,6 @@ module Doop
     def initialize application_controller, &block
       @controller = application_controller
       @block = block
-      @current_page_block = method( :default_current_page )
-      @all_pages_block = method( :default_all_pages )
     end
 
     def index
@@ -58,11 +56,10 @@ module Doop
 
     def change_page path
       in_doop do |doop|
-        #path = @controller.params["path"]
         doop.change( path )
 
         # unanswer all pages after path
-        pages = @all_pages_block.call 
+        pages = get_all_pages 
         pages[pages.index(path), pages.length].each do |n|
           doop[n]["_answered"] = false
         end
@@ -101,7 +98,7 @@ module Doop
       @doop = Doop.new()
       @self_before_instance_eval = eval "self", @block.binding
       instance_exec @doop, &@block
-      @doop.yaml = @load_yaml_block.call
+      @doop.yaml = load_yaml
       @doop.init
       @doop
     end
@@ -109,7 +106,7 @@ module Doop
     def in_doop
       load
       res = yield(@doop)
-      @save_yaml_block.call @doop.dump
+      save_yaml @doop.dump
       return res if res.kind_of? Hash
       {}
     end
@@ -123,47 +120,45 @@ module Doop
       @self_before_instance_eval.send method, *args, &block
     end
 
-    def current_page &block
-      @current_page_block = block
-    end
-
-    def all_pages &block
-      @all_pages_block = block
-    end
-
     def get_page
       path = @doop.currently_asked
-      @doop[@current_page_block.call( path )]["_page"]
+      @doop[current_page( path )]["_page"]
     end
 
     def get_page_path
       path = @doop.currently_asked
-      @current_page_block.call( path )
+      current_page( path )
     end
 
-    def get_all_pages
-      @all_pages_block.call
+    def load_yaml
+      data = params["doop_data"] 
+      return ActiveSupport::MessageEncryptor.new(Rails.application.secrets.secret_key_base).decrypt_and_verify(data) if !data.nil?
+      @yaml_block.call
     end
 
-    def load_yaml &block
-      @load_yaml_block = block
+    def save_yaml yaml
+      @controller.request["doop_data"] = ActiveSupport::MessageEncryptor.new(Rails.application.secrets.secret_key_base).encrypt_and_sign(yaml)
     end
 
-    def save_yaml &block
-      @save_yaml_block = block
+    def yaml &block
+      @yaml_block = block
     end
 
-    def default_current_page path 
+    def current_page path 
       a = path.split("/").reject {|s| s.empty? }[1] 
       "/page/#{a}"
     end
 
-    def default_all_pages 
+    def get_all_pages 
       l = []
       doop.each_question_with_regex_filter "^\/page/\\w+$" do |question,path|
         l << path if doop[path]["_enabled"]
       end
       l
     end
+
+    def inject_yaml yaml
+      @controller.params["doop_data"] = ActiveSupport::MessageEncryptor.new(Rails.application.secrets.secret_key_base).encrypt_and_sign(yaml)
+    end
   end
 end

data/lib/generators/doopgovuk/doopgovuk_generator.rb

@@ -1,5 +1,5 @@
 class DoopgovukGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
+  source_root File.expand_path('../../../../demo', __FILE__)
   argument :name, :type => :string, :default => "demo"
 
 
@@ -11,6 +11,8 @@ class DoopgovukGenerator < Rails::Generators::Base
     copy_file "app/assets/javascripts/demo/analytics.js.erb", "app/assets/javascripts/#{name}/analytics.js.erb"
     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 "public/uploads"
+    copy_file "public/uploads/.keep",  "public/uploads/.keep"
     directory "app/views/doop"
     directory "app/views/demo", "app/views/#{name}"
     gsub_file "app/controllers/#{name}_controller.rb", /DemoController/, "#{name.capitalize}Controller"
@@ -25,21 +27,29 @@ class DoopgovukGenerator < Rails::Generators::Base
     route "post '#{name}/index'"
     route "post '#{name}/answer'"
     route "get '#{name}/harness'"
+    route "post '#{name}/harness'"
 
-    gem 'govuk_frontend_toolkit'
-    gem 'govuk_template'
-    gem 'jquery-ui-rails'
+    gem "govuk_frontend_toolkit", "~> 1.6"
+    gem "govuk_template", "~> 0.9"
+    gem "jquery-ui-rails", "~> 5.0"
+    gem "blueimp-gallery", "~> 2.11.0"
+    gem "jquery-fileupload-rails", "~> 0.4"
+
+
+    gem_group :production do
+      gem 'rails_12factor', "~> 0.0"
+      gem 'pg', "~> 0.17"
+    end
 
     gem_group :development do
-      gem 'rspec-rails'
-      gem 'guard-rspec'
-      gem 'capybara'
-      gem 'pry'
-      gem 'pry-nav'
-      gem 'capybara-webkit'
-      gem 'headless'
-      gem 'capybara-screenshot'
-      gem 'selenium-webdriver'
+      gem 'rspec-rails', "~> 3.1"
+      gem 'guard-rspec', "~> 4.3"
+      gem 'capybara', "~> 2.4"
+      gem 'pry', "~> 0.10"
+      gem 'pry-nav', "~> 0.2"
+      gem 'capybara-webkit', "~> 1.3"
+      gem 'headless', "~> 1.0"
+      gem 'capybara-screenshot', "~> 1.0"
     end
 
     Bundler.with_clean_env do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doop
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Mark Middleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4'
 description: A question framework for govuk sites, inspired by the work GDS have done
   to standardize the cross government internet presence.
 email:
@@ -89,6 +89,94 @@ files:
 - app/assets/images/time-icon.png
 - app/helpers/doop_helper.rb
 - bin/.gitignore
+- demo/.gitignore
+- demo/.rspec
+- demo/Gemfile
+- demo/Gemfile.lock
+- demo/README.md
+- demo/Rakefile
+- demo/app/assets/images/.keep
+- demo/app/assets/images/cert_sample.jpg
+- demo/app/assets/javascripts/application.js
+- demo/app/assets/javascripts/demo.js.coffee
+- demo/app/assets/javascripts/demo/analytics.js.erb
+- demo/app/assets/javascripts/demo/application.js
+- demo/app/assets/stylesheets/application.css
+- demo/app/assets/stylesheets/demo.css.scss
+- demo/app/assets/stylesheets/demo/application.css
+- demo/app/controllers/application_controller.rb
+- demo/app/controllers/concerns/.keep
+- demo/app/controllers/demo_controller.rb
+- demo/app/helpers/application_helper.rb
+- demo/app/helpers/demo_helper.rb
+- demo/app/mailers/.keep
+- demo/app/models/.keep
+- demo/app/models/concerns/.keep
+- demo/app/views/demo/_about_you.html.erb
+- demo/app/views/demo/_before_you_begin.html.erb
+- demo/app/views/demo/_children.html.erb
+- demo/app/views/demo/_declaration.html.erb
+- demo/app/views/demo/_preamble.html.erb
+- demo/app/views/demo/harness.html.erb
+- demo/app/views/demo/index.html.erb
+- demo/app/views/demo/index.js.erb
+- demo/app/views/doop/_change_answer_tooltip.html.erb
+- demo/app/views/doop/_debug.html.erb
+- demo/app/views/doop/_error.html.erb
+- demo/app/views/doop/_file_uploader.html.erb
+- demo/app/views/doop/_info_box.html.erb
+- demo/app/views/doop/_navbar.html.erb
+- demo/app/views/doop/_question.html.erb
+- demo/app/views/doop/_question_form.html.erb
+- demo/app/views/doop/_textfield.html.erb
+- demo/app/views/doop/_tooltip.html.erb
+- demo/app/views/layouts/application.html.erb
+- demo/bin/bundle
+- demo/bin/rails
+- demo/bin/rake
+- demo/bin/rspec
+- demo/bin/spring
+- demo/config.ru
+- demo/config/application.rb
+- demo/config/boot.rb
+- demo/config/database.yml
+- demo/config/environment.rb
+- demo/config/environments/development.rb
+- demo/config/environments/production.rb
+- demo/config/environments/test.rb
+- demo/config/initializers/assets.rb
+- demo/config/initializers/backtrace_silencers.rb
+- demo/config/initializers/cookies_serializer.rb
+- demo/config/initializers/filter_parameter_logging.rb
+- demo/config/initializers/inflections.rb
+- demo/config/initializers/mime_types.rb
+- demo/config/initializers/session_store.rb
+- demo/config/initializers/wrap_parameters.rb
+- demo/config/locales/en.yml
+- demo/config/routes.rb
+- demo/config/secrets.yml
+- demo/db/seeds.rb
+- demo/lib/assets/.keep
+- demo/lib/tasks/.keep
+- demo/log/.keep
+- demo/notes.txt
+- demo/public/404.html
+- demo/public/422.html
+- demo/public/500.html
+- demo/public/favicon.ico
+- demo/public/robots.txt
+- demo/spec/features/demo_spec.rb
+- demo/spec/rails_helper.rb
+- demo/spec/spec_helper.rb
+- demo/test/controllers/.keep
+- demo/test/fixtures/.keep
+- demo/test/helpers/.keep
+- demo/test/integration/.keep
+- demo/test/mailers/.keep
+- demo/test/models/.keep
+- demo/test/test_helper.rb
+- demo/vendor/assets/javascripts/.keep
+- demo/vendor/assets/stylesheets/.keep
 - doop.gemspec
 - lib/doop-rspec.rb
 - lib/doop.rb
@@ -96,33 +184,8 @@ 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/javascripts/demo/analytics.js.erb
-- lib/generators/doopgovuk/templates/app/assets/javascripts/demo/application.js
-- lib/generators/doopgovuk/templates/app/assets/stylesheets/demo.css.scss
-- lib/generators/doopgovuk/templates/app/assets/stylesheets/demo/application.css
-- lib/generators/doopgovuk/templates/app/controllers/demo_controller.rb
-- lib/generators/doopgovuk/templates/app/views/demo/_about_you.html.erb
-- lib/generators/doopgovuk/templates/app/views/demo/_before_you_begin.html.erb
-- lib/generators/doopgovuk/templates/app/views/demo/_children.html.erb
-- lib/generators/doopgovuk/templates/app/views/demo/_declaration.html.erb
-- lib/generators/doopgovuk/templates/app/views/demo/_preamble.html.erb
-- lib/generators/doopgovuk/templates/app/views/demo/harness.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/_debug.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/_textfield.html.erb
-- lib/generators/doopgovuk/templates/app/views/doop/_tooltip.html.erb
-- lib/generators/doopgovuk/templates/app/views/layouts/application.html.erb
-- lib/generators/doopgovuk/templates/spec/features/demo_spec.rb
-- lib/generators/doopgovuk/templates/spec/rails_helper.rb
-- lib/generators/doopgovuk/templates/spec/spec_helper.rb
+- lib/generators/doopgovuk/templates/.keep
+- notes/screenshots/doop_1.png
 - spec/doop_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/coder36/doop

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

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

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

@@ -1,6 +0,0 @@
-<h1>YAML:</h1>
-<%=form_tag( {action: "index"}, :authenticity_token => true, :remote => false ) do %>
-  <textarea cols="140" rows="40" name="doop_data" id="doop_data"></textarea>
-  <br/>
-  <button id="render" name="harness">Render</button>
-<% end %>