Merge 8fc3288 into 2c2029a

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Pavlov Changelog
 
-## HEAD
+## 0.3.0
+
+#### Removed
+
+* Removed `Pavlov::Interactor`, `Pavlov::Command` and `Pavlov::Query` in favor of generated classes inside your own
+  application. Run `rails generate pavlov:install` and then find-and-replace `\n\s+include Pavlov::` for ` < ` to
+  rewrite your operations so that they inherit from the generated classes.
+
+## 0.2.0
 
 This release brings forth lots and lots of incompatibilities. Where possible, we've tried to keep a backwards-compatible API available. You can activate this by requiring `pavlov/alpha_compatibility'.
 

README.md

@@ -20,8 +20,7 @@ Then generate some initial files with:
 ## Usage
 
 ```ruby
-class Commands::CreateBlogPost
-  include Pavlov::Command
+class Commands::CreateBlogPost < Command
 
   attribute :id,        Integer
   attribute :title,     String
@@ -40,8 +39,7 @@ class Commands::CreateBlogPost
   end
 end
 
-class Queries::AvailableId
-  include Pavlov::Query
+class Queries::AvailableId < Query
 
   private
 
@@ -54,8 +52,7 @@ class Queries::AvailableId
   end
 end
 
-class Interactors::CreateBlogPost
-  include Pavlov::Interactor
+class Interactors::CreateBlogPost < Interactor
 
   attribute :title,     String
   attribute :body,      String
@@ -117,8 +114,7 @@ Interactors must define a method `authorized?` that determines if the interactio
 To help you determine whether operations are allowed, you can set up a global [interaction context](#context), which you can then access from your interactors:
 
 ```ruby
-class Interactors::CreateBlogPost
-  include Pavlov::Interactor
+class Interactors::CreateBlogPost < Interactor
 
   def authorized?
     context.current_user.is_admin?

lib/pavlov.rb

@@ -34,8 +34,5 @@ def self.query command_name, *args
 require_relative 'pavlov/validation_error'
 require_relative 'pavlov/validations'
 require_relative 'pavlov/operation'
-require_relative 'pavlov/command'
-require_relative 'pavlov/query'
-require_relative 'pavlov/interactor'
 require_relative 'pavlov/version'
 require_relative 'pavlov/alpha_compatibility'

spec/integration/alpha_compatibility_spec.rb

@@ -2,15 +2,18 @@
 require 'pavlov'
 require 'pavlov/alpha_compatibility'
 
+require 'generators/pavlov/templates/backend/command'
+require 'generators/pavlov/templates/backend/query'
+require 'generators/pavlov/templates/backend/interactor'
+
 describe "Pavlov Alpha Compatibility" do
   include Pavlov::Helpers
 
   describe 'retains .arguments' do
     before do
       stub_const "Interactors", Module.new
 
-      class Interactors::OldStyleInteractor
-        include Pavlov::Interactor
+      class Interactors::OldStyleInteractor < Interactor
         arguments :title, :published
 
         def authorized?
@@ -38,8 +41,7 @@ def pavlov_options
     before do
       stub_const "Queries", Module.new
       stub_const "Interactors", Module.new
-      class Queries::FindUppercaseName
-        include Pavlov::Query
+      class Queries::FindUppercaseName < Query
 
         attribute :pavlov_options, Hash, default: {}
 
@@ -48,8 +50,7 @@ def execute
         end
       end
 
-      class Interactors::ShoutyGreeting
-        include Pavlov::Interactor
+      class Interactors::ShoutyGreeting < Interactor
 
         attribute :pavlov_options, Hash, default: {}
 

spec/integration/attributes_spec.rb

@@ -1,12 +1,15 @@
 require_relative '../spec_helper'
 require 'pavlov'
 
+require 'generators/pavlov/templates/backend/command'
+require 'generators/pavlov/templates/backend/query'
+require 'generators/pavlov/templates/backend/interactor'
+
 describe "Pavlov attributes" do
   before do
     stub_const "Interactors", Module.new
     module Interactors
-      class CreateBlogPost
-        include Pavlov::Interactor
+      class CreateBlogPost < Interactor
 
         attribute :title,     String
         attribute :published, Boolean, default: true