classifieds_cli_app 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e55d1ca44e97ba4d0669686fde104c89d80eaa0
-  data.tar.gz: 1d08f774c879eb72c6415b0e316c546307826a33
+  metadata.gz: 01be9206924ea8e879c3236c148e9c2d6a339ae5
+  data.tar.gz: 3588d77e9d44be47a69d3fb05ecf11da97624cd7
 SHA512:
-  metadata.gz: bae09c79008cb2e988da7dddd9ee53652f9e594c54630caec8e7e668a8d77e4606f893463bd31d8bb5d2a90827f3977276cd8d8850b8cc3fd23b049bbefbdcb5
-  data.tar.gz: 92862e9b67c72ee5bf6c89b496d8a822dc936803a6e15ad891f643809632c07f1f77a945e5a1518d3dbf949675002a3d14dbc0c31b40ea1d2e1a56ab1ca7ebec
+  metadata.gz: d499692bde2dc07c237c0e4ac450755d848e7fcf935e0e9b8d962bae5c3c6114f87a6e9f41b08b11b08d97909e4316abd835acc4e956f556107e3d2ebe425c40
+  data.tar.gz: 158f1ba26b7b52697104b73e80203782849ef4658177687b618f42ce464aa39bfde9a55a975e6be66ca967ba83586e0b35c69d4a5d33683ed1bd6eac15cad71c

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    classifieds (0.1.0)
-      nokogiri
+    classifieds_cli_app (0.1.1)
+      nokogiri (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -24,8 +24,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.13)
-  classifieds!
-  pry
+  classifieds_cli_app!
+  pry (~> 0)
   rake (~> 10.0)
 
 BUNDLED WITH

data/lib/classifieds/auto.rb

@@ -1,18 +1,12 @@
 class Classifieds::Auto < Classifieds::Vehicle  # describes a Vehicle type of: Automobile
 
-  @@ATTR_COLUMN_WIDTHS  = [12, 10]
-  @@SUMMARY_COL_FORMATS = [[24,'l'], [7,'r'], [8,'r']]  # [width, justification]
+  SUMMARY_COL_FORMATS = [[32,'l'], [7,'r'], [9,'r']]  # [width, justification]
 
   def initialize(year, make, model, mileage, price, condition, detail_link)
     super(year, make, model, price, condition, detail_link)
     @mileage = mileage
   end
 
-  # Return attribute field width for given column
-  def attr_width(col)
-    @@ATTR_COLUMN_WIDTHS[col-1]
-  end
-
   # Creates listings from summary web page
   def self.scrape_results_page(results_url, results_url_file, results_doc)
     Classifieds::AutoScraper.scrape_results_page(results_url, results_url_file, results_doc, self)
@@ -25,11 +19,11 @@ class Classifieds::Auto < Classifieds::Vehicle  # describes a Vehicle type of: A
 
   # Returns a summary listing data row
   def summary_detail
-    Classifieds::Listing.fmt_cols([@title, @mileage, @price], @@SUMMARY_COL_FORMATS)
+    Classifieds::Listing.format_cols([@title, @mileage, @price], SUMMARY_COL_FORMATS)
   end
 
   # Returns the summary listing title row
   def self.summary_header
-    Classifieds::Listing.fmt_cols(['Vehicle', 'Mileage', 'Price '], @@SUMMARY_COL_FORMATS)
+    Classifieds::Listing.format_cols(['Vehicle', 'Mileage', 'Price '], SUMMARY_COL_FORMATS)
   end
 end

data/lib/classifieds/auto_scraper.rb

@@ -31,7 +31,7 @@ class Classifieds::AutoScraper  # converts automobile classified listings into o
   # Returns detail attributes and values in detail_values hash
   def self.scrape_results_detail_page(detail_doc, item_condition, detail_values)
     # Create some entries manually.
-    detail_values['Description'.to_sym] = detail_doc.css('.aiDetailsDescription')[0].children[2].text.strip
+    detail_values['Description'.to_sym] = detail_doc.css('.aiDetailsDescription')[0].children[2].text.strip  # Description must be first attribute.
     detail_values['Condition'.to_sym] = item_condition
     detail_values['Certified'.to_sym] = ''
     # Create the rest from scraping the html's detail attrribute/value table.

data/lib/classifieds/boat.rb

@@ -1,17 +1,11 @@
 class Classifieds::Boat < Classifieds::Vehicle  # describes a Vehicle type of: Boat
 
-  @@ATTR_COLUMN_WIDTHS  = [15, 14]
-  @@SUMMARY_COL_FORMATS = [[24,'l'], [8,'r']]  # [width, justification]
+  SUMMARY_COL_FORMATS = [[32,'l'], [9,'r']]  # [width, justification]
 
   def initialize(year, make, model, price, condition, detail_link)
     super(year, make, model, price, condition, detail_link)
   end
 
-  # Return attribute field width for given column
-  def attr_width(col)
-    @@ATTR_COLUMN_WIDTHS[col-1]
-  end
-
   # Creates listings from summary web page
   def self.scrape_results_page(results_url, results_url_file, results_doc)
     Classifieds::BoatScraper.scrape_results_page(results_url, results_url_file, results_doc, self)
@@ -24,11 +18,11 @@ class Classifieds::Boat < Classifieds::Vehicle  # describes a Vehicle type of: B
 
   # Returns a summary listing data row
   def summary_detail
-    Classifieds::Listing.fmt_cols([@title, @price], @@SUMMARY_COL_FORMATS)
+    Classifieds::Listing.format_cols([@title, @price], SUMMARY_COL_FORMATS)
   end
 
   # Returns the summary listing title row
   def self.summary_header
-    Classifieds::Listing.fmt_cols(['Boat', 'Price '], @@SUMMARY_COL_FORMATS)
+    Classifieds::Listing.format_cols(['Boat', 'Price '], SUMMARY_COL_FORMATS)
   end
 end

data/lib/classifieds/boat_scraper.rb

@@ -60,7 +60,7 @@ private
   def self.do_alt_processing(doc, item_condition, detail_values)
     # Create some entries manually.
     main_content = doc.css('#main-content')
-    detail_values['Description'.to_sym] = main_content.css('p').text.strip
+    detail_values['Description'.to_sym] = main_content.css('p').text.strip  # Description must be first attribute.
     detail_values['Condition'.to_sym] = item_condition
 
     # Create the rest from scraping the html's detail attrribute/value table.
