u-observers 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b67e1c24feb02de944be44aacb6bba935d9dc1dfac6c53de2ba95dcffbd93ee
-  data.tar.gz: aead6fb10e5ada014fed52383f031d140363cbf4f7ef9b21f5ee7c9e9f54c792
+  metadata.gz: bfa6d5600e86dd6086b2d6ebd4cd1b015ebe3331bd4cd61be90f2d96a1abf601
+  data.tar.gz: b483b0721def3d41085260343edf1041905b376264354b6ffbd07cbb5386725f
 SHA512:
-  metadata.gz: a77a575068bdee0f9312e25e5623a4031bb1369dee11df5d039121e84cf7cab418b8b37c3c93ff46265528304b64f80fc1be61ca42e78d9436e9e779c390b2bd
-  data.tar.gz: f90045332776294e6bc3bf6e70c34b0f24f40551f32a4d9be029ecd5fdfcad4b68d33b6f5c81802e9e257dedf9d1e16395bda434ee2dd48f38f9e291099a8a4e
+  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.notify(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(options = Utils::EMPTY_HASH)
-        notify_observers!(with: EventsOrActions.fetch_actions(options))
+        notify_observers!(Events[events])
       end
     end
 

data/lib/micro/observers/{events_or_actions.rb → events.rb}

@@ -3,7 +3,7 @@
 module Micro
   module Observers
 
-    module EventsOrActions
+    module Events
       DEFAULTS = [:call]
 
       def self.[](value)
@@ -12,12 +12,6 @@ module Micro
         values.empty? ? DEFAULTS : values
       end
 
-      def self.fetch_actions(hash)
-        return self[hash[:actions] || hash.fetch(:action)] if hash.is_a?(Hash)
-
-        raise ArgumentError, 'expected a hash with the key :action or :actions'
-      end
-
       private_constant :DEFAULTS
     end
 

data/lib/micro/observers/manager.rb

@@ -4,31 +4,81 @@ module Micro
   module Observers
 
     class Manager
+      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 count
+        @subscribers.size
+      end
+
+      def none?
+        @subscribers.empty?
+      end
+
+      def some?
+        !none?
+      end
+
+      def subject_changed?
+        @subject_changed
+      end
+
+      INVALID_BOOLEAN_ERROR = 'expected a boolean (true, false)'.freeze
+
+      def subject_changed(state)
+        if state == true || state == false
+          @subject_changed = state
+
+          return self
+        end
+
+        raise ArgumentError, INVALID_BOOLEAN_ERROR
+      end
+
+      def subject_changed!
+        subject_changed(true)
       end
 
       def included?(observer)
-        @list.any?(&EqualTo[observer])
+        @subscribers.any?(&EqualTo[observer])
       end
 
       def attach(*args)
         options = args.last.is_a?(Hash) ? args.pop : Utils::EMPTY_HASH
 
         Utils.compact_array(args).each do |observer|
-          if options[:allow_duplication] || !included?(observer)
-            @list << [:observer, observer, options[:data]]
-          end
+          @subscribers << MapObserver[observer, options] unless included?(observer)
+        end
+
+        self
+      end
+
+      def detach(*args)
+        Utils.compact_array(args).each do |observer|
+          @subscribers.delete_if(&EqualTo[observer])
         end
 
         self
@@ -39,62 +89,66 @@ module Micro
 
         return self unless event.is_a?(Symbol) && callable.respond_to?(:call)
 
-        @list << [:callable, event, [callable, with]]
-      end
-
-      def detach(*args)
-        Utils.compact_array(args).each do |observer|
-          @list.delete_if(&EqualTo[observer])
-        end
+        @subscribers << [:callable, event, [callable, with]] unless included?(callable)
 
         self
       end
 
       def notify(*events)
-        broadcast(EventsOrActions[events])
-
-        self
+        notify!(Events[events])
       end
 
-      def call(options = Utils::EMPTY_HASH)
-        broadcast(EventsOrActions.fetch_actions(options))
+      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 broadcast(evts_or_acts)
-          evts_or_acts.each do |evt_or_act|
-            @list.each do |strategy, observer, data|
-              call!(observer, strategy, data, with: evt_or_act)
-            end
+        def broadcast(events)
+          events.each do |event|
+            @subscribers.each { |subscriber| call!(subscriber, event) }
           end
         end
 
-        def call!(observer, strategy, data, with:)
-          return call_callable(data) if strategy == :callable && observer == with
+        def call!(subscriber, event)
+          strategy, observer, context = subscriber
+
+          return call_observer(observer, event, context) if strategy == :observer
 
-          return call_observer(observer, with, data) if strategy == :observer
+          return call_callable(context) if strategy == :callable && observer == event
         end
 
-        def call_callable(data)
-          callable, arg = data[0], data[1]
+        def call_callable(context)
+          callable, with = context[0], context[1]
 
-          callable_arg = arg.is_a?(Proc) ? arg.call(@subject) : (arg || @subject)
+          arg = with.is_a?(Proc) ? with.call(@subject) : (with || @subject)
 
-          callable.call(callable_arg)
+          callable.call(arg)
         end
 
-        def call_observer(observer, method_name, data)
+        def call_observer(observer, method_name, context)
           return unless observer.respond_to?(method_name)
 
-          handler = observer.method(method_name)
+          handler = observer.is_a?(Proc) ? observer : observer.method(method_name)
 
-          handler.arity == 1 ? handler.call(@subject) : handler.call(@subject, data)
+          handler.arity == 1 ? handler.call(@subject) : handler.call(@subject, context)
         end
 
-      private_constant :EqualTo
+      private_constant :MapObserver, :MapSubscribers, :EqualTo, :INVALID_BOOLEAN_ERROR
     end
 
   end

data/lib/micro/observers/version.rb

@@ -1,5 +1,5 @@
 module Micro
   module Observers
-    VERSION = '0.8.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.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-28 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: