copilot 0.0.7 → 0.0.8

data/lib/copilot/array_to_csv_converter.rb

@@ -1,4 +1,5 @@
 require 'csv'
+require 'hash_flattener'
 
 module CoPilot
   class ArrayToCsvConverter
@@ -19,7 +20,7 @@ module CoPilot
     private
 
     def rows
-      @rows ||= @array.map { |r| flatten r }
+      @rows ||= @array.map { |r| HashFlattener.flatten r }
     end
 
     def columns
@@ -47,25 +48,5 @@ module CoPilot
       keys.sort
     end
 
-    def flatten(enumerable)
-      res = {}
-
-      enumerable.each_with_index do |elem, i|
-        if elem.is_a?(Array)
-          k, v = elem
-        else
-          k, v = i, elem
-        end
-
-        if v.is_a? Enumerable
-          res.merge!(flatten k)
-        else
-          res[k] = v
-        end
-      end
-
-      res
-    end
-
   end
 end

data/lib/copilot/requests/builds_for_bundle_id_request.rb

@@ -1,5 +1,6 @@
-require_relative 'internal/build_table_row'
-require_relative 'internal/builds_page'
+require 'time'
+require_relative 'internal/array_limiter'
+require_relative 'internal/pager'
 
 module CoPilot
   class BuildsForBundleIdRequest
@@ -9,45 +10,59 @@ module CoPilot
     end
 
     def send(bundle_id, options={})
-      @limit = options[:limit]
-      @since = options[:since]
-      @builds_page = BuildsPage.new @browser, bundle_id
-      @builds_page.goto
-      @builds_page.more_builds
+      @bundle_id = bundle_id
       @builds = []
+      @builds_limiter = create_builds_limiter options
+      @pager = Pager.new @browser
+      go_to_builds_page
       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
+    def create_builds_limiter(options={})
+      l = ArrayLimiter.new @builds, max_number: options[:limit], max_time: options[:since]
+      l.time_lambda = lambda { |b| b[:added_date] }
+      l.limit_reached_lambda = lambda { @limit_reached = true }
+      l
     end
 
-    def add_builds
-      rows = @builds_page.builds_table_rows
-      @builds += rows.map { |row| BuildTableRow.new(row).to_hash }
+    def go_to_builds_page
+      @browser.goto 'https://www.testflightapp.com/dashboard/applications'
+      @browser.small(text: @bundle_id).click
+    end
+
+    def add_builds_for_each_page
+      until limit_reached? || no_more_builds? do
+        add_builds
+      end
     end
 
-    def remove_duplicate_builds
-      @builds.uniq! { |b| b[:id] }
+    def limit_reached?
+      @limit_reached ||= false
     end
 
-    def strip_excess_builds
-      @builds = @builds.first @limit if @limit
-      @builds.select! { |b| b[:added_date] > @since } if @since
+    def no_more_builds?
+      !@pager.next_page
     end
 
-    def limit_reached
-      @limit && @builds.length >= @limit
+    def add_builds
+      rows = @browser.trs(class: 'goversion pointer')
+      rows.each { |row| @builds_limiter.add create_build(row) }
     end
 
-    def age_reached
-      @since && @builds.last[:added_date] > @since
+    def create_build(row)
+      {
+          id: row.id.split('/').last,
+          version: row[0].text,
+          added_date: Time.parse(row[1].text),
+          built_for: row[2].text,
+          sdk: row[3].text,
+          crashes: row[4].text.to_i,
+          feedback: row[5].text.to_i,
+          installs: row[6].text.to_i
+      }
     end
 
   end

data/lib/copilot/requests/feedback_for_build_id_request.rb

@@ -1,4 +1,5 @@
 require_relative 'internal/feedback_page'
+require_relative 'internal/array_limiter'
 
 module CoPilot
   class FeedbackForBuildIdRequest
@@ -8,49 +9,56 @@ module CoPilot
     end
 
     def send(build_id, options={})
-      @limit = options[:limit]
-      @since = options[:since]
       @feedback = []
+      @feedback_limiter = create_feedback_limiter options
       @feedback_page = FeedbackPage.new @browser, build_id
+      @pager = Pager.new @browser
       @feedback_page.goto
       add_feedback_for_each_page
-      strip_excess_feedback
       @feedback
     end
 
     private
 
+    def create_feedback_limiter(options={})
+      l = ArrayLimiter.new @feedback, max_number: options[:limit], max_time: options[:since]
+      l.time_lambda = lambda { |f| f[:date] }
+      l.limit_reached_lambda = lambda { @limit_reached = true }
+      l
+    end
+
     def add_feedback_for_each_page
       add_feedback
