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

data/spec/resources/contacts_spec.rb

@@ -176,29 +176,29 @@ describe Flapjack::Diner::Resources::Contacts, :pact => true do
         expect(Flapjack::Diner.context).to eq(:included => resultify(resp_included))
       end
 
-      it 'returns a contact with media and rules' do
+      it 'returns a contact with media and acceptors' 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][:rules][:data] = [
-          {:type => 'rule', :id => rule_data[:id]}
+        resp_data[:relationships][:acceptors][:data] = [
+          {:type => 'acceptor', :id => acceptor_data[:id]}
         ]
         resp_included = [
           medium_json(email_data).merge(:relationships => medium_rel(email_data)),
-          rule_json(rule_data).merge(:relationships => rule_rel(rule_data))
+          acceptor_json(acceptor_data).merge(:relationships => acceptor_rel(acceptor_data))
         ]
 
-        flapjack.given("a contact with one medium and one rule exists").
-          upon_receiving("a GET request for a single contact with media and rules").
+        flapjack.given("a contact with one medium and one acceptor exists").
+          upon_receiving("a GET request for a single contact with media and acceptors").
           with(:method => :get, :path => "/contacts/#{contact_data[:id]}",
-            :query => 'include=media%2Crules').
+            :query => 'include=media%2Cacceptors').
           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', 'rules'])
+        result = Flapjack::Diner.contacts(contact_data[:id], :include => ['media', 'acceptors'])
         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])])

data/spec/resources/rejectors_spec.rb

@@ -0,0 +1,278 @@
+require 'spec_helper'
+require 'flapjack-diner'
+
+describe Flapjack::Diner::Resources::Rejectors, :pact => true do
+
+  before(:each) do
+    Flapjack::Diner.base_uri('localhost:19081')
+    Flapjack::Diner.logger = nil
+  end
+
+  context 'create' do
+
+    it "submits a POST request for a rejector" do
+      req_data  = rejector_json(rejector_data).merge(
+        :relationships => {
+          :contact => {
+            :data => {
+              :type => 'contact',
+              :id => contact_data[:id]
+            }
+          }
+        }
+      )
+      resp_data = rejector_json(rejector_data).merge(:relationships => rejector_rel(rejector_data))
+
+      flapjack.given("a contact exists").
+        upon_receiving("a POST request with one rejector").
+        with(:method => :post, :path => '/rejectors',
+             :headers => {'Content-Type' => 'application/vnd.api+json'},
+             :body => {:data => req_data}).
+        will_respond_with(
+          :status => 201,
+          :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
+         :body => {:data => resp_data}
+        )
+
+      result = Flapjack::Diner.create_rejectors(rejector_data.merge(:contact => contact_data[:id]))
+      expect(result).not_to be_nil
+      expect(result).to eq(resultify(resp_data))
+    end
+
+    it "submits a POST request for several rejectors" do
+      req_data = [rejector_json(rejector_data).merge(
+        :relationships => {
+          :contact => {
+            :data => {
+              :type => 'contact',
+              :id => contact_data[:id]
+            }
+          }
+        }
+      ), rejector_json(rejector_2_data).merge(
+        :relationships => {
+          :contact => {
+            :data => {
+              :type => 'contact',
+              :id => contact_data[:id]
+            }
+          }
+        }
+      )]
+      resp_data = [
+        rejector_json(rejector_data).merge(:relationships => rejector_rel(rejector_data)),
+        rejector_json(rejector_2_data).merge(:relationships => rejector_rel(rejector_2_data))
+      ]
+
+      flapjack.given("a contact exists").
+        upon_receiving("a POST request with two rejectors").
+        with(:method => :post, :path => '/rejectors',
+             :headers => {'Content-Type' => 'application/vnd.api+json; ext=bulk'},
+             :body => {:data => req_data}).
+        will_respond_with(
+          :status => 201,
+          :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
+          :body => {:data => resp_data}
+        )
+
+      result = Flapjack::Diner.create_rejectors(rejector_data.merge(:contact => contact_data[:id]),
+                                            rejector_2_data.merge(:contact => contact_data[:id]))
+      expect(result).not_to be_nil
+      expect(result).to eq(resultify(resp_data))
+    end
+
+    # TODO error due to invalid data
+
+  end
+
+  context 'read' do
+
+    it "submits a GET request for all rejectors" do
+      resp_data = [rejector_json(rejector_data).merge(:relationships => rejector_rel(rejector_data))]
+
+      flapjack.given("a rejector exists").
+        upon_receiving("a GET request for all rejectors").
+        with(:method => :get, :path => '/rejectors').
+        will_respond_with(
+          :status => 200,
+          :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
+            :body => {:data => resp_data} )
+
+      result = Flapjack::Diner.rejectors
+      expect(result).not_to be_nil
+      expect(result).to eq(resultify(resp_data))
+    end
+
+    it "submits a GET request for one rejector" do
+      resp_data = rejector_json(rejector_data).merge(:relationships => rejector_rel(rejector_data))
+
+      flapjack.given("a rejector exists").
+        upon_receiving("a GET request for a single rejector").
+        with(:method => :get, :path => "/rejectors/#{rejector_data[:id]}").
+        will_respond_with(
+          :status => 200,
+          :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
+            :body => {:data => resp_data}
+        )
+
+      result = Flapjack::Diner.rejectors(rejector_data[:id])
+      expect(result).not_to be_nil
+      expect(result).to eq(resultify(resp_data))
+    end
+
+    it "submits a GET request for several rejectors" do
+      resp_data = [
+        rejector_json(rejector_data).merge(:relationships => rejector_rel(rejector_data)),
+        rejector_json(rejector_2_data).merge(:relationships => rejector_rel(rejector_2_data))
+      ]
+
+      rejectors_data = [rejector_data.merge(:type => 'rejector'), rejector_2_data.merge(:type => 'rejector')]
+
+      flapjack.given("two rejectors exist").
+        upon_receiving("a GET request for two rejectors").
+        with(:method => :get, :path => "/rejectors",
+             :query => "filter%5B%5D=id%3A#{rejector_data[:id]}%7C#{rejector_2_data[:id]}").
+        will_respond_with(
+          :status => 200,
+          :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
+            :body => {:data => resp_data} )
+
+      result = Flapjack::Diner.rejectors(rejector_data[:id], rejector_2_data[:id])
+      expect(result).not_to be_nil
+      expect(result).to eq(resultify(resp_data))
+    end
+
+    it "can't find the rejector to read" do
+      flapjack.given("no data exists").
+        upon_receiving("a GET request for a single rejector").
+        with(:method => :get, :path => "/rejectors/#{rejector_data[:id]}").
+        will_respond_with(
+          :status => 404,
+          :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
+          :body => {:errors => [{
+              :status => '404',
+              :detail => "could not find Rejector record, id: '#{rejector_data[:id]}'"
+            }]}
+          )
+
+      result = Flapjack::Diner.rejectors(rejector_data[:id])
+      expect(result).to be_nil
+      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
+        :detail => "could not find Rejector record, id: '#{rejector_data[:id]}'"}])
+    end
+
+  end
+
+  # # Not immediately relevant, no data fields to update until time_restrictions are fixed
+  # context 'update' do
+  #   it 'submits a PUT request for a rejector' do
+  #     flapjack.given("a rejector exists").
+  #       upon_receiving("a PUT request for a single rejector").
+  #       with(:method => :put,
+  #            :path => "/rejectors/#{rejector_data[:id]}",
+  #            :body => {:rejectors => {:id => rejector_data[:id], :time_restrictions => []}},
+  #            :headers => {'Content-Type' => 'application/vnd.api+json'}).
+  #       will_respond_with(
+  #         :status => 204,
+  #         :body => '' )
+
+  #     result = Flapjack::Diner.update_rejectors(:id => rejector_data[:id], :time_restrictions => [])
+  #     expect(result).to be_a(TrueClass)
+  #   end
+
+  #   it 'submits a PUT request for several rejectors' do
+  #     flapjack.given("two rejectors exist").
+  #       upon_receiving("a PUT request for two rejectors").
+  #       with(:method => :put,
+  #            :path => "/rejectors/#{rejector_data[:id]},#{rejector_2_data[:id]}",
+  #            :body => {:rejectors => [{:id => rejector_data[:id], :time_restrictions => []},
+  #            {:id => rejector_2_data[:id], :enabled => true}]},
+  #            :headers => {'Content-Type' => 'application/vnd.api+json'}).
+  #       will_respond_with(
+  #         :status => 204,
+  #         :body => '' )
+
+  #     result = Flapjack::Diner.update_rejectors(
+  #       {:id => rejector_data[:id], :time_restrictions => []},
+  #       {:id => rejector_2_data[:id], :enabled => true})
+  #     expect(result).to be_a(TrueClass)
+  #   end
+
+  #   it "can't find the rejector to update" do
+  #     flapjack.given("no data exists").
+  #       upon_receiving("a PUT request for a single rejector").
+  #       with(:method => :put,
+  #            :path => "/rejectors/#{rejector_data[:id]}",
+  #            :body => {:rejectors => {:id => rejector_data[:id], :time_restrictions => []}},
+  #            :headers => {'Content-Type' => 'application/vnd.api+json'}).
+  #       will_respond_with(
+  #         :status => 404,
+  #         :headers => {'Content-Type' => 'application/vnd.api+json; charset=utf-8'},
+  #         :body => {:errors => [{
+  #             :status => '404',
+  #             :detail => "could not find Rejector records, ids: '#{rejector_data[:id]}'"
+  #           }]}
+  #         )
+
+  #     result = Flapjack::Diner.update_rejectors(:id => rejector_data[:id], :time_restrictions => [])
+  #     expect(result).to be_nil
+  #     expect(Flapjack::Diner.last_error).to eq([{:status => '404',
+  #       :detail => "could not find Rejector records, ids: '#{rejector_data[:id]}'"}])
+  #   end
+  # end
+
+  context 'delete' do
+
+    it "submits a DELETE request for a rejector" do
+      flapjack.given("a rejector exists").
+        upon_receiving("a DELETE request for a single rejector").
+        with(:method => :delete,
+             :path => "/rejectors/#{rejector_data[:id]}",
+             :body => nil).
+        will_respond_with(:status => 204,
+                          :body => '')
+
+      result = Flapjack::Diner.delete_rejectors(rejector_data[:id])
+      expect(result).to be_a(TrueClass)
+    end
+
+    it "submits a DELETE request for several rejectors" do
+      rejectors_data = [{:type => 'rejector', :id => rejector_data[:id]},
+                    {:type => 'rejector', :id => rejector_2_data[:id]}]
+
+      flapjack.given("two rejectors exist").
+        upon_receiving("a DELETE request for two rejectors").
+        with(:method => :delete,
+             :headers => {'Content-Type' => 'application/vnd.api+json; ext=bulk'},
+             :path => "/rejectors",
+             :body => {:data => rejectors_data}).
+        will_respond_with(:status => 204,
+                          :body => '')
+
+      result = Flapjack::Diner.delete_rejectors(rejector_data[:id], rejector_2_data[:id])
+      expect(result).to be_a(TrueClass)
+    end
+
+    it "can't find the rejector to delete" do
+      flapjack.given("no data exists").
+        upon_receiving("a DELETE request for a single rejector").
+        with(:method => :delete,
+             :path => "/rejectors/#{rejector_data[:id]}",
+             :body => nil).
+        will_respond_with(
+          :status => 404,
+          :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
+          :body => {:errors => [{
+              :status => '404',
+              :detail => "could not find Rejector record, id: '#{rejector_data[:id]}'"
+            }]}
+          )
+
+      result = Flapjack::Diner.delete_rejectors(rejector_data[:id])
+      expect(result).to be_nil
+      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
+        :detail => "could not find Rejector record, id: '#{rejector_data[:id]}'"}])
+    end
+  end
+
+end

data/spec/resources/relationships_spec.rb

@@ -73,21 +73,21 @@ describe Flapjack::Diner::Resources::Relationships, :pact => true do
   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)),
-      rule_json(rule_data).merge(:relationships => rule_rel(rule_data))
+      acceptor_json(acceptor_data).merge(:relationships => acceptor_rel(acceptor_data))
     ]
 
-    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").
+    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").
       with(:method => :get,
            :path => "/checks/#{check_data[:id]}/tags",
-           :query => 'include=tags.rules').
+           :query => 'include=tags.acceptors').
       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'}],
                   :included => included_data})
 
-    result = Flapjack::Diner.check_link_tags(check_data[:id], :include => 'rules')
+    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])])

data/spec/support/fixture_data.rb

@@ -74,62 +74,62 @@ module FixtureData
     {
       :alerting_media => {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/alerting_media",
-          :related => "http://example.org/checks/#{id}/alerting_media"
+          :self => "http://#{api_host}/checks/#{id}/relationships/alerting_media",
+          :related => "http://#{api_host}/checks/#{id}/alerting_media"
         }
       },
       :contacts => {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/contacts",
-          :related => "http://example.org/checks/#{id}/contacts"
+          :self => "http://#{api_host}/checks/#{id}/relationships/contacts",
+          :related => "http://#{api_host}/checks/#{id}/contacts"
         }
        },
       :current_scheduled_maintenances =>  {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/current_scheduled_maintenances",
-          :related => "http://example.org/checks/#{id}/current_scheduled_maintenances"
+          :self => "http://#{api_host}/checks/#{id}/relationships/current_scheduled_maintenances",
+          :related => "http://#{api_host}/checks/#{id}/current_scheduled_maintenances"
         }
       },
       :current_state => {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/current_state",
-          :related => "http://example.org/checks/#{id}/current_state"
+          :self => "http://#{api_host}/checks/#{id}/relationships/current_state",
+          :related => "http://#{api_host}/checks/#{id}/current_state"
         }
       },
       :current_unscheduled_maintenance => {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/current_unscheduled_maintenance",
-          :related => "http://example.org/checks/#{id}/current_unscheduled_maintenance"
+          :self => "http://#{api_host}/checks/#{id}/relationships/current_unscheduled_maintenance",
+          :related => "http://#{api_host}/checks/#{id}/current_unscheduled_maintenance"
         }
       },
       :latest_notifications => {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/latest_notifications",
-          :related => "http://example.org/checks/#{id}/latest_notifications"
+          :self => "http://#{api_host}/checks/#{id}/relationships/latest_notifications",
+          :related => "http://#{api_host}/checks/#{id}/latest_notifications"
         }
       },
       :scheduled_maintenances => {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/scheduled_maintenances",
-          :related => "http://example.org/checks/#{id}/scheduled_maintenances"
+          :self => "http://#{api_host}/checks/#{id}/relationships/scheduled_maintenances",
+          :related => "http://#{api_host}/checks/#{id}/scheduled_maintenances"
         }
       },
       :states => {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/states",
-          :related => "http://example.org/checks/#{id}/states"
+          :self => "http://#{api_host}/checks/#{id}/relationships/states",
+          :related => "http://#{api_host}/checks/#{id}/states"
         }
       },
       :tags => {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/tags",
-          :related => "http://example.org/checks/#{id}/tags"
+          :self => "http://#{api_host}/checks/#{id}/relationships/tags",
+          :related => "http://#{api_host}/checks/#{id}/tags"
         }
       },
       :unscheduled_maintenances => {
         :links => {
-          :self => "http://example.org/checks/#{id}/relationships/unscheduled_maintenances",
-          :related => "http://example.org/checks/#{id}/unscheduled_maintenances"
+          :self => "http://#{api_host}/checks/#{id}/relationships/unscheduled_maintenances",
+          :related => "http://#{api_host}/checks/#{id}/unscheduled_maintenances"
         }
       }
     }
@@ -162,10 +162,10 @@ module FixtureData
   def contact_rel(co_data)
     id = co_data[:id]
     {
-      :blackholes => {
+      :acceptors => {
         :links => {
-          :self => "http://#{api_host}/contacts/#{id}/relationships/blackholes",
-          :related => "http://#{api_host}/contacts/#{id}/blackholes"
+          :self => "http://#{api_host}/contacts/#{id}/relationships/acceptors",
+          :related => "http://#{api_host}/contacts/#{id}/acceptors"
         }
       },
       :checks => {
@@ -180,10 +180,10 @@ module FixtureData
           :related => "http://#{api_host}/contacts/#{id}/media"
         }
       },
-      :rules => {
+      :rejectors => {
         :links => {
-          :self => "http://#{api_host}/contacts/#{id}/relationships/rules",
-          :related => "http://#{api_host}/contacts/#{id}/rules"
+          :self => "http://#{api_host}/contacts/#{id}/relationships/rejectors",
+          :related => "http://#{api_host}/contacts/#{id}/rejectors"
         }
       }
     }
@@ -238,8 +238,8 @@ module FixtureData
     {
       :check => {
         :links => {
-          :self => "http://example.org/#{type}_maintenances/#{id}/relationships/check",
-          :related => "http://example.org/#{type}_maintenances/#{id}/check"
+          :self => "http://#{api_host}/#{type}_maintenances/#{id}/relationships/check",
+          :related => "http://#{api_host}/#{type}_maintenances/#{id}/check"
         }
       }
     }
@@ -283,6 +283,12 @@ module FixtureData
   def medium_rel(me_data)
     id = me_data[:id]
     {
+      :acceptors => {
+        :links => {
+          :self => "http://#{api_host}/media/#{id}/relationships/acceptors",
+          :related => "http://#{api_host}/media/#{id}/acceptors"
+        }
+      },
       :alerting_checks => {
         :links => {
           :self => "http://#{api_host}/media/#{id}/relationships/alerting_checks",
@@ -295,102 +301,102 @@ module FixtureData
           :related => "http://#{api_host}/media/#{id}/contact"
         }
       },
-      :rules => {
+      :rejectors => {
         :links => {
-          :self => "http://#{api_host}/media/#{id}/relationships/rules",
-          :related => "http://#{api_host}/media/#{id}/rules"
+          :self => "http://#{api_host}/media/#{id}/relationships/rejectors",
+          :related => "http://#{api_host}/media/#{id}/rejectors"
         }
       }
     }
   end
 
-  def rule_data
-    @rule_data ||= {
+  def acceptor_data
+    @acceptor_data ||= {
       :id          => '05983623-fcef-42da-af44-ed6990b500fa',
       :conditions_list => 'critical'
     }
   end
 
-  def rule_2_data
-    @rule_2_data ||= {
+  def acceptor_2_data
+    @acceptor_2_data ||= {
       :id          => '20f182fc-6e32-4794-9007-97366d162c51',
       :conditions_list => 'warning'
     }
   end
 
-  def rule_json(ru_data)
+  def acceptor_json(ac_data)
     {
-      :id => ru_data[:id],
-      :type => 'rule',
-      :attributes => ru_data.reject {|k,v| :id.eql?(k) }
+      :id => ac_data[:id],
+      :type => 'acceptor',
+      :attributes => ac_data.reject {|k,v| :id.eql?(k) }
     }
   end
 
-  def rule_rel(ru_data)
-    id = ru_data[:id]
+  def acceptor_rel(ac_data)
+    id = ac_data[:id]
     {
       :contact => {
         :links => {
-          :self => "http://example.org/rules/#{id}/relationships/contact",
-          :related => "http://example.org/rules/#{id}/contact"
+          :self => "http://#{api_host}/acceptors/#{id}/relationships/contact",
+          :related => "http://#{api_host}/acceptors/#{id}/contact"
         }
       },
       :media => {
         :links => {
-          :self => "http://example.org/rules/#{id}/relationships/media",
-          :related => "http://example.org/rules/#{id}/media"
+          :self => "http://#{api_host}/acceptors/#{id}/relationships/media",
+          :related => "http://#{api_host}/acceptors/#{id}/media"
         }
       },
       :tags => {
         :links => {
-          :self => "http://example.org/rules/#{id}/relationships/tags",
-          :related => "http://example.org/rules/#{id}/tags"
+          :self => "http://#{api_host}/acceptors/#{id}/relationships/tags",
+          :related => "http://#{api_host}/acceptors/#{id}/tags"
         }
       }
     }
   end
 
-  def blackhole_data
-    @blackhole_data ||= {
+  def rejector_data
+    @rejector_data ||= {
       :id          => '05983623-fcef-42da-af44-ed6990b500fa',
       :conditions_list => 'critical'
     }
   end
 
-  def blackhole_2_data
-    @blackhole_2_data ||= {
+  def rejector_2_data
+    @rejector_2_data ||= {
       :id          => '20f182fc-6e32-4794-9007-97366d162c51',
       :conditions_list => 'warning'
     }
   end
 
-  def blackhole_json(bl_data)
+  def rejector_json(re_data)
     {
-      :id => bl_data[:id],
-      :type => 'blackhole',
-      :attributes => bl_data.reject {|k,v| :id.eql?(k) }
+      :id => re_data[:id],
+      :type => 'rejector',
+      :attributes => re_data.reject {|k,v| :id.eql?(k) }
     }
   end
 
-  def blackhole_rel(bl_data)
-    id = bl_data[:id]
+  def rejector_rel(re_data)
+    id = re_data[:id]
     {
       :contact => {
         :links => {
-          :self => "http://example.org/blackholes/#{id}/relationships/contact",
-          :related => "http://example.org/blackholes/#{id}/contact"
+          :self => "http://#{api_host}/rejectors/#{id}/relationships/contact",
+          :related => "http://#{api_host}/rejectors/#{id}/contact"
         }
       },
       :media => {
         :links => {
-          :self => "http://example.org/blackholes/#{id}/relationships/media",
-          :related => "http://example.org/blackholes/#{id}/media"
+          :self => "http://#{api_host}/rejectors/#{id}/relationships/media",
+          :related => "http://#{api_host}/rejectors/#{id}/media"
         }
       },
       :tags => {
         :links => {
-          :self => "http://example.org/blackholes/#{id}/relationships/tags",
-          :related => "http://example.org/blackholes/#{id}/tags"
+          :self => "http://#{api_host}/rejectors/#{id}/relationships/tags",
+          :related => "http://#{api_host}/rejectors/#{id}/tags"
         }
       }
     }
@@ -428,8 +434,8 @@ module FixtureData
     {
       :check => {
         :links => {
-          :self => "http://example.org/states/#{id}/relationships/check",
-          :related => "http://example.org/states/#{id}/check"
+          :self => "http://#{api_host}/states/#{id}/relationships/check",
+          :related => "http://#{api_host}/states/#{id}/check"
         }
       }
     }
@@ -458,10 +464,10 @@ module FixtureData
   def tag_rel(ta_data)
     id = ta_data[:name]
     {
-      :blackholes => {
+      :acceptors => {
         :links => {
-          :self => "http://#{api_host}/tags/#{id}/relationships/blackholes",
-          :related => "http://#{api_host}/tags/#{id}/blackholes"
+          :self => "http://#{api_host}/tags/#{id}/relationships/acceptors",
+          :related => "http://#{api_host}/tags/#{id}/acceptors"
         }
       },
       :checks => {
@@ -470,10 +476,28 @@ module FixtureData
           :related => "http://#{api_host}/tags/#{id}/checks"
         }
       },
-      :rules => {
+      :rejectors => {
+        :links => {
+          :self => "http://#{api_host}/tags/#{id}/relationships/rejectors",
+          :related => "http://#{api_host}/tags/#{id}/rejectors"
+        }
+      },
+      :scheduled_maintenances => {
+        :links => {
+          :self => "http://#{api_host}/tags/#{id}/relationships/scheduled_maintenances",
+          :related => "http://#{api_host}/tags/#{id}/scheduled_maintenances"
+        }
+      },
+      :states => {
+        :links => {
+          :self => "http://#{api_host}/tags/#{id}/relationships/states",
+          :related => "http://#{api_host}/tags/#{id}/states"
+        }
+      },
+      :unscheduled_maintenances => {
         :links => {
-          :self => "http://#{api_host}/tags/#{id}/relationships/rules",
-          :related => "http://#{api_host}/tags/#{id}/rules"
+          :self => "http://#{api_host}/tags/#{id}/relationships/unscheduled_maintenances",
+          :related => "http://#{api_host}/tags/#{id}/unscheduled_maintenances"
         }
       }
     }