tobacco 0.0.2 → 0.0.3

data/README.md

@@ -297,6 +297,10 @@ end
 
 To avoid duplication, we wrap the callbacks and write! method in a helper module that is included in all the Writer classes. This makes the individual Writers very small and easy to maintain.
 
+## Future Improvements ##
+
+Make a backup of the file before attempting a new write. If something goes wrong with the write and an empty file is created, restore the original.
+
 
 ## Contributing
 

data/lib/tobacco/callback.rb

@@ -0,0 +1,32 @@
+module Tobacco
+  class Callback
+    attr_accessor :writer
+
+    def self.instance(writer = nil)
+      @instance ||= new(writer)
+    end
+    private_class_method :new
+
+    def initialize(writer = nil)
+      self.writer = writer
+    end
+
+    # Public: Notify the writer class based on callback name
+    #         passing along data which is either content or
+    #         an error object
+    #
+    # name - symbol - the callback name
+    #
+    # data - text or object
+    #
+    # return - data
+    #
+    def notify(name, data)
+      if writer.respond_to? name
+        writer.send(name, data)
+      else
+        data
+      end
+    end
+  end
+end

data/lib/tobacco/content_reader.rb

@@ -0,0 +1,48 @@
+module Tobacco
+  class ContentReader
+    attr_accessor :reader, :content, :modified_content
+
+    def initialize(smoker)
+      @smoker   = smoker
+      @consumer = smoker.consumer
+      @filepath = smoker.file_path_generator
+    end
+
+    def read
+      choose_reader
+      read_content
+      modify_content
+    end
+
+    def modify_content
+      self.modified_content = \
+        Tobacco::Callback.instance.notify(:before_write, content)
+    end
+
+    def read_content
+      self.content = reader.send(Tobacco.content_method)
+    end
+
+    # The reader will either be the calling class (consumer)
+    # if it provides the content method or a new Inhaler
+    # object that will be used to read the content from a url
+    #
+    def choose_reader
+      self.reader = \
+        if @consumer.respond_to? Tobacco.content_method
+          @consumer
+        else
+          Inhaler.new(@filepath.content_url).tap do |inhaler|
+
+            # Add an alias for the user configured content_method
+            # so that when it is called it calls :read
+            # on the Inhaler instance
+            #
+            inhaler.instance_eval %{
+              alias :"#{Tobacco.content_method}" :read
+            }
+          end
+      end
+    end
+  end
+end

data/lib/tobacco/content_validator.rb

@@ -0,0 +1,81 @@
+module Tobacco
+  class MissingContentError < RuntimeError
+    def message
+      "No error encountered but content is empty"
+    end
+  end
+
+  class ContentValidator
+    attr_accessor :content
+
+    def initialize(smoker)
+      @smoker      = smoker
+      self.content = smoker.content
+    end
+
+    # Public: Verifies that content is present and calls
+    #         continue_write on the Smoker class if so
+    #         and notifies the consumer class of the
+    #         read error if not
+    #
+    def validate!
+      if content_present?
+        @smoker.continue_write
+      else
+
+        # ????? IS this still true
+        #
+        # At this point, the content might be an error object
+        # but if not, we create one
+        #
+        object = missing_content_error(content)
+        error  = error_object('Error Reading', object)
+
+        Tobacco::Callback.instance.notify(:on_read_error, error)
+      end
+    end
+
+    #---------------------------------------------------------
+    private
+
+    def content_present?
+      @content_present ||= content?
+    end
+
+    def content?
+      return false if content.nil? || content.empty?
+
+      Array(content).last !~ /404 Not Found|The page you were looking for doesn't exist/
+    end
+
+    # Private: Convenience method to create a Tobacco::Error object
+    #
+    # msg              - Context where the error occurred
+    # modified_content - Content after the :before_write callback
+    # e                - The error that was raised
+    #
+    def error_object(msg, e)
+      Tobacco::Error.new(
+        msg: msg,
+        filepath: @smoker.filepath,
+        content: content,
+        object: e
+      )
+    end
+
+    # Private: Creates an error object if content is a string or nil
+    #
+    # content - A string, nil or Error object
+    # 
+    # returns an Error object
+    #
+    def missing_content_error(content)
+      if content.respond_to? :message
+        content
+      else
+        Tobacco::MissingContentError.new
+      end
+    end
+
+  end
+end

data/lib/tobacco/exhaler.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Tobacco
   class Exhaler
     attr_accessor :content, :filepath
@@ -8,6 +10,8 @@ module Tobacco
     end
 
     def write!
+     safety_net.backup
+
      create_directory
      write_content_to_file
     end
@@ -17,10 +21,26 @@ module Tobacco
     end
 
     def write_content_to_file
+      begin
+        persist(content)
+        safety_net.destroy
+      rescue => e
+        safety_net.restore
+        raise
+      end
+    end
+
+
+    private
+
+    def persist(file_content)
       File.open(filepath, 'wb') do |f|
-        f.write content
+        f.write file_content
       end
     end
 
+    def safety_net
+      @safety_net ||= Tobacco::SafetyNet.new(filepath)
+    end
   end
 end

data/lib/tobacco/safety_net.rb

@@ -0,0 +1,66 @@
+# Backup is responsible for backing up the current file
+# if it exists and restoring it in the event an error
+# occurs while attempting to write new content.
+#
+module Tobacco
+  class SafetyNet
+    attr_reader :file
+
+    def initialize(filepath)
+      @filepath = filepath
+    end
+
+    # Public: Creates a backup of the original file
+    #         so it can be restored if necessary
+    #
+    def backup
+      Tobacco.log("Backup: #{@filepath} => #{destination}")
+
+      if File.exists? @filepath
+        FileUtils.mv(@filepath, destination)
+      end
+    end
+
+    # Public: Restores the original file in
+    #         the event an error occurs during
+    #         writing the new content
+    #
+    def restore
+      Tobacco.log("Restoring: #{destination} => #{@filepath}")
+
+      if File.exists? destination
+        FileUtils.mv(destination, @filepath)
+      end
+    end
+
+    # Public: Destroys the backup file
+    #
+    def destroy
+      Tobacco.log("Destroying: #{destination}")
+
+      if File.exists? destination
+        FileUtils.rm(destination)
+      end
+    end
+
+    # Public: Memoizes the destination path
+    #
+    def destination
+      @destination ||= destination_path
+    end
+
+    private
+
+    # Private: Creates a temporary path with
+    #          a unique name using a timestamp
+    #
+    def destination_path
+      name     = File.basename @filepath
+      dir      = File.dirname @filepath
+      additive = Time.now.to_i
+      temp_name = "#{additive}_#{name}"
+
+      "#{dir}/#{temp_name}"
+    end
+  end
+end

data/lib/tobacco/smoker.rb

@@ -1,145 +1,76 @@
 module Tobacco
-  class MissingContentError < RuntimeError
-    def message
-      "No error encountered but content is empty"
-    end
-  end
-
   class Smoker
 
-    attr_accessor :smoker,
+    attr_accessor :consumer,
       :file_path_generator,
       :reader,
-      :writer,
+      :persister,
       :content
 
-    def initialize(smoker, content = '')
-      self.smoker  = smoker
-      self.content = content
+    def initialize(consumer, content = nil)
+      self.consumer = consumer
+      self.content  = content
+
+      Tobacco::Callback.instance(consumer)
+
+      generate_file_paths
     end
 
     def generate_file_paths
-      self.file_path_generator = Roller.new(smoker)
+      self.file_path_generator = Tobacco::Roller.new(consumer)
     end
 
     def read
-      choose_reader
-      read_content
-      verify_content
+      self.content = Tobacco::ContentReader.new(self).read
     end
 
