copilot 0.0.5 → 0.0.6

data/lib/copilot.rb

@@ -1,9 +1,9 @@
-require_relative 'copilot/facade'
-
-module CoPilot
-  class << self
-    def new(email_address, password)
-      Facade.new email_address, password
-    end
-  end
+require_relative 'copilot/facade'
+
+module CoPilot
+  class << self
+    def new(email_address, password)
+      Facade.new email_address, password
+    end
+  end
 end

data/lib/copilot/requests/builds_for_bundle_id_request.rb

@@ -1,5 +1,5 @@
 require_relative 'internal/build_table_row'
-require_relative 'internal/builds_dashboard'
+require_relative 'internal/builds_page'
 
 module CoPilot
   class BuildsForBundleIdRequest
@@ -10,36 +10,45 @@ module CoPilot
 
     def send(bundle_id, options={})
       @limit = options[:limit]
-      @builds_dashboard = BuildsDashboard.new @browser, bundle_id
-      @builds_dashboard.goto
-      @builds_dashboard.more_builds
+      @since = options[:since]
+      @builds_page = BuildsPage.new @browser, bundle_id
+      @builds_page.goto
+      @builds_page.more_builds
       @builds = []
-      add_builds
+      add_builds_for_each_page
+      remove_duplicate_builds
       strip_excess_builds
       @builds
     end
 
     private
 
+    def add_builds_for_each_page
+      add_builds
+      add_builds while @builds_page.next_page && !limit_reached && !age_reached
+    end
+
     def add_builds
-      rows = @builds_dashboard.builds_table_rows
+      rows = @builds_page.builds_table_rows
       @builds += rows.map { |row| BuildTableRow.new(row).to_hash }
-      return if limit_reached
+    end
 
-      next_link = @builds_dashboard.next_page_link
-      return unless next_link
-      next_link.click
-      sleep 2
-      add_builds
+    def remove_duplicate_builds
+      @builds.uniq! { |b| b[:id] }
     end
 
     def strip_excess_builds
       @builds = @builds.first @limit if @limit
+      @builds.select! { |b| b[:added_date] > @since } if @since
     end
 
     def limit_reached
       @limit && @builds.length >= @limit
     end
 
+    def age_reached
+      @since && @builds.last[:added_date] > @since
+    end
+
   end
 end

data/lib/copilot/requests/feedback_for_build_id_request.rb

@@ -9,6 +9,7 @@ module CoPilot
 
     def send(build_id, options={})
       @limit = options[:limit]
+      @since = options[:since]
       @feedback = []
       @feedback_page = FeedbackPage.new @browser, build_id
       @feedback_page.goto
@@ -21,41 +22,36 @@ module CoPilot
 
     def add_feedback_for_each_page
       add_feedback
-      while @feedback_page.next_page_link && !limit_reached
-        @feedback_page.next_page
-        add_feedback
-      end
+      add_feedback while @feedback_page.next_page && !limit_reached && !age_reached
     end
 
     def add_feedback
       @feedback_page.expand_details
-
-      @feedback_page.summary_detail_row_pairs.each do |pair|
-        summary_tr = pair[0]
-        detail_tr = pair[1]
-
-        main_feedback_table = detail_tr.table(class: 'mainfeedback')
-        td = main_feedback_table.tbody.tr.td
-
+      @feedback_page.each_summary_detail_pair do |summary, detail|
+        main_feedback_table = detail.table(class: 'mainfeedback')
         @feedback << {
-            user: summary_tr.tds[0].text,
-            date: Time.parse(summary_tr.tds[1].text),
-            subject: summary_tr.tds[2].text,
-            replies: summary_tr.tds[3].text.to_i,
-            via: td.ps[0].text,
-            message: td.ps[1].text
+            user: summary.tds[0].text,
+            date: Time.parse(summary.tds[1].text),
+            subject: summary.tds[2].text,
+            replies: summary.tds[3].text.to_i,
+            via: main_feedback_table.ps[0].text,
+            message: main_feedback_table.ps[1].text
         }
-
       end
     end
 
     def strip_excess_feedback
-       @feedback = @feedback.first @limit if @limit
-     end
+      @feedback = @feedback.first @limit if @limit
+      @feedback.select! { |f| f[:date] > @since } if @since
+    end
+
+    def limit_reached
+      @limit && @feedback.length >= @limit
+    end
 
-     def limit_reached
-       @limit && @feedback.length >= @limit
-     end
+    def age_reached
+      @since && @feedback.last[:date] > @since
+    end
 
     def b
       @browser

data/lib/copilot/requests/internal/build_table_row.rb