@@ -68,7 +68,7 @@ private
     (0...detail_cells.size).each { |index|
       dl_tag = detail_cells[index].children
       (0...dl_tag.size).step(2) { |child|
-        attribute = dl_tag[child].text
+        attribute = dl_tag[child].text.chomp(':')
         value = dl_tag[child+1].text
         detail_values[attribute.to_sym] = value
       }
@@ -94,7 +94,7 @@ private
         if 0 < dl_tag.size  # need to do alternate normal processing.
           process_detail_list_alt(dl_tag, detail_values)
         else
-          attribute = attribute_tag.text
+          attribute = attribute_tag.text.chomp(':')
           value_tag = detail_cells[index].children[3]
 
           if value_tag
@@ -121,7 +121,7 @@ private
     (0...doc.size).step(4) { |index|
       attribute = doc[index+1]
       next if attribute.nil?
-      attr_text = attribute.text
+      attr_text = attribute.text.chomp(':')
       value_tag = doc[index+3]
       detail_values[attr_text.to_sym] = value_tag.text if value_tag
     }
@@ -133,7 +133,7 @@ private
       children = doc[index].children
       child_index = 1
       while child_index < children.size
-        attribute = children[child_index].text
+        attribute = children[child_index].text.chomp(':')
         value = children[child_index+2]
         if value.nil? || value.text.strip.size == 0
           value = children[child_index+1]

data/lib/classifieds/item.rb

@@ -12,7 +12,7 @@ class Classifieds::Item  # describes the thing in a listing that is for sale
 
   # Empty list of created objects
   def self.clear
-    # all.clear
+    # all.clear  # not used, for now.
   end
 
   COLUMN_SEPARATION = 5
@@ -21,49 +21,74 @@ class Classifieds::Item  # describes the thing in a listing that is for sale
   def details_to_string(addon_details)
     Classifieds::Listing.scrape_listing_details(self.class, @detail_url, @condition, @detail_values) if @detail_values.empty?
 
+    # Setup attribute/value details array
     detail_values_array = @detail_values.to_a
-    addon_details.delete(:Phone) if detail_phone  # do not use seller phone if item details has a phone.
+    addon_details.delete(:Phone) if detail_phone?  # do not addon phone if item details has a phone.
     detail_values_array.concat(addon_details.to_a)
-    offset = detail_values_array.size / 2 # prepare for two column output.
-    mod2 = detail_values_array.size % 2   # and account for an odd number of details.
-    col1_ljust = max_col1_width(detail_values_array, offset+mod2) + COLUMN_SEPARATION
-    result = ''
+    col2_offset = ((detail_values_array.size-1) / 2) + ((detail_values_array.size-1) % 2) # remove 1 from array size for description. It will get its own row.
 
-    (0...offset+mod2).each { |index|
-      # column 1
-      attribute = detail_values_array[index][0].to_s
-      value = detail_values_array[index][1]
-      result << "  #{Classifieds::Listing.format_detail(attribute, attr_width(1), value).ljust(col1_ljust)}"
+    col_attr_width = []
+    col_width = []
+
+    # Calculate column 1 widths
+    widths = max_col_widths(detail_values_array, 0, col2_offset)  # [max_attr_width, max_val_width, max_column_width]
+    col_attr_width[0] = widths[0]
+    col_width[0] = [widths[2], Classifieds::Item.col_width_limit(1)].min  # limit col width to max col width
+    col_width[0] += COLUMN_SEPARATION
+
+    # Calculate column 2 widths
+    widths = max_col_widths(detail_values_array, col2_offset+1, detail_values_array.size)  # [max_attr_width, max_val_width, max_column_width]
+    col_attr_width[1] = widths[0]
+    col_width[1] = [widths[2], Classifieds::Item.col_width_limit(2)].min  # limit col width to max col width
 
-      # column 2
-      if 'Description' == attribute.to_s  # Have Description be on its own line.
-        result << "\n"
-      elsif (index + offset) < detail_values_array.size
-        attribute = detail_values_array[index+offset][0].to_s
-        value = detail_values_array[index+offset][1]
-        result << "#{Classifieds::Listing.format_detail(attribute, attr_width(2), value)}\n"
-      end
+    # Description value spans all columns.
+    attribute = detail_values_array[0][0].to_s
+    value = detail_values_array[0][1]
+    result = "  #{Classifieds::Listing.format_detail(attribute, col_attr_width[0], value)}\n"
+
+    # Then display remaining details in two column format.
+    (1..col2_offset).each { |index|
+      result << "  #{Classifieds::Item.format_pair(detail_values_array, index,             col_attr_width[0], col_width[0])}"
+      next if (index+col2_offset) == detail_values_array.size  # when odd number of details.
+      result << "  #{Classifieds::Item.format_pair(detail_values_array, index+col2_offset, col_attr_width[1], col_width[1])}\n"
     }
     result
   end
 
-  def detail_phone
-    @detail_values[:Phone]
-  end
-
   ## PRIVATE METHODS
   private
 
-  # Find width of widest col1 data
-  def max_col1_width(detail_values_array, end_val)
-    max_width = 0
-    (0...end_val).each { |index|
+  # Return attribute field width for given column
+  def self.col_width_limit(col)
+    [40, 40][col-1]
+  end
+
+  # Do the details contain a phone entry?
+  def detail_phone?
+    @detail_values[:Phone] ? true : false
+  end
+
+  # Formats an attribute/value pair for printing
+  def self.format_pair(array, index, attr_width, col_width)
+    attribute = array[index][0].to_s
+    value = array[index][1]
+    Classifieds::Listing.format_detail(attribute, attr_width, value).slice(0,col_width).ljust(col_width)
+  end
+
+  # Find widths of widest column data
+  # Returns [max_attr_width, max_val_width, max_column_width]
+  def max_col_widths(detail_values_array, start_index, end_index)
+    max_attr_width = 0
+    max_val_width = 0
+    (start_index...end_index).each { |index|
       attribute = detail_values_array[index][0].to_s
-      next if 'Description' == attribute  # Description spans all cols, so don't count its width.
+      width = Classifieds::Listing.format_detail_attr(attribute, 0).size
+      max_attr_width = width if width > max_attr_width
+      next if 'Description' == attribute  # Description spans all cols, so don't consider its value width.
       value = detail_values_array[index][1]
-      detail_width = Classifieds::Listing.format_detail(attribute, attr_width(1), value).size
-      max_width = detail_width if detail_width > max_width
+      width = Classifieds::Listing.format_detail_val(value, 0).size
+      max_val_width = width if width > max_val_width
     }
-    max_width
+    [max_attr_width, max_val_width, max_attr_width + max_val_width + ': '.size]
   end
 end

data/lib/classifieds/listing.rb

@@ -28,7 +28,7 @@ class Classifieds::Listing  # describes a classified advertisement
 
   # Prints the specified summary listings for the specified item subclass
   def self.print_summary(item_class, start_index, end_index)
-    puts "    #{item_class.summary_header} #{Classifieds::Seller.summary_header} #{lfmt('List Date', 10)}"
+    puts "    #{item_class.summary_header}  #{Classifieds::Seller.summary_header}  #{lfmt('List Date', 10)}"
     all[start_index..end_index].each_with_index { |listing, index| puts listing.summary_detail_row(start_index+index+1) }
   end
 
@@ -47,30 +47,30 @@ class Classifieds::Listing  # describes a classified advertisement
 
   # Prints a summary detail row
   def summary_detail_row(item_number)
-    "#{(item_number).to_s.rjust(2)}. #{@item.summary_detail} #{@seller.summary_detail} #{Classifieds::Listing.lfmt(@start_date, 10)}"
+    "#{(item_number).to_s.rjust(2)}. #{@item.summary_detail}  #{@seller.summary_detail}  #{Classifieds::Listing.lfmt(@start_date, 10)}"
   end
 
   # Formats an array of strings according to an array of formats
-  def self.fmt_cols(values, formats)
+  def self.format_cols(values, formats)
     result = ''
-    values.each_with_index { |value, index| result << "#{fmt_col(value, formats[index][0], formats[index][1])} " }
+    values.each_with_index { |value, index| result << "#{format_col(value, formats[index][0], formats[index][1])} " }
     result
   end
 
   MAX_LINE_LENGTH = 100
 
   # Format a detail attribute
-  def self.fmt_detail_attr(string, width)
+  def self.format_detail_attr(string, width)
     "#{lfmt(string, width)}"
   end
 
   # Format a detail item
   def self.format_detail(attr, attr_width, val)
-    "#{fmt_detail_attr(attr, attr_width)}: #{fmt_detail_val(val, attr_width)}"
+    "#{format_detail_attr(attr, attr_width)}: #{format_detail_val(val, attr_width)}"
   end
 
   # Format a detail value (with wrap if necessary)
-  def self.fmt_detail_val(string, wrap_indent)
+  def self.format_detail_val(string, wrap_indent)
     new_string = string.strip
     if new_string.size > MAX_LINE_LENGTH
       new_string = ''
@@ -101,7 +101,7 @@ class Classifieds::Listing  # describes a classified advertisement
   end
 
   # Format a column
-  def self.fmt_col(str, width, justify)
+  def self.format_col(str, width, justify)
     case justify
     when 'l'
       "#{lfmt(str, width)}"
@@ -114,7 +114,7 @@ class Classifieds::Listing  # describes a classified advertisement
 
   # Left justify string and pad or trim to size
   def self.lfmt(string, size)
-    string.slice(0,size).ljust(size)
+    size == 0 ? string : string.slice(0,size).ljust(size)
   end
 
   # Right justify string and pad or trim to size

data/lib/classifieds/seller.rb

@@ -1,7 +1,7 @@
 class Classifieds::Seller  # describes the entity that is selling the .Item in a .Listing
   # A seller is uniquely identified by name + location + phone
 
-  @@SUMMARY_COL_FORMATS = [[28,'l'], [32,'l']]  # [width, justification]
+  SUMMARY_COL_FORMATS = [[28,'l'], [32,'l']]  # [width, justification]
 
   @@all_sellers = []
 
@@ -34,12 +34,12 @@ class Classifieds::Seller  # describes the entity that is selling the .Item in a
 
   # Return a summary listing detail row
   def summary_detail
-    Classifieds::Listing.fmt_cols([@name, @location], @@SUMMARY_COL_FORMATS)
+    Classifieds::Listing.format_cols([@name, @location], SUMMARY_COL_FORMATS)
   end
 
   # Return the summary listing summary title row
   def self.summary_header
-    Classifieds::Listing.fmt_cols(['Seller', 'Location'], @@SUMMARY_COL_FORMATS)
+    Classifieds::Listing.format_cols(['Seller', 'Location'], SUMMARY_COL_FORMATS)
   end
 
   ## PRIVATE METHODS

data/lib/classifieds/version.rb

@@ -1,3 +1,3 @@
 module Classifieds
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classifieds_cli_app
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - John Pfingst