snitcher 0.4.0.pre1 → 0.4.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31fd69148d1e700f8fb0530699877e3efc5fad4b
-  data.tar.gz: cd47d65eb4574061cab9352d6de6818cdbc591dc
+  metadata.gz: 52b46733dac8b3d6892d836ce73c27527c705f4c
+  data.tar.gz: 8117b728733b857dd8840491a6fa16f0a2db6ba0
 SHA512:
-  metadata.gz: 934c98e32c1880697ecd3e13d50c4296b843de6fd85c7625ed150117c07cbbb2391fc7efc3c221efad17abe20a31caabd5bc1c14a7abe40941697ab585da6bfd
-  data.tar.gz: d6c37d3f7ff629ba62c2a6cf79254998a6a528ce85d63ab8104c3abcd129d509eaeae7a21f5d6182d9edb91746de7dba9ba26c01758d6d050b3e4eb8fdb53975
+  metadata.gz: fe9a30bdb596ffc377f951fd853ac66b00b22370cde6989224bd7a9e8ffa05a8b5a8832f14e74b0a779d458a29c4216e8efd8098720311c53fdb15491460dad0
+  data.tar.gz: f37a6ee3a9473e27e2a905bb81469c7df72990f3a35c16cc5892ffa5961ac92b5a52e7917af65a223767004666464104e6c2f7cce04ea620186e441f813d5318

data/lib/snitcher/api.rb

@@ -30,7 +30,7 @@ module Snitcher
     # Raises Snitcher::API::Error based on the type from the server.
     # Raises Timeout::Error if the request timed out.
     def get_key(username, password, options={})
-      api = options.fetch(:uri, "https://deadmanssnitch.com")
+      api = options.fetch(:uri, "https://api.deadmanssnitch.com")
       uri = URI.parse("#{api}/v1/api_key")
 
       timeout = options.fetch(:timeout, 5)

data/lib/snitcher/api/client.rb

@@ -187,16 +187,16 @@ class Snitcher::API::Client
   # Example
   #
   #   Add tags to an existing snitch.
-  #     token = "c2354d53d2"
-  #     tags =  [ "red", "green" ]
-  #     @client.add_tags(token, tags)
-  #     => [
-  #           "red",
-  #           "green"
-  #        ]
+  #     @client.add_tags("c2354d53d2", %w("red", "green")
+  #     => [ "yellow", "red", "green" ]
+  #
+  #   Adding a single tag
+  #     @client.add_tags("c2354d53d2", "orange")
+  #     => [ "yellow", "orange" ]
   #
   # Raise Timeout::Error if the API request times out
   def add_tags(token, tags=[])
+    tags = [tags].flatten
     post("/v1/snitches/#{token}/tags", tags)
   end
 

data/lib/snitcher/version.rb

@@ -1,3 +1,3 @@
 module Snitcher
-  VERSION = "0.4.0.pre1"
+  VERSION = "0.4.0.pre2"
 end

data/spec/api/client_spec.rb

@@ -287,29 +287,26 @@ describe Snitcher::API::Client do
   end
 
   describe "#add_tags" do
-    let(:token) { "c2354d53d2" }
-    let(:tags)  { ["red", "green"] }
-    let(:url)   { "#{snitch_url}/#{token}/tags" }
-    let(:body)  { '[
-                     "red",
-                     "green"
-                   ]'
-                }
+    it "adds the tags to the Snitch via the API" do
+      request = stub_request(:post, "#{snitch_url}/c2354d53d2/tags").
+        with(:body => %|["red","green"]|).
+        to_return(:body => %|["red", "green"]|, :status => 200)
 
-    before do
-      stub_request(:post, stub_url).to_return(:body => body, :status => 200)
+      result = client.add_tags("c2354d53d2", ["red", "green"])
+
+      expect(request).to have_been_made.once
+      expect(result).to eq(["red", "green"])
     end
 
-    it "pings API with the api_key" do
-      client.add_tags(token, tags)
+    it "allows passing a single tag to add" do
+      request = stub_request(:post, "#{snitch_url}/TOKEN/tags").
+        with(:body => %|["extremely important"]|).
+        to_return(:body => %|["extremely important"]|, :status => 200)
 
-      expect(a_request(:post, url)).to have_been_made.once
-    end
+      result = client.add_tags("TOKEN", "extremely important")
 
-    context "when successful" do
-      it "returns an array of the snitch's tags" do
-        expect(client.add_tags(token, tags)).to eq(JSON.parse(body))
-      end
+      expect(request).to have_been_made.once
+      expect(result).to eq(["extremely important"])
     end
   end
 

data/spec/api_spec.rb

@@ -1,20 +1,23 @@
 require "spec_helper"
+
 require "base64"
 require "securerandom"
 
+require "snitcher/api"
+
 describe Snitcher::API do
   describe "#get_key" do
     it "returns the api_key" do
       user = "alice@example.com"
       pass = "password"
 
-      request = stub_request(:get, "http://#{user}:#{pass}@dms.dev/v1/api_key").
+      request = stub_request(:get, "https://#{user}:#{pass}@api.deadmanssnitch.com/v1/api_key").
         to_return({
           :body   => '{"api_key": "_caeEiZXnEyEzXXYVh2NhQ"}',
           :status => 200
         })
 
-      actual = Snitcher::API.get_key(user, pass, uri: "http://dms.dev")
+      actual = Snitcher::API.get_key(user, pass)
 
       expect(actual).to eq("_caeEiZXnEyEzXXYVh2NhQ")
       expect(request).to have_been_made.once
@@ -24,7 +27,7 @@ describe Snitcher::API do
       user = "lol@notreally.horse"
       pass = "nope"
 
-      request = stub_request(:get, "http://#{user}:#{pass}@dms.dev/v1/api_key").
+      request = stub_request(:get, "https://#{user}:#{pass}@api.deadmanssnitch.com/v1/api_key").
         to_return({
           :body => JSON.generate({
             :type  => "sign_in_incorrect",
@@ -36,7 +39,7 @@ describe Snitcher::API do
       expect {
         # Some shenanigans to verify type
         begin
-          Snitcher::API.get_key(user, pass, uri: "http://dms.dev")
+          Snitcher::API.get_key(user, pass)
         rescue Snitcher::API::Error => e
           expect(e.type).to eq("sign_in_incorrect")
           expect(e.message).to eq("Invalid email or password.")
@@ -49,11 +52,24 @@ describe Snitcher::API do
     end
 
     it "raises Timeout::Error on a timeout" do
-      stub_request(:any, "dms.dev/v1/api_key").to_timeout
+      stub_request(:any, "https://api.deadmanssnitch.com/v1/api_key").to_timeout
 
       expect {
-        Snitcher::API.get_key("", "", uri: "http://dms.dev")
+        Snitcher::API.get_key("", "")
       }.to raise_error(Timeout::Error)
     end
+
+    it "allows the API URI to be provided" do
+      request = stub_request(:any, "user:pass@dms.dev:4000/v1/api_key").
+        to_return({
+          :body   => '{"api_key": "this_is_an_api_key"}',
+          :status => 200
+        })
+
+      actual = Snitcher::API.get_key("user", "pass", uri: "http://dms.dev:4000")
+
+      expect(actual).to eq("this_is_an_api_key")
+      expect(request).to have_been_made.once
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snitcher
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre1
+  version: 0.4.0.pre2
 platform: ruby
 authors:
 - Collective Idea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler