simple_action 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODZjYTY2ODQ4MjRiODdjOWZiNGZkZTI3ODFiZjMzNjc2ODg2MzI5YQ==
+    MWU2NmZhYWI0MDM3NTJkNzM2NjI4NzVjYmEyZDFkODViYzE5NzJjOQ==
   data.tar.gz: !binary |-
-    MDJhNmE2ZTg4Yzc0MTYwYzI1YWNkYTkxY2RlOGQ5Y2UyYjNmNzY4MA==
+    MTBjYTA2NThhZDUwN2QyN2ZiMWFlNWIzM2RjYWRkMDFjMzUxODIzZA==
 SHA512:
   metadata.gz: !binary |-
-    OGQ4ZGQ0NGRhMzNmODNiY2Y5ODJjOTc3Yzc0ZWYxZjFmYjUwZDdkODllNmI4
-    NzI3MmYwYjgwMmI4ZjE1NmMxZDIwOWVhMzBjYzZiYjlkMGYxY2ExMzM5ZjFm
-    MWM1OGJkNzQyMzY2YmE1YWI3YTllZjVhMGFiY2FjNWU2ZjlhODY=
+    ZWY0ZGNiYzI3MDcxOTI1OGI5NDZiMzA5M2Y2MGE1YjdmY2YxYzk0NTdjMjc5
+    YWE3YWYxMTI0N2M3ZjIyZDI2N2M4N2RmMzk2M2JiOWFiNTI0NDJhNjYzNDI2
+    NzBiZmFhOGU0OWZiN2U1ZjdlMjYyZjFmOWYxNTc4OWMwYzhlMzQ=
   data.tar.gz: !binary |-
-    NDlhNjQyODFkZjIyYmFlYTAwNjE3NGRmMTg1MTMxNzE1OTRlZjUwN2MyMzRm
-    OTQ3NGQ5NGY4NDYzNGRkMjM3OGM3YzQ5Y2FjMmQwM2MyMWM4N2IzZGY1MmQz
-    NzJmMTJlMGRlNDNjMWViYzhmMGZhMGI3MzdlMDZiZWYyZmMwYTU=
+    N2E2ZTcwZmM2MzM2MjYyMGJjMGU5M2Y5ODk3NDM5NGFjNTg0Y2ViY2QyZjdm
+    YmRjNmU4NzBkNTZjMDEwMjA3MmI5NjdjMTVhNzdhZDE1ZDQ1MzdiYzA0YmQx
+    MDc0OGFiNmJhM2JhZTU0YTkzY2E1OTc1MDk2ZDIwNjg4ZDI4MDY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_action (1.0.3)
+    simple_action (1.0.4)
       simple_params (>= 1.0.2, < 2.0)
 
 GEM

data/lib/simple_action/service.rb

@@ -4,25 +4,25 @@ require_relative 'concerns/transactable'
 require_relative 'concerns/delegates_to_params'
 
 module SimpleAction
-  class Service    
+  class Service
     extend AcceptsParams
     extend Transactable
+    include ActiveModel::Conversion
+    extend ActiveModel::Naming
     include DelegatesToParams
 
     class << self
-      def model_name 
-        ActiveModel::Name.new(self)
-      end
-
       def run(params = {})
         instance = self.new(params)
+        instance.mark_as_ran
         result = transaction do
           if instance.valid?
             outcome = instance.execute
             instance.errors.empty? ? outcome : nil
           end
         end
-        Response.new(instance, result)
+        instance.set_result(result)
+        instance
       end
 
       def run!(params = {})
@@ -39,6 +39,8 @@ module SimpleAction
       @raw_params = params
       @params = self.class.params_class.new(params)
       @initial_params_valid = nil
+      @result = nil
+      @has_run = false
     end
 
     def params
@@ -57,6 +59,27 @@ module SimpleAction
       raise ImplementationError, "subclasses must implement 'execute' method."
     end
 
+    def persisted?
+      false
+    end
+
+    def success?
+      valid? && @has_run
+    end
+
+    def result
+      @result
+    end
+    alias_method :value, :result
+
+    def set_result(result = nil)
+      @result = result
+    end
+
+    def mark_as_ran
+      @has_run = true
+    end
+
     private
     def initial_params_valid?
       if @initial_params_valid.nil?

data/lib/simple_action/version.rb

@@ -1,3 +1,3 @@
 module SimpleAction
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/simple_action.rb

@@ -1,7 +1,6 @@
 require 'simple_action/version'
 require 'simple_action/error'
 require 'simple_action/params'
-require 'simple_action/response'
 require 'simple_action/service'
 require 'simple_action/concerns/accepts_params'
 require 'simple_action/concerns/transactable'

data/spec/service_spec.rb

@@ -77,6 +77,20 @@ describe SimpleAction::Service do
   end
 
   describe "instance methods", instance_methods: true do
+    describe "#to_key", to_key: true do
+      it "has correct keys" do
+        params = ServiceSpecClass.new(name: "Tom", age: 12)
+        params.to_key.should be_nil
+      end
+    end
+
+    describe "#persisted?", persisted: true do
+      it "is not persisted" do
+        params = ServiceSpecClass.new(name: "Tom", age: 12)
+        params.persisted?.should eq(false)
+      end
+    end
+
     describe "#params", params: true do
       it "assigns params" do
         instance = ServiceSpecClass.new(name: "Nic Cage", age: "40")
@@ -127,5 +141,61 @@ describe SimpleAction::Service do
         end
       end
     end
+
+    describe "#success?", success: true do
+      context "without having run" do
+        it "is false" do
+          ServiceSpecClass.new(name: "Tom", age: 12).should_not be_success
+        end
+      end
+
+      context "with invalid params" do
+        it "is false" do
+          ServiceSpecClass.run(age: 12).should_not be_success
+        end
+      end
+
+      context "with valid params" do
+        it "is true" do
+          ServiceSpecClass.run(name: "Tom", age: 12).should be_success
+        end
+      end
+    end
+
+    describe "#result", result: true do
+      context "with no result provided" do
+        it "is nil" do
+          service = ServiceSpecClass.new(name: "Tom", age: 12)
+          service.result.should be_nil
+        end
+      end
+
+      context "with result set" do
+        it "is 53" do
+          service = ServiceSpecClass.new(name: "Tom", age: 12)
+          service.result.should be_nil
+          service.set_result(53)
+          service.result.should eq(53)
+        end
+      end
+    end
+
+    describe "#value", value: true do
+      context "with no result provided" do
+        it "is nil" do
+          service = ServiceSpecClass.new(name: "Tom", age: 12)
+          service.value.should be_nil
+        end
+      end
+
+      context "with result set" do
+        it "is 53" do
+          service = ServiceSpecClass.new(name: "Tom", age: 12)
+          service.result.should be_nil
+          service.set_result(53)
+          service.value.should eq(53)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_action
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_params
@@ -107,7 +107,6 @@ files:
 - lib/simple_action/concerns/transactable.rb
 - lib/simple_action/error.rb
 - lib/simple_action/params.rb
-- lib/simple_action/response.rb
 - lib/simple_action/service.rb
 - lib/simple_action/version.rb
 - simple_action.gemspec
@@ -116,7 +115,6 @@ files:
 - spec/fixtures/params_spec_class.rb
 - spec/fixtures/service_spec_class.rb
 - spec/params_spec.rb
-- spec/response_spec.rb
 - spec/service_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/brycesenz/simple_action
@@ -149,6 +147,5 @@ test_files:
 - spec/fixtures/params_spec_class.rb
 - spec/fixtures/service_spec_class.rb
 - spec/params_spec.rb
-- spec/response_spec.rb
 - spec/service_spec.rb
 - spec/spec_helper.rb

data/lib/simple_action/response.rb

@@ -1,26 +0,0 @@
-module SimpleAction
-  class Response
-    def initialize(service_object, result = nil)
-      @service_object = service_object
-      @result = result
-      valid?
-    end
-
-    def valid?
-      @service_object.valid?
-    end
-
-    def errors
-      @service_object.errors
-    end
-
-    def success?
-      valid?
-    end
-
-    def result
-      @result
-    end
-    alias_method :value, :result
-  end
-end

data/spec/response_spec.rb

@@ -1,104 +0,0 @@
-require 'spec_helper'
-require 'fixtures/dummy_service_object_class'
-
-describe SimpleAction::Response do
-  describe "#valid?" do
-    context "with valid object" do
-      let(:object) { DummyServiceObjectClass.new(name: "Dummy") }
-      let(:response) { described_class.new(object) }
-
-      it "is valid" do
-        response.should be_valid
-      end
-    end
-
-    context "with invalid object" do
-      let(:object) { DummyServiceObjectClass.new(name: nil) }
-      let(:response) { described_class.new(object) }
-
-      it "is not valid" do
-        response.should_not be_valid
-      end
-    end
-  end
-
-  describe "#errors" do
-    context "with valid object" do
-      let(:object) { DummyServiceObjectClass.new(name: "Dummy") }
-      let(:response) { described_class.new(object) }
-
-      it "has no errors" do
-        response.errors.should be_empty
-      end
-    end
-
-    context "with invalid object" do
-      let(:object) { DummyServiceObjectClass.new(name: nil) }
-      let(:response) { described_class.new(object) }
-
-      it "has errors" do
-        response.errors[:name].should eq(["can't be blank"])
-      end
-    end
-  end
-
-  describe "#success?" do
-    context "with valid object" do
-      let(:object) { DummyServiceObjectClass.new(name: "Dummy") }
-      let(:response) { described_class.new(object) }
-
-      it "is success" do
-        response.should be_success
-      end
-    end
-
-    context "with invalid object" do
-      let(:object) { DummyServiceObjectClass.new(name: nil) }
-      let(:response) { described_class.new(object) }
-
-      it "is not success" do
-        response.should_not be_success
-      end
-    end
-  end
-
-  describe "#result" do
-    let(:object) { DummyServiceObjectClass.new(name: "Dummy") }
-
-    context "with no result provided" do
-      let(:response) { described_class.new(object) }
-
-      it "is nil" do
-        response.result.should be_nil
-      end
-    end
-
-    context "with response provided" do
-      let(:response) { described_class.new(object, 53) }
-
-      it "is 53" do
-        response.result.should eq(53)
-      end
-    end
-  end
-
-  describe "#value" do
-    let(:object) { DummyServiceObjectClass.new(name: "Dummy") }
-
-    context "with no result provided" do
-      let(:response) { described_class.new(object) }
-
-      it "is nil" do
-        response.value.should be_nil
-      end
-    end
-
-    context "with response provided" do
-      let(:response) { described_class.new(object, 53) }
-
-      it "is 53" do
-        response.value.should eq(53)
-      end
-    end
-  end
-end