flapjack 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00e9afa87734c98245ef9b370a726bd5e5e4a9d7
-  data.tar.gz: 4852d02b41ec46f45bfe2fbb44cd18e4ad95a0a5
+  metadata.gz: 0c18eef4f4dd8297baab83f9f8c1ac1eb3972ace
+  data.tar.gz: b62c3482d22ddb71af95b7cb5c097fa9ea75bdf4
 SHA512:
-  metadata.gz: d938e90fe44d654985e9bba3ec644f43a71bc172efb7e2cce39ae0dd38239fc164741ae4f4d2a57b0d88f85dd87f0ac4a699ea9fa30740ee6224b9186f738b6e
-  data.tar.gz: f37d7d6a16fd859fb2011cbc48fa5e0f8c82ec994e9238844921f4a49be28b267923beabf98723e1e1a5ccfc824a98d4cb8c3736b3dbe68844ff93e8b15f51a3
+  metadata.gz: 0edb5492abaf9467c0960bcf9be3a5c941803354ce6f0e6bb5b2c03c6ac44a691544d173c00da9c37a4ab0e4973a6e5bc5c0bc02f44008701777597a7d5f8c24
+  data.tar.gz: 2befbc8f51f15d686e88a5dadc7b2eea9f73f32860a7b77f34fdd8af31e243b4a99262e3d1befcba50f3d2a28f70f5679e91f22178ffbacebba23405a19c50eb

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 0.8.5 - UNRELEASED
+- Feature: jsonapi rework now supports PATCH, eg for media under contacts gh-253 (@ali-graham)
+- Feature: experimental backbone based /edit_contacts page in the web UI has improvements gh-253 (@ali-graham)
+
 # 0.8.4 - 2014-01-31
 - Bug: The scheduled maintenance periods table on the checks page is messed up gh-427 (@jswoods)
 - Bug: api current check state shows check summary and details from last state change gh-431 (@ali-graham)

data/bin/flapper

@@ -83,7 +83,7 @@ OptionParser.new do |opts|
     options.bind_ip = b
   end
 
-  opts.on("-P", "--bind-port [PORT]", String, "PORT for flapper to bind to") do |p|
+  opts.on("-P", "--bind-port [PORT]", String, "PORT for flapper to bind to (default: 12345)") do |p|
     options.bind_port = p.to_i
   end
 

data/lib/flapjack/data/contact.rb

@@ -20,7 +20,7 @@ module Flapjack
 
       attr_accessor :id, :first_name, :last_name, :email, :media,
         :media_intervals, :media_rollup_thresholds, :pagerduty_credentials,
-        :linked_entity_ids
+        :linked_entity_ids, :linked_media_ids
 
       TAG_PREFIX = 'contact_tag'
       ALL_MEDIA  = ['email', 'sms', 'jabber', 'pagerduty']
@@ -155,6 +155,18 @@ module Flapjack
                      *['subdomain', 'username', 'password'].collect {|f| [f, details[f]]})
       end
 
+      # returns false if this contact was already in the set for the entity
+      def add_entity(entity)
+        key = "contacts_for:#{entity.id}"
+        @redis.sadd(key, self.id)
+      end
+
+      # returns false if this contact wasn't in the set for the entity
+      def remove_entity(entity)
+        key = "contacts_for:#{entity.id}"
+        @redis.srem(key, self.id)
+      end
+
       # NB ideally contacts_for:* keys would scope the entity and check by an
       # input source, for namespacing purposes
       def entities(options = {})
@@ -204,7 +216,7 @@ module Flapjack
           next unless k =~ /^contacts_for:([a-zA-Z0-9][a-zA-Z0-9\.\-]*[a-zA-Z0-9])(?::(\w+))?$/
 
           entity_id = $1
-          check = $2
+          check     = $2
 
           entity_data << {:id => entity_id, :name => redis.hget("entity:#{entity_id}", 'name')}
 
@@ -466,8 +478,21 @@ module Flapjack
           "media_intervals"         => self.media_intervals,
           "media_rollup_thresholds" => self.media_rollup_thresholds,
           "timezone"                => self.timezone.name,
+          "tags"                    => self.tags.to_a
+        }.to_json
+      end
+
+      def to_jsonapi(*args)
+        { "id"                      => self.id,
+          "first_name"              => self.first_name,
+          "last_name"               => self.last_name,
+          "email"                   => self.email,
+          "timezone"                => self.timezone.name,
           "tags"                    => self.tags.to_a,
-          "links"                   => {:entities => @linked_entity_ids || []}
+          "links"                   => {
+            :entities => @linked_entity_ids || [],
+            :media    => @linked_media_ids  || []
+          }
         }.to_json
       end
 

