Merge pull request #9 from abak-press/master

Merge branch 'master' into 'orders/release/20160303'

.gitignore

@@ -15,4 +15,4 @@ mkmf.log
 /.rvmrc
 /.idea/
 gemfiles/
-internal/
+internal/log

CHANGELOG.md

@@ -1,5 +1,9 @@
 
 #### [Current]
+ * 2016-03-01 [8375263](../../commit/8375263) - __(Semyon Pupkov)__ feature: add base field and translators
+
+#### v0.0.4
+ * 2016-02-17 [d16dde0](../../commit/d16dde0) - __(Salahutdinov Dmitry)__ Release 0.0.4
  * 2016-02-16 [791f5d1](../../commit/791f5d1) - __(Salahutdinov Dmitry)__ feature: базовый счетчик денормализации
 
 #### v0.0.3

lib/treasury/fields/base.rb

@@ -0,0 +1,6 @@
+module Treasury
+  module Fields
+    class Base < ::CoreDenormalization::Fields::Base
+    end
+  end
+end

lib/treasury/processors/base.rb

@@ -3,6 +3,13 @@
 module Treasury
   module Processors
     class Base < ::CoreDenormalization::Processors::Base
+      def form_value(value)
+        value
+      end
+
+      def result_row(value)
+        {@object => form_value(value)}
+      end
     end
   end
 end

lib/treasury/processors/counters.rb

@@ -68,7 +68,7 @@ def process_insert
         fields = counters_list.each_with_object({}) do |counter, hash|
           hash[counter] = incremented_current_value(counter) if send "#{counter}_satisfied?"
         end
-        result_row fields
+        result_row(fields) if fields.present?
       end
 
       def process_update
@@ -79,14 +79,14 @@ def process_update
             hash[counter] = decremented_current_value(counter) if send "#{counter}_was_counted?"
           end
         end
-        result_row fields
+        result_row(fields) if fields.present?
       end
 
       def process_delete
         fields = counters_list.each_with_object({}) do |counter, hash|
           hash[counter] = decremented_current_value(counter) if send "#{counter}_was_counted?"
         end
-        result_row fields
+        result_row(fields) if fields.present?
       end
     end
   end

lib/treasury/processors/optimized_translator.rb

@@ -0,0 +1,7 @@
+module Treasury
+  module Processors
+    module OptimizedTranslator
+      include ::CoreDenormalization::Processors::OptimizedTranslator
+    end
+  end
+end

lib/treasury/processors/translator.rb

@@ -0,0 +1,7 @@
+module Treasury
+  module Processors
+    module Translator
+      include ::CoreDenormalization::Processors::Translator
+    end
+  end
+end

lib/treasury/version.rb

@@ -1,3 +1,3 @@
 module Treasury
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

spec/internal/lib/core_denormalization/processors/base.rb

@@ -0,0 +1,6 @@
+module CoreDenormalization
+  module Processors
+    class Base
+    end
+  end
+end

spec/lib/treasury/processors/counters_spec.rb

@@ -4,7 +4,7 @@
   let(:processor) { processor_class.new }
 
   let(:processor_class) do
-    Class.new do
+    Class.new(::Treasury::Processors::Base) do
       include ::Treasury::Processors::Counters
       counters :count
 
@@ -34,13 +34,13 @@ def count?(data)
     it do
       expect(processor).not_to receive(:incremented_current_value)
       expect(processor).not_to receive(:decremented_current_value)
+      expect(result).to be_nil
     end
   end
 
   before do
     allow(processor).to receive(:incremented_current_value)
     allow(processor).to receive(:decremented_current_value)
-    allow(processor).to receive(:result_row)
 
     processor.instance_variable_set :@event, event
   end
@@ -107,6 +107,8 @@ def count?(data)
   end
 
   describe "#process_insert" do
+    let(:result) { processor.process_insert }
+
     context "when event is satisfied" do
       let(:event) { double satisfied }
       it { expect(processor).to receive(:incremented_current_value).with(:count) }
@@ -121,6 +123,8 @@ def count?(data)
   end
 
   describe "#process_update" do
+    let(:result) { processor.process_update }
+
     context "when event is satisfied and wasn't counted" do
       let(:event) { double satisfied.merge(not_counted) }
       it { expect(processor).to receive(:incremented_current_value).with(:count) }
@@ -145,6 +149,8 @@ def count?(data)
   end
 
   describe "#process_delete" do
+    let(:result) { processor.process_delete }
+
     context "when event was counted" do
       let(:event) { double counted }
       it { expect(processor).to receive(:decremented_current_value).with(:count) }

spec/spec_helper.rb

@@ -8,3 +8,5 @@
 
 require 'combustion'
 Combustion.initialize!
+
+require_relative 'internal/lib/core_denormalization/processors/base'