nogara-geckoboard-push 0.1.0 → 0.1.1

data/lib/geckoboard/push.rb

@@ -4,11 +4,9 @@ require 'json'
 
 module Geckoboard
   class Push
-    class << self
-      # API configuration
-      attr_accessor :api_key
-      attr_accessor :api_version
-    end
+    # API configuration
+    attr_accessor :api_key
+    attr_accessor :api_version
 
     # Custom error type for handling API errors
     class Error < Exception; end
@@ -17,14 +15,15 @@ module Geckoboard
     base_uri 'https://push.geckoboard.com'
 
     # Initializes the push object for a specific widget
-    def initialize(widget_key)
+    def initialize(api_key, widget_key)
+      @api_key = api_key
       @widget_key = widget_key
     end
 
     # Makes a call to Geckoboard to push data to the current widget
     def push(data)
-      raise Geckoboard::Push::Error.new("Api key not configured.") if Geckoboard::Push.api_key.nil? || Geckoboard::Push.api_key.empty?
-      result = JSON.parse(self.class.post("/#{Geckoboard::Push.api_version || 'v1'}/send/#{@widget_key}", {:body => {:api_key => Geckoboard::Push.api_key, :data => data}.to_json}))
+      raise Geckoboard::Push::Error.new("Api key not configured.") if @api_key.nil? || @api_key.empty?
+      result = JSON.parse(self.class.post("/#{@api_version || 'v1'}/send/#{@widget_key}", {:body => {:api_key => @api_key, :data => data}.to_json}))
       raise Geckoboard::Push::Error.new(result["error"]) unless result["success"]
       result["success"]
     end

data/test/geckoboard/push_test.rb

@@ -8,66 +8,64 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "lib", "
 class PushTest < Test::Unit::TestCase
   def setup
     FakeWeb.allow_net_connect = false
-    Geckoboard::Push.api_key = "12345"
-    @push = Geckoboard::Push.new("54321")
+    @api_key = "12345"
+    @widget_key = "54321"
   end
 
   def test_with_no_api_key
-    Geckoboard::Push.api_key = nil
     assert_raise Geckoboard::Push::Error do
-      @push.number_and_secondary_value(100, 10)
+      Geckoboard::Push.new(nil, @widget_key).number_and_secondary_value(100, 10)
     end
   end
 
   def test_invalid_key
-    Geckoboard::Push.api_key = "invalid"
     response = Net::HTTPOK.new("1.1", 200, "OK")
     response.instance_variable_set(:@body, '{"success":false,"error":"Api key has wrong format. "}')
     response.instance_variable_set(:@read, true)
     Net::HTTP.any_instance.expects(:request).returns(response)
     assert_raise Geckoboard::Push::Error do
-      @push.number_and_secondary_value(100, 10)
+      Geckoboard::Push.new("invalid", @widget_key).number_and_secondary_value(100, 10)
     end
   end
 
   def test_number_and_secondary_value
     expect_http_request({"api_key" => "12345", "data" => {"item" => [{"text" => "", "value" => 100}, {"text" => "", "value" => 10}]}}.to_json)
-    assert_equal true, @push.number_and_secondary_value(100, 10)
+    assert_equal true, Geckoboard::Push.new(@api_key, @widget_key).number_and_secondary_value(100, 10)
   end
 
   def test_number_and_secondary_value_and_prefix
     expect_http_request({"api_key" => "12345", "data" => {"item" => [{"text" => "", "value" => 100, "prefix" => "$"}, {"text" => "", "value" => 10}]}}.to_json)
-    assert_equal true, @push.number_and_secondary_value(100, 10, '$')
+    assert_equal true, Geckoboard::Push.new(@api_key, @widget_key).number_and_secondary_value(100, 10, '$')
   end
 
   def test_text
     expect_http_request({"api_key" => "12345", "data" => {"item" => [{"text" => "Test1", "type" => 2}, {"text" => "Test2", "type" => 1}]}}.to_json)
-    assert_equal true, @push.text([{:type => :info, :text => "Test1"}, {:type => :alert, :text => "Test2"}])
+    assert_equal true, Geckoboard::Push.new(@api_key, @widget_key).text([{:type => :info, :text => "Test1"}, {:type => :alert, :text => "Test2"}])
   end
 
   def test_rag
     expect_http_request({"api_key" => "12345","data" => {"item" => [{"value" => 1,"text" => "red"},{"value" => 2,"text" => "amber"},{"value" => 3,"text" => "green"}]}}.to_json)
-    assert_equal true, @push.rag('red', 1, 'amber', 2, 'green', 3)
+    assert_equal true, Geckoboard::Push.new(@api_key, @widget_key).rag('red', 1, 'amber', 2, 'green', 3)
   end
 
   def test_line
     expect_http_request({"api_key" => "12345", "data" => {"item" => [1,2,3], "settings" => {"axisx" => "x axis", "axisy" => "y axis", "colour" => "ff9900"}}}.to_json)
-    assert_equal true, @push.line([1,2,3], "ff9900", "x axis", "y axis")
+    assert_equal true, Geckoboard::Push.new(@api_key, @widget_key).line([1,2,3], "ff9900", "x axis", "y axis")
   end
 
   def test_pie
     expect_http_request({"api_key" => "12345", "data" => {"item" => [{"value" => 1, "label" => "Test1", "colour" => "ff9900"}, {"value" => 2, "label" => "Test2", "colour" => "ff0099"}]}}.to_json)
-    assert_equal true, @push.pie([{:value => 1, :label => "Test1", :colour => "ff9900"}, {:value => 2, :label => "Test2", :colour => "ff0099"}])
+    assert_equal true, Geckoboard::Push.new(@api_key, @widget_key).pie([{:value => 1, :label => "Test1", :colour => "ff9900"}, {:value => 2, :label => "Test2", :colour => "ff0099"}])
   end
 
   def test_geckometer
     expect_http_request({"api_key" => "12345", "data" => {"item" => 100, "min" => {"value" => 50}, "max" => {"value" => 200}}}.to_json)
-    assert_equal true, @push.geckometer(100, 50, 200)
+    assert_equal true, Geckoboard::Push.new(@api_key, @widget_key).geckometer(100, 50, 200)
   end
 
   def test_funnel
     expect_http_request({"api_key" => "12345", "data" => {"item" => [{"value" => 5, "label" => "Test1"}, {"value" => 10, "label" => "Test2"}], "type" => "reverse", "percentage" => "hide"}}.to_json)
-    assert_equal true, @push.funnel([{:label => "Test1", :value => 5}, {:label => "Test2", :value => 10}], true, true)
+    assert_equal true, Geckoboard::Push.new(@api_key, @widget_key).funnel([{:label => "Test1", :value => 5}, {:label => "Test2", :value => 10}], true, true)
   end
 
   def expect_http_request(json)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nogara-geckoboard-push
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: