active_job_log 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631bb4927c7b983aa4769085de0462843e127bf9ee68e4f7525b8faa1cf6d594
-  data.tar.gz: 418431e2de9e9ab94f82ff3c8eca48062178b53aa52261924a4056350aab4208
+  metadata.gz: bfbf0127bae9efde3b2c7e9ea25b1673a045efed6d6c27ffd9e41b3bf99722c6
+  data.tar.gz: b5443486b6e699d85b0cf37ac08bebabe58d520660b6fa377fde7065ae063a45
 SHA512:
-  metadata.gz: 0c0874d42b2a885d261813412fb3b719746cf8d7c620fd5337736e038960ec9a919743cd7a70cfe92a059a10d706d49f73a0d1e5871978201ae69414eebb2a32
-  data.tar.gz: 8f23eb67fadd5abcfc0289f74d1f35ae0a9a72ab025f9f23db11e27915efa9dbcd9d722edea1e9adc2f575a8c7a08b2b8889981d70c3f4305f0ca3691da12ea9
+  metadata.gz: 9c5dd6c2715bb55d4ce6168da27e801a2ddd70afe1a930a269e577778b6952ef2b5087d173ac4dd648a30db062164af99d99c5331904a85c4b59caedba3555ae
+  data.tar.gz: 5419a4c87f8b82b5cdf3928009d265aa84c69852a00dc2cbe5fd21b75f27fa348428ee7a8ffb2c4f153482b2afa44fc917dc016ef2690de6e831e7dde12a342a

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### v1.0.0
+
+#### Changed
+
+* Copy Job model into app.
+
 ### v0.2.1
 
 #### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_job_log (0.2.1)
+    active_job_log (1.0.0)
       enumerize (>= 1.0)
       rails (>= 4.2.0)
 
@@ -99,7 +99,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)

data/lib/active_job_log/engine.rb

@@ -9,6 +9,7 @@ module ActiveJobLog
 
     initializer "initialize" do
       require_relative "./log_ext"
+      require_relative "./loggeable"
     end
   end
 end

data/lib/active_job_log/loggeable.rb

@@ -0,0 +1,72 @@
+module ActiveJobLog
+  module Loggeable
+    extend ActiveSupport::Concern
+
+    included do
+      extend Enumerize
+
+      STATUSES = %i{queued pending finished failed}
+
+      validates :job_id, presence: true
+
+      enumerize :status, in: STATUSES, scope: true
+
+      serialize :params, Array
+      serialize :stack_trace, Array
+
+      before_save :set_queued_duration
+      before_save :set_execution_duration
+      before_save :set_total_duration
+
+      def set_queued_duration
+        return if queued_at.blank? || started_at.blank?
+        self.queued_duration = (started_at.to_f - queued_at.to_f).to_i
+      end
+
+      def set_execution_duration
+        return if started_at.blank? || ended_at.blank?
+        self.execution_duration = (ended_at.to_f - started_at.to_f).to_i
+      end
+
+      def set_total_duration
+        from = queued_at || started_at
+        return if from.blank? || ended_at.blank?
+        self.total_duration = (ended_at.to_f - from.to_f).to_i
+      end
+    end
+
+    module ClassMethods
+      def update_job!(job_id, status, params = {})
+        params.merge!(status_to_params(status))
+        job = find_or_create_job(job_id)
+        job.update_attributes!(params)
+        job
+      end
+
+      def find_or_create_job(job_id)
+        where(job_id: job_id).where.not(status: :failed).last || create(job_id: job_id)
+      end
+
+      def status_to_params(status)
+        time_attr = infer_duration_attr_from_status(status)
+        {
+          time_attr => DateTime.current,
+          status: status
+        }
+      end
+
+      def infer_duration_attr_from_status(status)
+        case status
+        when :queued
+          :queued_at
+        when :pending
+          :started_at
+        when :finished, :failed
+          :ended_at
+        else
+          fail "invalid status"
+        end
+      end
+    end
+  end
+end

data/lib/active_job_log/version.rb

@@ -1,3 +1,3 @@
 module ActiveJobLog
-  VERSION = '0.2.1'
+  VERSION = '1.0.0'
 end

data/lib/generators/active_job_log/install/install_generator.rb

@@ -13,6 +13,10 @@ class ActiveJobLog::InstallGenerator < Rails::Generators::Base
     end
   end
 
+  def copy_job_model
+    copy_file "job_model.rb", "app/models/active_job_log/job.rb"
+  end
+
   def copy_engine_migrations
     rake "railties:install:migrations"
   end

data/lib/generators/active_job_log/install/templates/job_model.rb

@@ -0,0 +1,5 @@
+module ActiveJobLog
+  class Job < ApplicationRecord
+    include Loggeable
+  end
+end

data/spec/dummy/app/models/active_job_log/job.rb

@@ -0,0 +1,5 @@
+module ActiveJobLog
+  class Job < ApplicationRecord
+    include Loggeable
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_job_log
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Platanus
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,7 +170,6 @@ files:
 - app/jobs/active_job_log/application_job.rb
 - app/mailers/active_job_log/application_mailer.rb
 - app/models/active_job_log/application_record.rb
-- app/models/active_job_log/job.rb
 - app/views/layouts/active_job_log/application.html.erb
 - bin/rails
 - config/routes.rb
@@ -178,10 +177,12 @@ files:
 - lib/active_job_log.rb
 - lib/active_job_log/engine.rb
 - lib/active_job_log/log_ext.rb
+- lib/active_job_log/loggeable.rb
 - lib/active_job_log/version.rb
 - lib/generators/active_job_log/install/USAGE
 - lib/generators/active_job_log/install/install_generator.rb
 - lib/generators/active_job_log/install/templates/initializer.rb
+- lib/generators/active_job_log/install/templates/job_model.rb
 - lib/tasks/active_job_log_tasks.rake
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -194,6 +195,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/jobs/application_job.rb
 - spec/dummy/app/mailers/application_mailer.rb
+- spec/dummy/app/models/active_job_log/job.rb
 - spec/dummy/app/models/application_record.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/layouts/mailer.html.erb
@@ -262,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Rails engine to keep jobs history
@@ -278,6 +280,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/jobs/application_job.rb
 - spec/dummy/app/mailers/application_mailer.rb
+- spec/dummy/app/models/active_job_log/job.rb
 - spec/dummy/app/models/application_record.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/layouts/mailer.html.erb

data/app/models/active_job_log/job.rb

@@ -1,72 +0,0 @@
-module ActiveJobLog
-  class Job < ApplicationRecord
-    extend Enumerize
-
-    STATUSES = %i{queued pending finished failed}
-
-    validates :job_id, presence: true
-
-    enumerize :status, in: STATUSES, scope: true
-
-    serialize :params, Array
-    serialize :stack_trace, Array
-
-    before_save :set_queued_duration
-    before_save :set_execution_duration
-    before_save :set_total_duration
-
-    def self.update_job!(job_id, status, params = {})
-      params.merge!(status_to_params(status))
-      job = find_or_create_job(job_id)
-      job.update_attributes!(params)
-      job
-    end
-
-    class << self
-      private
-
-      def find_or_create_job(job_id)
-        Job.where(job_id: job_id).where.not(status: :failed).last || Job.create(job_id: job_id)
-      end
-
-      def status_to_params(status)
-        time_attr = infer_duration_attr_from_status(status)
-        {
-          time_attr => DateTime.current,
-          status: status
-        }
-      end
-
-      def infer_duration_attr_from_status(status)
-        case status
-        when :queued
-          :queued_at
-        when :pending
-          :started_at
-        when :finished, :failed
-          :ended_at
-        else
-          fail "invalid status"
-        end
-      end
-    end
-
-    private
-
-    def set_queued_duration
-      return if queued_at.blank? || started_at.blank?
-      self.queued_duration = (started_at.to_f - queued_at.to_f).to_i
-    end
-
-    def set_execution_duration
-      return if started_at.blank? || ended_at.blank?
-      self.execution_duration = (ended_at.to_f - started_at.to_f).to_i
-    end
-
-    def set_total_duration
-      from = queued_at || started_at
-      return if from.blank? || ended_at.blank?
-      self.total_duration = (ended_at.to_f - from.to_f).to_i
-    end
-  end
-end