conversational 0.4.0 → 0.4.1

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .bundle
 .rvmrc
 coverage
+*.swp

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+ - 1.8.7
+ - 1.9.2
+

data/Gemfile

@@ -2,3 +2,9 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in conversational.gemspec
 gemspec
+
+group :development do
+  # for travis-ci.org
+  gem "rake"
+end
+

data/Gemfile.lock

@@ -1,16 +1,19 @@
 PATH
   remote: .
   specs:
-    conversational (0.3.2)
+    conversational (0.4.0)
       activesupport
       i18n
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.5)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     diff-lcs (1.1.2)
     i18n (0.5.0)
+    multi_json (1.0.3)
+    rake (0.9.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -19,14 +22,11 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    simplecov (0.4.1)
-      simplecov-html (~> 0.4.3)
-    simplecov-html (0.4.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   conversational!
+  rake
   rspec
-  simplecov

data/{MIT-LICENSE → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2010 David Wilkie
+Copyright (c) David Wilkie
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/{README.markdown → README.md}

@@ -1,5 +1,7 @@
 # Conversational
 
+[![Build Status](https://secure.travis-ci.org/dwilkie/conversational.png)](http://travis-ci.org/dwilkie/conversational)
+
 Conversational makes it easier to accept incoming text messages (SMS), emails and IM and respond to them in your application.
 
 NOTE: Conversational no longer supports ActiveRecord additions or "stateful" conversations. If you still need this feature use version 0.3.2
@@ -82,5 +84,3 @@ You can configure Conversation to deal with unknown or blank topics as follows:
 
 Now if the user texts something like "hey jonnie", they'll receive: "Sorry. Unknown Command." Similarly, if they text nothing, they'll receive "Hey. What do you want?"
 
-Copyright (c) 2011 David Wilkie, released under the MIT license
-

data/conversational.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("activesupport")
-  s.add_runtime_dependency("i18n")
+  s.add_dependency("activesupport")
+  s.add_dependency("i18n")
 
   s.add_development_dependency("rspec")
-  s.add_development_dependency("simplecov")
 end
 

data/lib/conversational.rb

@@ -1,3 +1,4 @@
-require "active_support/core_ext"
-require "conversational/conversation"
+require 'active_support/concern'
+require 'active_support/core_ext'
+require 'conversational/conversation'
 

data/lib/conversational/conversation.rb

@@ -2,23 +2,19 @@ module Conversational
   module Conversation
 
     mattr_accessor :unknown_topic_subclass,
-                   :blank_topic_subclass,
-                   :parent,
-                   :class_suffix
+                  :blank_topic_subclass,
+                  :parent,
+                  :class_suffix
 
-    def self.included(base)
-      self.parent = base
-      base.send(:include, InstanceMethods)
-      base.send(:include, InstanceAttributes)
-      base.extend ClassMethods
-    end
+    extend ActiveSupport::Concern
+
+    included do
+      Conversational::Conversation.parent = self
 
-    module InstanceAttributes
       attr_accessor :topic
 
       def initialize(options = {})
         self.topic = options[:topic]
-        super
       end
     end
 
@@ -83,6 +79,7 @@ module Conversational
     end
 
     module ClassMethods
+
       def unknown_topic_subclass(value)
         Conversational::Conversation.unknown_topic_subclass = Conversational::Conversation.stringify(value)
       end
@@ -185,7 +182,7 @@ module Conversational
 
     def self.find_subclass_by_topic(topic, options = {})
       subclass = nil
-      if topic.nil? || topic.blank?
+      if topic.nil? || topic.empty?
         unless options[:exclude_blank_unknown]
           subclass = blank_topic_subclass.constantize if blank_topic_subclass
         end
@@ -224,7 +221,7 @@ module Conversational
     end
 
     def self.topic_subclass_name(topic)
-      topic.classify + (class_suffix || parent).to_s
+      topic.camelize + (class_suffix || parent).to_s
     end
 
     private
@@ -258,7 +255,7 @@ module Conversational
       else
         excluded_class = @@excluded_classes.to_s
         begin
-          excluded_class.classify.constantize == subclass
+          excluded_class.camelize.constantize == subclass
         rescue
           false
         end

data/lib/conversational/version.rb

@@ -1,4 +1,4 @@
 module Conversational
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end
 

data/spec/conversation_spec.rb

@@ -13,6 +13,9 @@ describe Conversational::Conversation do
   class SmokingConversation < Conversation
   end
 
+  class BusinessConversation < Conversation
+  end
+
   class DrivingBlahBlah < Conversation
   end
 
@@ -31,7 +34,7 @@ describe Conversational::Conversation do
     Conversation.should respond_to(:class_suffix)
   end
 
-  let!(:conversation) { Conversation.new }
+  let(:conversation) { Conversation.new }
 
   before do
     Conversation.exclude(nil)
@@ -46,31 +49,37 @@ describe Conversational::Conversation do
         Conversation.exclude "something"
         }.should_not raise_error
     end
+
     it "should accept a symbol" do
       lambda {
         Conversation.exclude :defined_conversation
         }.should_not raise_error
     end
+
     it "should accept a regex" do
       lambda {
         Conversation.exclude /something/i
         }.should_not raise_error
     end
+
     it "should accept a Class" do
       lambda {
         Conversation.exclude(DrinkingConversation)
       }.should_not raise_error
     end
+
     it "should accept an Array where the elements are a Class, String, Symbol or Regexp" do
       lambda {
         Conversation.exclude ["Something", DrinkingConversation, /something/i, :something]
         }.should_not raise_error
     end
+
     it "should accept nil" do
       lambda {
         Conversation.exclude nil
         }.should_not raise_error
     end
+
     it "should not accept anything else" do
       lambda {
         Conversation.exclude({})
@@ -85,6 +94,16 @@ describe Conversational::Conversation do
     end
   end
 
+  describe "#initialize" do
+    context ":topic => 'blah'" do
+      let(:subject) { Conversation.new(:topic => 'blah') }
+
+      it "should set the topic to 'blah'" do
+        subject.topic.should == 'blah'
+      end
+    end
+  end
+
   describe "#topic_defined?" do
     shared_examples_for "#topic_defined? for an excluded class" do
       it "should return nil" do
@@ -93,8 +112,8 @@ describe Conversational::Conversation do
     end
 
     context "a class with this topic is defined" do
-      before { conversation.topic = "drinking" }
       it "should be true" do
+        conversation.topic = "drinking"
         conversation.topic_defined?.should be_true
       end
 
@@ -145,6 +164,7 @@ describe Conversational::Conversation do
       it "should return nil" do
         conversation.details.should be_nil
       end
+
       context "when '.unknown_topic_subclass' is set" do
         before {Conversation.unknown_topic_subclass(SmokingConversation)}
         it "should return an instance of the unknown_topic_subclass" do
@@ -153,6 +173,13 @@ describe Conversational::Conversation do
       end
     end
 
+    context "a conversation for this topic ending with 's' has been defined" do
+      before { conversation.topic = "business" }
+      it "should return the instance as a subclass" do
+        conversation.details.should be_a(BusinessConversation)
+      end
+    end
+
     context "a conversation for this topic has been defined" do
       before { conversation.topic = "drinking" }
       it "should return the instance as a subclass" do

data/spec/spec_helper.rb

@@ -1,4 +1,2 @@
-require 'simplecov'
-SimpleCov.start
 require "conversational"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conversational
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-09-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &78477010 !ruby/object:Gem::Requirement
+  requirement: &82126960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78477010
+  version_requirements: *82126960
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &78476800 !ruby/object:Gem::Requirement
+  requirement: &82126750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78476800
+  version_requirements: *82126750
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78476580 !ruby/object:Gem::Requirement
+  requirement: &82126510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78476580
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &78476370 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *78476370
+  version_requirements: *82126510
 description: Allows you to instansiate conversations based on keywords
 email:
 - dwilkie@gmail.com
@@ -63,10 +52,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
-- MIT-LICENSE
-- README.markdown
+- LICENSE
+- README.md
 - Rakefile
 - conversational.gemspec
 - lib/conversational.rb
@@ -94,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: conversational
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Have topic based conversations