smartdown 0.8.2 → 0.9.0

data/README.md

@@ -106,6 +106,19 @@ to your outbound flight.
 * no: No
 ```
 
+### 'Country' question
+
+A 'country' question allows the user to select a country from a drop-down list.
+
+```markdown
+## Where do you want to get married?
+
+[country: marriage_country, countries: all_countries]
+```
+
+Where `all_countries` is the name of a data-plugin method that will return a hash of
+country slugs/names.
+
 ### Date
 
 ```markdown

data/lib/smartdown/api/country_question.rb

@@ -0,0 +1,21 @@
+require 'smartdown/api/question'
+require 'smartdown/model/element/question/country'
+
+module Smartdown
+  module Api
+    class CountryQuestion < Question
+      def options
+        question = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Country}
+        question.countries.map do |choice|
+          OpenStruct.new(:label => choice[1], :value => choice[0])
+        end
+      end
+
+      def name
+        question = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Country}
+        question.name
+      end
+
+    end
+  end
+end

data/lib/smartdown/api/flow.rb

@@ -12,8 +12,11 @@ module Smartdown
 
       attr_reader :scenario_sets
 
-      def initialize(smartdown_input, initial_state = {})
-        @smartdown_flow = Smartdown::Parser::FlowInterpreter.new(smartdown_input).interpret
+      def initialize(smartdown_input, options = {})
+        initial_state = options.fetch(:initial_state, {})
+        data_module = options.fetch(:data_module, nil)
+
+        @smartdown_flow = Smartdown::Parser::FlowInterpreter.new(smartdown_input, data_module).interpret
         @engine = Smartdown::Engine.new(@smartdown_flow, initial_state)
         @scenario_sets = Smartdown::Parser::ScenarioSetsInterpreter.new(smartdown_input).interpret
       end

data/lib/smartdown/api/previous_question.rb

@@ -10,6 +10,8 @@ module Smartdown
       def initialize(elements, response)
         if element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::MultipleChoice}
           @question = MultipleChoice.new(elements)
+        elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Country}
+          @question = CountryQuestion.new(elements)
         elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Date}
           @question = DateQuestion.new(elements)
         elsif element = elements.find{|element| element.is_a? Smartdown::Model::Element::Question::Salary}

data/lib/smartdown/api/question_page.rb

@@ -1,5 +1,6 @@
 require 'smartdown/api/multiple_choice'
 require 'smartdown/api/date_question'
+require 'smartdown/api/country_question'
 require 'smartdown/api/salary_question'
 require 'smartdown/api/text_question'
 
@@ -10,8 +11,10 @@ module Smartdown
         elements.slice_before do |element|
           element.is_a? Smartdown::Model::Element::MarkdownHeading
         end.map do |question_element_group|
-          if question_element_group.find{|element| element.is_a? Smartdown::Model::Element::Question::MultipleChoice}
+          if question_element_group.find{|element| element.is_a? Smartdown::Model::Element::Question::MultipleChoice }
             Smartdown::Api::MultipleChoice.new(question_element_group)
+          elsif question_element_group.find{ |element| element.is_a?(Smartdown::Model::Element::Question::Country) }
+            Smartdown::Api::CountryQuestion.new(question_element_group)
           elsif question_element_group.find{|element| element.is_a? Smartdown::Model::Element::Question::Date}
             Smartdown::Api::DateQuestion.new(question_element_group)
           elsif question_element_group.find{|element| element.is_a? Smartdown::Model::Element::Question::Salary}

data/lib/smartdown/model/answer/country.rb

@@ -0,0 +1,28 @@
+require_relative "base"
+
+module Smartdown
+  module Model
+    module Answer
+      class Country < Base
+        def value_type
+          ::String
+        end
+
+        def humanize
+          question.countries[value]
+        end
+
+        private
+        def parse_value(value)
+          check_value_not_nil(value)
+          if valid?
+            unless question.countries.keys.include? value
+              @error = "Invalid country"
+            end
+          end
+          value
+        end
+      end
+    end
+  end
+end

