duties 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edbe40e92993677875bf20a969da0da52510e54a
-  data.tar.gz: 1285e2050b670d768cca9e561d2524117d92a3aa
+  metadata.gz: 58c199bfac0f918469da8f3cd3ac3efdde00e725
+  data.tar.gz: 8f2c956d07738c6f47d6a45c37e74d1720d50fc0
 SHA512:
-  metadata.gz: c1cde1edaf89b8d427d6b59a23b59727efe16e79b9692d6a7919b3ead4244107bbaccbc466c29cc2b97aa0721d669e9d17347a869dffe0c999478347651d84e0
-  data.tar.gz: bf9e023647f0f35f8d2a0ea6cc618ef6f2f9f22abf3abc389cc87ebaa88fb32ffc3648e78308f0125cbe97e53fd6353d1c2678c5ce41e63e5841b5ad1ae1830f
+  metadata.gz: 23d892e0109a2c5cdc1d0adcefcffa1c569d50e157fb34a22c4f2e06f3e56437f7934d642c27102b5c9bab4f44679b0651726fe9fffc8720d3b668cc54a88b04
+  data.tar.gz: 4abb6fa7809ef118ad6cc6561984fb309d3574a13b0b5ac13fa79908d1277634db42616f794612eb906a24b0889a4eb3c86373e7b5498d19ae0799369b1a6437

data/README.md

@@ -9,7 +9,7 @@ Duties are composed of one or more activities. These activities have positions,
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'duties', '0.0.1'
+gem 'duties', '0.0.2'
 ```
 
 ## Usage

data/app/models/duties/activity_record.rb

@@ -2,6 +2,7 @@ class Duties::ActivityRecord < ActiveRecord::Base
   self.table_name = 'duties_activity_records'
 
   belongs_to :duty_record, class_name: 'Duties::DutyRecord'
+  serialize :failures, JSON
 
   validates :name,        presence: true
   validates :duty_record, presence: true

data/db/migrate/2_add_errors_to_activities.rb

@@ -0,0 +1,5 @@
+class AddErrorsToActivities < ActiveRecord::Migration
+  def change
+    add_column :duties_activity_records, :failures, :text, default: '[]'
+  end
+end

data/duties.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'duties'
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ['Pat Allan']
   spec.email         = ['pat@freelancing-gods.com']
   spec.summary       = %q{Run activities related to a duty in a specific order}

data/lib/duties/activity.rb

@@ -1,14 +1,11 @@
 class Duties::Activity
   def self.call(record)
-    activity = new(record)
-    begin
-      activity.call
-      record.update_attributes status: 'success'
+    new(record).call
 
-      Duties::Next.call record.duty_record, record.position
-    rescue => error
-      record.update_attributes status: 'failure'
-    end
+    record.status = record.failures.any? ? 'failure' : 'success'
+    record.save!
+
+    Duties::Next.call record.duty_record, record.position
   end
 
   def initialize(activity)

data/lib/duties/status.rb

@@ -0,0 +1,36 @@
+class Duties::Status
+  def initialize(id)
+    @record = Duties::DutyRecord.find id
+  end
+
+  def status
+    return 'failure' if statuses.include?('failure')
+    return 'pending' if statuses.include?('pending')
+
+    'success'
+  end
+
+  def failure?
+    status == 'failure'
+  end
+
+  def failures
+    record.activity_records.pluck(:failures).flatten
+  end
+
+  def pending?
+    status == 'pending'
+  end
+
+  def success?
+    status == 'success'
+  end
+
+  private
+
+  attr_reader :record
+
+  def statuses
+    @statuses ||= record.activity_records.pluck :status
+  end
+end

data/lib/duties.rb

@@ -10,3 +10,4 @@ require 'duties/duty'
 require 'duties/duty_job'
 require 'duties/engine'
 require 'duties/next'
+require 'duties/status'

data/spec/acceptance/running_duties_spec.rb

@@ -8,6 +8,13 @@ module Running
         enqueue_activity 'success_two', at: 2
       end
     end
+
+    class ExampleTwo < ::Duties::Duty
+      def enqueue_activities
+        enqueue_activity 'fail_one',    at: 1
+        enqueue_activity 'success_one', at: 2
+      end
+    end
   end
 
   module Activities
@@ -22,6 +29,12 @@ module Running
         #
       end
     end
+
+    class FailOne < ::Duties::Activity
+      def call
+        activity.failures << 'nope'
+      end
+    end
   end
 end
 
@@ -38,4 +51,12 @@ describe 'Running duties' do
     expect(duty.activity_records.length).to eq(2)
     expect(duty.activity_records.pluck(:status)).to eq(['success', 'success'])
   end
+
+  it 'stores errors' do
+    id     = Duties::Duty.enqueue 'example_two'
+    status = Duties::Status.new id
+
+    expect(status).to be_failure
+    expect(status.failures).to eq(['nope'])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duties
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Pat Allan
@@ -111,6 +111,7 @@ files:
 - app/models/duties/duty_record.rb
 - config.ru
 - db/migrate/1_create_duties_and_activities.rb
+- db/migrate/2_add_errors_to_activities.rb
 - duties.gemspec
 - lib/duties.rb
 - lib/duties/activity.rb
@@ -119,6 +120,7 @@ files:
 - lib/duties/duty_job.rb
 - lib/duties/engine.rb
 - lib/duties/next.rb
+- lib/duties/status.rb
 - spec/acceptance/running_duties_spec.rb
 - spec/internal/config/database.yml
 - spec/internal/config/routes.rb