conversational 0.3.1 → 0.3.2

data/README.markdown

@@ -86,7 +86,7 @@ Conversational also allows you to have *stateful* conversations. A stateful conv
 
 Let's build on the prevous example using stateful conversations.
 
-Our application so far is *stateless*. Currently if we get a friend request we have no way of accepting or rejecting it. If we were to continue building a stateless application we would simple add a couple of new commands such as:
+Our application so far is *stateless*. Currently if we get a friend request we have no way of accepting or rejecting it. If we were to continue building a stateless application we would simply add a couple of new commands such as:
 
 * "afr <friend>"
 * "rfr <friend>"
@@ -146,7 +146,7 @@ Now take a look at our `FacebookAlert` class. The first thing is that we renamed
 
 There is also a new method `move_along` which looks at the message to see if the user replied with "yes" or "no" and responds appropriately. Notice it also calls `finish`. 
 
-If we jump back and take a look at our main Conversation class we see that `finish` marks the conversation state as finished so it will be found by `find_or_create_with`. It is important that you remember to call `finish` on all conversations where you don't expect a response.
+If we jump back and take a look at our main Conversation class we see that `finish` marks the conversation state as finished so it won't be found by `find_or_create_with`. It is important that you remember to call `finish` on all conversations where you don't expect a response.
 
 So how does this all tie together?
 
@@ -196,7 +196,7 @@ Now when we text in "hey jonnie", `details` will try and find a conversation def
 
 The same thing happens for a blank conversation.
 
-There is one more subtle issue with our application. What if we text in "facebook_alert"? The reply will be: "Invalid response. Reply with yes or no" when it should actually be "Sorry. Unknown Command". This is because if `find_or_create_with` cannot find an existing conversation it will try and create one with the topic "facebook_alert" if `FacebookAlertConversation` is defined in our application (which it is). To solve this prolem we can use `exclude`.
+There is one more subtle issue with our application. What if we text in "facebook_alert"? The reply will be: "Invalid response. Reply with yes or no" when it should actually be "Sorry. Unknown Command". This is because if `find_or_create_with` cannot find an existing conversation it will try and create one with the topic "facebook_alert" if `FacebookAlertConversation` is defined in our application (which it is). To solve this problem we can use `exclude`.
 
     class Conversation
       exclude FacebookAlertConversation
@@ -231,7 +231,7 @@ Generates a migration file if you want to use Conversational with Rails
 
 ## More Examples
 
-Here's an [example](http://github.com/dwilkie/drinking) *stateful* conversation app  about drinking
+Here's an [example](http://github.com/dwilkie/drinking) *stateful* conversation app about drinking
 
 ## Notes
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/conversational.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{conversational}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Wilkie"]
-  s.date = %q{2010-06-01}
+  s.date = %q{2010-08-31}
   s.email = %q{dwilkie@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dwilkie/conversational}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Have conversations with your users over SMS}
   s.test_files = [
     "spec/conversation_spec.rb",
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/conversational/conversation.rb

@@ -12,12 +12,12 @@ module Conversational
 
     # Returns the specific sublass of conversation based from the topic
     # Example:
-    # 
+    #
     # <tt>
     #   Class Conversation
     #     include Conversational::Conversation
     #   end
-    # 
+    #
     #   Class HelloConversation < Conversation
     #   end
     #
@@ -58,6 +58,10 @@ module Conversational
       becomes(details_subclass) if details_subclass
     end
 
+    def topic_defined?
+      details_subclass = ConversationDefinition.topic_defined?(topic)
+    end
+
     protected
       # Called from a subclass to deliver the message
       def say(message)
@@ -66,7 +70,7 @@ module Conversational
 
     module InstanceAttributes
       attr_accessor :with, :topic
-      
+
       def initialize(options = {})
         self.with = options[:with]
         self.topic = options[:topic]
@@ -89,15 +93,15 @@ module Conversational
       def unknown_topic_subclass=(klass)
         ConversationDefinition.unknown_topic_subclass = klass
       end
-      
+
       def unknown_topic_subclass
         ConversationDefinition.unknown_topic_subclass
       end
-      
+
       def blank_topic_subclass=(klass)
         ConversationDefinition.blank_topic_subclass = klass
       end
-      
+
       def blank_topic_subclass
         ConversationDefinition.blank_topic_subclass
       end
@@ -127,7 +131,7 @@ module Conversational
       # <tt>
       #   class AbstractConversation < Conversation
       #   end
-      # 
+      #
       #   class MonkeyConversation < AbstractConversation
       #   end
       #
@@ -197,3 +201,4 @@ module Conversational
     end
   end
 end
+

data/lib/conversational/conversation_definition.rb

@@ -21,7 +21,9 @@ module Conversational
     def self.find_subclass_by_topic(topic, options = {})
       subclass = nil
       if topic.nil? || topic.blank?
-        subclass = blank_topic_subclass if blank_topic_subclass
+        unless options[:exclude_blank_unknown]
+          subclass = blank_topic_subclass if blank_topic_subclass
+        end
       else
         project_class_name = self.topic_subclass_name(topic)
         begin
@@ -35,16 +37,25 @@ module Conversational
           (options[:include_all] || !self.exclude?(project_class))
             subclass = project_class
         else
-          subclass = unknown_topic_subclass if unknown_topic_subclass
+          unless options[:exclude_blank_unknown]
+            subclass = unknown_topic_subclass if unknown_topic_subclass
+          end
         end
       end
       subclass
     end
 
+    def self.topic_defined?(topic)
+      self.find_subclass_by_topic(
+        topic,
+        :exclude_blank_unknown => true
+      )
+    end
+
     def self.topic_subclass_name(topic)
       topic.classify + @@klass.to_s
     end
-    
+
     private
       def self.exclude?(subclass)
         if defined?(@@excluded_classes)
@@ -57,7 +68,7 @@ module Conversational
           end
         end
       end
-      
+
       def self.exclude_class?(subclass)
         if @@excluded_classes.is_a?(Class)
           @@excluded_classes == subclass
@@ -84,3 +95,4 @@ module Conversational
       end
   end
 end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - David Wilkie
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 +07:00
+date: 2010-08-31 00:00:00 +07:00
 default_executable: 
 dependencies: []
 
@@ -73,6 +73,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -80,6 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -89,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Have conversations with your users over SMS