-      add_feedback while @feedback_page.next_page && !limit_reached && !age_reached
+      until limit_reached? || no_more_feedback? do
+        add_feedback
+      end
+    end
+
+    def limit_reached?
+      @limit_reached ||= false
+    end
+
+    def no_more_feedback?
+      !@pager.next_page
     end
 
     def add_feedback
       @feedback_page.expand_details
       @feedback_page.each_summary_detail_pair do |summary, detail|
         main_feedback_table = detail.table(class: 'mainfeedback')
-        @feedback << {
-            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
-        }
+        @feedback_limiter.add create_feedback(summary, main_feedback_table)
       end
     end
 
-    def strip_excess_feedback
-      @feedback = @feedback.first @limit if @limit
-      @feedback.select! { |f| f[:date] > @since } if @since
-    end
-
-    def limit_reached
-      @limit && @feedback.length >= @limit
-    end
-
-    def age_reached
-      @since && @feedback.last[:date] > @since
+    def create_feedback(summary, main_feedback_table)
+      {
+          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
 
     def b

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

@@ -0,0 +1,29 @@
+module CoPilot
+  class ArrayLimiter
+
+    attr_accessor :time_lambda, :limit_reached_lambda
+
+    def initialize(array, options={})
+      @array = array
+      @max_number = options[:max_number]
+      @max_time = options[:max_time]
+      @time_lambda = lambda { |v| v[:time] }
+      @limit_reached_lambda = {}
+    end
+
+    def add(value)
+      time = @time_lambda.call value
+      limit_reached = max_number_reached?(@array.length) || max_time_reached?(time)
+      limit_reached ? @limit_reached_lambda.call : @array << value
+    end
+
+    def max_number_reached?(number)
+      @max_number && number >= @max_number
+    end
+
+    def max_time_reached?(time)
+      @max_time && time > @max_time
+    end
+
+  end
+end

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

@@ -19,20 +19,8 @@ module CoPilot
       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 summary_detail_row_pairs
       pairs = []
       summary_rows.to_a.each_index { |i| pairs << [summary_rows[i], detail_rows[i]] }

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

@@ -0,0 +1,24 @@
+module CoPilot
+  class Pager
+
+    def initialize(browser)
+      @browser = browser
+    end
+
+    def next_page
+      link = next_page_link
+      return false unless link
+      link.click
+      sleep 1
+      true
+    end
+
+    private
+
+    def next_page_link
+      links = @browser.as(title: 'Next Page')
+      links.length == 1 ? links[0] : nil
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copilot
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hash_flattener
+  requirement: &70291170643440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70291170643440
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70328055296520 !ruby/object:Gem::Requirement
+  requirement: &70291170638840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328055296520
+  version_requirements: *70291170638840
 description: 
 email: matthew-github@matthewriley.name
 executables: []
@@ -33,9 +44,9 @@ files:
 - lib/copilot/facade.rb
 - 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_page.rb
+- lib/copilot/requests/internal/array_limiter.rb
 - lib/copilot/requests/internal/feedback_page.rb
+- lib/copilot/requests/internal/pager.rb
 - lib/copilot/requests.rb
 - lib/copilot.rb
 homepage: http://rubygems.org/gems/copilot

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

@@ -1,61 +0,0 @@
-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_page.rb

@@ -1,63 +0,0 @@
-module CoPilot
-  class BuildsPage
-
-    def initialize(browser, bundle_id)
-      @browser = browser
-      @bundle_id = bundle_id
-    end
-
-    def goto
-      b.goto 'https://www.testflightapp.com/dashboard/builds'
-    end
-
-    def header_div
-      @header_div ||= header_divs[bundle_index]
-    end
-
-    def builds_table
-      @builds_table ||= header_div.parent.tables[bundle_index]
-    end
-
-    def builds_table_rows
-      builds_table.trs(id: /\/dashboard\/builds\/report\/\d+\//)
-    end
-
-    def next_page
-      link = next_page_link
-      return false unless link
-      link.click
-      true
-    end
-
-    def more_builds_link
-      builds_table.as(text: 'more')[0]
-    end
-
-    def more_builds
-      link = more_builds_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
-
-    def bundle_index
-      @bundle_index ||= header_divs.to_a.index { |div| div.li.text == @bundle_id }
-    end
-
-    def b
-      @browser
-    end
-
-  end
-end