Merge pull request #46 from andypike/file_specs_bump_gems

File specs bump gems

Author: andypike

Diff for: .rubocop.yml

@@ -12,14 +12,23 @@ Style/HashSyntax:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-Style/AlignParameters:
+Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
-Style/MultilineMethodCallIndentation:
+Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Style/IndentationWidth:
-  Width: 2
+Layout/IndentationWidth:
+  Width: 2  
+
+Metrics/ClassLength:
+  Max: 110
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*_spec.rb'

Diff for: .travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
  - "2.2.2"
  - "2.3.0"
+ - "2.5.1"
 script: bundle exec rspec

Diff for: Gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "wisper-rspec", :github => "krisleech/wisper-rspec", :ref => "ba039c6f"
+gem "wisper-rspec"

Diff for: Gemfile.lock

@@ -1,14 +1,7 @@
-GIT
-  remote: git://github.com/krisleech/wisper-rspec.git
-  revision: ba039c6f717008cba378253a0ee254fcafdee276
-  ref: ba039c6f
-  specs:
-    wisper-rspec (0.0.2)
-
 PATH
   remote: .
   specs:
-    rectify (0.10.0)
+    rectify (0.12.0)
       activemodel (>= 4.1.0)
       activerecord (>= 4.1.0)
       activesupport (>= 4.1.0)
@@ -18,127 +11,126 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
-      arel (~> 6.0)
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    ast (2.2.0)
-    awesome_print (1.6.1)
+    arel (9.0.0)
+    ast (2.4.0)
+    awesome_print (1.8.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.2)
-    coderay (1.1.1)
+    builder (3.2.3)
+    coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     equalizer (0.0.11)
-    erubis (2.7.0)
-    i18n (0.7.0)
+    erubi (1.7.1)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (1.8.3)
-    loofah (2.0.3)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.8.2)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    parser (2.3.0.6)
-      ast (~> 2.2)
+    method_source (0.9.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
     powerpack (0.1.1)
-    pry (0.10.3)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    rainbow (2.1.0)
-    rake (11.1.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-collection_matchers (1.1.2)
+      method_source (~> 0.9.0)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-collection_matchers (1.1.3)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.37.2)
-      parser (>= 2.3.0.4, < 3.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.56.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 0.3)
-    ruby-progressbar (1.7.5)
-    slop (3.6.0)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (0.3.1)
+    unicode-display_width (1.3.2)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    wisper (1.6.1)
+    wisper (2.0.0)
+    wisper-rspec (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   actionpack (>= 4.1.0)
   awesome_print (~> 1.6)
-  pry (~> 0.10.3)
+  pry (~> 0.11.3)
   rake
   rectify!
   rspec (~> 3.4)
   rspec-collection_matchers (~> 1.1)
   rubocop
   sqlite3
-  wisper-rspec!
+  wisper-rspec
 
 BUNDLED WITH
    1.11.2

Diff for: Rakefile

@@ -4,12 +4,22 @@ require "yaml"
 require "active_record"
 
 namespace :db do
-  db_config = YAML.load(File.open("spec/config/database.yml"))
+  db_config = YAML.safe_load(File.open("spec/config/database.yml"))
+
+  def activerecord_below_5_2?
+    ActiveRecord.version.release < Gem::Version.new("5.2.0")
+  end
 
   desc "Migrate the database"
   task :migrate do
     ActiveRecord::Base.establish_connection(db_config)
-    ActiveRecord::Migrator.migrate("spec/db/migrate")
+
+    if activerecord_below_5_2?
+      ActiveRecord::Migrator.migrate("spec/db/migrate")
+    else
+      ActiveRecord::MigrationContext.new("spec/db/migrate").migrate
+    end
+
     Rake::Task["db:schema"].invoke
     puts "Database migrated."
   end
@@ -36,12 +46,12 @@ namespace :g do
     migration_class = name.split("_").map(&:capitalize).join
 
     File.open(path, "w") do |file|
-      file.write <<-EOF.strip_heredoc
-        class #{migration_class} < ActiveRecord::Migration
+      file.write <<-MIGRATION.strip_heredoc
+        class #{migration_class} < ActiveRecord::Migration[5.2]
           def change
           end
         end
-      EOF
+      MIGRATION
     end
 
     puts "Migration #{path} created"

Diff for: lib/rectify/build_form_from_model.rb

@@ -18,7 +18,7 @@ def build
 
     private
 
-    attr_reader :form_class, :form, :model
+    attr_reader :form_class, :model
 
     def form
       @form ||= form_class.new

Diff for: lib/rectify/command.rb

@@ -1,15 +1,39 @@
 module Rectify
+  class EventRecorder
+    attr_reader :events
+
+    def initialize
+      @events = {}
+    end
+
+    # rubocop:disable Style/MethodMissing
+    def method_missing(method_name, *args, &_block)
+      args = args.first if args.size == 1
+      @events[method_name] = args
+    end
+    # rubocop:enable Style/MethodMissing
+
+    def respond_to_missing?(_method_name, _include_private = false)
+      true
+    end
+  end
+
   class Command
     include Wisper::Publisher
 
     def self.call(*args, &block)
+      event_recorder = EventRecorder.new
+
       command = new(*args)
+      command.subscribe(event_recorder)
       command.evaluate(&block) if block_given?
       command.call
+
+      event_recorder.events
     end
 
     def evaluate(&block)
-      @caller = eval("self", block.binding)
+      @caller = eval("self", block.binding, __FILE__, __LINE__)
       instance_eval(&block)
     end
 

Diff for: lib/rectify/version.rb

@@ -1,3 +1,3 @@
 module Rectify
-  VERSION = "0.10.0".freeze
+  VERSION = "0.12.0".freeze
 end

Diff for: readme.md

@@ -609,6 +609,29 @@ When an event is handled, the appropriate block is called in the context of the
 controller. Basically, any method call within the block is delegated back to the
 controller.
 
+As well as capturing events in a block, the command will also return a hash of the
+broadcast events together with any parameters that were passed. For example:
+
+```ruby
+events = RegisterAccount.call(form)
+
+events  # => { :ok => user }
+```
+
+There will be a key for each event broadcast and its value will be the parameters
+passed. If there is a single parameter it will be the value. If there are no
+parameters or many, the hash value for the event key will be an array of the parameters:
+
+```ruby
+events = RegisterAccount.call(form)
+
+events  # => {
+        #      :ok       => user,
+        #      :messages => ["User registered", "Email sent", "Account ready"],
+        #      :next     => []
+        #    }
+```
+
 You may occasionally want to expose a value within a handler block to the view.
 You do this via the `expose` method within the handler block. If you want to
 use `expose` then you must include the `Rectify::ControllerHelpers` module in