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

data/spec/resources/tags_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources::Tags, :pact => true do
+describe Flapjack::Diner::Resources, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')
@@ -95,40 +95,96 @@ describe Flapjack::Diner::Resources::Tags, :pact => true do
 
         flapjack.given("a tag exists").
           upon_receiving("a GET request for tag 'www.example.com:SSH'").
-          with(:method => :get, :path => "/tags/#{tag_data[:name]}").
+          with(:method => :get, :path => "/tags/#{tag_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.tags(tag_data[:name])
+        result = Flapjack::Diner.tags(tag_data[:id])
         expect(result).to eq(resultify(resp_data))
       end
 
       it "can't find tag" do
         flapjack.given("no data exists").
           upon_receiving("a GET request for tag 'www.example.com:SSH'").
-          with(:method => :get, :path => "/tags/#{tag_data[:name]}").
+          with(:method => :get, :path => "/tags/#{tag_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 Tag record, id: '#{tag_data[:name]}'"
+              :detail => "could not find Tag record, id: '#{tag_data[:id]}'"
             }]}
           )
 
-        result = Flapjack::Diner.tags(tag_data[:name])
+        result = Flapjack::Diner.tags(tag_data[:id])
         expect(result).to be_nil
-        expect(Flapjack::Diner.last_error).to eq([{:status => '404',
-          :detail => "could not find Tag record, id: '#{tag_data[:name]}'"}])
+        expect(Flapjack::Diner.error).to eq([{:status => '404',
+          :detail => "could not find Tag record, id: '#{tag_data[:id]}'"}])
       end
 
     end
 
   end
 
-  # no tag updates allowed
+  context 'update' do
+
+    it 'submits a PATCH request for a tag' do
+      flapjack.given("a tag exists").
+        upon_receiving("a PATCH request for a single tag").
+        with(:method => :patch,
+             :path => "/tags/#{tag_data[:id]}",
+             :body => {:data => {:id => tag_data[:id], :type => 'tag', :attributes => {:name => 'database_only'}}},
+             :headers => {'Content-Type' => 'application/vnd.api+json'}).
+        will_respond_with(
+          :status => 204,
+          :body => '' )
+
+      result = Flapjack::Diner.update_tags(:id => tag_data[:id], :name => 'database_only')
+      expect(result).to be_a(TrueClass)
+    end
+
+    it 'submits a PATCH request for several tags' do
+      flapjack.given("two tags exist").
+        upon_receiving("a PATCH request for two tags").
+        with(:method => :patch,
+             :path => "/tags",
+             :headers => {'Content-Type' => 'application/vnd.api+json; ext=bulk'},
+             :body => {:data => [{:id => tag_data[:id], :type => 'tag', :attributes => {:name => 'database_only'}},
+                                 {:id => tag_2_data[:id], :type => 'tag', :attributes => {:name => 'app_only'}}]}).
+        will_respond_with(
+          :status => 204,
+          :body => '' )
+
+      result = Flapjack::Diner.update_tags(
+        {:id => tag_data[:id], :name => 'database_only'},
+        {:id => tag_2_data[:id], :name => 'app_only'})
+      expect(result).to be_a(TrueClass)
+    end
+
+    it "can't find the tag to update" do
+      flapjack.given("no data exists").
+        upon_receiving("a PATCH request for a single tag").
+        with(:method => :patch,
+             :path => "/tags/#{tag_data[:id]}",
+             :body => {:data => {:id => tag_data[:id], :type => 'tag', :attributes => {:name => 'database_only'}}},
+             :headers => {'Content-Type' => 'application/vnd.api+json'}).
+        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 Tag record, id: '#{tag_data[:id]}'"
+            }]}
+          )
+
+      result = Flapjack::Diner.update_tags(:id => tag_data[:id], :name => 'database_only')
+      expect(result).to be_nil
+      expect(Flapjack::Diner.error).to eq([{:status => '404',
+        :detail => "could not find Tag record, id: '#{tag_data[:id]}'"}])
+    end
+  end
 
   context 'delete' do
 
@@ -136,18 +192,18 @@ describe Flapjack::Diner::Resources::Tags, :pact => true do
       flapjack.given("a tag exists").
         upon_receiving("a DELETE request for a single tag").
         with(:method => :delete,
-             :path => "/tags/#{tag_data[:name]}",
+             :path => "/tags/#{tag_data[:id]}",
              :body => nil).
         will_respond_with(:status => 204,
                           :body => '')
 
