hub_link 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55820ffa015f5004c8f88f16f18a55a617926a95
-  data.tar.gz: 89d401fa82ab3d62a7c78df1f2dd8a45ceae2e2a
+  metadata.gz: ca30700c01889aa81a758897b9ed2045326fc007
+  data.tar.gz: 927b8700754db70fd474635aa22cbadd5e2d68f3
 SHA512:
-  metadata.gz: 6c213375c41d32eeeebd6f0867ce64eadcfa0e47b19664603c3f584e64093f645fc9f6408f321765a3dd271dd1e71c3de05d2f9fd30a5a264ede25b9737786b8
-  data.tar.gz: 171461c43bb35bc5b2db94ccde9c971094bc6d255cfd37c5b73502ece8b0b2c31fb45dee039cf03108b9a21a9c666e1ef6b9a5b6d6f4db99619024e27b024cd2
+  metadata.gz: ed4acda89cfe380cd64cf031a3be42d23340a297025fb48e625c50f720d997eefcdc031ca1cfe1e5a612caca131c7427188f0ae8e3e14ca9455c9dc6e1aaf24c
+  data.tar.gz: 8c8faa99fdb7f301f7c2a0c72d1e38bb5adc14f0efb39b6dcf8ef6d25983b1603ac2615f20c930567d2b3a0cb55253e1b7a905508f57b87a82d9dc2f7ae419d7

data/README.md

@@ -17,9 +17,9 @@ Then you can do:
 stream = HubLink::Stream.new("balvig/hub_link", start_date: 3.months.ago)
 
 stream.in_batches do |batch|
-  batch.prs # => [{ id: 34, merge_time: 6400, ... }]
-  batch.reviews # => [{ id: 54, reviewer: "balvig", approval: true, ... }]
   batch.review_requests # => [{ digest: "a45bfa...", reviewer: "balvig", ... }]
