bidu-house 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bce0f17bbdd46d4d769e1b3a6d086abad2ba9b4
-  data.tar.gz: ab14a3c78154d146481f730c198face541890f24
+  metadata.gz: a8ee8b5568f69553340146072bce28f3887689fc
+  data.tar.gz: 2260ec4004e11743cb309b17abcb39128f0df8bc
 SHA512:
-  metadata.gz: 173182741ddeb9f5ec7bcf41beb5e084777d8039cd6d13e3dee181c9b6bddab21ebe052248199c8bd8450ea79ce12523a00439140629a35337c374ca6ac7698b
-  data.tar.gz: 5d83943edac6382f139c0f7d61b35c32b1566cd355f28ccf5816c326f093a431b515d7edee0a81ab8fa0d4863f32d05fd96351ca62ac3801d6c0f1a5c129648d
+  metadata.gz: df4558e098446b0d289a6e243894f2e77c0912d996e16a4bdf6bb7bb9d4966dc74f7628c1ebbe7cc1812cdf302d4aee2996cc280d2b193942d3c89bffdc293e8
+  data.tar.gz: 640c40f723e5ec0568de883080043bebf05c3d5cca4828f2ae3ffcc9d81afd2d53af96bd1432b3bbfaddf51f7dfce19cef27c7b2420efd68ab3635501c28658c

data/Gemfile.lock

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

data/README.md

@@ -2,6 +2,7 @@ Bidu House
 ==========
 
 [![Code Climate](https://codeclimate.com/github/Bidu/house/badges/gpa.svg)](https://codeclimate.com/github/Bidu/house)
+[![Test Coverage](https://codeclimate.com/github/Bidu/house/badges/coverage.svg)](https://codeclimate.com/github/Bidu/house/coverage)
 
 This gem tries to make server monitoring easier and more reliable by adding an easly configurable
 report and making it avaliable in a controller
@@ -23,7 +24,7 @@ with error and render the report
     include Bidu::House
 
     status_report :failures, clazz: Document
-    status_report :'failures.schedules', clazz: Schedules, on: :schedules
+    status_report :failures, clazz: Schedules, on: :schedules
     status_report :delays, clazz: Schedules, scope: :late, on: :schedules
     status_report :'documents.count', clazz: Document, scope: :active, type: House::Range, minimum: 100
     status_report :'documents.errors', clazz: Document, scope: :'active.with_error', type: :range, maximum: 1000

data/circle.yml

@@ -0,0 +1,3 @@
+test:
+  pre:
+    - bundle install

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

@@ -0,0 +1,28 @@
+module Bidu
+  module House
+    class Report::ActiveRecord < Report
+      json_parse :period, type: :period
+      json_parse :clazz, :base_scope, case: :snake
+
+      private
+
+      def fetch_scoped(base, scope)
+        if (scope.is_a?(Symbol))
+          scope.to_s.split('.').inject(base) do |entries, method|
+            entries.public_send(method)
+          end
+        else
+          base.where(scope)
+        end
+      end
+
+      def last_entries
+        @last_entries ||= base.where('updated_at >= ?', period.seconds.ago)
+      end
+
+      def base
+        fetch_scoped(clazz, base_scope)
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Bidu
   module House
     class Report
-      class Error < Report
+      class Error < Report::ActiveRecord
         ALLOWED_PARAMETERS=[:period, :threshold]
         DEFAULT_OPTION = {
           external_key: :id,

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

@@ -0,0 +1,29 @@
+class Bidu::House::Report::Multiple < Bidu::House::Report
+  def as_json
+    {
+      status: status
+    }.merge(sub_reports_hash)
+  end
+
+  def error?
+    sub_reports.any?(&:error?)
+  end
+
+  private
+
+  def sub_reports_hash
+    sub_reports.map(&:as_json).as_hash(reports_ids.map(&:to_s))
+  end
+
+  def sub_reports
+    @sub_reports ||= reports_ids.map do |id|
+      build_sub_report(id)
+    end
+  end
+
+  def build_sub_report(id)
+    sub_report_class.new(json.merge(key => id))
+  end
+end
+
+

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

@@ -1,7 +1,7 @@
 module Bidu
   module House
     class Report
-      class Range < Report
+      class Range < Report::ActiveRecord
         ALLOWED_PARAMETERS=[:period, :maximum, :minimum]
         DEFAULT_OPTION = {
           period: 1.day,

data/lib/bidu/house/report.rb

@@ -2,6 +2,7 @@ module Bidu
   module House
     class Report
       include JsonParser
+      require 'bidu/house/report/active_record'
       require 'bidu/house/report/error'
       require 'bidu/house/report/range'
       ALLOWED_PARAMETERS = []
@@ -9,10 +10,9 @@ module Bidu
 
       attr_reader :json
 
-      json_parse :period, type: :period
-      json_parse :clazz, :base_scope, :id, case: :snake
+      json_parse :id, case: :snake
 
-      def initialize(options)
+      def initialize(options = {})
         @json = DEFAULT_OPTION.merge(options)
       end
 
@@ -27,26 +27,6 @@ module Bidu
       def as_json
         { status: status }
       end
-
-      private
-
-      def fetch_scoped(base, scope)
-        if (scope.is_a?(Symbol))
-          scope.to_s.split('.').inject(base) do |entries, method|
-            entries.public_send(method)
-          end
-        else
-          base.where(scope)
-        end
-      end
-
-      def last_entries
-        @last_entries ||= base.where('updated_at >= ?', period.seconds.ago)
-      end
-
-      def base
-        fetch_scoped(clazz, base_scope)
-      end
     end
   end
 end

data/lib/bidu/house/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bidu-house
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Bidu Dev's Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,13 +192,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- circle.yml
 - house.gemspec
 - lib/bidu.rb
 - lib/bidu/house.rb
 - lib/bidu/house/class_methods.rb
 - lib/bidu/house/concern.rb
 - lib/bidu/house/report.rb
+- lib/bidu/house/report/active_record.rb
 - lib/bidu/house/report/error.rb
+- lib/bidu/house/report/multiple.rb
 - lib/bidu/house/report/range.rb
 - lib/bidu/house/report_builder.rb
 - lib/bidu/house/report_config.rb