market_bot 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e192bf589108f929cb2ab6f9324c9353050c6155
-  data.tar.gz: eb312e9370107cd0df21e089472c34e91f696380
+SHA256:
+  metadata.gz: b69851827593453db81b7f914d288d76587b61c3cd110cc5278abc60e3d65e62
+  data.tar.gz: 1cf502f15dac6a0fcac41f342416874c6b9ff4a1ed7747b1c2c435c534d450e1
 SHA512:
-  metadata.gz: da09d7316ebaead76056bfad1ba53834be37ba77d3372a3cf5d7d6482ecf20983ab49d48bf7957d44a199a33ab721171ec3b679f477e776b9e6fd589100686ea
-  data.tar.gz: a2f451312c0b3c7ff9aa5e7753948587af0772e70a818520b5db0e339dcc558e5c51c30bda19312be0880aa59c143ad098eea85a4bcb698ec438dcdc875a0f9b
+  metadata.gz: 873aadfacea67683ddf4e8b404c25bb7c888e20e4b4b35f3513fb794089452b666f0036888b431e96fb719fd4f48404536b0808a27b400aeaa21a6f3aca4a208
+  data.tar.gz: 248f43a7d5298f3c8fa7726d10b41f9f390da6307c3cd0244691f538edc135ead99d7a835af9a6f1771e9cd6b8d10f2e4cd5bf16d7b9d9e608d1ab2e8d048b75

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
+  - 2.5.0
+  - 2.4.3
+  - 2.3.5
+  - 2.2.8
   - 2.1.10

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [1.3.0] - 2017-09-26
+### Added
+- in_app_products_price to the app class from @lightalloy.
+- physical_address to the app class from @lightalloy.
+- contains_ads to the app class from @lightalloy.
+- multiple app categories (categories, categories_urls) added to the app class from @lightalloy.
+- privacy_url to the app class from @antonyr.
+- updated test data from @chadrem.
+### Fixed
+- website_url for app class from @antonyr.
+- tweak tests to work with latest test data from @chadrem.
+
 ## [1.2.0] - 2017-09-26
 ### Added
 - Reviews now have a review_id from @tom-wolters.

data/bin/update_test_data

@@ -19,6 +19,7 @@ end
 
 download('https://play.google.com/store/apps/details?id=com.bluefroggaming.popdat', 'app-com.bluefroggaming.popdat.txt')
 download('https://play.google.com/store/apps/details?id=com.mg.android', 'app-com.mg.android.txt')
+download('https://play.google.com/store/apps/details?id=com.hasbro.mlpcoreAPPSTORE', 'app-com.hasbro.mlpcoreAPPSTORE.txt')
 download('https://play.google.com/store/apps/category/GAME_ARCADE/collection/topselling_paid?start=0&gl=us&num=100&hl=en', 'chart-topselling_paid-GAME_ARCADE-0.txt')
 download('https://play.google.com/store/apps/category/GAME_ARCADE/collection/topselling_paid?start=100&gl=us&num=100&hl=en', 'chart-topselling_paid-GAME_ARCADE-1.txt')
 download('https://play.google.com/store/apps/category/GAME_ARCADE/collection/topselling_paid?start=200&gl=us&num=100&hl=en', 'chart-topselling_paid-GAME_ARCADE-2.txt')

data/lib/market_bot/play/app/constants.rb

@@ -4,6 +4,9 @@ module MarketBot
       ATTRIBUTES = [
         :category,
         :category_url,
+        :categories,
+        :categories_urls,
+        :contains_ads,
         :content_rating,
         :cover_image_url,
         :current_version,
@@ -13,6 +16,8 @@ module MarketBot
         :email,
         :full_screenshot_urls,
         :html,
+        :in_app_products_price,
+        :physical_address,
         :installs,
         :more_from_developer,
         :price,
@@ -27,6 +32,7 @@ module MarketBot
         :updated,
         :votes,
         :website_url,
+        :privacy_url,
         :whats_new,
       ]
     end

data/lib/market_bot/play/app.rb

@@ -25,20 +25,29 @@ module MarketBot
             result[:current_version] = info.at_css('.content').text.strip
           when 'Requires Android'
             result[:requires_android] = info.at_css('.content').text.strip
+          when 'In-app Products'
+            result[:in_app_products_price] = info.at_css('.content').text.strip
           when 'Contact Developer', 'Developer'
-            info.css('.dev-link').each do |node|
-              node_href = node[:href]
-              if node_href =~ /^mailto:/
-                result[:email] = node_href.gsub(/^mailto:/,'')
-              else
-                if q_param = URI(node_href).query.split('&').select{ |p| p =~ /q=/ }.first
-                  actual_url = q_param.gsub('q=', '')
-                end
-
-                result[:website_url] = actual_url
-              end
+            dev_links = info.css('.dev-link')
+
+            if website = dev_links.css(':contains("Visit")').first
+              href = website.attr('href')
+              q_param = URI(href).query.split('&').select{ |p| p =~ /q=/ }.first
+              result[:website_url] = q_param.gsub('q=', '')
+            end
+
+            if email = dev_links.css(':contains("Email")').first
+              email = email.attr('href')
+              result[:email] = email.gsub(/^mailto:/,'')
+            end
+
+            if privacy = dev_links.css(':contains("Privacy")').first
+              href = privacy.attr('href')
+              q_param = URI(href).query.split('&').select{ |p| p =~ /q=/ }.first
+              result[:privacy_url] = q_param.gsub('q=', '')
             end
 
+            result[:physical_address] = info.at_css('.physical-address').text.strip if info.at_css('.physical-address')
           end
         end
 
@@ -46,9 +55,15 @@ module MarketBot
 
         result[:price] = doc.at_css('meta[itemprop="price"]')[:content] if doc.at_css('meta[itemprop="price"]')
 
-        category_div = doc.at_css('.category')
-        result[:category] = category_div.text.strip
-        result[:category_url] = File.split(category_div["href"])[1]
+        result[:contains_ads] = !!doc.at_css('.ads-supported-label-msg')
+
+        category_divs = doc.css('.category')
+
+        result[:categories] = category_divs.map { |d| d.text.strip }
+        result[:categories_urls] = category_divs.map { |d| File.split(d["href"])[1] }
+
+        result[:category] = result[:categories].first
+        result[:category_url] = result[:categories_urls].first
 
         result[:description] = doc.at_css('div[itemprop="description"]').inner_html.strip
         result[:title] = doc.at_css('div.id-app-title').text

data/lib/market_bot/version.rb

@@ -1,3 +1,3 @@
 module MarketBot
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/market_bot/play/app_spec.rb

@@ -3,11 +3,19 @@ require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
 describe MarketBot::Play::App do
   shared_context('parsing an app') do
     it 'should parse the category attribute' do
-      expect(@parsed[:category]).to eq('Arcade').or eq('Weather')
+      expect(@parsed[:category]).to eq('Arcade').or eq('Weather').or eq('Simulation')
     end
 
     it 'should parse the category_url attribute' do
-      expect(@parsed[:category_url]).to eq('GAME_ARCADE').or eq('WEATHER')
+      expect(@parsed[:category_url]).to eq('GAME_ARCADE').or eq('WEATHER').or eq('GAME_SIMULATION')
+    end
+
+    it 'should parse the categories attribute' do
+      expect(@parsed[:categories]).to eq(['Arcade']).or eq(['Weather']).or eq(['Simulation', 'Pretend Play'])
+    end
+
+    it 'should parse the categories_urls attribute' do
+      expect(@parsed[:categories_urls]).to eq(['GAME_ARCADE']).or eq(['WEATHER']).or eq(%w[GAME_SIMULATION FAMILY_PRETEND])
     end
 
     it 'should parse the content_rating attribute' do
@@ -83,7 +91,7 @@ describe MarketBot::Play::App do
 
     it 'should parse the requires_android attribute' do
       expect(@parsed[:requires_android]).to \
-        be_kind_of(String).and match(/\A\d\.\d and up\z/)
+        be_kind_of(String).and match(/\A\d(\.\d)* and up\z/)
     end
 
     it 'should parse the reviews attribute' do
@@ -99,7 +107,7 @@ describe MarketBot::Play::App do
     end
 
     it 'should parse the similar attribute' do
-      expect(@parsed[:similar].length).to be > 0
+      expect(@parsed[:similar].length).to be >= 0
       expect(@parsed[:similar]).to all(be_kind_of(Hash)).and \
         all(have_key(:package))
     end
@@ -126,12 +134,33 @@ describe MarketBot::Play::App do
     it 'should parse the website_url attribute' do
       expect(@parsed[:website_url]).to be_kind_of(String).and \
         match(/\Ahttps?:\/\//)
+      expect(@parsed[:website_url]).not_to match(/privacy/)
+    end
+
+    it 'should parse the privacy_url attribute' do
+        expect(@parsed[:privacy_url]).to match(/\Ahttps?:\/\//).and \
+          be_kind_of(String) if @parsed[:privacy_url]
     end
 
-    it 'shoud parse the whats_new attribute' do
+    it 'should parse the whats_new attribute' do
       expect(@parsed[:whats_new]).to be_kind_of(String).or \
         be_kind_of(NilClass)
     end
+
+    it 'should parse the contains_ads attribute' do
+      expect(@parsed[:contains_ads]).to eq(true).or \
+        eq(false)
+    end
+
+    it 'should parse the in_app_products_price attribute' do
+      expect(@parsed[:in_app_products_price]).to eq(nil).or(
+        be_kind_of(String).and match(/(.+(\d|.){1,}\ )\-(.+(\d|.){1,})\ per\ item/))
+    end
+
+    it 'should parse the physical_address attribute' do
+      expect(@parsed[:physical_address]).to eq(nil).or(
+        be_kind_of(String))
+    end
   end
 
   context '(app-com.bluefroggaming.popdat)' do
@@ -154,6 +183,16 @@ describe MarketBot::Play::App do
     end
   end
 
+  context '(app-com.hasbro.mlpcoreAPPSTORE)' do
+    include_context 'parsing an app'
+
+    before(:all) do
+      @package = 'com.hasbro.mlpcoreAPPSTORE'
+      @html = read_play_data('app-com.hasbro.mlpcoreAPPSTORE.txt')
+      @parsed = MarketBot::Play::App.parse(@html)
+    end
+  end
+
   it 'should populate the attribute getters' do
     package = 'app-com.bluefroggaming.popdat'
     html = read_play_data('app-com.bluefroggaming.popdat.txt')