+  batch.reviews # => [{ id: 54, reviewer: "balvig", approval: true, ... }]
+  batch.prs # => [{ id: 34, merge_time: 6400, ... }]
 end
 ```
 

data/lib/hub_link/api/pull_request.rb

@@ -7,12 +7,13 @@ require "hub_link/slicer"
 module HubLink
   module Api
     class PullRequest < SimpleDelegator
-      def self.search(filter)
+      def self.search(filter, auto_paginate: true)
+        Octokit.auto_paginate = auto_paginate
         Octokit.search_issues(filter).items.map { |item| new(item) }
       end
 
       def self.oldest(repo:)
-        search("type:pr sort:updated-asc repo:#{repo}").first
+        search("type:pr sort:updated-asc repo:#{repo}", auto_paginate: false).first
       end
 
       def submitter
@@ -100,7 +101,7 @@ module HubLink
         end
 
         def first_review
-          reviews.first
+          reviews.find(&:submitted?)
         end
 
         def extended_data

data/lib/hub_link/api/review.rb

@@ -12,11 +12,21 @@ module HubLink
       end
 
       def invalid?
-        bot? || driveby? || draft?
+        bot?
+      end
+
+      def submitted?
+        !draft?
+      end
+
+      def submitted_at
+        if submitted?
+          super
+        end
       end
 
       def to_h
-        Slicer.new(self, columns: %i(id pull_request_id submitted_at reviewer approval?)).to_h
+        Slicer.new(self, columns: %i(id pull_request_id submitted_at reviewer approval? state)).to_h
       end
 
       private
@@ -25,10 +35,6 @@ module HubLink
           BOTS.include?(reviewer)
         end
 
-        def driveby?
-          state == "COMMENTED"
-        end
-
         def draft?
           state == "PENDING"
         end

data/lib/hub_link/callbacks.rb

@@ -0,0 +1,23 @@
+# https://gist.github.com/nilbus/6385142
+module HubLink
+  class Callbacks
+    def initialize(block)
+      block&.call(self)
+    end
+
+    def callback(message, *args)
+      callbacks[message]&.call(*args)
+    end
+
+    def method_missing(m, *args, &block)
+      block ? callbacks[m] = block : super
+      self
+    end
+
+    private
+
+      def callbacks
+        @callbacks ||= {}
+      end
+  end
+end

data/lib/hub_link/configuration.rb

@@ -6,7 +6,6 @@ module HubLink
   class Configuration
     def apply
       Octokit.middleware = middleware
-      Octokit.auto_paginate = true
     end
 
     private

data/lib/hub_link/importer.rb

@@ -0,0 +1,46 @@
+require "hub_link"
+require "hub_link/callbacks"
+require "hub_link/insert"
+
+module HubLink
+  class Importer
+    delegate :callback, to: :callbacks
+
+    def self.run(*args, &block)
+      new(*args, &block).run
+    end
+
+    def initialize(repo:, start_date:, resources:, &block)
+      @repo = repo.to_s
+      @start_date = start_date
+      @resources = resources
+      @callbacks = Callbacks.new(block)
+    end
+
+    def run
+      stream.in_batches do |batch|
+        callback(:init, batch.query)
+
+        resources.each do |source, target|
+          callback(:start, source)
+          import batch.fetch(source), to: target
+          callback(:finish, target.count)
+        end
+      end
+    end
+
+    private
+
+      attr_reader :repo, :start_date, :resources, :callbacks
+
+      def import(records, to:)
+        records.each do |row|
+          Insert.new(row: row, target: to).run
+        end
+      end
+
+      def stream
+        @_stream ||= Stream.new(repo, start_date: start_date)
+      end
+  end
+end

data/lib/hub_link/insert.rb

@@ -0,0 +1,34 @@
+module HubLink
+  class Insert
+    delegate :primary_key, to: :target
+
+    def initialize(row:, target:)
+      @row = row
+      @target = target
+    end
+
+    def run
+      record.update! importable_attributes
+    end
+
+    private
+
+      def record
+        target.find_or_initialize_by(primary_key => primary_key_value)
+      end
+
+      def primary_key_value
+        row[primary_key]
+      end
+
+      def importable_attributes
+        row.slice(*target_columns)
+      end
+
+      def target_columns
+        target.columns.map(&:name).map(&:to_sym)
+      end
+
+      attr_reader :row, :target
+  end
+end

data/lib/hub_link/slicer.rb

@@ -8,7 +8,7 @@ module HubLink
     end
 
     def to_h
-      normalized_attributes
+      normalized_attributes.with_indifferent_access
     end
 
     private

data/lib/hub_link/stream.rb

@@ -10,8 +10,9 @@ module HubLink
     end
 
     def in_batches(&block)
-      queries.each do |query|
-        yield Batch.new(query)
+      start_date.step(end_date, batch_size) do |date|
+        range = "#{date}..#{date + (batch_size - 1)}"
+        yield Batch.new "type:pr updated:#{range} repo:#{repo}"
       end
     end
 
@@ -23,14 +24,8 @@ module HubLink
         Api::PullRequest.oldest(repo: repo)&.updated_at
       end
 
-      def queries
-        start_date.step(end_date, batch_size).map do |date|
-          "type:pr updated:#{date}..#{date + (batch_size - 1)} repo:#{repo}"
-        end
-      end
-
       def end_date
-        Date.tomorrow
+        @_end_date ||= Date.tomorrow
       end
   end
 end

data/lib/hub_link/version.rb

@@ -1,3 +1,3 @@
 module HubLink
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hub_link
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -158,8 +158,11 @@ files:
 - lib/hub_link/api/review.rb
 - lib/hub_link/api/review_request.rb
 - lib/hub_link/batch.rb
+- lib/hub_link/callbacks.rb
 - lib/hub_link/configuration.rb
 - lib/hub_link/core_ext/float.rb
+- lib/hub_link/importer.rb
+- lib/hub_link/insert.rb
 - lib/hub_link/slicer.rb
 - lib/hub_link/stream.rb
 - lib/hub_link/version.rb