flapjack-diner 2.0.0.pre.alpha.3 → 2.0.0

data/lib/flapjack-diner/utility.rb

@@ -0,0 +1,16 @@
+module Flapjack
+  module Diner
+    module Utility
+      def self.symbolize(obj)
+        case obj
+        when Hash
+          obj.each_with_object({}) {|(k, v), a| a[k.to_sym] = symbolize(v) }
+        when Array
+          obj.each_with_object([]) {|e, a| a << symbolize(e) }
+        else
+          obj
+        end
+      end
+    end
+  end
+end

data/lib/flapjack-diner/version.rb

@@ -1,5 +1,5 @@
 module Flapjack
   module Diner
-    VERSION = '2.0.0-alpha.3'
+    VERSION = '2.0.0'
   end
 end

data/spec/flapjack-diner_spec.rb

@@ -3,8 +3,6 @@ require 'flapjack-diner'
 
 describe Flapjack::Diner do
 
-  # include_context 'fixture data'
-
   let(:server) { 'flapjack.com' }
 
   let(:time) { Time.now }
@@ -18,9 +16,9 @@ describe Flapjack::Diner do
     WebMock.reset!
   end
 
-  context 'argument parsing' do
+  # context 'argument parsing' do
 
-  end
+  # end
 
   context 'keys as strings' do
 
@@ -41,8 +39,8 @@ describe Flapjack::Diner do
       expect(result).not_to be_nil
       expect(result).to be_an_instance_of(Array)
       expect(result.length).to be(1)
-      expect(result[0]).to be_an_instance_of(Hash)
-      expect(result[0]).to have_key('id')
+      expect(result.first).to be_an_instance_of(Hash)
+      expect(result.first).to have_key('id')
     end
 
   end
@@ -60,9 +58,7 @@ describe Flapjack::Diner do
       req = stub_request(:get, "http://#{server}/contacts").
         to_return(:body => response)
 
-      expect(logger).to receive(:info).with("GET http://#{server}/contacts")
-      expect(logger).to receive(:info).with("  Response Code: 200")
-      expect(logger).to receive(:info).with("  Response Body: #{response}")
+      expect(logger).to receive(:info).with(%r{\[Flapjack::Diner\] \[[^\]]+\] 200 "GET /contacts" - $})
 
       result = Flapjack::Diner.contacts
       expect(req).to have_been_requested
@@ -82,10 +78,8 @@ describe Flapjack::Diner do
       response = {:data => resp_data}.to_json
       req = stub_request(:post, "http://#{server}/test_notifications").
               to_return(:status => 201, :body => response)
-      expect(logger).to receive(:info).with("POST http://#{server}/test_notifications\n" +
-        "  Body: {:data=>#{req_data.inspect}}")
-      expect(logger).to receive(:info).with("  Response Code: 201")
-      expect(logger).to receive(:info).with("  Response Body: #{response}")
+
+      expect(logger).to receive(:info).with(%r{\[Flapjack::Diner\] \[[^\]]+\] 201 "POST /test_notifications" - $})
 
       result = Flapjack::Diner.create_test_notifications(test_notification_data.merge(:check => check_data[:id]))
       expect(req).to have_been_requested
@@ -96,8 +90,8 @@ describe Flapjack::Diner do
       req = stub_request(:delete, "http://#{server}/scheduled_maintenances/#{scheduled_maintenance_data[:id]}").
         to_return(:status => 204)
 
-      expect(logger).to receive(:info).with("DELETE http://#{server}/scheduled_maintenances/#{scheduled_maintenance_data[:id]}")
-      expect(logger).to receive(:info).with("  Response Code: 204")
+      expect(logger).to receive(:info).
+        with(%r{\[Flapjack::Diner\] \[[^\]]+\] 204 "DELETE /scheduled_maintenances/#{scheduled_maintenance_data[:id]}" - $})
 
       result = Flapjack::Diner.delete_scheduled_maintenances(scheduled_maintenance_data[:id])
       expect(req).to have_been_requested
@@ -107,7 +101,6 @@ describe Flapjack::Diner do
   end
 
   context "problems" do
-
     it "raises an exception on network failure" do
       req = stub_request(:get, "http://#{server}/contacts").to_timeout
 
@@ -145,7 +138,5 @@ describe Flapjack::Diner do
       }.to raise_error(ArgumentError)
       expect(req).not_to have_been_requested
     end
-
   end
-
 end

data/spec/{resources/relationships_spec.rb → relationships_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources::Relationships, :pact => true do
+describe Flapjack::Diner::Relationships, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')
@@ -13,11 +13,11 @@ describe Flapjack::Diner::Resources::Relationships, :pact => true do
       upon_receiving("a POST request adding a tag to a check").
       with(:method => :post, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:name], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:id], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
-    result = Flapjack::Diner.create_check_link_tags(check_data[:id], tag_data[:name])
+    result = Flapjack::Diner.create_check_link_tags(check_data[:id], tag_data[:id])
     expect(result).to be true
   end
 
@@ -26,13 +26,13 @@ describe Flapjack::Diner::Resources::Relationships, :pact => true do
       upon_receiving("a POST request adding two tags to a check").
       with(:method => :post, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:name], :type => 'tag'},
-                               {:id => tag_2_data[:name], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:id], :type => 'tag'},
+                               {:id => tag_2_data[:id], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
     result = Flapjack::Diner.create_check_link_tags(check_data[:id],
-      tag_data[:name], tag_2_data[:name])
+      tag_data[:id], tag_2_data[:id])
     expect(result).to be true
   end
 
@@ -43,15 +43,15 @@ describe Flapjack::Diner::Resources::Relationships, :pact => true do
       will_respond_with(
         :status => 200,
         :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
-        :body => {:data => [{:id => tag_data[:name], :type => 'tag'}]})
+        :body => {:data => [{:id => tag_data[:id], :type => 'tag'}]})
 
     result = Flapjack::Diner.check_link_tags(check_data[:id])
-    expect(result).to eq([{:id => tag_data[:name], :type => 'tag'}])
+    expect(result).to eq([{:id => tag_data[:id], :type => 'tag'}])
   end
 
   it 'gets tags for a check with full tag records' do
     included_data = [
-      tag_json(tag_data).merge(:relationships => tag_rel(tag_data))
+      tag_json(tag_data)
     ]
 
     flapjack.given("a check with a tag exists").
@@ -62,35 +62,37 @@ describe Flapjack::Diner::Resources::Relationships, :pact => true do
       will_respond_with(
         :status => 200,
         :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
-        :body => {:data => [{:id => tag_data[:name], :type => 'tag'}],
+        :body => {:data => [{:id => tag_data[:id], :type => 'tag'}],
                   :included => included_data})
 
     result = Flapjack::Diner.check_link_tags(check_data[:id], :include => 'tags')
-    expect(result).to eq([{:id => tag_data[:name], :type => 'tag'}])
-    expect(Flapjack::Diner.context[:included]).to eq([resultify(included_data[0])])
+    expect(result).to eq([{:id => tag_data[:id], :type => 'tag'}])
+    expect(Flapjack::Diner.context[:included]).to eq('tag' => {tag_data[:id] => resultify(included_data[0])})
   end
 
   it 'gets tags for a check with full tag and rule record' do
     included_data = [
-      tag_json(tag_data).merge(:relationships => tag_rel(tag_data)),
-      acceptor_json(acceptor_data).merge(:relationships => acceptor_rel(acceptor_data))
+      tag_json(tag_data),
+      rule_json(rule_data)
     ]
 
-    flapjack.given("a check with a tag and an acceptor exists").
-      upon_receiving("a GET request for all tags on a check, with full tag and acceptor records").
+    flapjack.given("a check with a tag and a rule exists").
+      upon_receiving("a GET request for all tags on a check, with full tag and rule records").
       with(:method => :get,
            :path => "/checks/#{check_data[:id]}/tags",
-           :query => 'include=tags.acceptors').
+           :query => 'include=tags.rules').
       will_respond_with(
         :status => 200,
         :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
-        :body => {:data => [{:id => tag_data[:name], :type => 'tag'}],
+        :body => {:data => [{:id => tag_data[:id], :type => 'tag'}],
                   :included => included_data})
 
-    result = Flapjack::Diner.check_link_tags(check_data[:id], :include => 'acceptors')
-    expect(result).to eq([{:id => tag_data[:name], :type => 'tag'}])
-    expect(Flapjack::Diner.context[:included]).to eq([resultify(included_data[0]),
-      resultify(included_data[1])])
+    result = Flapjack::Diner.check_link_tags(check_data[:id], :include => 'rules')
+    expect(result).to eq([{:id => tag_data[:id], :type => 'tag'}])
+    expect(Flapjack::Diner.context[:included]).to eq(
+      'tag'  => {tag_data[:id] => resultify(included_data[0])},
+      'rule' => {rule_data[:id] => resultify(included_data[1])}
+    )
   end
 
   it 'updates tags for a check' do
@@ -98,12 +100,12 @@ describe Flapjack::Diner::Resources::Relationships, :pact => true do
       upon_receiving("a PATCH request updating tags for a check").
       with(:method => :patch, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:name], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:id], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
     result = Flapjack::Diner.update_check_link_tags(check_data[:id],
-      tag_data[:name])
+      tag_data[:id])
     expect(result).to be true
   end
 
@@ -125,12 +127,12 @@ describe Flapjack::Diner::Resources::Relationships, :pact => true do
       upon_receiving("a DELETE request deleting a tag from a check").
       with(:method => :delete, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:name], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:id], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
     result = Flapjack::Diner.delete_check_link_tags(check_data[:id],
-      tag_data[:name])
+      tag_data[:id])
     expect(result).to be true
   end
 
@@ -139,13 +141,13 @@ describe Flapjack::Diner::Resources::Relationships, :pact => true do
       upon_receiving("a DELETE request deleting two tags from a check").
       with(:method => :delete, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:name], :type => 'tag'},
-                               {:id => tag_2_data[:name], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:id], :type => 'tag'},
+                               {:id => tag_2_data[:id], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
     result = Flapjack::Diner.delete_check_link_tags(check_data[:id],
-      tag_data[:name], tag_2_data[:name])
+      tag_data[:id], tag_2_data[:id])
     expect(result).to be true
   end
 
@@ -162,4 +164,48 @@ describe Flapjack::Diner::Resources::Relationships, :pact => true do
     expect(result).to eq(:id => contact_data[:id], :type => 'contact')
   end
 
+  it "doesn't duplicate linked data references in included data" do
+    resp_check = check_json(check_data)
+    resp_check[:relationships] = {
+      :current_state => {
+        :data => {:type => 'state', :id => state_data[:id]}
+      },
+      :latest_notifications => {
+        :data => [{:type => 'state', :id => state_data[:id]}]
+      }
+    }
+
+    sd = state_data.delete_if {|k, _| [:created_at, :updated_at].include?(k)}
+
+    included_data = [
+      resp_check,
+      state_json(sd)
+    ]
+
+    flapjack.given("a check with a tag, current state and a latest notification exists").
+      upon_receiving("a GET request for a check (via tag)'s state and notifications").
+      with(:method => :get,
+           :path => "/tags/#{tag_data[:id]}/checks",
+           :query => 'include=checks.current_state%2Cchecks.latest_notifications').
+      will_respond_with(
+        :status => 200,
+        :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
+        :body => {
+          :data => [
+            {:id => check_data[:id], :type => 'check'},
+          ],
+          :included => included_data
+        })
+
+    result = Flapjack::Diner.tag_link_checks(tag_data[:id],
+      :include => ['checks.current_state', 'checks.latest_notifications'])
+    expect(result).to eq([
+      {:id => check_data[:id], :type => 'check'}
+    ])
+    expect(Flapjack::Diner.context[:included]).to eq(
+      'check' => {check_data[:id] => resultify(resp_check)},
+      'state' => {sd[:id] => resultify(state_json(sd))}
+    )
+  end
+
 end