data/lib/flapjack/data/entity.rb

@@ -32,6 +32,8 @@ module Flapjack
         raise "Redis connection not set" unless redis = options[:redis]
         raise "Entity name not provided" unless entity['name'] && !entity['name'].empty?
 
+        #FIXME: should probably raise an exception if trying to create a new entity with the 
+        # same name or id as an existing entity. (Go away and use update instead.)
         if entity['id']
           existing_name = redis.hget("entity:#{entity['id']}", 'name')
           redis.del("entity_id:#{existing_name}") unless existing_name == entity['name']

data/lib/flapjack/data/notification_rule.rb

@@ -38,7 +38,11 @@ module Flapjack
       def self.add(rule_data, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
 
-        rule_id = SecureRandom.uuid
+        if rule_data[:id] && self.find_by_id(rule_data[:id], :redis => redis)
+          errors = ["a notification rule already exists with id '#{rule_data[:id]}'"]
+          return errors
+        end
+        rule_id = rule_data[:id] || SecureRandom.uuid
         errors = self.add_or_update(rule_data.merge(:id => rule_id), options)
         return errors unless errors.nil? || errors.empty?
         self.find_by_id(rule_id, :redis => redis)

data/lib/flapjack/gateways/jsonapi.rb

@@ -27,7 +27,7 @@ module Flapjack
 
       include Flapjack::Utility
 
-      JSON_REQUEST_MIME_TYPES = ['application/vnd.api+json', 'application/json']
+      JSON_REQUEST_MIME_TYPES = ['application/vnd.api+json', 'application/json', 'application/json-patch+json']
 
       class ContactNotFound < RuntimeError
         attr_reader :contact_id
@@ -36,6 +36,13 @@ module Flapjack
         end
       end
 
+      class ContactsNotFound < RuntimeError
+        attr_reader :contact_ids
+        def initialize(contact_ids)
+          @contact_ids = contact_ids
+        end
+      end
+
       class NotificationRuleNotFound < RuntimeError
         attr_reader :rule_id
         def initialize(rule_id)
@@ -106,6 +113,8 @@ module Flapjack
         case e
         when Flapjack::Gateways::JSONAPI::ContactNotFound
           rescue_error.call(404, e, request_info, "could not find contact '#{e.contact_id}'")
+        when Flapjack::Gateways::JSONAPI::ContactsNotFound
+          rescue_error.call(404, e, request_info, "could not find contacts '" + e.contact_ids.join(', ') + "'")
         when Flapjack::Gateways::JSONAPI::NotificationRuleNotFound
           rescue_error.call(404, e, request_info,"could not find notification rule '#{e.rule_id}'")
         when Flapjack::Gateways::JSONAPI::EntityNotFound
@@ -187,13 +196,21 @@ module Flapjack
                         request.query_string.length > 0) ? "?#{request.query_string}" : ""
         if logger.debug?
           logger.debug("Returning #{response.status} for #{request.request_method} " +
-            "#{request.path_info}#{query_string}, body: #{response.body.join(', ')}")
+            "#{request.path_info}#{query_string}, body: #{response.body}")
         elsif logger.info?
           logger.info("Returning #{response.status} for #{request.request_method} " +
             "#{request.path_info}#{query_string}")
         end
       end
 
+      def is_json_request?
+        Flapjack::Gateways::JSONAPI::JSON_REQUEST_MIME_TYPES.include?(request.content_type.split(/\s*[;,]\s*/, 2).first.downcase)
+      end
+
+      def is_jsonpatch_request?
+        'application/json-patch+json'.eql?(request.content_type.split(/\s*[;,]\s*/, 2).first.downcase)
+      end
+
       register Flapjack::Gateways::JSONAPI::EntityMethods
 
       register Flapjack::Gateways::JSONAPI::ContactMethods

data/lib/flapjack/gateways/jsonapi/contact_methods.rb

@@ -49,6 +49,40 @@ module Flapjack
             raise Flapjack::Gateways::JSONAPI::ResourceLocked.new(resource) unless semaphore
             semaphore
           end
+
+          def apply_json_patch(object_path, &block)
+            ops = params[:ops]
+
+            if ops.nil? || !ops.is_a?(Array)
+              halt err(400, "Invalid JSON-Patch request")
+            end
+
+            ops.each do |operation|
+              linked = nil
+              property = nil
+
+              op = operation['op']
+              operation['path'] =~ /\A\/#{object_path}\/0\/([^\/]+)(?:\/([^\/]+)(?:\/([^\/]+))?)?\z/
+              if 'links'.eql?($1)
+                linked = $2
+
+                value = case op
+                when 'add'
+                  operation['value']
+                when 'remove'
+                  $3
+                end
+              elsif 'replace'.eql?(op)
+                property = $1
+                value = $3
+              else
+                next
+              end
+
+              yield(op, property, linked, value)
+            end
+          end
+
         end
 
         def self.registered(app)
@@ -56,7 +90,7 @@ module Flapjack
           app.helpers Flapjack::Gateways::JSONAPI::ContactMethods::Helpers
 
           app.post '/contacts' do
-            pass unless Flapjack::Gateways::JSONAPI::JSON_REQUEST_MIME_TYPES.include?(request.content_type)
+            pass unless is_json_request?
             content_type :json
             cors_headers
 
@@ -96,96 +130,84 @@ module Flapjack
             contacts_data.map {|cd| cd['id']}.to_json
           end
 
-          app.post '/contacts_atomic' do
-            pass unless Flapjack::Gateways::JSONAPI::JSON_REQUEST_MIME_TYPES.include?(request.content_type)
-            content_type :json
-
-            contacts_data = params[:contacts]
-            if contacts_data.nil? || !contacts_data.is_a?(Enumerable)
-              halt err(422, "No valid contacts were submitted")
-            end
-
-            # stringifying as integer string params are automatically integered,
-            # but our redis ids are strings
-            contacts_data_ids = contacts_data.reject {|c| c['id'].nil? }.
-              map {|co| co['id'].to_s }
-
-            if contacts_data_ids.empty?
-              halt err(422, "No contacts with IDs were submitted")
-            end
-
-            semaphore = obtain_semaphore(SEMAPHORE_CONTACT_MASS_UPDATE)
-
-            contacts = Flapjack::Data::Contact.all(:redis => redis)
-            contacts_h = hashify(*contacts) {|c| [c.id, c] }
-            contacts_ids = contacts_h.keys
 
-            # delete contacts not found in the bulk list
-            (contacts_ids - contacts_data_ids).each do |contact_to_delete_id|
-              contact_to_delete = contacts.detect {|c| c.id == contact_to_delete_id }
-              contact_to_delete.delete!
-            end
-
-            # add or update contacts found in the bulk list
-            contacts_data.reject {|cd| cd['id'].nil? }.each do |contact_data|
-              if contacts_ids.include?(contact_data['id'].to_s)
-                contacts_h[contact_data['id'].to_s].update(contact_data)
-              else
-                Flapjack::Data::Contact.add(contact_data, :redis => redis)
-              end
-            end
-
-            semaphore.release
-            204
-          end
-
-          # Returns all the contacts
+          # Returns all (/contacts) or some (/contacts/1,2,3) or one (/contact/2) contact(s)
           # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts
-          app.get '/contacts' do
-            content_type :json
+          app.get %r{/contacts(?:/)?([^/]+)?$} do
+            content_type 'application/vnd.api+json'
             cors_headers
 
-            contacts = if params[:ids]
-              Flapjack::Data::Contact.find_by_ids(params[:ids].split(',').uniq, :redis => redis)
+            requested_contacts = if params[:captures] && params[:captures][0]
+              params[:captures][0].split(',').uniq
+            else
+              nil
+            end
+
+            #FIXME: do we need to url decode the ids? has rack or some middleware already done this?
+            contacts = if requested_contacts
+              Flapjack::Data::Contact.find_by_ids(requested_contacts, :logger => logger, :redis => redis)
             else
               Flapjack::Data::Contact.all(:redis => redis)
             end
             contacts.compact!
 
+            if requested_contacts && contacts.empty?
+              raise Flapjack::Gateways::JSONAPI::ContactsNotFound.new(requested_contacts)
+            end
+
             linked_entity_data, linked_entity_ids = if contacts.empty?
               [[], []]
             else
               Flapjack::Data::Contact.entities_jsonapi(contacts.map(&:id), :redis => redis)
             end
 