+    # Public: Writes content to file allowing for manipulation
+    # of the content beforehand through the :before_write callback
+    # This is due to the fact that content can be set directly
+    # without going through the read method.
+    #
+    # Validate is only in the write method because
+    # the content can be set directly and the read method
+    # never called.
+    #
     def write!
-      return unless content_present?
+      Tobacco::ContentValidator.new(self).validate!
+    end
 
+    # Public: Called by ContentValidator if content is valid
+    #
+    def continue_write
       begin
-        filepath         = file_path_generator.output_filepath
-        modified_content = modify_content_before_writing
-        content_writer   = Tobacco::Exhaler.new(modified_content, filepath)
-
+        content_writer = Tobacco::Exhaler.new(content, filepath)
         content_writer.write!
 
-        callback(:on_success, modified_content)
+        Tobacco::Callback.instance.notify(:on_success, content)
 
       rescue => e
-        Tobacco.log("ErrorWriting: #{filepath}")
-
-        # Remove the empty file
-        File.delete(filepath) if File.exists?(filepath)
-
-        error = error_object('Error Writing', modified_content, e)
-        callback(:on_write_error, error)
-      end
-    end
-
-
-    #---------------------------------------------------------
-    # End of Public API
-    #---------------------------------------------------------
-
-
-    #---------------------------------------------------------
-    # Write helper methods
-    #---------------------------------------------------------
-    def modify_content_before_writing
-      callback(:before_write, content)
-    end
+        Tobacco.log("ErrorWriting: #{filepath}\nError: #{e}")
 
-    #---------------------------------------------------------
-    # Read helper methods
-    #---------------------------------------------------------
-    def read_content
-      self.content = reader.send(Tobacco.content_method)
-    end
-
-    def verify_content
-      unless content_present?
-
-        # At this point, the content might be an error object
-        # but if not, we create one
-        #
-        object = missing_content_error(content)
-        error  = error_object('Error Reading', '', object)
-
-        callback(:on_read_error, error)
-      end
-    end
+        error = error_object('Error Writing', e)
+        Tobacco::Callback.instance.notify(:on_write_error, error)
 
-    def missing_content_error(content)
-      if content.respond_to? :message
-        content
-      else
-        Tobacco::MissingContentError.new
+        # raise
       end
     end
 
-    def content_present?
-      @content_present ||= content?
-    end
-
-    def content?
-      return false if content.nil? || content.empty?
-
-      Array(content).last !~ /404 Not Found|The page you were looking for doesn't exist/
-    end
-
-    def choose_reader
-      # The reader will either be the calling class (smoker)
-      # if it provides the content method or a new Inhaler
-      # object that will be used to read the content from a url
-      #
-      self.reader = \
-        if smoker.respond_to? Tobacco.content_method
-          smoker
-        else
-          Inhaler.new(file_path_generator.content_url).tap do |inhaler|
-
-            # Add an alias for the user configured content_method
-            # so that when it is called it calls :read
-            # on the Inhaler instance
-            #
-            inhaler.instance_eval %{
-              alias :"#{Tobacco.content_method}" :read
-            }
-          end
-      end
+    def filepath
+      @filepath ||= file_path_generator.output_filepath
     end
 
     #---------------------------------------------------------
-    # private
+    private
 
-    def error_object(msg, modified_content, e)
+    def error_object(msg, e)
       Tobacco::Error.new(
         msg: msg,
-        filepath: file_path_generator.output_filepath,
-        content: modified_content,
+        filepath: filepath,
+        content: content,
         object: e
       )
     end
 
-    def callback(name, error)
-      if smoker.respond_to? name
-        smoker.send(name, error)
-      end
-    end
   end
 end

data/lib/tobacco/version.rb

@@ -1,3 +1,3 @@
 module Tobacco
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/tobacco.rb

@@ -13,13 +13,15 @@ module Tobacco
   @content_method         = :content
   @content_url_method     = :content_url
   @output_filepath_method = :output_filepath
+  @logging                = false
 
   class << self
     attr_accessor :base_path,
       :published_host,
       :content_method,
       :content_url_method,
-      :output_filepath_method
+      :output_filepath_method,
+      :logging
   end
 
   def self.configure
@@ -27,6 +29,8 @@ module Tobacco
   end
 
   def self.log(msg)
+    return unless logging
+
     log_msg =  "\n*******************************************\n"
     log_msg += "Tobacco::Log: #{msg}\n"
     log_msg += "*******************************************\n"
@@ -45,4 +49,8 @@ require 'tobacco/roller'
 require 'tobacco/inhaler'
 require 'tobacco/exhaler'
 require 'tobacco/error'
+require 'tobacco/safety_net'
+require 'tobacco/content_validator'
+require 'tobacco/content_reader'
+require 'tobacco/callback'
 

data/spec/tobacco/content_reader_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe Tobacco::ContentReader do
+  before do
+    Tobacco.configure do |config|
+      config.published_host         = 'http://localhost:3000'
+      config.base_path              = '/tmp/published_content'
+      config.content_method         = :content
+      config.content_url_method     = :content_url
+      config.output_filepath_method = :output_filepath
+    end
+  end
+
+  let(:consumer) { mock('consumer', content: 'Base content') }
+  let(:smoker) { mock('smoker', file_path_generator: filepath, consumer: consumer, content: '') }
+  let(:filepath) { mock('roller', content_url: '/video', output_filepath: '/file/path') }
+
+  subject { Tobacco::ContentReader.new(smoker) }
+
+  describe '#choose_reader' do
+    context 'when consumer provides the content' do
+      let(:consumer) { mock('consumer', content: 'Base content') }
+
+      it 'uses the consumer for the content' do
+        subject.choose_reader
+
+        subject.reader.should == consumer
+      end
+    end
+
+    context 'when smoker does not provide content' do
+      let(:inhaler)  { mock('inhaler', read: 'reader method') }
+      let(:filepath) { mock('roller', content_url: '/video') }
+
+      before do
+        smoker.consumer.unstub!(:content)
+        Tobacco::Inhaler.stub(:new).and_return(inhaler)
+      end
+
+      it 'uses the smoker for the content' do
+        subject.choose_reader
+        subject.reader.should == inhaler
+      end
+    end
+  end
+
+
+  describe '#read_content' do
+    context 'when content is read from the consumer' do
+      let(:content) { 'Provided content' }
+
+      before { smoker.consumer.stub(:content).and_return(content) }
+
+      it 'should have the correct content' do
+        subject.choose_reader
+        subject.read_content
+
+        subject.content.should == content
+      end
+    end
+
+    context 'when content is read from url' do
+      let(:content)  { 'Content from reading url' }
+      let(:inhaler)  { mock('inhaler', read: content) }
+      let(:filepath) { mock('roller', content_url: '/video', output_filepath: '/tmp/howdy.txt') }
+
+      before do
+        smoker.consumer.unstub!(:content)
+        Tobacco::Inhaler.stub(:new).and_return(inhaler)
+        smoker.stub(:file_path_generator).and_return(filepath)
+      end
+
+      it 'should have the correct content' do
+        subject.choose_reader
+        subject.read
+
+        subject.content.should == content
+      end
+    end
+  end
+
+  describe 'modifies content' do
+    let(:content) { '<h1>Summer Gear</h1>' }
+    let(:modified_content) { '<h1>Winter Gear</h1>' }
+
+    before do
+      Tobacco::Callback.instance.writer = consumer
+      smoker.consumer.stub(:content).and_return(content)
+      smoker.consumer.stub(:before_write).and_return(modified_content)
+    end
+
+    it 'allows the consumer to modify content after reading' do
+      subject.read
+
+      subject.modified_content.should == modified_content
+    end
+  end
+
+end  

