interrogative 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/interrogative.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "interrogative"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Lloyd"]

data/lib/interrogative.rb

@@ -37,8 +37,8 @@ module Interrogative
     # @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)
+    def question(name, text, attrs={}, &instance_block)
+      q = Question.new(name, text, self, attrs, &instance_block)
       (@_questions||=[]) << q
       
       postprocess_question(q)
@@ -56,7 +56,7 @@ module Interrogative
     # Get the array of all noted questions.
     #
     # @return [Array<Question>] array of all noted questions.
-    def questions
+    def questions(instance=nil)
       qs = []
       qs |= superclass.questions if superclass.respond_to? :questions
       qs |= (@_questions||=[])
@@ -72,7 +72,7 @@ module Interrogative
 
     def questions
       qs = []
-      qs |= self.class.questions if self.class.respond_to? :questions
+      qs |= self.class.questions(self) if self.class.respond_to? :questions
       qs |= (@_questions||=[])
       qs
     end

data/lib/interrogative/question.rb

@@ -12,15 +12,21 @@ module Interrogative
     attr_accessor :name, :text, :attrs
 
     # @see Interrogative#question
-    def initialize(name, text, owner=nil, attrs={})
+    def initialize(name, text, owner=nil, attrs={}, &instance_block)
       @name = name or raise ArgumentError, "A question must have a name."
       @text = text or raise ArgumentError, "A question must have a label."
       @owner = owner
       @attrs = attrs
+      @instance_block = instance_block
     end
 
     # Possible answers for the question.
     #
+    # If a block was passed to the initializer, then the result of
+    # that block is returned. If the `instance` argument is provided,
+    # the block will be `instance_eval`ed in the context of that
+    # instance.
+    #
     # Returns `nil` unless the class that included Interrogative
     # responds to a method called `#{ name }_options`; otherwise, it
     # returns the result of calling that method.
@@ -29,28 +35,43 @@ module Interrogative
     # In the case of a Hash, the format should be `{ text => value }`.
     #
     # @return [Array, Hash] the possible answers for the question.
-    def options
+    def options(instance=nil)
+      if (@instance_block)
+        if not instance.nil?
+          return instance.instance_eval &@instance_block
+        else
+          return @instance_block.call
+        end
+      end
+
       return nil if @owner.nil?
 
       options_method = "#{@name}_options".intern
       if @owner.respond_to? options_method
-        @owner.send options_method
+        return @owner.send options_method
       end
     end
 
+    # Equivalent to calling `hash_for_instance` without an instance.
+    #
+    # @see #hash_for_instance
+    def to_hash
+      hash_for_instance(nil)
+    end
+
     # Returns a hash representation of the question.
     #
     # Attributes are merged into the top level, along with `:text` and
     # `:name`. Possible options are nested under `:options`.
     #
     # @return [Hash]
-    def to_hash
+    def hash_for_instance(instance=nil)
       h = @attrs.merge({
         :text => text,
         :name => name,
       })
 
-      o = options
+      o = options(instance)
       h[:options] = o if not o.nil?
       return h
     end
@@ -59,7 +80,14 @@ module Interrogative
     # representation.
     #
     # @return [String]
-    # @see #to_hash
+    # @see #hash_for_instance
+    def json_for_instance(instance=nil, opts={})
+      self.hash_for_instance(instance).to_json(opts)
+    end
+
+    # Equivalent to calling `json_for_instance` without an instance.
+    #
+    # @see #json_for_instance
     def to_json(opts={})
       self.to_hash.to_json(opts)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interrogative
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70224616106960 !ruby/object:Gem::Requirement
+  requirement: &70347291288840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224616106960
+  version_requirements: *70347291288840
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &70224616105880 !ruby/object:Gem::Requirement
+  requirement: &70347291287780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224616105880
+  version_requirements: *70347291287780
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70224616105320 !ruby/object:Gem::Requirement
+  requirement: &70347291287080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70224616105320
+  version_requirements: *70347291287080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70224616104320 !ruby/object:Gem::Requirement
+  requirement: &70347291286060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70224616104320
+  version_requirements: *70347291286060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70224616120040 !ruby/object:Gem::Requirement
+  requirement: &70347291301860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70224616120040
+  version_requirements: *70347291301860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70224616119480 !ruby/object:Gem::Requirement
+  requirement: &70347291301240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70224616119480
+  version_requirements: *70347291301240
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70224616118320 !ruby/object:Gem::Requirement
+  requirement: &70347291300180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224616118320
+  version_requirements: *70347291300180
 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: 3808566574672159458
+      hash: -3466753285083621786
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: