bidu-house 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8ee8b5568f69553340146072bce28f3887689fc
-  data.tar.gz: 2260ec4004e11743cb309b17abcb39128f0df8bc
+  metadata.gz: 96781d4525f8097700f5d5db4795f493b38fe712
+  data.tar.gz: ea2a54d9377214dc1e0edd66aa66d9d33daa7acb
 SHA512:
-  metadata.gz: df4558e098446b0d289a6e243894f2e77c0912d996e16a4bdf6bb7bb9d4966dc74f7628c1ebbe7cc1812cdf302d4aee2996cc280d2b193942d3c89bffdc293e8
-  data.tar.gz: 640c40f723e5ec0568de883080043bebf05c3d5cca4828f2ae3ffcc9d81afd2d53af96bd1432b3bbfaddf51f7dfce19cef27c7b2420efd68ab3635501c28658c
+  metadata.gz: edcdf77746f852974617b39a3288de005f6a704d2aa2e9670b25c61c44f3bac344cb50fbda438d32442a50e6d35bd2273cd80942721b15abd42357631e001b6f
+  data.tar.gz: 384598beefd1f88bfea28e7fd8169b33a3e6b589da309636d44b926b4714ee85044829f63beed65ae34ca1ede71626bbce6a1dc73fc2b1a519e2173ce0fee2f4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bidu-house (1.2.0)
+    bidu-house (1.3.0)
       activesupport
       bidu-active_ext
       concern_builder

data/lib/bidu/house/report.rb

@@ -5,6 +5,7 @@ module Bidu
       require 'bidu/house/report/active_record'
       require 'bidu/house/report/error'
       require 'bidu/house/report/range'
+      require 'bidu/house/report/multiple'
       ALLOWED_PARAMETERS = []
       DEFAULT_OPTION = {}
 
@@ -13,7 +14,7 @@ module Bidu
       json_parse :id, case: :snake
 
       def initialize(options = {})
-        @json = DEFAULT_OPTION.merge(options)
+        @json = default_option.merge(options)
       end
 
       def status
@@ -27,6 +28,17 @@ module Bidu
       def as_json
         { status: status }
       end
+
+      private
+
+      def default_option
+        self.class.default_options
+      end
+
+      def self.default_options
+        return {} if self == Report
+        self.superclass.default_options.merge(self::DEFAULT_OPTION)
+      end
     end
   end
 end

data/lib/bidu/house/report/error.rb

@@ -16,7 +16,7 @@ module Bidu
         json_parse :scope, :external_key, :uniq, :limit, case: :snake
 
         def initialize(options)
-          super(DEFAULT_OPTION.merge(options))
+          super(self.class::DEFAULT_OPTION.merge(options))
         end
 
         def percentage

data/lib/bidu/house/report/multiple.rb

@@ -1,4 +1,4 @@
-class Bidu::House::Report::Multiple < Bidu::House::Report
+module Bidu::House::Report::Multiple
   def as_json
     {
       status: status

data/lib/bidu/house/version.rb

@@ -1,5 +1,5 @@
 module Bidu
   module House
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/spec/lib/bidu/house/report/multiple_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+describe Bidu::House::Report::Multiple do
+  class Bidu::House::Report::DocTypeError < Bidu::House::Report::Error
+    ALLOWED_PARAMETERS=[:period, :threshold]
+    DEFAULT_OPTION = {
+      threshold: 0.25,
+      clazz: Document,
+      external_key: :external_id
+    }
+
+    json_parse :doc_type, case: :snake
+
+    def base
+      super.where(doc_type: doc_type)
+    end
+  end
+
+  class Bidu::House::Report::Multiple::Dummy < Bidu::House::Report
+    include Bidu::House::Report::Multiple
+    DEFAULT_OPTION = {
+      doc_type: [:a, :b]
+    }
+    json_parse :doc_type, case: :snake
+
+    def reports_ids
+      [ doc_type ].flatten
+    end
+
+    def sub_report_class
+      Bidu::House::Report::DocTypeError
+    end
+
+    def key
+      :doc_type
+    end
+  end
+
+  let(:subject) { described_class::Dummy.new }
+  let(:a_errors) { 1 }
+  let(:a_successes) { 1 }
+  let(:b_errors) { 1 }
+  let(:b_successes) { 1 }
+  let(:setup) do
+    {
+      success: { a: a_successes, b: b_successes },
+      error: { a: a_errors, b: b_errors }
+    }
+  end
+
+  before do
+    Document.delete_all
+    setup.each do |status, map|
+      map.each do |doc_type, quantity|
+        quantity.times do
+          Document.create(status: status, doc_type: doc_type, external_id: Document.count)
+        end
+      end
+    end
+  end
+
+  describe '#error?' do
+    context 'when all subreports are with error' do
+      it { expect(subject.error?).to be_truthy }
+    end
+
+    context 'when one of the reports is not an error' do
+      let(:a_successes) { 4 }
+
+      it { expect(subject.error?).to be_truthy }
+    end
+
+    context 'when none of the reports is an error' do
+      let(:a_successes) { 4 }
+      let(:b_successes) { 4 }
+
+      it { expect(subject.error?).to be_falsey }
+    end
+  end
+
+  describe '#as_json' do
+    let(:expected) do
+      {
+        'a' => { ids: [2], percentage: 0.5, status: :error },
+        'b' => { ids: [3], percentage: 0.5, status: :error },
+        status: :error
+      }
+    end
+
+    context 'when all subreports are with error' do
+      it { expect(subject.as_json).to eq(expected) }
+    end
+
+    context 'when one of the reports is not an error' do
+      let(:a_successes) { 4 }
+      let(:expected) do
+        {
+          'a' => { ids: [5], percentage: 0.2, status: :ok },
+          'b' => { ids: [6], percentage: 0.5, status: :error },
+          status: :error
+        }
+      end
+
+      it { expect(subject.as_json).to eq(expected) }
+    end
+
+    context 'when none of the reports is an error' do
+      let(:a_successes) { 4 }
+      let(:b_successes) { 4 }
+      let(:expected) do
+        {
+          'a' => { ids: [8], percentage: 0.2, status: :ok },
+          'b' => { ids: [9], percentage: 0.2, status: :ok },
+          status: :ok
+        }
+      end
+
+      it { expect(subject.as_json).to eq(expected) }
+    end
+  end
+end
+

data/spec/lib/bidu/house/report_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Bidu::House::Report do
+  class Bidu::House::Report::Dummy1 < Bidu::House::Report
+    DEFAULT_OPTION = {
+      option_value: 1,
+      other_option: 10
+    }
+    json_parse :option_value, :other_option, case: :snake
+  end
+  class Bidu::House::Report::Dummy2 < Bidu::House::Report::Dummy1; end
+  class Bidu::House::Report::Dummy3 < Bidu::House::Report::Dummy1
+    DEFAULT_OPTION = { option_value: 5 }
+  end
+
+  describe 'default_options' do
+    let(:report_class) { described_class::Dummy1 }
+    let(:subject) { report_class.new }
+    
+    it 'setup the attributes using class default options' do
+      expect(subject.option_value).to eq(1)
+      expect(subject.other_option).to eq(10)
+    end
+
+    context 'when class inherit options' do
+      let(:report_class) { described_class::Dummy2 }
+
+      it 'setup the attributes using superclass default options' do
+        expect(subject.option_value).to eq(1)
+        expect(subject.other_option).to eq(10)
+      end
+    end
+
+    context 'when class inherit options but overrides some' do
+      let(:report_class) { described_class::Dummy3 }
+
+      it 'setup the attributes using superclass default options' do
+        expect(subject.option_value).to eq(5)
+        expect(subject.other_option).to eq(10)
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bidu-house
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Bidu Dev's Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -211,9 +211,11 @@ files:
 - lib/bidu/period_parser.rb
 - lib/json_parser/type_cast_ext.rb
 - spec/lib/bidu/house/report/error_spec.rb
+- spec/lib/bidu/house/report/multiple_spec.rb
 - spec/lib/bidu/house/report/range_spec.rb
 - spec/lib/bidu/house/report/report_config_spec.rb
 - spec/lib/bidu/house/report_builder_spec.rb
+- spec/lib/bidu/house/report_spec.rb
 - spec/lib/bidu/house/status_builder_spec.rb
 - spec/lib/bidu/house/status_spec.rb
 - spec/lib/bidu/period_parser_spec.rb