@@ -1,61 +1,61 @@
-require 'time'
-
-module CoPilot
-  class BuildTableRow
-
-    def initialize(tr)
-      @tr = tr
-    end
-
-    def build_id
-      @tr.id.split('/').last
-    end
-
-    def version
-      @tr[1].text
-    end
-
-    def added_date
-      Time.parse @tr[2].text
-    end
-
-    def built_for
-      @tr[3].text
-    end
-
-    def size
-      @tr[4].text
-    end
-
-    def sdk
-      @tr[5].text
-    end
-
-    def crashes
-      @tr[6].text.to_i
-    end
-
-    def feedback
-      @tr[7].text.to_i
-    end
-
-    def installs
-      @tr[8].text.to_i
-    end
-
-    def to_hash
-      {
-          id: build_id,
-          version: version,
-          added_date: added_date,
-          built_for: built_for,
-          size: size,
-          sdk: sdk,
-          crashes: crashes,
-          feedback: feedback,
-          installs: installs
-      }
-    end
-
-  end
+require 'time'
+
+module CoPilot
+  class BuildTableRow
+
+    def initialize(tr)
+      @tr = tr
+    end
+
+    def build_id
+      @tr.id.split('/').last
+    end
+
+    def version
+      @tr[1].text
+    end
+
+    def added_date
+      Time.parse @tr[2].text
+    end
+
+    def built_for
+      @tr[3].text
+    end
+
+    def size
+      @tr[4].text
+    end
+
+    def sdk
+      @tr[5].text
+    end
+
+    def crashes
+      @tr[6].text.to_i
+    end
+
+    def feedback
+      @tr[7].text.to_i
+    end
+
+    def installs
+      @tr[8].text.to_i
+    end
+
+    def to_hash
+      {
+          id: build_id,
+          version: version,
+          added_date: added_date,
+          built_for: built_for,
+          size: size,
+          sdk: sdk,
+          crashes: crashes,
+          feedback: feedback,
+          installs: installs
+      }
+    end
+
+  end
 end

data/lib/copilot/requests/internal/{builds_dashboard.rb → builds_page.rb}

@@ -1,5 +1,5 @@
 module CoPilot
-  class BuildsDashboard
+  class BuildsPage
 
     def initialize(browser, bundle_id)
       @browser = browser
@@ -22,13 +22,11 @@ module CoPilot
       builds_table.trs(id: /\/dashboard\/builds\/report\/\d+\//)
     end
 
-    def next_page_link
-      builds_table.as(title: 'Next Page')[0]
-    end
-
     def next_page
       link = next_page_link
-      link.click if link
+      return false unless link
+      link.click
+      true
     end
 
     def more_builds_link
@@ -37,11 +35,18 @@ module CoPilot
 
     def more_builds
       link = more_builds_link
-      link.click if link
+      return unless link
+      link.click
+      sleep 2
     end
 
     private
 
+    def next_page_link
+      links = builds_table.as(title: 'Next Page')
+      links.length == 1 ? links[0] : nil
+    end
+
     def header_divs
       @header_divs ||= b.divs(class: 'section-header-build')
     end

data/lib/copilot/requests/internal/feedback_page.rb

@@ -15,24 +15,30 @@ module CoPilot
       sleep 1
     end
 
-    def summary_detail_row_pairs
-      pairs = []
-      summary_rows.to_a.each_index { |i| pairs << [summary_rows[i], detail_rows[i]] }
-      pairs
+    def each_summary_detail_pair
+      summary_rows.to_a.each_index { |i| yield [summary_rows[i], detail_rows[i]] }
     end
 
+    def next_page
+      link = next_page_link
+      return false unless link
+      link.click
+      true
+    end
+
+    private
+
     def next_page_link
       links = b.as(title: 'Next Page')
       links.length == 1 ? links[0] : nil
     end
 
-    def next_page
-      link = next_page_link
-      link.click if link
+    def summary_detail_row_pairs
+      pairs = []
+      summary_rows.to_a.each_index { |i| pairs << [summary_rows[i], detail_rows[i]] }
+      pairs
     end
 
-    private
-
     def summary_rows
       feedback_table.trs(class: 'rowexpand')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copilot
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70136296097120 !ruby/object:Gem::Requirement
+  requirement: &70099948187940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136296097120
+  version_requirements: *70099948187940
 description: 
 email: matthew-github@matthewriley.name
 executables: []
@@ -32,7 +32,7 @@ files:
 - lib/copilot/requests/builds_for_bundle_id_request.rb
 - lib/copilot/requests/feedback_for_build_id_request.rb
 - lib/copilot/requests/internal/build_table_row.rb
-- lib/copilot/requests/internal/builds_dashboard.rb
+- lib/copilot/requests/internal/builds_page.rb
 - lib/copilot/requests/internal/feedback_page.rb
 - lib/copilot/requests.rb
 - lib/copilot.rb