waterdrop 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47faf12d9fbcb7cebc0b764ecace5eb3de8bb0c1
-  data.tar.gz: 2bd185c502c8b3103c900c116dc0f0534fcd4ba9
+  metadata.gz: 0f15e7e19f6c653cae48eed591c3036b9813c6de
+  data.tar.gz: 7faded565baae3e1dc796d7e87b5591181a450d4
 SHA512:
-  metadata.gz: d42b8147179daf3c6b767334ffee0f46ed30d852c74a6b85e7e8af36fe8b4802c34f57d046dada12ce0786fe697ca7b075ece78c9439bd2162933b9c71a83bf3
-  data.tar.gz: a2ec57ba800cf3fc8f8bc7c2e48b5287b4c198b7e82d72efa6655403366f15d94c61754dbeece5eb1a4e86dc255be40eef233000f7d4d1038d8e50b94193220a
+  metadata.gz: 7f4f66bad01e5e24102130f5c7fbd30bf256480f57e4dc4764f9093949c94c8c1fac0b1f4259dedafb38e76e46d1b1ca78efa4550e54964b3928ab6a60fed929
+  data.tar.gz: b254e0081368a53e68cf0c12648ec7d6db4596f2735f4c1cfcdebad0323f11b99722adb6845a0953ef68b1330b77e85a3a1969304fb8712ec11719ddcf786bf2

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 rvm:
   - 2.1.7
   - 2.2.3
+  - 2.3.0
 script:
   - bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # WaterDrop changelog
 
+## 0.2.0
+- Version dump - this WaterDrop version no longer relies on Aspector to work
+- #17 - Logger for Aspector - WaterDrop no longer depends on Aspector
+- #8 - add send date as a default value added to a message - wontfix. Should be implemented on a message level since WaterDrop just transports messages without adding additional stuff.
+- #11 - same as above
+
 ## 0.1.13
 - Resolved bug #15. When you use waterdrop in aspect way, message will be automatically parse to JSON.
 

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    waterdrop (0.1.13)
-      aspector
+    waterdrop (0.2.0)
       bundler
       connection_pool
       null-logger
@@ -25,15 +24,14 @@ GEM
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
-    aspector (0.14.0)
-    ast (2.1.0)
+    ast (2.2.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    brakeman (3.1.3)
+    brakeman (3.1.4)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
       haml (>= 3.0, < 5.0)
@@ -85,9 +83,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
     minitest (5.8.3)
-    mongo (2.2.0)
+    mongo (2.2.1)
       bson (~> 4.0)
-    mongoid (5.0.1)
+    mongoid (5.0.2)
       activemodel (~> 4.0)
       mongo (~> 2.1)
       origin (~> 2.1)
@@ -156,7 +154,7 @@ GEM
       sexp_processor (~> 4.0)
     ruby_parser (3.7.2)
       sexp_processor (~> 4.1)
-    rubycritic (2.3.0)
+    rubycritic (2.4.0)
       flay (= 2.6.1)
       flog (= 4.3.2)
       parser (>= 2.2.0, < 3.0)
@@ -212,4 +210,4 @@ DEPENDENCIES
   waterdrop!
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/README.md

@@ -4,7 +4,7 @@
 [![Code Climate](https://codeclimate.com/github/karafka/waterdrop/badges/gpa.svg)](https://codeclimate.com/github/karafka/waterdrop)
 [![Gem Version](https://badge.fury.io/rb/waterdrop.svg)](http://badge.fury.io/rb/waterdrop)
 
-Gem used to send messages to Kafka in a standard and in an aspect way.
+Gem used to send messages to Kafka in an easy way.
 
 ## Installation
 
@@ -64,7 +64,7 @@ end
 
 ### Creating and sending standard messages
 
-To send Kafka messages, you don't need to use aspects, you can create and send messages directly:
+To send Kafka messages, just create and send messages directly:
 
 ```ruby
 message = WaterDrop::Message.new('topic', 'message')
@@ -78,86 +78,16 @@ message that you want to send should be either binary or stringified (to_s, to_j
 
 ### Using aspects to handle messages
 
-WaterDrop uses [Aspector](https://github.com/gcao/aspector) to allow aspect oriented messages hookup. If you need extensive details about aspector usage, please refer to the [examples](https://github.com/gcao/aspector/tree/master/examples) directory of this project.
-
-In general aspects allows adding additional behavior to existing code without modifying the code itself. This way we can create and send messages, without "polluting" the business logic with it.
-
-All the WaterDrop aspects accept following parameters:
-
-| Option                  | Value type            | Description                                    |
-|-------------------------|-----------------------|------------------------------------------------|
-| ClassName               | Class                 | Class to which we want to hook                 |
-| method: :method_name    | Symbol, Array<Symbol> | Method (or methods) to which we want to hook   |
-| topic: 'karafka_topic'  | String, Symbol        | Kafka topic to which we will send the message  |
-
-There also a *message*, *after_message* and *before_message* proc parameter that will be evaluated in the methods object context.
-
-**Note**: If you use waterdrop in aspect way, the message will be parsed to JSON as default. If you want to change this behaviour, you must override WaterDrop::Aspects::Formatter class.
-#### Before aspects hookup
-
-```ruby
-WaterDrop::Aspects::BeforeAspect.apply(
-  ClassName,
-  method: :run,
-  topic: 'karafka_topic',
-  message: -> { any_class_name_instance_method }
-)
-```
-
-now each time before you run:
-
-```ruby
-ClassName.new.run
-```
-
-a message with the given message will be send to Kafka.
-
-#### After aspects hookup
-
-```ruby
-WaterDrop::Aspects::AfterAspect.apply(
-  ClassName,
-  method: :run,
-  topic: 'karafka_topic',
-  message: ->(result) { "This is result of method run: #{result}" }
-)
-```
-
-now each time after you run:
-
-```ruby
-ClassName.new.run
-```
-
-a message with the given message will be send to Kafka.
-
-#### Around aspects hookup
-
-```ruby
-WaterDrop::Aspects::AroundAspect.apply(
-  ClassName,
-  method: :run,
-  topic: 'karafka_topic',
-  before_message: -> { any_class_name_instance_method },
-  after_message: ->(result) { "This is result of method run: #{result}" }
-)
-```
-
-now each time you run:
-
-```ruby
-ClassName.new.run
-```
-
-a message with the given message will be send before and after the method execution.
+WaterDrop no longer depends on [Aspector](https://github.com/gcao/aspector). Please refer to [Aspector](https://github.com/gcao/aspector) documentation if you want to handle messaging in an aspect way.
 
 ## References
 
 * [Karafka framework](https://github.com/karafka/karafka)
 * [Waterdrop](https://github.com/karafka/waterdrop)
-* [Sidekiq Glass](https://github.com/karafka/sidekiq-glass)
+* [Worker Glass](https://github.com/karafka/worker-glass)
 * [Envlogic](https://github.com/karafka/envlogic)
 * [Null Logger](https://github.com/karafka/null-logger)
+* [Aspector](https://github.com/gcao/aspector)
 * [WaterDrop Travis CI](https://travis-ci.org/karafka/waterdrop)
 * [WaterDrop Code Climate](https://codeclimate.com/github/karafka/waterdrop)
 

data/lib/water_drop/version.rb

@@ -1,5 +1,5 @@
 # WaterDrop library
 module WaterDrop
   # Current WaterDrop version
-  VERSION = '0.1.13'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/waterdrop.rb

@@ -7,7 +7,6 @@
   pathname
   json
   poseidon
-  aspector
   forwardable
   connection_pool
   null_logger
@@ -22,11 +21,6 @@ base_path = File.dirname(__FILE__) + '/water_drop'
   pool
   config
   message
-  aspects/base_aspect
-  aspects/formatter
-  aspects/after_aspect
-  aspects/around_aspect
-  aspects/before_aspect
 ).each { |lib| require "#{base_path}/#{lib}" }
 
 # WaterDrop library

data/waterdrop.gemspec

@@ -1,6 +1,6 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rake'
+
 require 'water_drop/version'
 
 Gem::Specification.new do |spec|
@@ -10,13 +10,12 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Maciej Mensfeld', 'Pavlo Vavruk']
   spec.email         = %w( maciej@mensfeld.pl pavlo.vavruk@gmail.com )
   spec.homepage      = 'https://github.com/karafka/waterdrop'
-  spec.summary       = %q{ Kafka messages with aspects made easy! }
+  spec.summary       = %q{ Kafka messaging made easy! }
   spec.description   = spec.summary
   spec.license       = 'MIT'
 
   spec.add_dependency 'bundler', '>= 0'
   spec.add_dependency 'rake', '>= 0'
-  spec.add_dependency 'aspector', '>= 0'
   spec.add_dependency 'poseidon', '>= 0'
   spec.add_dependency 'connection_pool', '>= 0'
   spec.add_dependency 'null-logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterdrop
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aspector
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: poseidon
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +81,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Kafka messages with aspects made easy!
+description: Kafka messaging made easy!
 email:
 - maciej@mensfeld.pl
 - pavlo.vavruk@gmail.com
@@ -113,11 +99,6 @@ files:
 - MIT-LICENCE
 - README.md
 - Rakefile
-- lib/water_drop/aspects/after_aspect.rb
-- lib/water_drop/aspects/around_aspect.rb
-- lib/water_drop/aspects/base_aspect.rb
-- lib/water_drop/aspects/before_aspect.rb
-- lib/water_drop/aspects/formatter.rb
 - lib/water_drop/config.rb
 - lib/water_drop/message.rb
 - lib/water_drop/pool.rb
@@ -145,9 +126,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Kafka messages with aspects made easy!
+summary: Kafka messaging made easy!
 test_files: []
 has_rdoc: 

data/lib/water_drop/aspects/after_aspect.rb

@@ -1,19 +0,0 @@
-module WaterDrop
-  module Aspects
-    # After method execution aspect
-    # @example Apply after aspect to a method
-    #   WaterDrop::Aspects::AfterAspect.apply(
-    #     ClassName,
-    #     method: :run,
-    #     topic: 'karafka_topic',
-    #     message: ->(result) { "This is result of method run: #{result}" }
-    #   )
-    class AfterAspect < BaseAspect
-      after options[:method], interception_arg: true do |interception, result, *args|
-        options = interception.options
-        interception.aspect.handle(self, options, args, options[:message], result)
-        result
-      end
-    end
-  end
-end

data/lib/water_drop/aspects/around_aspect.rb

@@ -1,22 +0,0 @@
-module WaterDrop
-  module Aspects
-    # Around method execution aspect
-    # @example Apply around aspect to a method
-    #   WaterDrop::Aspects::AroundAspect.apply(
-    #     ClassName,
-    #     method: :run,
-    #     topic: 'karafka_topic',
-    #     before_message: -> { any_class_name_instance_method },
-    #     after_message: ->(result) { "This is result of method run: #{result}" }
-    #   )
-    class AroundAspect < BaseAspect
-      around options[:method], interception_arg: true do |interception, proxy, *args, &block|
-        options = interception.options
-        interception.aspect.handle(self, options, args, options[:before_message])
-        result = proxy.call(*args, &block)
-        interception.aspect.handle(self, options, args, options[:after_message], result)
-        result
-      end
-    end
-  end
-end

data/lib/water_drop/aspects/base_aspect.rb

@@ -1,37 +0,0 @@
-module WaterDrop
-  # Aspects module which include all available aspects
-  module Aspects
-    # Base class for all aspects
-    class BaseAspect < ::Aspector::Base
-      default private_methods: true
-
-      # @param this is an instance on which we execute aspect (original method caller)
-      # @param [Hash] options aspect options
-      # @param [Array] args original method arguments
-      # @param [Block] message block which we evaluate to get a message that we will send
-      # @param result original method result
-      def handle(this, options, args, message, *result)
-        formatter = Formatter.new(
-          options,
-          args,
-          instance_run(this, result, message)
-        )
-
-        Message.new(options[:topic], formatter.message).send!
-      end
-
-      private
-
-      # Method used to change message block binding, so it will be evaluated
-      # in the caller instance context
-      # @param this is an instance on which we execute aspect (original method caller)
-      # @param result original method call result
-      # @param [Block] message block
-      def instance_run(this, result, message)
-        return this.instance_eval(&message) if message.parameters.empty?
-
-        this.instance_exec(result, message) { |res, block| block.call(res.first) }
-      end
-    end
-  end
-end

data/lib/water_drop/aspects/before_aspect.rb

@@ -1,18 +0,0 @@
-module WaterDrop
-  module Aspects
-    # Before method execution aspect
-    # @example Apply before aspect to a method
-    #   WaterDrop::Aspects::BeforeAspect.apply(
-    #     ClassName,
-    #     method: :run,
-    #     topic: 'karafka_topic',
-    #     message: -> { any_class_name_instance_method }
-    #   )
-    class BeforeAspect < BaseAspect
-      before options[:method], interception_arg: true do |interception, *args|
-        options = interception.options
-        interception.aspect.handle(self, options, args, options[:message])
-      end
-    end
-  end
-end

data/lib/water_drop/aspects/formatter.rb

@@ -1,25 +0,0 @@
-module WaterDrop
-  module Aspects
-    # Class used to format message that will be send from an aspect
-    class Formatter
-      # @param [Hash] options from an aspect
-      # @param [Array] args original method arguments
-      # @param result of execution of the method
-      def initialize(options, args, result)
-        @options = options
-        @args = args
-        @result = result
-      end
-
-      # @return [JSON] with formatted message that can be send
-      def message
-        {
-          topic:  @options[:topic],
-          method: @options[:method],
-          message: @result,
-          args: @args
-        }.to_json
-      end
-    end
-  end
-end