data/lib/smartdown/model/answer/text.rb

@@ -7,6 +7,10 @@ module Smartdown
         def value_type
           ::String
         end
+
+        def humanize
+          value
+        end
       end
     end
   end

data/lib/smartdown/model/element/question/country.rb

@@ -0,0 +1,15 @@
+require 'smartdown/model/answer/country'
+
+module Smartdown
+  module Model
+    module Element
+      module Question
+        class Country < Struct.new(:name, :countries, :alias)
+          def answer_type
+            Smartdown::Model::Answer::Country
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smartdown/parser/base.rb

@@ -33,15 +33,6 @@ module Smartdown
         match('[*-]')
       }
 
-      rule(:option_pair) {
-        comma >>
-        optional_space >>
-        identifier.as(:key) >>
-        colon >>
-        optional_space >>
-        identifier.as(:value) >>
-        optional_space
-      }
     end
   end
 end

data/lib/smartdown/parser/element/country_question.rb

@@ -0,0 +1,21 @@
+require 'smartdown/parser/base'
+require 'smartdown/parser/question'
+
+module Smartdown
+  module Parser
+    module Element
+      class CountryQuestion < Question
+
+        rule(:question_type) {
+          str("country")
+        }
+
+        rule(:country_question) {
+          question_tag.as(:country)
+        }
+
+        root(:country_question)
+      end
+    end
+  end
+end

data/lib/smartdown/parser/element/date_question.rb

@@ -1,21 +1,18 @@
 require 'smartdown/parser/base'
+require 'smartdown/parser/question'
 
 module Smartdown
   module Parser
     module Element
-      class DateQuestion < Base
+      class DateQuestion < Question
+        rule(:question_type) {
+          str("date")
+        }
+
         rule(:date_question) {
-          (
-          str("[date:") >>
-              optional_space >>
-              question_identifier.as(:identifier) >>
-              optional_space >>
-              option_pair.repeat.as(:option_pairs) >>
-              str("]") >>
-              optional_space >>
-              line_ending
-          ).as(:date)
+          question_tag.as(:date)
         }
+
         root(:date_question)
       end
     end

data/lib/smartdown/parser/element/multiple_choice_question.rb

@@ -1,18 +1,13 @@
 require 'smartdown/parser/base'
+require 'smartdown/parser/question'
 
 module Smartdown
   module Parser
     module Element
