interrogative 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/interrogative.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "interrogative"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Lloyd"]
-  s.date = "2012-02-17"
+  s.date = "2012-05-10"
   s.description = "    A simple interface for keeping track of HTML-form-like questions without \n    feeling like you're accomodating HTML forms.\n"
   s.email = "alloyd@jibe.com"
   s.extra_rdoc_files = [

data/lib/interrogative.rb

@@ -2,41 +2,78 @@ require 'interrogative/question'
 
 # A mixin for curious classes.
 module Interrogative
-  # Get the array of all noted questions.
-  #
-  # @return [Array<Question>] array of all noted questions.
-  def questions; @_questions; end
 
-  # Give instructions for dealing with new questions.
+  # Methods applicable on both the class and instance levels.
+  module BaseMethods
+    # Give instructions for dealing with new questions.
+    #
+    # @param [Proc] postprocessor a block to run after adding a question;
+    #                             the question is given as the argument.
+    def when_questioned(&postprocessor)
+      (@_question_postprocessors||=[]) << postprocessor
+    end
+
+    # Give a new question.
+    #
+    # @param [Symbol, String] name the name (think <input name=...>) of
+    #   the question.
+    # @param [String] label the text of the question (think <label>).
+    # @param [Hash] attrs additional attributes for the question.
+    # @option attrs [Boolean] :long whether the question has a long answer
+    #   (think <textarea> vs <input>).
+    # @option attrs [Boolean] :multiple whether the question could have
+    #   multiple answers.
+    # @return [Question] the new Question.
+    def question(name, text, attrs={})
+      q = Question.new(name, text, self, attrs)
+      (@_questions||=[]) << q
+      
+      unless @_question_postprocessors.nil?
+        @_question_postprocessors.each do |postprocessor|
+          postprocessor.call(q)
+        end
+      end
+
+      return q
+    end
+  end
+
+  # Methods tailored to the class level.
   #
-  # @param [Proc] postprocessor a block to run after adding a question;
-  #                             the question is given as the argument.
-  def when_questioned(&postprocessor)
-    (@_question_postprocessors||=[]) << postprocessor
+  # These handle inheritance of questions.
+  module ClassMethods
+    include BaseMethods
+
+    # Get the array of all noted questions.
+    #
+    # @return [Array<Question>] array of all noted questions.
+    def questions
+      qs = []
+      qs |= superclass.questions if superclass.respond_to? :questions
+      qs |= (@_questions||=[])
+      qs
+    end
   end
 
-  # Give a new question.
+  # Methods tailored to the instance level.
   #
-  # @param [Symbol, String] name the name (think <input name=...>) of
-  #   the question.
-  # @param [String] label the text of the question (think <label>).
-  # @param [Hash] attrs additional attributes for the question.
-  # @option attrs [Boolean] :long whether the question has a long answer
-  #   (think <textarea> vs <input>).
-  # @option attrs [Boolean] :multiple whether the question could have
-  #   multiple answers.
-  # @return [Question] the new Question.
-  def question(name, text, attrs={})
-    q = Question.new(name, text, self, attrs)
-    (@_questions||=[]) << q
-    
-    unless @_question_postprocessors.nil?
-      @_question_postprocessors.each do |postprocessor|
-        postprocessor.call(q)
-      end
+  # These handle getting questions from the class level.
+  module InstanceMethods
+    include BaseMethods
+
+    def questions
+      qs = []
+      qs |= self.class.questions if self.class.respond_to? :questions
+      qs |= (@_questions||=[])
+      qs
     end
+  end
 
-    return q
+  def self.included(base)
+    base.extend(Interrogative::ClassMethods)
+    base.instance_eval do
+      include Interrogative::InstanceMethods
+    end
   end
 end
 

data/test/interrogative_test.rb

@@ -1,11 +1,77 @@
 require 'teststrap'
 
-context "interrogative" do
-  setup do
-    false
+class NoQuestionsTest
+  include Interrogative
+end
+
+class QuestionsTest
+  include Interrogative
+
+  question :has_questions, "Does this have questions?"
+end
+
+class SubclassWithNoQuestionsTest < QuestionsTest
+end
+
+class SubclassWithQuestionsTest < QuestionsTest
+  question :is_subclass, "Is this a subclass?"
+end
+
+context "class with no questions" do
+  setup { NoQuestionsTest }
+
+  asserts(:questions).kind_of Array
+  asserts(:questions).empty
+end
+
+context "class with one question" do
+  context "(class)" do
+    setup { QuestionsTest }
+
+    denies(:questions).empty
+    asserts(:questions).size(1)
   end
 
-  asserts "i'm a failure :(" do
-    topic
+  context "(an instance)" do
+    setup { QuestionsTest.new }
+
+    denies(:questions).empty
+    asserts(:questions).size(1)
+  end
+
+  context "(an instance with a question of its own)" do
+    setup do
+      QuestionsTest.new.tap {|q| q.question :is_instance, "Is this an instance?" }
+    end
+
+    asserts(:questions).size(2)
+  end
+end
+
+context "subclass with no questions of its own" do
+  setup { SubclassWithNoQuestionsTest }
+
+  denies(:questions).empty
+end
+
+context "subclass with a question of its own" do
+  setup { SubclassWithQuestionsTest }
+
+  denies(:questions).empty
+  asserts(:questions).size(2)
+
+  context "(instance)" do
+    setup { SubclassWithQuestionsTest.new }
+
+    denies(:questions).empty
+    asserts(:questions).size(2)
+  end
+
+  context "(instance with a question of its own)" do
+    setup do
+      SubclassWithQuestionsTest.new.tap {|i| i.question :is_instance, "Is this an instance?" }
+    end
+
+    asserts(:questions).size(3)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interrogative
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70173227943280 !ruby/object:Gem::Requirement
+  requirement: &70273680769440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173227943280
+  version_requirements: *70273680769440
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &70173227942160 !ruby/object:Gem::Requirement
+  requirement: &70273680785160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173227942160
+  version_requirements: *70273680785160
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70173227941440 !ruby/object:Gem::Requirement
+  requirement: &70273680784220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70173227941440
+  version_requirements: *70273680784220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70173227940400 !ruby/object:Gem::Requirement
+  requirement: &70273680783100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70173227940400
+  version_requirements: *70273680783100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70173227956200 !ruby/object:Gem::Requirement
+  requirement: &70273680782080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70173227956200
+  version_requirements: *70273680782080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70173227955600 !ruby/object:Gem::Requirement
+  requirement: &70273680780860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70173227955600
+  version_requirements: *70273680780860
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70173227954480 !ruby/object:Gem::Requirement
+  requirement: &70273680779660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173227954480
+  version_requirements: *70273680779660
 description: ! "    A simple interface for keeping track of HTML-form-like questions
   without \n    feeling like you're accomodating HTML forms.\n"
 email: alloyd@jibe.com
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -252886752722838641
+      hash: 3214481857536529281
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: