From cc49822964920b2b4bcce66a6ae46e801602208c Mon Sep 17 00:00:00 2001 From: snusnu Date: Fri, 1 Aug 2014 02:57:24 +0200 Subject: [PATCH] Nuke Operation::Result in favor of Orc::Result --- Gemfile | 1 + lib/ramom.rb | 2 +- lib/ramom/operation.rb | 8 ++++---- lib/ramom/operation/result.rb | 27 --------------------------- ramom.gemspec | 1 + 5 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 lib/ramom/operation/result.rb diff --git a/Gemfile b/Gemfile index 2a39a9a..28d632b 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ gem 'anima', git: "#{MBJ}/anima.git", branch: M gem 'morpher', git: "#{MBJ}/morpher.git", branch: MASTER gem 'lupo', git: "#{SNUSNU}/lupo.git", branch: MASTER gem 'procto', git: "#{SNUSNU}/procto.git", branch: MASTER +gem 'orc', git: "#{SNUSNU}/orc.git", branch: MASTER gem 'axiom', git: "#{DKUBB}/axiom.git", branch: 'add-relation-one' gem 'axiom-optimizer', git: "#{DKUBB}/axiom-optimizer.git", branch: MASTER diff --git a/lib/ramom.rb b/lib/ramom.rb index d555870..a9dd4f1 100644 --- a/lib/ramom.rb +++ b/lib/ramom.rb @@ -4,6 +4,7 @@ require 'anima' require 'lupo' require 'procto' +require 'orc' require 'adamantium' require 'abstract_type' @@ -55,7 +56,6 @@ def self.query(*args) require 'ramom/aggregate' require 'ramom/operation/registry' require 'ramom/operation/registrar' -require 'ramom/operation/result' require 'ramom/operation/environment' require 'ramom/operation' require 'ramom/command' diff --git a/lib/ramom/operation.rb b/lib/ramom/operation.rb index d0cb137..e93177f 100644 --- a/lib/ramom/operation.rb +++ b/lib/ramom/operation.rb @@ -22,12 +22,12 @@ def dress(attributes) dresser.call(attributes) end - def success(data) - Result::Success.new(data) + def success(object) + Orc::Result.success(object) end - def failure(data) - Result::Failure.new(data) + def failure(status, context) + Orc::Result.failure(status, context) end end # Operation end # Ramom diff --git a/lib/ramom/operation/result.rb b/lib/ramom/operation/result.rb deleted file mode 100644 index feafc0a..0000000 --- a/lib/ramom/operation/result.rb +++ /dev/null @@ -1,27 +0,0 @@ -# encoding: utf-8 - -module Ramom - module Operation - - class Result - - include Concord::Public.new(:output) - include AbstractType - - abstract_method :success? - - class Success < self - def success? - true - end - end # Success - - class Failure < self - def success? - false - end - end # Failure - - end # Result - end # Operation -end # Ramom diff --git a/ramom.gemspec b/ramom.gemspec index 678d547..f3467bc 100644 --- a/ramom.gemspec +++ b/ramom.gemspec @@ -21,6 +21,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'anima', '~> 0.2.0' gem.add_dependency 'lupo', '~> 0.0.1' gem.add_dependency 'procto', '~> 0.0.2' + gem.add_dependency 'orc', '~> 0.0.1' gem.add_dependency 'morpher', '~> 0.2.3' gem.add_dependency 'adamantium', '~> 0.2.0' gem.add_dependency 'abstract_type', '~> 0.0.7'