+            linked_media_data = []
+            linked_media_ids  = {}
+            contacts.each do |contact|
+              contact.media.keys.each do |medium|
+                id = "#{contact.id}_#{medium}"
+                interval = contact.media_intervals[medium].nil? ? nil : contact.media_intervals[medium].to_i
+                rollup_threshold = contact.media_rollup_thresholds[medium].nil? ? nil : contact.media_rollup_thresholds[medium].to_i
+                linked_media_ids[contact.id] = id
+                linked_media_data <<
+                  { "id" => id,
+                    "type" => medium,
+                    "address" => contact.media[medium],
+                    "interval" => interval,
+                    "rollup_threshold" => rollup_threshold,
+                    "contact_id" => contact.id }
+              end
+            end
+
             contacts_json = contacts.collect {|contact|
               contact.linked_entity_ids = linked_entity_ids[contact.id]
-              contact.to_json
+              contact.linked_media_ids  = linked_media_ids[contact.id]
+              contact.to_jsonapi
             }.join(", ")
 
             '{"contacts":[' + contacts_json + ']' +
-              ( linked_entity_data.empty? ? '}' :
-                ', "linked": {"entities":' + linked_entity_data.to_json + '}}')
+                ',"linked":{"entities":' + linked_entity_data.to_json +
+                          ',"media":' + linked_media_data.to_json + '}}'
           end
 
           # Returns the core information about the specified contact
           # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id
           app.get '/contacts/:contact_id' do
-            content_type :json
+            content_type 'application/vnd.api+json'
             cors_headers
             contact = find_contact(params[:contact_id])
 
             entities = contact.entities.map {|e| e[:entity] }
 
-            '{"contacts":[' + contact.to_json + ']' +
+            '{"contacts":[' + contact.to_jsonapi + ']' +
               ( entities.empty? ? '}' :
                 ', "linked": {"entities":' + entities.values.to_json + '}}')
           end
 
           # Updates a contact
           app.put '/contacts/:contact_id' do
-            content_type :json
             cors_headers
+            content_type :json
 
             contacts_data = params[:contacts]
 
@@ -208,7 +230,43 @@ module Flapjack
             logger.debug("contact_data: #{contact_data}")
             contact.update(contact_data)
 
-            contact.to_json
+            contact.to_jsonapi
+          end
+
+          # TODO this should build up all data, verify entities exist, etc.
+          # before applying any changes
+          # TODO generalise JSON-Patch data parsing code
+          app.patch '/contacts/:contact_id' do
+            pass unless is_jsonpatch_request?
+            content_type :json
+            cors_headers
+
+            contact = find_contact(params[:contact_id])
+
+            apply_json_patch('contacts') do |op, property, linked, value|
+              case op
+              when 'replace'
+                if ['first_name', 'last_name', 'email'].include?(property)
+                  contact.update(property => value)
+                end
+              when 'add'
+                logger.debug "patch add operation. linked: #{linked}"
+                if 'entities'.eql?(linked)
+                  entity = Flapjack::Data::Entity.find_by_id(value, :redis => redis)
+                  logger.debug "adding this entity: #{entity}"
+                  contact.add_entity(entity) unless entity.nil?
+                end
+              when 'remove'
+                if 'entities'.eql?(linked)
+                  entity = Flapjack::Data::Entity.find_by_id(value, :redis => redis)
+                  contact.remove_entity(entity) unless entity.nil?
+                end
+              end
+            end
+
+            # will need to be 200 and return contact.to_jsonapi
+            # if updated_at changes, or Etag, when those are introduced
+            status 204
           end
 
           # Deletes a contact
@@ -221,17 +279,85 @@ module Flapjack
             status 204
           end
 
-          # Lists this contact's notification rules
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_notification_rules
-          app.get '/contacts/:contact_id/notification_rules' do
+          app.post '/media' do
+            pass unless is_json_request?
             content_type :json
             cors_headers
 
-            "[" + find_contact(params[:contact_id]).notification_rules.map {|r| r.to_json }.join(',') + "]"
+            media_data = params[:media]
+
+            if media_data.nil? || !media_data.is_a?(Enumerable)
+              halt err(422, "No valid media were submitted")
+            end
+
+            unless media_data.all? {|m| m['id'].nil? }
+              halt err(422, "Media creation cannot include IDs")
+            end
+
+            semaphore = obtain_semaphore(SEMAPHORE_CONTACT_MASS_UPDATE)
+
+            contacts = media_data.inject({}) {|memo, medium_data|
+              contact_id = medium_data['contact_id']
+              if contact_id.nil?
+                semaphore.release
+                halt err(422, "Media data must include 'contact_id'")
+              end
+              next memo if memo.has_key?(contact_id)
+              contact = Flapjack::Data::Contact.find_by_id(contact_id, :redis => redis)
+              if contact.nil?
+                semaphore.release
+                halt err(422, "Contact id:'#{contact_id}' could not be loaded")
+              end
+              memo[contact_id] = contact
+              memo
+            }
+
+            media_data.each do |medium_data|
+              contact = contacts[medium_data['contact_id']]
+              type = medium_data['type']
+              contact.set_address_for_media(type, medium_data['address'])
+              contact.set_interval_for_media(type, medium_data['interval'])
+              contact.set_rollup_threshold_for_media(type, medium_data['rollup_threshold'])
+              medium_data['id'] = "#{contact.id}_#{type}"
+            end
+
+            semaphore.release
+
+            '{"media":' + media_data.to_json + '}'
+          end
+
+          app.patch '/media/:media_id' do
+            pass unless is_jsonpatch_request?
+            content_type :json
+            cors_headers
+
+            media_id = params[:media_id]
+            media_id =~ /\A(.+)_(email|sms|jabber)\z/
+
+            contact_id = $1
+            type = $2
+
+            halt err(422, "Could not get contact_id from media_id") if contact_id.nil?
+            halt err(422, "Could not get type from media_id") if type.nil?
+
+            contact = find_contact(contact_id)
+
+            apply_json_patch('media') do |op, property, linked, value|
+              if 'replace'.eql?(op)
+                case property
+                when 'address'
+                  contact.set_address_for_media(type, value)
+                when 'interval'
+                  contact.set_interval_for_media(type, value)
+                when 'rollup_threshold'
+                  contact.set_rollup_threshold_for_media(type, value)
+                end
+              end
+            end
+
+            status 204
           end
 
-          # Get the specified notification rule for this user
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_notification_rules_id
           app.get '/notification_rules/:id' do
             content_type :json
             cors_headers
@@ -242,7 +368,6 @@ module Flapjack
           end
 
           # Creates a notification rule or rules for a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-post_contacts_id_notification_rules
           app.post '/notification_rules' do
             content_type :json
             cors_headers
@@ -253,10 +378,6 @@ module Flapjack
               halt err(422, "No valid notification rules were submitted")
             end
 
-            if rules_data.any? {|rule| rule['id']}
-              halt err(422, "ID fields may not be generated by you. Remove IDs and POST again")
-            end
-
             errors = []
             rules_data.each do |rule_data|
               errors << Flapjack::Data::NotificationRule.prevalidate_data(symbolize(rule_data), {:logger => logger})
@@ -298,7 +419,6 @@ module Flapjack
           end
 
           # Updates a notification rule
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_notification_rules_id
           app.put('/notification_rules/:id') do
             content_type :json
             cors_headers
@@ -338,7 +458,6 @@ module Flapjack
           end
 
           # Deletes a notification rule
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_notification_rules_id
           app.delete('/notification_rules/:id') do
             cors_headers
             rule = find_rule(params[:id])
@@ -348,191 +467,6 @@ module Flapjack
             status 204
           end
 
-          # Returns the media of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_media
-          app.get '/contacts/:contact_id/media' do
-            content_type :json
-            cors_headers
-
-            contact = find_contact(params[:contact_id])
-
-            media = contact.media
-            media_intervals = contact.media_intervals
-            media_rollup_thresholds = contact.media_rollup_thresholds
-            media_addr_int = hashify(*media.keys) {|k|
-              [k, {'address'          => media[k],
-                   'interval'         => media_intervals[k],
-                   'rollup_threshold' => media_rollup_thresholds[k] }]
-            }
-            media_addr_int.to_json
-          end
-
-          # Returns the specified media of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_media_media
-          app.get('/contacts/:contact_id/media/:id') do
-            content_type :json
-            cors_headers
-
-            contact = find_contact(params[:contact_id])
-            media = contact.media[params[:id]]
-            if media.nil?
-              halt err(404, "no #{params[:id]} for contact '#{params[:contact_id]}'")
-            end
-            interval = contact.media_intervals[params[:id]]
-            # FIXME: does erroring when no interval found make sense?
-            if interval.nil?
-              halt err(403, "no #{params[:id]} interval for contact '#{params[:contact_id]}'")
-            end
-            rollup_threshold = contact.media_rollup_thresholds[params[:id]]
-            {'address'          => media,
-             'interval'         => interval,
-             'rollup_threshold' => rollup_threshold }.to_json
-          end
-
-          # Creates or updates a media of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_contacts_id_media_media
-          app.put('/contacts/:contact_id/media/:id') do
-            content_type :json
-            cors_headers
-
-            contact = find_contact(params[:contact_id])
-            errors = []
-
-            if 'pagerduty'.eql?(params[:id])
-              errors = [:service_key, :subdomain, :username, :password].inject([]) do |memo, pdp|
-                memo << "no #{pdp.to_s} for 'pagerduty' media" if params[pdp].nil?
-                memo
-              end
-
-              halt err(422, *errors) unless errors.empty?
-
-              contact.set_pagerduty_credentials('service_key'  => params[:service_key],
-                                                'subdomain'    => params[:subdomain],
-                                                'username'     => params[:username],
-                                                'password'     => params[:password])
-
-              contact.pagerduty_credentials.to_json
-            else
-              if params[:address].nil?
-                errors << "no address for '#{params[:id]}' media"
-              end
-
-              halt err(422, *errors) unless errors.empty?
-
-              contact.set_address_for_media(params[:id], params[:address])
-              contact.set_interval_for_media(params[:id], params[:interval])
-              contact.set_rollup_threshold_for_media(params[:id], params[:rollup_threshold])
-
-              {'address'          => contact.media[params[:id]],
-               'interval'         => contact.media_intervals[params[:id]],
-               'rollup_threshold' => contact.media_rollup_thresholds[params[:id]]}.to_json
-            end
-          end
-
-          # delete a media of a contact
-          app.delete('/contacts/:contact_id/media/:id') do
-            cors_headers
-            contact = find_contact(params[:contact_id])
-            contact.remove_media(params[:id])
-            status 204
-          end
-
-          # Returns the timezone of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-get_contacts_id_timezone
-          app.get('/contacts/:contact_id/timezone') do
-            content_type :json
-            cors_headers
-
-            contact = find_contact(params[:contact_id])
-            contact.timezone.name.to_json
-          end
-
-          # Sets the timezone of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_contacts_id_timezone
-          app.put('/contacts/:contact_id/timezone') do
-            content_type :json
-            cors_headers
-
-            contact = find_contact(params[:contact_id])
-            contact.timezone = params[:timezone]
-            contact.timezone.name.to_json
-          end
-
-          # Removes the timezone of a contact
-          # https://github.com/flpjck/flapjack/wiki/API#wiki-put_contacts_id_timezone
-          app.delete('/contacts/:contact_id/timezone') do
-            cors_headers
-            contact = find_contact(params[:contact_id])
-            contact.timezone = nil
-            status 204
-          end
-
-          app.post '/contacts/:contact_id/tags' do
-            content_type :json
-            cors_headers
-
-            tags = find_tags(params[:tags])
-            contact = find_contact(params[:contact_id])
-            contact.add_tags(*tags)
-            '{"tags":' +
-              contact.tags.to_json +
-            '}'
-          end
-
-          app.post '/contacts/:contact_id/entity_tags' do
-            content_type :json
-            cors_headers
-            contact = find_contact(params[:contact_id])
-            contact.entities.map {|e| e[:entity]}.each do |entity|
-              next unless tags = params[:entity][entity.name]
-              entity.add_tags(*tags)
-            end
-            contact_ent_tag = hashify(*contact.entities(:tags => true)) {|et|
-              [et[:entity].name, et[:tags]]
-            }
-            contact_ent_tag.to_json
-          end
-
-          app.delete '/contacts/:contact_id/tags' do
-            cors_headers
-            tags = find_tags(params[:tags])
-            contact = find_contact(params[:contact_id])
-            contact.delete_tags(*tags)
-            status 204
-          end
-
-          app.delete '/contacts/:contact_id/entity_tags' do
-            cors_headers
-            contact = find_contact(params[:contact_id])
-            contact.entities.map {|e| e[:entity]}.each do |entity|
-              next unless tags = params[:entity][entity.name]
-              entity.delete_tags(*tags)
-            end
-            status 204
-          end
-
-          app.get '/contacts/:contact_id/tags' do
-            content_type :json
-            cors_headers
-
-            contact = find_contact(params[:contact_id])
-            '{"tags":' +
-              contact.tags.to_json +
-              '}'
-
-          end
-
-          app.get '/contacts/:contact_id/entity_tags' do
-            content_type :json
-            cors_headers
-
-            contact = find_contact(params[:contact_id])
-            contact_ent_tag = hashify(*contact.entities(:tags => true)) {|et|
-              [et[:entity].name, et[:tags]]
-            }
-            contact_ent_tag.to_json
-          end
-
         end
 
       end