data/spec/resources/checks_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources::Checks, :pact => true do
+describe Flapjack::Diner::Resources, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')
@@ -55,7 +55,7 @@ describe Flapjack::Diner::Resources::Checks, :pact => true do
       req_data  = check_json(check_data).merge(
         :relationships => {
           :tags => {
-            :data => [{:type => 'tag', :id => tag_data[:name]}]
+            :data => [{:type => 'tag', :id => tag_data[:id]}]
           }
         }
       )
@@ -71,7 +71,7 @@ describe Flapjack::Diner::Resources::Checks, :pact => true do
           :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
           :body => {:data => resp_data})
 
-      result = Flapjack::Diner.create_checks(check_data.merge(:tags => [tag_data[:name]]))
+      result = Flapjack::Diner.create_checks(check_data.merge(:tags => [tag_data[:id]]))
       expect(result).to eq(resultify(resp_data))
     end
 
@@ -218,7 +218,7 @@ describe Flapjack::Diner::Resources::Checks, :pact => true do
 
         result = Flapjack::Diner.checks(check_data[:id])
         expect(result).to be_nil
-        expect(Flapjack::Diner.last_error).to eq([{:status => '404',
+        expect(Flapjack::Diner.error).to eq([{:status => '404',
           :detail => "could not find Check record, id: '#{check_data[:id]}'"}])
       end
     end
@@ -277,7 +277,7 @@ describe Flapjack::Diner::Resources::Checks, :pact => true do
 
       result = Flapjack::Diner.update_checks(:id => check_data[:id], :enabled => false)
       expect(result).to be_nil
-      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
+      expect(Flapjack::Diner.error).to eq([{:status => '404',
         :detail => "could not find Check record, id: '#{check_data[:id]}'"}])
     end
 
@@ -287,7 +287,7 @@ describe Flapjack::Diner::Resources::Checks, :pact => true do
         :type => 'check',
         :relationships => {
           :tags => {
-            :data => [{:type => 'tag', :id => tag_data[:name]}]
+            :data => [{:type => 'tag', :id => tag_data[:id]}]
           }
         }
       }
@@ -302,7 +302,7 @@ describe Flapjack::Diner::Resources::Checks, :pact => true do
           :status => 204,
           :body => '' )
 
-      result = Flapjack::Diner.update_checks(:id => check_data[:id], :tags => [tag_data[:name]])
+      result = Flapjack::Diner.update_checks(:id => check_data[:id], :tags => [tag_data[:id]])
       expect(result).to be_a(TrueClass)
     end
 

data/spec/resources/contacts_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources::Contacts, :pact => true do
+describe Flapjack::Diner::Resources, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')
@@ -70,7 +70,7 @@ describe Flapjack::Diner::Resources::Contacts, :pact => true do
 
       result = Flapjack::Diner.create_contacts(contact_data)
       expect(result).to be_nil
-      expect(Flapjack::Diner.last_error).to eq([{:status => '409',
+      expect(Flapjack::Diner.error).to eq([{:status => '409',
         :detail => "Contacts already exist with the following ids: #{contact_data[:id]}"}])
     end
 
@@ -146,7 +146,7 @@ describe Flapjack::Diner::Resources::Contacts, :pact => true do
 
         result = Flapjack::Diner.contacts(contact_data[:id])
         expect(result).to be_nil
-        expect(Flapjack::Diner.last_error).to eq([{:status => '404',
+        expect(Flapjack::Diner.error).to eq([{:status => '404',
           :detail => "could not find Contact record, id: '#{contact_data[:id]}'"}])
       end
 
@@ -159,7 +159,7 @@ describe Flapjack::Diner::Resources::Contacts, :pact => true do
         resp_data[:relationships][:media][:data] = [
           {:type => 'medium', :id => email_data[:id]}
         ]
-        resp_included = [medium_json(email_data).merge(:relationships => medium_rel(email_data))]
+        resp_included = [medium_json(email_data)]
 
         flapjack.given("a contact with one medium exists").
           upon_receiving("a GET request for a single contact with media").
@@ -173,39 +173,41 @@ describe Flapjack::Diner::Resources::Contacts, :pact => true do
         result = Flapjack::Diner.contacts(contact_data[:id], :include => 'media')
         expect(result).not_to be_nil
         expect(result).to eq(resultify(resp_data))
-        expect(Flapjack::Diner.context).to eq(:included => resultify(resp_included))
+        expect(Flapjack::Diner.context).to eq(:included => {'medium' => {email_data[:id] => resultify(resp_included.first)}})
       end
 
-      it 'returns a contact with media and acceptors' do
+      it 'returns a contact with media and rules' do
         resp_data = contact_json(contact_data).merge(:relationships => contact_rel(contact_data))
         resp_data[:relationships][:media][:data] = [
           {:type => 'medium', :id => email_data[:id]}
         ]
-        resp_data[:relationships][:acceptors][:data] = [
-          {:type => 'acceptor', :id => acceptor_data[:id]}
+        resp_data[:relationships][:rules][:data] = [
+          {:type => 'rule', :id => rule_data[:id]}
         ]
         resp_included = [
-          medium_json(email_data).merge(:relationships => medium_rel(email_data)),
-          acceptor_json(acceptor_data).merge(:relationships => acceptor_rel(acceptor_data))
+          medium_json(email_data),
+          rule_json(rule_data)
         ]
 
-        flapjack.given("a contact with one medium and one acceptor exists").
-          upon_receiving("a GET request for a single contact with media and acceptors").
+        flapjack.given("a contact with one medium and one rule exists").
+          upon_receiving("a GET request for a single contact with media and rules").
           with(:method => :get, :path => "/contacts/#{contact_data[:id]}",
-            :query => 'include=media%2Cacceptors').
+            :query => 'include=media%2Crules').
           will_respond_with(
             :status => 200,
             :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
             :body => {:data => resp_data, :included => resp_included})
 
-        result = Flapjack::Diner.contacts(contact_data[:id], :include => ['media', 'acceptors'])
+        result = Flapjack::Diner.contacts(contact_data[:id], :include => ['media', 'rules'])
         expect(result).not_to be_nil
         expect(result).to eq(resultify(resp_data))
-        expect(Flapjack::Diner.context).to eq(:included => [resultify(resp_included[0]), resultify(resp_included[1])])
-      end
+        expect(Flapjack::Diner.context).to eq(:included => {
+          'medium' => {email_data[:id] => resultify(resp_included[0])},
+          'rule'  => {rule_data[:id] => resultify(resp_included[1])}
+        })
 
+      end
     end
-
   end
 
   context 'update' do
@@ -261,7 +263,7 @@ describe Flapjack::Diner::Resources::Contacts, :pact => true do
 
       result = Flapjack::Diner.update_contacts(:id => contact_data[:id], :name => 'Hello There')
       expect(result).to be_nil
-      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
+      expect(Flapjack::Diner.error).to eq([{:status => '404',
         :detail => "could not find Contact record, id: '#{contact_data[:id]}'"}])
     end
   end
@@ -315,7 +317,7 @@ describe Flapjack::Diner::Resources::Contacts, :pact => true do
 
       result = Flapjack::Diner.delete_contacts(contact_data[:id])
       expect(result).to be_nil
-      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
+      expect(Flapjack::Diner.error).to eq([{:status => '404',
         :detail => "could not find Contact record, id: '#{contact_data[:id]}'"}])
     end
   end