woople-theme 0.2.49 → 0.3.0

data/app/presenters/answer_presenter.rb

@@ -0,0 +1,6 @@
+require 'explicit_delegator'
+
+class AnswerPresenter < ExplicitDelegator
+  delegate_methods :index, # ID of the option to be used in the form
+                   :text   # Text of the option/answer
+end

data/app/presenters/assessment_form_presenter.rb

@@ -1,5 +1,19 @@
-class AssessmentFormPresenter < SimpleDelegator
+require 'explicit_delegator'
+
+class AssessmentFormPresenter < ExplicitDelegator
+
+  delegate_methods :description, # Short description of assessment
+                   :course_path, # url to go to when assessment cancelled
+                   :copyright,   # copyright notice for assessment
+                   :submit_path, # path for assessment form to submit to
+                   :questions    # set of questions in the assessment
+
   def render_copyright
     yield if copyright.present?
   end
+
+  def questions
+    ThemePresentation.wrap_collection(__getobj__.questions, QuestionPresenter)
+  end
+
 end

data/app/presenters/question_presenter.rb

@@ -0,0 +1,12 @@
+require 'explicit_delegator'
+
+class QuestionPresenter < ExplicitDelegator
+  delegate_methods :id,       # Response id used in the form
+                   :question, # Text of the question
+                   :answers  # Set of options/answers for the question
+
+  def answers
+    ThemePresentation.wrap_collection(__getobj__.answers, AnswerPresenter)
+  end
+
+end

data/app/views/woople-theme/_assessment_form.html.erb

@@ -1,18 +1,24 @@
 <%= page_header title: 'Assessment', description: assessment_form.description %>
 
-<form id="assessment">
+
+<%= form_tag(assessment_form.submit_path, id: "assessment") do %>
+
   <%= render partial: 'woople-theme/assessment_form_question', collection: assessment_form.questions %>
 
   <div class="fieldset <%= cycle 'odd', 'even' %>">
     <div class="row-fluid">
       <div class="span4"><span class="badge"><%= t 'woople_theme.assessment_form.unanswered_questions', count: assessment_form.questions.count %></span></div>
       <div class="span8">
-        <input type="button" value="Cancel" class="btn btn-large" data-course-path="<%= assessment_form.course_path %>" />
-        <input type="submit" value="Submit Assessment" class="btn btn-primary btn-large" disabled="disabled" />
+        <input type="button"
+               value="<%= I18n.t('woople_theme.cancel') %>"
+               class="btn btn-large"
+               data-course-path="<%= assessment_form.course_path %>" />
+        <%= submit_tag(I18n.t('woople_theme.assessment_form.submit_assessment'), {class: "btn btn-primary btn-large", disabled: "disabled"}) %>
       </div>
     </div>
   </div>
   <% assessment_form.render_copyright do %>
     <p class="<%= cycle 'odd', 'even' %>"><%= assessment_form.copyright %></p>
   <% end %>
-</form>
+
+<% end %>

data/app/views/woople-theme/_assessment_form_answer.html.erb

@@ -1,2 +1,9 @@
-<% input_id = "question_#{question_number}_answer_#{assessment_form_answer_counter + 1}" %>
-<label class="radio" for="<%= input_id %>"><input type="radio" id="<%= input_id %>" name="question_<%= question_number %>" /><%= assessment_form_answer %></label>
+<% input_id = "response_#{response_id}_index_#{assessment_form_answer.index}" %>
+<label class="radio" for="<%= input_id %>">
+  <input type="radio"
+         id="<%= input_id %>"
+         name="response[<%= response_id %>]"
+         value="<%= assessment_form_answer.index %>"/>
+
+  <%= assessment_form_answer.text %>
+</label>

data/app/views/woople-theme/_assessment_form_question.html.erb

@@ -1,7 +1,7 @@
 <% question_number = assessment_form_question_counter + 1 %>
 <div class="fieldset <%= cycle 'odd', 'even' %>">
-  <div class="legend"><span><%= question_number %></span> <%= assessment_form_question.name %></div>
+  <div class="legend"><span><%= question_number %></span> <%= assessment_form_question.question %></div>
   <div>
-    <%= render partial: 'woople-theme/assessment_form_answer', collection: assessment_form_question.answers, locals: { question_number: question_number } %>
+    <%= render partial: 'woople-theme/assessment_form_answer', collection: assessment_form_question.answers, locals: { response_id: assessment_form_question.id } %>
   </div>
 </div>

data/config/locales/en.yml

@@ -39,9 +39,11 @@ en:
       unanswered_questions:
         one: 1 unanswered question
         other: '%{count} unanswered questions'
+      submit_assessment: Submit Assessment
     search_results_more: See All >
     logged_in_as: Logged in as
     impersonating: impersonating
+    cancel: Cancel
   date:
     formats:
       default: ! '%b %d %Y'

data/lib/explicit_delegator.rb

@@ -0,0 +1,19 @@
+class ExplicitDelegator
+
+  def initialize(obj)
+    @obj = obj
+  end
+
+  def __getobj__
+    @obj
+  end
+
+  def self.delegate_methods(*methods)
+    methods.each do |method|
+      define_method(method) do
+        __getobj__.send(method)
+      end
+    end
+  end
+
+end

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = "0.2.49"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.2.49
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177854241140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,31 +21,21 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.5
+  version_requirements: *70177854241140
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177854240400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.0.13
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.13
+  version_requirements: *70177854240400
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177854239960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70177854239960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177854239200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70177854239200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177854233240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70177854233240
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177854232480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+  version_requirements: *70177854232480
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177854231880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,12 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70177854231880
 description: All Front-End all the Time
 email:
 - developers@bigbangtechnology.com
@@ -189,6 +154,7 @@ files:
 - app/assets/stylesheets/woople-theme/variables.css.less
 - app/helpers/javascript_helper.rb
 - app/helpers/theme_helper.rb
+- app/presenters/answer_presenter.rb
 - app/presenters/assessment_form_presenter.rb
 - app/presenters/content_image.rb
 - app/presenters/content_item_presenter.rb
@@ -201,6 +167,7 @@ files:
 - app/presenters/outline_video_presenter.rb
 - app/presenters/page_header_presenter.rb
 - app/presenters/profile_presenter.rb
+- app/presenters/question_presenter.rb
 - app/presenters/theme_presentation.rb
 - app/views/layouts/theme.html.erb
 - app/views/woople-theme/_assessment_form.html.erb
@@ -222,6 +189,7 @@ files:
 - app/views/woople-theme/_video_modal.html.erb
 - config/locales/en.yml
 - config/routes.rb
+- lib/explicit_delegator.rb
 - lib/tasks/woople-theme_tasks.rake
 - lib/woople-theme/configuration.rb
 - lib/woople-theme/engine.rb
@@ -257,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Our Front-End CSS Framework/Theme