-      class MultipleChoiceQuestion < Base
-        rule(:multiple_choice_question_tag) {
-          str("[choice:") >>
-            optional_space >>
-            question_identifier.as(:identifier) >>
-            optional_space >>
-            option_pair.repeat.as(:option_pairs) >>
-            str("]") >>
-            optional_space >>
-            line_ending
+      class MultipleChoiceQuestion < Question
+
+        rule(:question_type) {
+          str("choice")
         }
 
         rule(:option_definition_line) {
@@ -27,7 +22,7 @@ module Smartdown
 
         rule(:multiple_choice_question) {
           (
-            multiple_choice_question_tag >>
+            question_tag >>
             (option_definition_line >> line_ending).repeat(1).as(:options)
           ).as(:multiple_choice)
         }

data/lib/smartdown/parser/element/salary_question.rb

@@ -1,21 +1,18 @@
 require 'smartdown/parser/base'
+require 'smartdown/parser/question'
 
 module Smartdown
   module Parser
     module Element
-      class SalaryQuestion < Base
+      class SalaryQuestion < Question
+        rule(:question_type) {
+          str("salary")
+        }
+
         rule(:salary_question) {
-          (
-          str("[salary:") >>
-              optional_space >>
-              question_identifier.as(:identifier) >>
-              optional_space >>
-              option_pair.repeat.as(:option_pairs) >>
-              str("]") >>
-              optional_space >>
-              line_ending
-          ).as(:salary)
+          question_tag.as(:salary)
         }
+
         root(:salary_question)
       end
     end

data/lib/smartdown/parser/element/text_question.rb

@@ -1,21 +1,18 @@
-require 'smartdown/parser/base'
+require 'smartdown/parser/question'
 
 module Smartdown
   module Parser
     module Element
-      class TextQuestion < Base
+      class TextQuestion < Question
+
+        rule(:question_type) {
+          str("text")
+        }
+
         rule(:text_question) {
-          (
-          str("[text:") >>
-              optional_space >>
-              question_identifier.as(:identifier) >>
-              optional_space >>
-              option_pair.repeat.as(:option_pairs) >>
-              str("]") >>
-              optional_space >>
-              line_ending
-          ).as(:text)
+          question_tag.as(:text)
         }
+
         root(:text_question)
       end
     end

data/lib/smartdown/parser/flow_interpreter.rb

@@ -18,10 +18,11 @@ module Smartdown
     end
 
     class FlowInterpreter
-      attr_reader :flow_input
+      attr_reader :flow_input, :data_module
 
-      def initialize(flow_input)
+      def initialize(flow_input, data_module=nil)
         @flow_input = pre_parse(flow_input)
+        @data_module = data_module
       end
 
       def interpret
@@ -42,7 +43,7 @@ module Smartdown
       end
 
       def interpret_node(input_data)
-        Smartdown::Parser::NodeInterpreter.new(input_data.name, input_data.read).interpret
+        Smartdown::Parser::NodeInterpreter.new(input_data.name, input_data.read, options).interpret
       rescue Parslet::ParseFailed => error
         raise ParseError.new(input_data.name, error)
       end
@@ -50,6 +51,12 @@ module Smartdown
       def pre_parse(flow_input)
         SnippetPreParser.parse(flow_input)
       end
+
+      def options
+        {}.tap do |opts|
+          opts[:data_module] = data_module if data_module
+        end
+      end
     end
   end
 end

data/lib/smartdown/parser/node_interpreter.rb

@@ -12,8 +12,9 @@ module Smartdown
       def initialize(name, source, options = {})
         @name = name
         @source = source
+        data_module = options.fetch(:data_module, {})
         @parser = options.fetch(:parser, Smartdown::Parser::NodeParser.new)
-        @transform = options.fetch(:transform, Smartdown::Parser::NodeTransform.new)
+        @transform = options.fetch(:transform, Smartdown::Parser::NodeTransform.new(data_module))
       end
 
       def interpret

data/lib/smartdown/parser/node_parser.rb

@@ -6,6 +6,7 @@ require 'smartdown/parser/element/multiple_choice_question'
 require 'smartdown/parser/element/date_question'
 require 'smartdown/parser/element/salary_question'
 require 'smartdown/parser/element/text_question'
+require 'smartdown/parser/element/country_question'
 require 'smartdown/parser/element/markdown_heading'
 require 'smartdown/parser/element/markdown_paragraph'
 require 'smartdown/parser/element/conditional'
@@ -21,6 +22,7 @@ module Smartdown
         Element::DateQuestion.new |
         Element::SalaryQuestion.new |
         Element::TextQuestion.new |
+        Element::CountryQuestion.new |
         Rules.new |
         Element::StartButton.new |
         Element::NextSteps.new |

data/lib/smartdown/parser/node_transform.rb

@@ -6,6 +6,7 @@ require 'smartdown/model/rule'
 require 'smartdown/model/nested_rule'
 require 'smartdown/model/next_node_rules'
 require 'smartdown/model/element/question/multiple_choice'
+require 'smartdown/model/element/question/country'
 require 'smartdown/model/element/question/date'
 require 'smartdown/model/element/question/salary'
 require 'smartdown/model/element/question/text'
@@ -27,6 +28,22 @@ require 'smartdown/model/predicate/comparison/less'
 module Smartdown
   module Parser
     class NodeTransform < Parslet::Transform
+
+      attr_reader :data_module
+
+      def initialize data_module=nil, &block
+        super(&block)
+
+        @data_module = data_module || {}
+      end
+
+      #TODO: Horrible monkey patching, should try to submit a PR to parselet
+      #to allow modification of bindings?
+      def call_on_match(bindings, block)
+        bindings.merge! data_module
+        super(bindings, block)
+      end
+
       rule(body: subtree(:body)) {
         Smartdown::Model::Node.new(
           node_name, body, Smartdown::Model::FrontMatter.new({})
@@ -74,6 +91,16 @@ module Smartdown
         )
       }
 
+      rule(:country => {identifier: simple(:identifier), :option_pairs => subtree(:option_pairs)}) {
+        country_data_method = Smartdown::Parser::OptionPairs.transform(option_pairs).fetch('countries', nil)
+        country_hash = (eval country_data_method).call
+        Smartdown::Model::Element::Question::Country.new(
+          identifier.to_s,
+          country_hash,
+          Smartdown::Parser::OptionPairs.transform(option_pairs).fetch('alias', nil)
+        )
+      }
+
       rule(:date => {identifier: simple(:identifier), :option_pairs => subtree(:option_pairs)}) {
         Smartdown::Model::Element::Question::Date.new(
           identifier.to_s,

data/lib/smartdown/parser/question.rb

@@ -0,0 +1,37 @@
+require 'smartdown/parser/base'
+require 'smartdown/parser/predicates'
+
+module Smartdown
+  module Parser
+    module Element
+      class Question < Base
+
+        rule(:option_pair) {
+          comma >>
+          optional_space >>
+          identifier.as(:key) >>
+          colon >>
+          optional_space >>
+          identifier.as(:value) >>
+          optional_space
+        }
+
+        rule(:question_tag) {
+          (
+            str("[") >>
+            question_type >>
+            str(':') >>
+            optional_space >>
+            identifier.as(:identifier) >>
+            optional_space >>
+            option_pair.repeat.as(:option_pairs) >>
+            str("]") >>
+            optional_space >>
+            line_ending
+          )
+        }
+
+      end
+    end
+  end
+end

data/lib/smartdown/version.rb

@@ -1,3 +1,3 @@
 module Smartdown
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/spec/engine/interpolator_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 #TODO: this "require" for money is here for now since there is no associated question type for money yet
 require 'smartdown/model/answer/money'
+require 'smartdown/model/element/question/country'
 require 'smartdown/engine/interpolator'
 require 'smartdown/engine/state'
 require 'parslet'
@@ -126,4 +127,47 @@ describe Smartdown::Engine::Interpolator do
       expect(interpolated_node.elements.first.content).to eq("£12.33")
     end
   end
+
+  context "a paragraph containing a text answer" do
+    let(:elements) { [Smartdown::Model::Element::MarkdownParagraph.new('%{text_answer}')] }
+    let(:state) {
+      Smartdown::Engine::State.new(
+          current_node: node.name,
+          text_answer: Smartdown::Model::Answer::Text.new('I AM TEXT, HEAR ME RAWR')
+      )
+    }
+    it "interpolates the result" do
+      expect(interpolated_node.elements.first.content).to eq("I AM TEXT, HEAR ME RAWR")
+    end
+  end
+
+  context "a paragraph containing a multuple-choice answer" do
+    let(:elements) { [Smartdown::Model::Element::MarkdownParagraph.new('%{multiple_choice_answer}')] }
+    let(:choices) { { 'dog' => 'Dog', 'growlithe' => 'Growlithe', 'arcanine' => 'Arcanine' } }
+    let(:question) { Smartdown::Model::Element::Question::MultipleChoice.new('arcanine', choices) }
+    let(:state) {
+      Smartdown::Engine::State.new(
+          current_node: node.name,
+          multiple_choice_answer: Smartdown::Model::Answer::MultipleChoice.new('arcanine', question)
+      )
+    }
+    it "interpolates the result" do
+      expect(interpolated_node.elements.first.content).to eq("Arcanine")
+    end
+  end
+
+  context "a paragraph containing a country answer" do
+    let(:elements) { [Smartdown::Model::Element::MarkdownParagraph.new('%{country_answer}')] }
+    let(:country_hash) { { 'united-kingdom' => 'United Kingdom' } }
+    let(:question) { Smartdown::Model::Element::Question::Country.new('united-kingdom', country_hash) }
+    let(:state) {
+      Smartdown::Engine::State.new(
+          current_node: node.name,
+          country_answer: Smartdown::Model::Answer::Country.new('united-kingdom', question)
+      )
+    }
+    it "interpolates the result" do
+      expect(interpolated_node.elements.first.content).to eq("United Kingdom")
+    end
+  end
 end

data/spec/model/answer/country_spec.rb

@@ -0,0 +1,31 @@
+describe Smartdown::Model::Answer::Country do
+  let(:text_string) { "United Kingdom" }
+  subject(:instance) { described_class.new(text_string) }
+
+
+  let(:answer_string) { "country" }
+  subject(:answer) { described_class.new(answer_string, multiple_choice_question) }
+  let(:multiple_choice_question) {
+    Smartdown::Model::Element::Question::Country.new("question",
+                                                     {"country" => "Lovely country"}
+    )
+  }
+
+  describe "#humanize" do
+    it "returns the humanized answer" do
+      expect(answer.humanize).to eq "Lovely country"
+    end
+  end
+
+  describe "errors" do
+    context "format is incorrect" do
+      let(:answer_string) { "kasjdf" }
+      specify { expect(answer.error).to eql "Invalid country" }
+    end
+
+    context "answer not filled in" do
+      let(:answer_string) { nil }
+      specify { expect(answer.error).to eql "Please answer this question" }
+    end
+  end
+end

data/spec/parser/element/country_question_spec.rb

@@ -0,0 +1,70 @@
+require 'smartdown/parser/node_parser'
+require 'smartdown/parser/node_interpreter'
+require 'smartdown/parser/element/country_question'
+
+describe Smartdown::Parser::Element::CountryQuestion do
+  subject(:parser) { described_class.new }
+  let(:data_module) { { 'country_data_all' => ->{{}} } }
+
+  context "with question tag and countries" do
+    let(:source) { "[country: country_of_residence, countries: country_data_all]" }
+
+    it "parses" do
+      should parse(source).as(
+        country: {
+          identifier: "country_of_residence",
+          option_pairs:[
+            {
+              key: 'countries',
+              value: 'country_data_all',
+            },
+          ]
+        }
+      )
+    end
+
+    describe "transformed" do
+      let(:node_name) { "my_node" }
+      subject(:transformed) {
+        Smartdown::Parser::NodeInterpreter.new(node_name, source, data_module: data_module, parser: parser).interpret
+      }
+
+      it { should eq(Smartdown::Model::Element::Question::Country.new("country_of_residence", {})) }
+    end
+
+  end
+
+  context "with question tag and countries, and alias" do
+    let(:source) { "[country: country_of_residence, countries: country_data_all, alias: birthplace]" }
+
+    it "parses" do
+      should parse(source).as(
+        country: {
+          identifier: "country_of_residence",
+          option_pairs:[
+            {
+              key: 'countries',
+              value: 'country_data_all',
+            },
+            {
+              key: 'alias',
+              value: 'birthplace',
+            },
+          ]
+        }
+      )
+    end
+
+    describe "transformed" do
+      let(:node_name) { "my_node" }
+      subject(:transformed) {
+        Smartdown::Parser::NodeInterpreter.new(node_name, source, data_module: data_module, parser: parser).interpret
+      }
+
+      it { should eq(Smartdown::Model::Element::Question::Country.new("country_of_residence", {}, "birthplace")) }
+    end
+
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &5594140 !ruby/object:Gem::Requirement
+  requirement: &9477660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *5594140
+  version_requirements: *9477660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &5593360 !ruby/object:Gem::Requirement
+  requirement: &9476740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *5593360
+  version_requirements: *9476740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5592880 !ruby/object:Gem::Requirement
+  requirement: &9475460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5592880
+  version_requirements: *9475460
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &5592080 !ruby/object:Gem::Requirement
+  requirement: &9474100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5592080
+  version_requirements: *9474100
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -66,6 +66,7 @@ files:
 - lib/smartdown/engine.rb
 - lib/smartdown/parser/predicates.rb
 - lib/smartdown/parser/node_transform.rb
+- lib/smartdown/parser/question.rb
 - lib/smartdown/parser/node_interpreter.rb
 - lib/smartdown/parser/snippet_pre_parser.rb
 - lib/smartdown/parser/base.rb
@@ -80,6 +81,7 @@ files:
 - lib/smartdown/parser/element/markdown_paragraph.rb
 - lib/smartdown/parser/element/start_button.rb
 - lib/smartdown/parser/element/front_matter.rb
+- lib/smartdown/parser/element/country_question.rb
 - lib/smartdown/parser/element/multiple_choice_question.rb
 - lib/smartdown/parser/element/next_steps.rb
 - lib/smartdown/parser/element/markdown_heading.rb
@@ -97,6 +99,7 @@ files:
 - lib/smartdown/api/directory_input.rb
 - lib/smartdown/api/previous_question.rb
 - lib/smartdown/api/outcome.rb
+- lib/smartdown/api/country_question.rb
 - lib/smartdown/api/multiple_choice.rb
 - lib/smartdown/api/text_question.rb
 - lib/smartdown/api/previous_question_page.rb
@@ -127,6 +130,7 @@ files:
 - lib/smartdown/model/answer/date.rb
 - lib/smartdown/model/answer/base.rb
 - lib/smartdown/model/answer/salary.rb
+- lib/smartdown/model/answer/country.rb
 - lib/smartdown/model/answer/money.rb
 - lib/smartdown/model/answer/multiple_choice.rb
 - lib/smartdown/model/answer/text.rb
@@ -137,6 +141,7 @@ files:
 - lib/smartdown/model/element/markdown_heading.rb
 - lib/smartdown/model/element/question/date.rb
 - lib/smartdown/model/element/question/salary.rb
+- lib/smartdown/model/element/question/country.rb
 - lib/smartdown/model/element/question/multiple_choice.rb
 - lib/smartdown/model/element/question/text.rb
 - lib/smartdown/model/next_node_rules.rb
@@ -156,6 +161,7 @@ files:
 - spec/parser/predicates_spec.rb
 - spec/parser/element/next_steps_spec.rb
 - spec/parser/element/multiple_choice_question_spec.rb
+- spec/parser/element/country_question_spec.rb
 - spec/parser/element/conditional_spec.rb
 - spec/parser/element/start_button_parser_spec.rb
 - spec/parser/element/date_question_spec.rb
@@ -224,6 +230,7 @@ files:
 - spec/model/answer/base_spec.rb
 - spec/model/answer/salary_spec.rb
 - spec/model/answer/date_spec.rb
+- spec/model/answer/country_spec.rb
 - spec/model/predicates/set_membership_spec.rb
 - spec/model/predicates/combined_spec.rb
 - spec/model/predicates/comparison_spec.rb
@@ -245,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1665618218665725274
+      hash: -2036017641587620978
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -254,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1665618218665725274
+      hash: -2036017641587620978
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -273,6 +280,7 @@ test_files:
 - spec/parser/predicates_spec.rb
 - spec/parser/element/next_steps_spec.rb
 - spec/parser/element/multiple_choice_question_spec.rb
+- spec/parser/element/country_question_spec.rb
 - spec/parser/element/conditional_spec.rb
 - spec/parser/element/start_button_parser_spec.rb
 - spec/parser/element/date_question_spec.rb
@@ -341,6 +349,7 @@ test_files:
 - spec/model/answer/base_spec.rb
 - spec/model/answer/salary_spec.rb
 - spec/model/answer/date_spec.rb
+- spec/model/answer/country_spec.rb
 - spec/model/predicates/set_membership_spec.rb
 - spec/model/predicates/combined_spec.rb
 - spec/model/predicates/comparison_spec.rb