sunnytrail 0.0.1.3 → 0.0.1.4

data/lib/sunnytrail.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'net/https'
 require 'json'
 require 'hashie'
+require 'logger'
 
 class Sunnytrail
 
@@ -14,12 +15,17 @@ class Sunnytrail
   # class methods
 
   class << self
-    def configure(options = {})
+    def configure(options = {}, &block)
       default_options = {
-        :api_url => "api.thesunnytrail.com",
-        :api_key => nil,
-        :use_ssl => true
+        :api_url     => "api.thesunnytrail.com",
+        :api_key     => nil,
+        :use_ssl     => true,
+        :verbose     => false,
+        :send_events => true,
+        :log_path    => 'sunnytrail.log'
       }
+
+      block.call(options) if block_given?
       @options = default_options.merge(options)
     end
 
@@ -28,21 +34,29 @@ class Sunnytrail
     end
 
     def add_event(args={})
-      sunny_trail = Sunnytrail.new
-      sunny_trail.add_event(args)
+      @sunny_trail ||= Sunnytrail.new
+      @sunny_trail.add_event(args)
     end
   end
 
   # EOF class methods
 
+
   # instance methods
   def initialize(init_options={})
     @options = Sunnytrail.options.merge(init_options)
+    start_logger if verbose?
     raise ConfigurationError, "API KEY not set" if @options[:api_key].nil?
   end
 
   def add_event(args={})
-    request args
+    message = args.to_json
+    @logger.info("Event sent: #{message}") if verbose?
+    request(message) if @options[:send_events]
+  end
+
+  def verbose?
+    !!@options[:verbose]
   end
 
   # EOF instance methods
@@ -61,7 +75,7 @@ class Sunnytrail
     api = setup_call
     
     response = api.post("/messages?apikey=#{@options[:api_key]}",
-                        "message=#{message.to_json}")
+                        "message=#{message}")
 
     case response.code.to_i
     when 200..202
@@ -75,6 +89,17 @@ class Sunnytrail
     end
   end
 
+  def start_logger
+    @logger = Logger.new(@options[:log_path]) if verbose?
+    @logger.formatter = proc{|s,t,p,m|"%5s [%s] (%s) %s :: %s\n" % [s, t.strftime("%Y-%m-%d %H:%M:%S"), $$, p, m]}
+    @logger.info "Options set:"
+    @options.each_pair do |option, value|
+      @logger.info "#{option} => #{value}"
+    end
+    @logger.info "EOF Options\n\n"
+  end
+
+
   class Event < Hashie::Dash
 
     attr_writer :action, :plan
@@ -93,8 +118,8 @@ class Sunnytrail
 
     def to_hash
       out = {}
-      out[:action] = @action.nil? ? {} : @action.to_hash
-      out[:plan] = @plan.nil? ? {} : @plan.to_hash
+      out["action"] = @action.nil? ? {} : @action.to_hash
+      out["plan"] = @plan.nil? ? {} : @plan.to_hash
       keys.each do |k|
         out[k] = Hashie::Hash === self[k] ? self[k].to_hash : self[k]
       end

data/spec/mock.rb

@@ -1,9 +1,8 @@
 #Sunnytrail Mock. We override request method not to sent requests to SunnyTrail
 
-class Sunnytrail
-  private
 
-  def request(message)
-    return true
+class Net::HTTP
+  def post(*args)
+    Net::HTTPResponse.new "HTTP/1.0", 200, "OK"
   end
 end

data/spec/sunnytrail_spec.rb

@@ -5,17 +5,17 @@ describe Sunnytrail do
 
   before :all do
       TIME_NOW = Time.now.to_i
-      OPTIONS_HASH = {:id => 123,
-              :email => "user123@example.com",
-              :name => "User123",
-              :action => {
-                          :name => "Signup",
-                          :created => TIME_NOW
+      OPTIONS_HASH = {"id" => 123,
+              "email" => "user123@example.com",
+              "name" => "User123",
+              "action" => {
+                          "name" => "Signup",
+                          "created" => TIME_NOW
                          },
-              :plan => {
-                        :name => "Gold",
-                        :price => 123.0,
-                        :recurring => 31
+              "plan" => {
+                        "name" => "Gold",
+                        "price" => 123.0,
+                        "recurring" => 31
                        }
              }
 
@@ -39,13 +39,43 @@ describe Sunnytrail do
   it "should override conf when specified in constructor" do
     sunnytrail = Sunnytrail.new :api_key => "thisisthenewtoken"
     sunnytrail.options[:api_key].should == "thisisthenewtoken"
+    Sunnytrail.options[:api_key].should == "abcdefghijklmnoprstvuxywz"
+  end
+
+  it "should override conf when specified in block" do
+    Sunnytrail.configure do |config|
+      config[:api_key] = "evennewertoken"
+      config[:use_ssl] = false
+    end
+    Sunnytrail.options[:api_key].should == "evennewertoken"
+    Sunnytrail.options[:use_ssl].should be_false
+    Sunnytrail.options[:use_ssl] = true
   end
 
   it "should send event" do
-    sunnytrail = Sunnytrail.new
+    sunnytrail = Sunnytrail.new 
     sunnytrail.add_event(OPTIONS_HASH).should be_true
   end
 
+  it "should not send event if send_events set to false" do
+    sunnytrail = Sunnytrail.new :send_events => false
+    sunnytrail.add_event(OPTIONS_HASH).should be_nil
+  end
+
+  it "should create log file when in verbose mode" do 
+    sunnytrail = Sunnytrail.new(:verbose => true)
+    sunnytrail.add_event(OPTIONS_HASH).should be_true
+    File.exist?("sunnytrail.log").should be_true
+
+    sunnytrail = Sunnytrail.new(:verbose => true,
+                                :log_path => "sunnylogger.log")
+    sunnytrail.add_event(OPTIONS_HASH).should be_true
+    File.exist?("sunnylogger.log").should be_true
+
+    File.delete("sunnytrail.log")
+    File.delete("sunnylogger.log")
+
+  end
 
   describe Sunnytrail::Event do
 
@@ -61,7 +91,7 @@ describe Sunnytrail do
       event.plan.price = 123.0
       event.plan.recurring = 31
       event.to_hash.should == OPTIONS_HASH
-      event.to_json.should == OPTIONS_HASH.to_json
+      JSON.parse(event.to_json).should == OPTIONS_HASH
     end
 
     it "should set up and clear action and plan attributes properly" do 
@@ -79,8 +109,8 @@ describe Sunnytrail do
     it "should add empty plan and action node to hash when they are not specified" do
       event = Sunnytrail::Event.new
       hash = event.to_hash
-      hash[:action].should == {}
-      hash[:plan].should == {}
+      hash["action"].should == {}
+      hash["plan"].should == {}
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sunnytrail
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 67
   prerelease: false
   segments: 
   - 0
   - 0
   - 1
-  - 3
-  version: 0.0.1.3
+  - 4
+  version: 0.0.1.4
 platform: ruby
 authors: 
 - Mateusz Zawisza