-      result = Flapjack::Diner.delete_tags(tag_data[:name])
+      result = Flapjack::Diner.delete_tags(tag_data[:id])
       expect(result).to be_a(TrueClass)
     end
 
     it "submits a DELETE request for several tags" do
-      tags_data = [{:type => 'tag', :id => tag_data[:name]},
-                   {:type => 'tag', :id => tag_2_data[:name]}]
+      tags_data = [{:type => 'tag', :id => tag_data[:id]},
+                   {:type => 'tag', :id => tag_2_data[:id]}]
 
       flapjack.given("two tags exist").
         upon_receiving("a DELETE request for two tags").
@@ -158,7 +214,7 @@ describe Flapjack::Diner::Resources::Tags, :pact => true do
         will_respond_with(:status => 204,
                           :body => '')
 
-      result = Flapjack::Diner.delete_tags(tag_data[:name], tag_2_data[:name])
+      result = Flapjack::Diner.delete_tags(tag_data[:id], tag_2_data[:id])
       expect(result).to be_a(TrueClass)
     end
 
@@ -166,21 +222,21 @@ describe Flapjack::Diner::Resources::Tags, :pact => true do
       flapjack.given("no data exists").
         upon_receiving("a DELETE request for a single tag").
         with(:method => :delete,
-             :path => "/tags/#{tag_data[:name]}",
+             :path => "/tags/#{tag_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 Tag record, id: '#{tag_data[:name]}'"
+            :detail => "could not find Tag record, id: '#{tag_data[:id]}'"
           }]}
         )
 
-      result = Flapjack::Diner.delete_tags(tag_data[:name])
+      result = Flapjack::Diner.delete_tags(tag_data[:id])
       expect(result).to be_nil
-      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
-        :detail => "could not find Tag record, id: '#{tag_data[:name]}'"}])
+      expect(Flapjack::Diner.error).to eq([{:status => '404',
+        :detail => "could not find Tag record, id: '#{tag_data[:id]}'"}])
     end
   end
 

data/spec/support/fixture_data.rb

@@ -40,15 +40,14 @@ module FixtureData
     ret
   end
 
-  # def contextify(resp_data)
-
-  # end
-
   def check_data
     @check_data ||= {
      :id   => '1ed80833-6d28-4aba-8603-d81c249b8c23',
      :name => 'www.example.com:SSH',
-     :enabled => true
+     :enabled => true,
+     :initial_failure_delay => nil,
+     :repeat_failure_delay => nil,
+     :initial_recovery_delay => nil
     }
   end
 
@@ -56,7 +55,10 @@ module FixtureData
     @check_2_data ||= {
      :id   => '29e913cf-29ea-4ae5-94f6-7069cf4a1514',
      :name => 'www2.example.com:PING',
-     :enabled => true
+     :enabled => true,
+     :initial_failure_delay => nil,
+     :repeat_failure_delay => nil,
+     :initial_recovery_delay => nil
     }
   end
 
@@ -162,12 +164,6 @@ module FixtureData
   def contact_rel(co_data)
     id = co_data[:id]
     {
-      :acceptors => {
-        :links => {
-          :self => "http://#{api_host}/contacts/#{id}/relationships/acceptors",
-          :related => "http://#{api_host}/contacts/#{id}/acceptors"
-        }
-      },
       :checks => {
         :links => {
           :self => "http://#{api_host}/contacts/#{id}/relationships/checks",
@@ -180,10 +176,16 @@ module FixtureData
           :related => "http://#{api_host}/contacts/#{id}/media"
         }
       },
-      :rejectors => {
+      :rules => {
         :links => {
-          :self => "http://#{api_host}/contacts/#{id}/relationships/rejectors",
-          :related => "http://#{api_host}/contacts/#{id}/rejectors"
+          :self => "http://#{api_host}/contacts/#{id}/relationships/rules",
+          :related => "http://#{api_host}/contacts/#{id}/rules"
+        }
+      },
+      :tags => {
+        :links => {
+          :self => "http://#{api_host}/contacts/#{id}/relationships/tags",
+          :related => "http://#{api_host}/contacts/#{id}/tags"
         }
       }
     }
@@ -283,12 +285,6 @@ 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",
@@ -301,102 +297,62 @@ module FixtureData
           :related => "http://#{api_host}/media/#{id}/contact"
         }
       },
-      :rejectors => {
-        :links => {
-          :self => "http://#{api_host}/media/#{id}/relationships/rejectors",
-          :related => "http://#{api_host}/media/#{id}/rejectors"
-        }
-      }
-    }
-  end
-
-  def acceptor_data
-    @acceptor_data ||= {
-      :id          => '05983623-fcef-42da-af44-ed6990b500fa',
-      :conditions_list => 'critical'
-    }
-  end
-
-  def acceptor_2_data
-    @acceptor_2_data ||= {
-      :id          => '20f182fc-6e32-4794-9007-97366d162c51',
-      :conditions_list => 'warning'
-    }
-  end
-
-  def acceptor_json(ac_data)
-    {
-      :id => ac_data[:id],
-      :type => 'acceptor',
-      :attributes => ac_data.reject {|k,v| :id.eql?(k) }
-    }
-  end
-
-  def acceptor_rel(ac_data)
-    id = ac_data[:id]
-    {
-      :contact => {
-        :links => {
-          :self => "http://#{api_host}/acceptors/#{id}/relationships/contact",
-          :related => "http://#{api_host}/acceptors/#{id}/contact"
-        }
-      },
-      :media => {
+      :rules => {
         :links => {
-          :self => "http://#{api_host}/acceptors/#{id}/relationships/media",
-          :related => "http://#{api_host}/acceptors/#{id}/media"
-        }
-      },
-      :tags => {
-        :links => {
-          :self => "http://#{api_host}/acceptors/#{id}/relationships/tags",
-          :related => "http://#{api_host}/acceptors/#{id}/tags"
+          :self => "http://#{api_host}/media/#{id}/relationships/rules",
+          :related => "http://#{api_host}/media/#{id}/rules"
         }
       }
     }
   end
 
-  def rejector_data
-    @rejector_data ||= {
+  def rule_data
+    @rule_data ||= {
       :id          => '05983623-fcef-42da-af44-ed6990b500fa',
+      :enabled     => true,
+      :blackhole   => false,
+      :strategy    => 'all_tags',
       :conditions_list => 'critical'
     }
   end
 
-  def rejector_2_data
-    @rejector_2_data ||= {
+  def rule_2_data
+    @rule_2_data ||= {
       :id          => '20f182fc-6e32-4794-9007-97366d162c51',
+      :enabled     => true,
+      :blackhole   => true,
+      :strategy    => 'all_tags',
       :conditions_list => 'warning'
     }
   end
 
-  def rejector_json(re_data)
+  def rule_json(ru_data)
     {
-      :id => re_data[:id],
-      :type => 'rejector',
-      :attributes => re_data.reject {|k,v| :id.eql?(k) }
+      :id => ru_data[:id],
+      :type => 'rule',
+      :attributes => ru_data.reject {|k,v| :id.eql?(k) }
     }
   end
 
-  def rejector_rel(re_data)
-    id = re_data[:id]
+  def rule_rel(ru_data)
+    id = ru_data[:id]
     {
       :contact => {
         :links => {
-          :self => "http://#{api_host}/rejectors/#{id}/relationships/contact",
-          :related => "http://#{api_host}/rejectors/#{id}/contact"
+          :self => "http://#{api_host}/rules/#{id}/relationships/contact",
+          :related => "http://#{api_host}/rules/#{id}/contact"
         }
       },
       :media => {
         :links => {
-          :self => "http://#{api_host}/rejectors/#{id}/relationships/media",
-          :related => "http://#{api_host}/rejectors/#{id}/media"
+          :self => "http://#{api_host}/rules/#{id}/relationships/media",
+          :related => "http://#{api_host}/rules/#{id}/media"
         }
       },
       :tags => {
         :links => {
-          :self => "http://#{api_host}/rejectors/#{id}/relationships/tags",
-          :related => "http://#{api_host}/rejectors/#{id}/tags"
+          :self => "http://#{api_host}/rules/#{id}/relationships/tags",
+          :related => "http://#{api_host}/rules/#{id}/tags"
         }
       }
     }
@@ -443,43 +399,46 @@ module FixtureData
 
   def tag_data
     @tag_data ||= {
+     :id => '1850b8d7-1055-4a6e-9c96-f8f50e55bd0f',
      :name => 'database',
     }
   end
 
   def tag_2_data
     @tag_2_data ||= {
+     :id => 'c7a12328-8902-4974-8efa-68ec3e284507',
      :name => 'physical',
     }
   end
 
   def tag_json(ta_data)
-    id = ta_data[:name]
+    id = ta_data[:id]
     {
+      :id => id,
       :type => 'tag',
-      :attributes => ta_data
+      :attributes => ta_data.reject {|k,v| :id.eql?(k) }
     }
   end
 
   def tag_rel(ta_data)
-    id = ta_data[:name]
+    id = ta_data[:id]
     {
-      :acceptors => {
-        :links => {
-          :self => "http://#{api_host}/tags/#{id}/relationships/acceptors",
-          :related => "http://#{api_host}/tags/#{id}/acceptors"
-        }
-      },
       :checks => {
         :links => {
           :self => "http://#{api_host}/tags/#{id}/relationships/checks",
           :related => "http://#{api_host}/tags/#{id}/checks"
         }
       },
-      :rejectors => {
+      :contacts => {
+        :links => {
+          :self => "http://#{api_host}/tags/#{id}/relationships/contacts",
+          :related => "http://#{api_host}/tags/#{id}/contacts"
+        }
+      },
+      :rules => {
         :links => {
-          :self => "http://#{api_host}/tags/#{id}/relationships/rejectors",
-          :related => "http://#{api_host}/tags/#{id}/rejectors"
+          :self => "http://#{api_host}/tags/#{id}/relationships/rules",
+          :related => "http://#{api_host}/tags/#{id}/rules"
         }
       },
       :scheduled_maintenances => {

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: flapjack-diner
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Ali Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.13.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.13.5
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -47,8 +47,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -57,33 +55,28 @@ files:
 - flapjack-diner.gemspec
 - lib/flapjack-diner.rb
 - lib/flapjack-diner/argument_validator.rb
+- lib/flapjack-diner/configuration.rb
 - lib/flapjack-diner/index_range.rb
-- lib/flapjack-diner/resources/acceptors.rb
-- lib/flapjack-diner/resources/checks.rb
-- lib/flapjack-diner/resources/contacts.rb
-- lib/flapjack-diner/resources/events.rb
-- lib/flapjack-diner/resources/maintenance_periods.rb
-- lib/flapjack-diner/resources/media.rb
-- lib/flapjack-diner/resources/metrics.rb
-- lib/flapjack-diner/resources/rejectors.rb
-- lib/flapjack-diner/resources/relationships.rb
-- lib/flapjack-diner/resources/states.rb
-- lib/flapjack-diner/resources/statistics.rb
-- lib/flapjack-diner/resources/tags.rb
+- lib/flapjack-diner/log_formatter.rb
+- lib/flapjack-diner/query.rb
+- lib/flapjack-diner/relationships.rb
+- lib/flapjack-diner/request.rb
+- lib/flapjack-diner/resources.rb
+- lib/flapjack-diner/response.rb
 - lib/flapjack-diner/tools.rb
+- lib/flapjack-diner/utility.rb
 - lib/flapjack-diner/version.rb
 - log/.gitkeep
 - spec/argument_validator_spec.rb
 - spec/flapjack-diner_spec.rb
-- spec/resources/acceptors_spec.rb
+- spec/relationships_spec.rb
 - spec/resources/checks_spec.rb
 - spec/resources/contacts_spec.rb
 - spec/resources/events_spec.rb
 - spec/resources/maintenance_periods_spec.rb
 - spec/resources/media_spec.rb
 - spec/resources/metrics_spec.rb
-- spec/resources/rejectors_spec.rb
-- spec/resources/relationships_spec.rb
+- spec/resources/rules_spec.rb
 - spec/resources/states_spec.rb
 - spec/resources/statistics_spec.rb
 - spec/resources/tags_spec.rb
@@ -103,27 +96,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Access the API of a Flapjack system monitoring server
 test_files:
 - spec/argument_validator_spec.rb
 - spec/flapjack-diner_spec.rb
-- spec/resources/acceptors_spec.rb
+- spec/relationships_spec.rb
 - spec/resources/checks_spec.rb
 - spec/resources/contacts_spec.rb
 - spec/resources/events_spec.rb
 - spec/resources/maintenance_periods_spec.rb
 - spec/resources/media_spec.rb
 - spec/resources/metrics_spec.rb
-- spec/resources/rejectors_spec.rb
-- spec/resources/relationships_spec.rb
+- spec/resources/rules_spec.rb
 - spec/resources/states_spec.rb
 - spec/resources/statistics_spec.rb
 - spec/resources/tags_spec.rb