mmailer 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.0.7
+
+* Correctly handles Array or Proc passed in config.collection, warns if it something else.
+
 ## Version 0.0.6
 
 * Markdown template

data/lib/mmailer/commands.rb

@@ -40,11 +40,7 @@ class MyCLI < Thor
   option :mail_interval, :type => :numeric
   option :sleep_time, :type => :numeric
   def config
-    if options.empty?
-      client(:config)
-    else
       client(:config, options)
-    end
   end
 
 end

data/lib/mmailer/server_helper.rb

@@ -58,8 +58,8 @@ module Mmailer
       end
     end
 
-    def config(options=nil)
-      if options.nil?
+    def config(options)
+      if options.empty?
         puts "I will send emails every #{Mmailer.configuration.time_interval} seconds. After #{Mmailer.configuration.mail_interval} emails, I will sleep for #{Mmailer.configuration.sleep_time} seconds."
       else
         Mmailer.configuration.sleep_time = options.fetch("sleep_time", Mmailer.configuration.sleep_time)

data/lib/mmailer/version.rb

@@ -1,3 +1,3 @@
 module Mmailer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/mmailer/worker.rb

@@ -38,13 +38,19 @@ module Mmailer
             break
         end
       end
-      obj.puts "Exiting worker, stopping server"
-      DRb::stop_service
-      Thread.exit
+      stop
     end
 
     def load_collection
-      @collection = Mmailer.configuration.collection.lambda? ? Mmailer.configuration.collection.call : Mmailer.configuration.collection
+      @collection = case Mmailer.configuration.collection
+                      when Array
+                        Mmailer.configuration.collection
+                      when Proc
+                        Mmailer.configuration.collection.call
+                      else
+                        obj.puts "Collection needs to be an array or a proc object. It appears to be neither."
+                        stop
+                    end
       collection.shift(from)
       obj.puts "Loaded #{collection.count} entries"
     end
@@ -54,5 +60,11 @@ module Mmailer
       @mail_interval = Mmailer.configuration.mail_interval
       @sleep_time = Mmailer.configuration.sleep_time
     end
+
+    def stop
+      obj.puts "Exiting worker, stopping server"
+      DRb::stop_service
+      Thread.exit
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmailer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler