u-observers 0.4.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9c81561b00ca412faa80abc349e8a87251f4d84ce81da5fcd95ca1117e2bd2e
-  data.tar.gz: da923ace22c60cac08f710dccac65367b0bb568d9b4a99fbbe8bc164c8824b12
+  metadata.gz: bfa6d5600e86dd6086b2d6ebd4cd1b015ebe3331bd4cd61be90f2d96a1abf601
+  data.tar.gz: b483b0721def3d41085260343edf1041905b376264354b6ffbd07cbb5386725f
 SHA512:
-  metadata.gz: 69eedf04951d55a0889412d50e62e226fdfe2561a3a3a52df087f0091ec15ec696fe002fe906a00fdf15119455c4c7f7f1a54a464c83e56c3ec5d6ff143ed1f4
-  data.tar.gz: 805003dac964746271f6b7789527e608fbd2caf77dd8f9eb735b8d30f42159e9d577f0a8bb0b3b60199fc764b40c0ae7a1edd005deb2d01f7e9567d49e18c4fd
+  metadata.gz: '06318ee21d6b9e842fa7ad752f9ccb137286667211fc43bed267d5593506d239fe946f03159236e00e0549c45e71d5de1f36cb1213ce698c3ad3b8edaf4c5abf'
+  data.tar.gz: 91aac7ae90a990f5575838bf13ddfd174066257a2b82620e82fc8af963519d9c85526aa742005b3d7c1cc78c1dba67d557f62ab233d34b30b70b8c69a945a929

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.5

data/.travis.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+ruby_v=$(ruby -v)
+
+ACTIVERECORD_VERSION='3.2' bundle update
+ACTIVERECORD_VERSION='3.2' bundle exec rake test
+
+ACTIVERECORD_VERSION='4.0' bundle update
+ACTIVERECORD_VERSION='4.0' bundle exec rake test
+
+ACTIVERECORD_VERSION='4.1' bundle update
+ACTIVERECORD_VERSION='4.1' bundle exec rake test
+
+ACTIVERECORD_VERSION='4.2' bundle update
+ACTIVERECORD_VERSION='4.2' bundle exec rake test
+
+ACTIVERECORD_VERSION='5.0' bundle update
+ACTIVERECORD_VERSION='5.0' bundle exec rake test
+
+ACTIVERECORD_VERSION='5.1' bundle update
+ACTIVERECORD_VERSION='5.1' bundle exec rake test
+
+if [[ ! $ruby_v =~ '2.2.0' ]]; then
+  ACTIVERECORD_VERSION='5.2' bundle update
+  ACTIVERECORD_VERSION='5.2' bundle exec rake test
+fi
+
+if [[ $ruby_v =~ '2.5.' ]] || [[ $ruby_v =~ '2.6.' ]] || [[ $ruby_v =~ '2.7.' ]]; then
+  ACTIVERECORD_VERSION='6.0' bundle update
+  ACTIVERECORD_VERSION='6.0' bundle exec rake test
+fi

data/.travis.yml

@@ -1,6 +1,30 @@
 ---
 language: ruby
-cache: bundler
+
+sudo: false
+
 rvm:
-  - 2.6.5
-before_install: gem install bundler -v 2.1.4
+- 2.2.0
+- 2.3.0
+- 2.4.0
+- 2.5.0
+- 2.6.0
+- 2.7.0
+
+cache: bundler
+
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+
+install: bundle install --jobs=3 --retry=3
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - "./cc-test-reporter before-build"
+
+script: "./.travis.sh"
+
+after_success:
+  - "./cc-test-reporter after-build -t simplecov"

data/Gemfile

@@ -3,12 +3,36 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in u-observers.gemspec
 gemspec
 
-gem 'rake', '~> 12.0'
-gem 'minitest', '~> 5.0'
+activerecord_version = ENV.fetch('ACTIVERECORD_VERSION', '6.1')
+
+activerecord = case activerecord_version
+              when '3.2' then '3.2.22'
+              when '4.0' then '4.0.13'
+              when '4.1' then '4.1.16'
+              when '4.2' then '4.2.11'
+              when '5.0' then '5.0.7'
+              when '5.1' then '5.1.7'
+              when '5.2' then '5.2.3'
+              when '6.0' then '6.0.3'
+              end
+
+simplecov_version =
+  case RUBY_VERSION
+  when /\A2.[23]/ then '~> 0.17.1'
+  when /\A2.4/ then '~> 0.18.5'
+  else '~> 0.19'
+  end
+
+sqlite3 =
+  case activerecord
+  when /\A6\.0/, nil then '~> 1.4.0'
+  else '~> 1.3.0'
+  end
 
 group :test do
-  gem 'activerecord', require: 'active_record'
-  gem 'sqlite3'
+  gem 'minitest', activerecord_version < '4.1' ? '~> 4.2' : '~> 5.0'
+  gem 'simplecov', simplecov_version, require: false
 
-  gem 'simplecov', '~> 0.19', require: false
+  gem 'sqlite3', sqlite3
+  gem 'activerecord', activerecord, require: 'active_record'
 end

data/lib/micro/observers.rb

@@ -3,20 +3,19 @@ require 'micro/observers/version'
 module Micro
   module Observers
     require 'micro/observers/utils'
-    require 'micro/observers/events_or_actions'
+    require 'micro/observers/events'
     require 'micro/observers/manager'
 
     module ClassMethods
-      def notify_observers!(with:)
-        proc { |object| with.each { |evt_or_act| object.observers.call(evt_or_act) } }
+      def notify_observers!(events)
+        proc do |object|
+          object.observers.subject_changed!
+          object.observers.send(:notify!, events)
+        end
       end
 
       def notify_observers(*events)
-        notify_observers!(with: EventsOrActions[events])
-      end
-
-      def call_observers(action: :call)
-        notify_observers!(with: EventsOrActions[action])
+        notify_observers!(Events[events])
       end
     end
 

data/lib/micro/observers/events.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Micro
+  module Observers
+
+    module Events
+      DEFAULTS = [:call]
+
+      def self.[](value)
+        values = Utils.compact_array(value)
+
+        values.empty? ? DEFAULTS : values
+      end
+
+      private_constant :DEFAULTS
+    end
+
+  end
+end

data/lib/micro/observers/manager.rb

@@ -4,83 +4,151 @@ module Micro
   module Observers
 
     class Manager
-      EMPTY_HASH = {}.freeze
+      MapObserver = -> (observer, options) { [:observer, observer, options[:context]] }
+
+      MapSubscribers = -> (value) do
+        array = Utils.compact_array(value.kind_of?(Array) ? value : [])
+        array.map { |observer| MapObserver[observer, Utils::EMPTY_HASH] }
+      end
 
       EqualTo = -> (observer) do
-        -> item { item[0] == :observer && item[1] == observer }
+        -> subscriber do
+          handler = subscriber[0] == :observer ? subscriber[1] : subscriber[2][0]
+          handler == observer
+        end
       end
 
       def self.for(subject)
         new(subject)
       end
 
-      def initialize(subject, list = nil)
+      def initialize(subject, subscribers: nil)
         @subject = subject
 
-        @list = Utils.compact_array(list.kind_of?(Array) ? list : [])
+        @subject_changed = false
+
+        @subscribers = MapSubscribers.call(subscribers)
       end
 
-      def included?(observer)
-        @list.any?(&EqualTo[observer])
+      def count
+        @subscribers.size
+      end
+
+      def none?
+        @subscribers.empty?
+      end
+
+      def some?
+        !none?
+      end
+
+      def subject_changed?
+        @subject_changed
       end
 
-      def attach(observer, options = EMPTY_HASH)
-        if options[:allow_duplication] || !included?(observer)
-          @list << [:observer, observer, options[:data]]
+      INVALID_BOOLEAN_ERROR = 'expected a boolean (true, false)'.freeze
+
+      def subject_changed(state)
+        if state == true || state == false
+          @subject_changed = state
+
+          return self
         end
 
-        self
+        raise ArgumentError, INVALID_BOOLEAN_ERROR
       end
 
-      def on(options=EMPTY_HASH)
-        event, callable, with = options[:event], options[:call], options[:with]
+      def subject_changed!
+        subject_changed(true)
+      end
 
-        return self unless event.is_a?(Symbol) && callable.respond_to?(:call)
+      def included?(observer)
+        @subscribers.any?(&EqualTo[observer])
+      end
 
-        arg = with.is_a?(Proc) ? with.call(@subject) : (arg || subject)
+      def attach(*args)
+        options = args.last.is_a?(Hash) ? args.pop : Utils::EMPTY_HASH
 
-        @list << [:callable, event, [callable, arg]]
+        Utils.compact_array(args).each do |observer|
+          @subscribers << MapObserver[observer, options] unless included?(observer)
+        end
+
+        self
       end
 
-      def detach(observer)
-        @list.delete_if(&EqualTo[observer])
+      def detach(*args)
+        Utils.compact_array(args).each do |observer|
+          @subscribers.delete_if(&EqualTo[observer])
+        end
 
         self
       end
 
-      def notify(event)
-        notify!(event)
+      def on(options = Utils::EMPTY_HASH)
+        event, callable, with = options[:event], options[:call], options[:with]
+
+        return self unless event.is_a?(Symbol) && callable.respond_to?(:call)
+
+        @subscribers << [:callable, event, [callable, with]] unless included?(callable)
 
         self
       end
 
-      def call(*actions)
-        EventsOrActions[actions].each { |act| notify!(act) }
+      def notify(*events)
+        notify!(Events[events])
+      end
+
+      def call(*events)
+        broadcast(Events[events])
 
         self
       end
 
+      protected
+
+        def notify!(events)
+          return self unless subject_changed?
+
+          broadcast(events)
+
+          subject_changed(false)
+
+          self
+        end
+
       private
 
-        def notify!(evt_or_act)
-          @list.each do |strategy, observer, data|
-            call!(observer, strategy, data, with: evt_or_act)
+        def broadcast(events)
+          events.each do |event|
+            @subscribers.each { |subscriber| call!(subscriber, event) }
           end
         end
 
-        def call!(observer, strategy, data, with:)
-          return data[0].call(data[1]) if strategy == :callable && observer == with
+        def call!(subscriber, event)
+          strategy, observer, context = subscriber
 
-          if strategy == :observer && observer.respond_to?(with)
-            handler = observer.method(with)
+          return call_observer(observer, event, context) if strategy == :observer
 
-            return handler.call(@subject) if handler.arity == 1
+          return call_callable(context) if strategy == :callable && observer == event
+        end
 
-            handler.call(@subject, data)
-          end
+        def call_callable(context)
+          callable, with = context[0], context[1]
+
+          arg = with.is_a?(Proc) ? with.call(@subject) : (with || @subject)
+
+          callable.call(arg)
+        end
+
+        def call_observer(observer, method_name, context)
+          return unless observer.respond_to?(method_name)
+
+          handler = observer.is_a?(Proc) ? observer : observer.method(method_name)
+
+          handler.arity == 1 ? handler.call(@subject) : handler.call(@subject, context)
         end
 
-      private_constant :EMPTY_HASH, :EqualTo
+      private_constant :MapObserver, :MapSubscribers, :EqualTo, :INVALID_BOOLEAN_ERROR
     end
 
   end

data/lib/micro/observers/utils.rb

@@ -4,6 +4,8 @@ module Micro
   module Observers
 
     module Utils
+      EMPTY_HASH = {}.freeze
+
       def self.compact_array(value)
         Array(value).flatten.tap(&:compact!)
       end

data/lib/micro/observers/version.rb

@@ -1,5 +1,5 @@
 module Micro
   module Observers
-    VERSION = '0.4.0'
+    VERSION = '0.9.0'
   end
 end

data/test.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+bundle
+
+rm Gemfile.lock
+
+source $(dirname $0)/.travis.sh
+
+rm Gemfile.lock
+
+bundle

data/u-observers.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Simple and powerful implementation of the observer pattern.}
   spec.homepage      = 'https://github.com/serradura/u-observers'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/serradura/u-observers'
@@ -24,4 +23,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.0')
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: u-observers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
-dependencies: []
+date: 2020-09-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 description: Simple and powerful implementation of the observer pattern.
 email:
 - rodrigo.serradura@gmail.com
@@ -18,6 +46,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".tool-versions"
+- ".travis.sh"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -27,11 +57,12 @@ files:
 - bin/console
 - bin/setup
 - lib/micro/observers.rb
-- lib/micro/observers/events_or_actions.rb
+- lib/micro/observers/events.rb
 - lib/micro/observers/manager.rb
 - lib/micro/observers/utils.rb
 - lib/micro/observers/version.rb
 - lib/u-observers.rb
+- test.sh
 - u-observers.gemspec
 homepage: https://github.com/serradura/u-observers
 licenses:

data/lib/micro/observers/events_or_actions.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Micro
-  module Observers
-
-    module EventsOrActions
-      DEFAULT = [:call]
-
-      def self.[](values)
-        vals = Utils.compact_array(values)
-
-        vals.empty? ? DEFAULT : vals
-      end
-
-      private_constant :DEFAULT
-    end
-
-  end
-end