data/spec/tobacco/content_validator_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+
+describe Tobacco::ContentValidator do
+
+  class Consumer
+    def on_read_error(error)
+    end
+  end
+
+  let(:consumer) { Consumer.new }
+  let(:smoker) { Tobacco::Smoker.new(consumer) }
+
+  subject { Tobacco::ContentValidator.new(smoker) }
+
+  before do
+    smoker.stub(:filepath).and_return('/path')
+    Tobacco::Callback.instance.stub(:writer).and_return(consumer)
+  end
+
+  describe '#validate!' do
+    context 'when validation passes' do
+      let(:content) { 'Lorem ipsum' }
+
+      before { smoker.content = content }
+
+      it 'calls continue write' do
+        smoker.should_receive(:continue_write)
+        smoker.consumer.should_not_receive(:on_read_error)
+
+        subject.validate!
+      end
+    end
+  end
+
+  describe '#validate!' do
+    context 'when validation fails' do
+      before { smoker.content = '' }
+
+      it 'does not call continue write on' do
+        smoker.should_not_receive(:continue_write)
+
+        subject.validate!
+      end
+
+      it 'calls on_read_error' do
+        consumer.should_receive(:on_read_error)
+
+        subject.validate!
+      end
+    end
+  end
+end

data/spec/tobacco/exhaler_spec.rb

@@ -43,6 +43,11 @@ describe Tobacco::Exhaler do
     let(:dir)      { '/tmp/base_dir/' }
     let(:content) { '<h1>Page Title</h1>' }
 
+    before do
+      FileUtils.mkdir_p(dir)
+      File.open(filepath, 'w') { |f| f.write content }
+    end
+
     after { FileUtils.rm_rf(dir) }
 
     describe '#create_directory' do

data/spec/tobacco/safety_net_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Tobacco::SafetyNet do
+  let(:safety_net) { Tobacco::SafetyNet }
+  let(:filepath)   { '/tmp/tempfile.txt' }
+  let(:content)    { 'This little piggy went to market...' }
+
+  before do
+    File.open(filepath, 'w') {|f| f.write content }
+    @safety_net = safety_net.new(filepath)
+    @safety_net.backup
+  end
+
+  context 'when backing up' do
+    after { @safety_net.destroy }
+
+    it 'creates a tempfile' do
+      File.exists?(@safety_net.destination).should be_true
+    end
+
+    it 'has correct content' do
+      File.read(@safety_net.destination).should == content
+    end
+  end
+
+  context 'when restoring the original file' do
+    before { @safety_net.restore }
+
+    it 'works' do
+      File.exists?(filepath).should be_true
+    end
+
+    it 'has the correct content' do
+      File.read(filepath).should == content
+    end
+  end
+end

data/spec/tobacco/smoker_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 require 'tobacco'
 
-
 describe Tobacco::Smoker do
   before do
     Tobacco.configure do |config|
@@ -13,22 +12,21 @@ describe Tobacco::Smoker do
     end
   end
 
-  let(:smoker) { mock('smoker') }
+  let(:consumer) { mock('consumer') }
 
-  subject { Tobacco::Smoker.new(smoker) }
+  subject { Tobacco::Smoker.new(consumer) }
 
   context '#write!' do
+    let(:filepath) { mock('roller', content_url: '/video', output_filepath: '/tmp/tobacco.txt') }
 
-    context 'when content is empty' do
-      let(:inhaler)  { mock('inhaler', read: '') }
-      let(:filepath) { mock('roller', content_url: '/video', output_filepath: '/user') }
+    before do
+      subject.file_path_generator = filepath
+    end
 
-      before do
-        Tobacco::Inhaler.stub(:new).and_return(inhaler)
-        subject.file_path_generator = filepath
-      end
+    context 'when content is empty' do
 
       it 'does not attempt a write' do
