khronos 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    khronos (0.1.0)
+    khronos (0.1.1)
       activerecord (~> 3.2.8)
       girl_friday (~> 0.10.0)
       json (~> 1.7.5)

data/README.md

@@ -38,6 +38,13 @@ Query for a scheduled task:
     RestClient.get('http://localhost:3000/task', :params => { :context => 'test' })
     # => "{\"active\":true,\"at\":\"2012-09-15T21:24:56-03:00\",\"context\":\"test\",\"id\":1,\"recurrency\":1,\"task_url\":\"http://myapp.com/do-something-awesome\"}"
 
+Delete a scheduled task by query:
+
+    RestClient.delete('http://localhost:3000/task', :params => { :status_code => 404 })
+    # => "{\"deleted\":3}"
+    RestClient.delete('http://localhost:3000/task', :params => { :id => 9 })
+    # => "{\"deleted\":1}"
+
 Query for logs for tasks that already ran.
 
     RestClient.get('http://localhost:3000/schedule/logs', :params => { :status_code => 500 })

data/lib/khronos/scheduler.rb

@@ -5,7 +5,6 @@ module Khronos
   class Scheduler
 
     def self.run(schedule, runner=nil)
-      puts "Khronos::Scheduler#run => #{schedule.inspect}"
       schedule.update_attributes(:active => false)
       schedule.save
       runner.enqueue(schedule) if runner

data/lib/khronos/server/runner.rb

@@ -39,7 +39,6 @@ module Khronos
       end
 
       def log_schedule!(schedule_log)
-        puts "Log schedule! #{schedule_log.inspect}"
         RestClient.post( scheduler_route('/schedule/log'), schedule_log )
       end
 

data/lib/khronos/server/scheduler.rb

@@ -14,7 +14,7 @@ module Khronos
           :name => "Khronos - HTTP Job Scheduler Interface.",
           :version => Khronos::VERSION,
           :link => "https://github.com/endel/khronos"
-        }
+        }.to_json
       end
 
       # Creates a schedule
@@ -90,6 +90,21 @@ module Khronos
         schedule.to_json
       end
 
+      # Delete a single task by params
+      #
+      # @param [String] context
+      # @param [String] context
+      #
+      # @return [Hash]
+      delete '/task' do
+        if params.empty?
+          return 403, "Too open query. Use '?all=1' to delete all entries."
+        elsif params['all']
+          params = {}
+        end
+        { :deleted => Storage::Schedule.where(params).delete_all }.to_json
+      end
+
       # Force a task to be scheduled right now
       #
       # @param [Integer] id

data/lib/khronos/tasks/db.rake

@@ -1,25 +1,26 @@
 require 'khronos/storage/adapter/activerecord/migrations/schedule'
 require 'khronos/storage/adapter/activerecord/migrations/schedule_log'
 
-namespace :db do
+namespace :khronos do
+  namespace :db do
 
-  desc 'Create the database.'
-  task :create do
-    adapter = Khronos::Storage::Adapter.get(ENV['KHRONOS_STORAGE'])
-    if adapter.name =~ /ActiveRecord/
-      CreateSchedule.up
-      CreateScheduleLog.up
+    desc 'Create the database.'
+    task :create do
+      adapter = Khronos::Storage::Adapter.get(ENV['KHRONOS_STORAGE'])
+      if adapter.name =~ /ActiveRecord/
+        CreateSchedule.up
+        CreateScheduleLog.up
+      end
     end
-  end
 
-  desc 'Destroy entire database.'
-  task :drop do
-    adapter = Khronos::Storage::Adapter.get(ENV['KHRONOS_STORAGE'])
-    if adapter.name =~ /ActiveRecord/
-      CreateSchedule.down
-      CreateScheduleLog.down
+    desc 'Destroy entire database.'
+    task :drop do
+      adapter = Khronos::Storage::Adapter.get(ENV['KHRONOS_STORAGE'])
+      if adapter.name =~ /ActiveRecord/
+        CreateSchedule.down
+        CreateScheduleLog.down
+      end
     end
-  end
 
+  end
 end
-

data/lib/khronos/version.rb

@@ -1,3 +1,3 @@
 module Khronos
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/integration/scheduler_server_spec.rb

@@ -72,6 +72,17 @@ describe Khronos::Server::Scheduler do
       schedule.at.to_i.should == 1.day.from_now.to_i
     end
 
+    it "should delete a scheduled task" do
+      schedule = FactoryGirl.create(:schedule, {:context => "to-delete"})
+      delete('/task', :id => schedule.id)
+      Khronos::Storage::Schedule.where(:id => schedule.id).length.should == 0
+
+      schedule = FactoryGirl.create(:schedule)
+      delete('/task')
+      last_response.status.should == 403
+      last_response.body.should include("Too open")
+    end
+
     it "should retrieve a list of schedules by context pattern" do
       FactoryGirl.create(:schedule, {:context => "namespaced"})
       FactoryGirl.create(:schedule, {:context => "namespaced:1"})
@@ -123,10 +134,9 @@ describe Khronos::Server::Scheduler do
       get('/schedule/logs', {:status_code => 200, :limit => 1})
       JSON.parse(last_response.body).length.should == 1
 
-      get('/schedule/logs', {:status_code => 500})
-      puts "status_code => #{last_response.body.inspect}"
-      #logs = JSON.parse(last_response.body)
-      #logs.first['schedule_id'].should == 2
+      get('/schedule/logs', {:status_code => 500, :offset => 1})
+      logs = JSON.parse(last_response.body)
+      logs.first['schedule_id'].should == 2
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: khronos
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: