activecrew 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a45d0ac6c7ba04c2eee3d07464b4a33eb8929527
-  data.tar.gz: d451a7a7ada0b52d1cab74db53f5545f0b48f1bc
+SHA256:
+  metadata.gz: abcdf07af76ef64766aba9c33476f500568662cd82129c47a988c1973de50b40
+  data.tar.gz: d0a818a0e3e4f6bb77f22dd23ea1b2c406f34b6f67568db5c445c9085e5db537
 SHA512:
-  metadata.gz: fdea905f162d86ff05391ed80582cbfaa5c092f2a2741847a65f0dc73273d63bfb61f987f614cba8b43d0466374ec0ebbffe09ea56d0939723a29669bcf51af7
-  data.tar.gz: 487f78c9e5cc76199a3f0841ad956f4c38aaa7170cc2a6cda9aed1e0dc6ccbd656e66dcd437afe897ab71201fa3e1b45c7f57c6f4c215ab9c8dedf983ffac01c
+  metadata.gz: 04c5f0e527ccb5d71d81a72b4a81a13ee3c8c35e655205a1970cac1da344426aa499d9d1c6569ab01acac388f92f889732c0824cdcd5f1144c4c7cc406a5bc33
+  data.tar.gz: 8589ad620868591ea5298eaa15ac9f0f50a1040096a729804c9d41eccccbe020930e1549dd75e31b2381188147177259ad07d8b49938cd08d5d835a63f29e0ab

data/activecrew.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '>= 1.10'
+  spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'actionpack', '~> 4.0'
+  spec.add_development_dependency 'actionpack', '>= 4.0'
 
-  spec.add_dependency 'activesupport', '~> 4.0'
+  spec.add_dependency 'activesupport', '>= 4.0'
 end

data/lib/active_crew/backends/inline_backend.rb

@@ -5,14 +5,26 @@ module ActiveCrew
         def size
           0
         end
-      end
 
-      def self.enqueue(*args)
-        ActiveCrew::Backends.dequeue *args
+        def method_missing(method, *args, &block)
+          return unless respond_to? method
+
+          super method, *args, &block
+        end
       end
 
-      def self.queue(command_name)
-        Queue.new
+      class << self
+        def enqueue(*args)
+          ActiveCrew::Backends.dequeue *args
+        end
+
+        def queue(command_name)
+          Queue.new
+        end
+
+        def context
+          {}
+        end
       end
     end
   end

data/lib/active_crew/backends/sidekiq_backend.rb

@@ -4,10 +4,10 @@ module ActiveCrew
       include Sidekiq::Worker
 
       class << self
-        def enqueue(*args)
+        def enqueue(name, invoker, context)
           Sidekiq::Client.push 'class' => self,
-                               'queue' => queue_name(args.first),
-                               'args' => args
+                               'queue' => queue_name(name),
+                               'args' => [YAML.dump([name, invoker, normalize(context)])]
         end
 
         def queue_name(command_name)
@@ -17,10 +17,20 @@ module ActiveCrew
         def queue(command_name)
           Sidekiq::Queue.new queue_name command_name
         end
+
+        def context
+          Sidekiq::Processor::WORKER_STATE.dup[Sidekiq::Logging.tid]
+        end
+
+        private
+
+        def normalize(context)
+          context.merge(options: context.fetch(:options, {}).to_hash).to_hash
+        end
       end
 
-      def perform(*args)
-        ActiveCrew::Backends.dequeue *args
+      def perform(context)
+        ActiveCrew::Backends.dequeue *YAML.load(context)
       end
     end
   end

data/lib/active_crew/backends.rb

@@ -17,8 +17,15 @@ module ActiveCrew
       end
 
       def dequeue(name, invoker, *args)
-        command = create_command name, deserialize(invoker), *args
-        command.execute if command.can_execute?
+        invoker = deserialize invoker
+        return if invoker.blank?
+
+        command name, invoker, *args
+      end
+
+      def command(name, invoker, *args)
+        command = create_command name, invoker, *args
+        command.execute if command && command.can_execute?
       end
 
       private
@@ -38,7 +45,7 @@ module ActiveCrew
       def create_command(name, invoker, *args)
         "#{name.classify}Command".constantize.new invoker, *args
       rescue NameError
-        raise ArgumentError, "Unsupported command #{name} for active command."
+        raise ArgumentError, "Unsupported command #{name} for active command." unless ActiveCrew.configuration.silent
       end
     end
   end

data/lib/active_crew/base.rb

@@ -24,6 +24,7 @@ module ActiveCrew
     prepend Measurable
     prepend Respondable
     prepend Authorizable
+    prepend Lockable
 
     include Commandable
 

data/lib/active_crew/concerns/authorizable.rb

@@ -1,17 +1,9 @@
 module ActiveCrew
-  class AuthorizationError < Exception; end
-
   module Authorizable
     extend ActiveSupport::Concern
 
-    def execute
-      raise AuthorizationError unless can_execute?
-
-      super
-    end
-
     def can_execute?
-      invoker.can? name, options
+      invoker.can? name, self
     end
   end
 end

data/lib/active_crew/concerns/lockable.rb

@@ -0,0 +1,40 @@
+module ActiveCrew
+  module Lockable
+    def execute
+      super unless locked?
+    end
+
+    def locked?
+      options = context.delete :locker
+      return false if options.blank?
+
+      model = deserialize_locker options
+      return true if model.blank?
+
+      model.locker != options[:value]
+    end
+
+    def lock(model)
+      return unless model
+
+      locker_was = context[:locker]
+      context[:locker] = serialize_locker model
+
+      yield
+
+      context[:locker] = locker_was
+    end
+
+    protected
+
+    def serialize_locker(model)
+      { class: model.class.to_s,
+        id: model.id.to_s,
+        value: model.lock }
+    end
+
+    def deserialize_locker(options)
+      options[:class].safe_constantize&.find options[:id]
+    end
+  end
+end

data/lib/active_crew/concerns/respondable.rb

@@ -2,8 +2,9 @@ module ActiveCrew
   class CommandError < Exception; end
 
   module Respondable
-    def respond_with(model)
-      Responders.respond_with name, invoker, context, model
+    def respond_with(model, options = {})
+      name = options.delete(:name) || self.name
+      Responders.respond_with name, invoker, context.merge(options), model
     end
 
     def respond_fail(*args)
@@ -12,8 +13,6 @@ module ActiveCrew
 
     def execute
       super
-    rescue Interrupt
-      raise
     rescue CommandError
       respond_with $ERROR_INFO
     end

data/lib/active_crew/configuration.rb

@@ -1,10 +1,11 @@
 module ActiveCrew
   class Configuration
-    attr_accessor :responder, :backend, :measurer
+    attr_accessor :responder, :backend, :measurer, :silent
 
     def initialize
       @responder = :inline
       @backend = :inline
+      @silent = false
     end
   end
 end

data/lib/active_crew/extender.rb

@@ -1,10 +1,14 @@
 module ActiveCrew
   module Extender
-    def command(name, options)
+    def command_context
+      @command_context ||= {}
+    end
+
+    def command(name, options = {})
       context = { options: options }
+      context[:session] = request.headers['x-session-token'] if respond_to? :request
 
-      ActiveCrew::Responders.init context, request
-      ActiveCrew::Backends.enqueue name, current_user, context
+      ActiveCrew::Backends.enqueue name, current_user, context.merge(command_context)
     end
   end
 end

data/lib/active_crew/responders/faye_responder.rb

@@ -1,25 +1,20 @@
 module ActiveCrew
   module Responders
-    # FayeResponderError class.
-    class FayeResponderError < Exception; end
-
-    # FayeConnectionError class.
-    class FayeConnectionError < Exception; end
-
     # ActiveCrew Faye responder.
     module FayeResponder
+
+      # FayeResponderError class.
+      class FayeResponderError < Exception; end
+
       module_function
 
       MAX_RETRIES = 5
 
-      def init(context, request)
-        context[:session] = request.headers['x-session-token']
-      end
-
       # Respond with faye
-      def respond(name, invoker, context, model)
-        request channel: channel(invoker),
-                data: payload(name, invoker, context, model),
+      # Respond with faye
+      def respond(name, invoker, options, model)
+        request channel: channel(invoker, options),
+                data: payload(name, invoker, options, model),
                 ext: { publish_key: config[:publish_key] }
       end
 
@@ -30,27 +25,28 @@ module ActiveCrew
           validate RestClient.post url, message.to_json, header
         rescue FayeResponderError
           retries += 1
-          raise FayeConnectionError $ERROR_INFO unless retries < MAX_RETRIES
 
-          retry
-        rescue FayeConnectionError
-          Rails.logger.fatal $ERROR_INFO.message
+          retry if retries < MAX_RETRIES
+
+          Rails.logger.fatal "[#{self}] #{$ERROR_INFO.message}"
+        rescue Exception
+          Rails.logger.fatal "[#{self}] #{$ERROR_INFO.message}"
         end
       end
 
       # @return Invoker channel name
-      def channel(invoker)
-        "/#{invoker.class.to_s.underscore}/#{invoker.id}"
+      def channel(invoker, options)
+        options[:channel] || "/#{invoker.class.to_s.underscore}/#{invoker.id}"
       end
 
       # @return Faye request payload
-      def payload(name, invoker, context, model)
+      def payload(name, invoker, options, model)
         {
           invoker: serialize_invoker(invoker),
-          session: context[:session],
+          session: options[:session],
           command: name,
           status: status(model),
-          response: serialize(model)
+          response: serialize(model, options)
         }
       end
 
@@ -62,15 +58,18 @@ module ActiveCrew
       def serialize(model, options = {})
         return { base: model.message } if model.is_a? CommandError
 
-        if model.is_a?(Array) || model.errors.empty?
-          ActiveModelSerializers::SerializableResource.new(model, options).serializable_hash
+        if model.is_a?(Array) || !model.respond_to?(:errors) || model.errors.empty?
+          # SerializableResource need only symbolize options
+          options = options.slice(:serializer, :each_serializer).symbolize_keys
+          resource = ActiveModelSerializers::SerializableResource.new model, options
+          resource.adapter.respond_to?(:serializable_hash) ? resource.serializable_hash : model
         else
-          ActiveModelSerializers::SerializableResource.new(model.errors, options.merge(root: 'errors')).serializable_hash[:errors]
+          ActiveModelSerializers::SerializableResource.new(model.errors, root: 'errors').serializable_hash[:errors]
         end
       end
 
       def status(model)
-        model.is_a?(Array) || !model.is_a?(CommandError) && model.valid? ? :success : :failure
+        !model.is_a?(CommandError) && (!model.respond_to?(:errors) || model.errors.empty?) ? :success : :failure
       end
 
       # @return Faye request header
@@ -91,7 +90,7 @@ module ActiveCrew
       end
 
       def url
-        "http://#{config[:host]}/faye"
+        "#{config[:ssl] ? 'https' : 'http'}://#{config[:host]}/faye"
       end
 
       def config

data/lib/active_crew/responders.rb

@@ -12,10 +12,6 @@ module ActiveCrew
         raise ArgumentError, "Unsupported responder #{responder} for active command."
       end
 
-      def init(context, request)
-        default.init(context, request) if default.respond_to? :init 
-      end
-
       def respond_with(name, invoker, context, model)
         default.respond name, invoker, context, model
       end

data/lib/active_crew/version.rb

@@ -1,3 +1,3 @@
 module ActiveCrew
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/active_crew.rb

@@ -7,6 +7,7 @@ require 'active_crew/concerns/authorizable'
 require 'active_crew/concerns/chainable'
 require 'active_crew/concerns/commandable'
 require 'active_crew/concerns/combinable'
+require 'active_crew/concerns/lockable'
 require 'active_crew/concerns/respondable'
 require 'active_crew/concerns/measurable'
 require 'active_crew/concerns/validatable'

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: activecrew
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Max Kazarin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -56,28 +56,28 @@ dependencies:
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Steroid command pattern.
@@ -105,6 +105,7 @@ files:
 - lib/active_crew/concerns/chainable.rb
 - lib/active_crew/concerns/combinable.rb
 - lib/active_crew/concerns/commandable.rb
+- lib/active_crew/concerns/lockable.rb
 - lib/active_crew/concerns/measurable.rb
 - lib/active_crew/concerns/respondable.rb
 - lib/active_crew/concerns/validatable.rb
@@ -119,7 +120,7 @@ homepage: https://github.com/maxkazar/activecrew
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,9 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
-signing_key: 
+rubygems_version: 3.3.16
+signing_key:
 specification_version: 4
 summary: Steroid command pattern.
 test_files: []