+        consumer.stub(:content).and_return('')
         Tobacco::Exhaler.should_not_receive(:new)
 
         subject.read
@@ -36,46 +34,44 @@ describe Tobacco::Smoker do
       end
     end
 
-    context 'content' do
-      let(:content) { 'Directly set content' }
-      let(:exhaler) { mock('exhaler', write!: true) }
-      let(:filepath) { mock('roller', content_url: '/video', output_filepath: '/desktop') }
-
-      before do
-        Tobacco::Exhaler.stub(:new).and_return(exhaler)
-        subject.file_path_generator = filepath
-      end
+    context 'content success' do
+      let(:consumer) { mock('smoker') }
+      subject { Tobacco::Smoker.new(consumer) }
 
       context 'when providing content directly' do
+        let(:content) { 'Directly set content' }
+        let(:exhaler) { mock('exhaler', write!: true) }
+        let(:filepath) { mock('roller', content_url: '/video', output_filepath: '/tmp/tobacco.txt') }
 
-        it 'allows setting content directly' do
-          exhaler.should_receive(:write!)
+        before do
+          Tobacco::Exhaler.stub(:new).and_return(exhaler)
           subject.content = content
+        end
 
+        it 'uses the provided content' do
+          exhaler.should_receive(:write!)
           subject.write!
         end
 
-        it 'callback :on_success is called' do
-          smoker.should_receive(:before_write).with(content).and_return(content)
-          smoker.should_receive(:on_success).with(content)
-          subject.content = content
+        it 'does not call the :before_write callback' do
+          Tobacco::Callback.instance.should_not_receive(:notify).with(:before_write, content)
+          subject.write!
+        end
 
+        it 'callback :on_success is called' do
+          Tobacco::Callback.instance.writer.should_receive(:on_success).with(content)
           subject.write!
         end
       end
+    end
 
+    context 'content errors' do
       context 'when an error occurs during writing' do
-        let(:error) { raise RuntimeError.new('File Permission Error') }
-
-        before do
-          subject.file_path_generator = filepath
-          smoker.should_receive(:before_write).with(content).and_return(content)
-          exhaler.should_receive(:write!).and_return { error }
-        end
+        let(:filepath) { mock('roller', content_url: '/video', output_filepath: '/users/blah.txt') }
 
         it 'calls the callback :on_write_error' do
-          smoker.should_receive(:on_write_error)
-          subject.content = content
+          Tobacco::Callback.instance.should_receive(:notify).once
+          subject.content = 'Directly set content'
 
           subject.write!
         end
@@ -83,122 +79,13 @@ describe Tobacco::Smoker do
     end
   end
 
-  describe '#modify_content_before_writing' do
-    let(:content) { '<h1>Summer Gear</h1>' }
-    let(:modified_content) { '<h1>Winter Gear</h1>' }
-
-    before do
-      smoker.stub(:before_write).and_return(modified_content)
-    end
-
-    it 'allows the smoker to modify content before writing' do
-      subject.content = content
-
-      subject.modify_content_before_writing.should == modified_content
-    end
-  end
-
   describe '#generate_file_paths' do
-    it 'sets the file_path_generator' do
-      Tobacco::Roller.should_receive(:new).with(smoker)
-
-      subject.generate_file_paths
-    end
-  end
-
-  describe '#choose_reader' do
-    context 'when smoker provides the content' do
-      before { smoker.stub(:content) }
-
-      it 'uses the smoker for the content' do
-        subject.choose_reader
-        subject.reader.should == smoker
-      end
-    end
-
-    context 'when smoker does not provide content' do
-      let(:inhaler)  { mock('inhaler', read: 'reader method') }
-      let(:filepath) { mock('roller', content_url: '/video') }
-
-      before do
-        Tobacco::Inhaler.stub(:new).and_return(inhaler)
-        subject.file_path_generator = filepath
-      end
-
-      it 'uses the smoker for the content' do
-        subject.choose_reader
-        subject.reader.should == inhaler
-      end
-    end
-  end
-
-  describe '#read_content' do
-    context 'when content is read from the smoker' do
-      let(:content) { 'Provided content' }
-
-      before { smoker.stub(:content).and_return(content) }
+    before { consumer.stub(:output_filepath).and_return('/tmp/path.txt') }
 
-      it 'should have the correct content' do
-        subject.choose_reader
-        subject.read_content
-
-        subject.content.should == content
-      end
-    end
-
-    context 'when content is read from url' do
-      let(:content)  { 'Content from reading url' }
-      let(:inhaler)  { mock('inhaler', read: content) }
-      let(:filepath) { mock('roller', content_url: '/video') }
-
-      before do
-        Tobacco::Inhaler.stub(:new).and_return(inhaler)
-        subject.file_path_generator = filepath
-      end
-
-      it 'should have the correct content' do
-        subject.choose_reader
-        subject.read_content
-
-        subject.content.should == content
-      end
-    end
-  end
-
-  describe '#read' do
-    context 'when content is empty' do
-      class Writer
-        attr_accessor :error
-        def on_read_error(error)
-          self.error = error
-        end
-      end
-
-      describe '#on_read_error' do
-        let(:inhaler)  { mock('inhaler', read: '') }
-        let(:filepath) { mock('roller', content_url: '/video', output_filepath: '/file/path') }
-        let(:smoker)   { Writer.new }
-
-        before do
-          Tobacco::Inhaler.stub(:new).and_return(inhaler)
-          subject.file_path_generator = filepath
-        end
-
-        it 'the callback is called on the smoker' do
-          subject.smoker.should_receive(:on_read_error)
-
-          subject.read
-        end
-
-        it 'has the correct message on the error object' do
-          subject.read
-
-          error   = subject.smoker.error
-          message = error.object.message
+    it 'sets the file_path_generator' do
+      Tobacco::Roller.should_receive(:new).with(consumer)
 
-          message.should match(/No error encountered/)
-        end
-      end
+      Tobacco::Smoker.new(consumer)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tobacco
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,19 +108,26 @@ files:
 - Rakefile
 - lib/tobacco.rb
 - lib/tobacco/burnout.rb
+- lib/tobacco/callback.rb
+- lib/tobacco/content_reader.rb
+- lib/tobacco/content_validator.rb
 - lib/tobacco/error.rb
 - lib/tobacco/exhaler.rb
 - lib/tobacco/inhaler.rb
 - lib/tobacco/roller.rb
+- lib/tobacco/safety_net.rb
 - lib/tobacco/smoker.rb
 - lib/tobacco/version.rb
 - spec/spec_helper.rb
 - spec/support/vcr_cassettes/url_content.yml
 - spec/tobacco/burnout_spec.rb
+- spec/tobacco/content_reader_spec.rb
+- spec/tobacco/content_validator_spec.rb
 - spec/tobacco/error_spec.rb
 - spec/tobacco/exhaler_spec.rb
 - spec/tobacco/inhaler_spec.rb
 - spec/tobacco/roller_spec.rb
+- spec/tobacco/safety_net_spec.rb
 - spec/tobacco/smoker_spec.rb
 - spec/tobacco_spec.rb
 - tobacco.gemspec
@@ -152,9 +159,12 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/vcr_cassettes/url_content.yml
 - spec/tobacco/burnout_spec.rb
+- spec/tobacco/content_reader_spec.rb
+- spec/tobacco/content_validator_spec.rb
 - spec/tobacco/error_spec.rb
 - spec/tobacco/exhaler_spec.rb
 - spec/tobacco/inhaler_spec.rb
 - spec/tobacco/roller_spec.rb
+- spec/tobacco/safety_net_spec.rb
 - spec/tobacco/smoker_spec.rb
 - spec/tobacco_spec.rb