cockatrice_feeder 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8351da4a5eff2051048c3b0c0610167361f97ee
-  data.tar.gz: 56f2632308cd7bd822a9daab16741d247fbbd274
+  metadata.gz: b5240773a3d354704315fc39c1849dca7b5b340e
+  data.tar.gz: 841cec3ad20d2ccea73ef3034f03fbf7aca2e8a4
 SHA512:
-  metadata.gz: dd03bf14ebbdf4731c7acb48147dd786c87668737e06f867d1048ff2241a79b39a34deb14f806ed1abb283a0c2d479a62d176f6f5124f90e6558ff5ad3688cb9
-  data.tar.gz: 4777f537c2a521625396116ee1b6bb9860f62d482c6e9e61815b39cdf5996fd2df7e43979656040250435e481ab791c3616dcf45df7a94853df6b450c64f698d
+  metadata.gz: c3e20b320975dc4cb933ff8999b40dd82dc008123e6b03ef99d47e4146947bd9c2322ad42cc73e846f106aaf3ee147bfc24608441419ce64786a331277c3f519
+  data.tar.gz: e7b518285b7fd5e7441d0a269fd693aac5b49909e49d6ca61fad3b1b1095507f9b42f5c2ec0de13cb6aabc0d4ed20fc263345e5e817995930ecc71241c4b62c0

data/lib/cockatrice_feeder.rb

@@ -2,7 +2,6 @@ module CockatriceFeeder
   require 'httparty'
   require 'nokogiri'
   require 'fileutils'
-  require 'descriptive_statistics'
 
   @@app_dir = Dir.pwd+"/"
   @@deck_dir = @@app_dir+"decks/"
@@ -168,6 +167,17 @@ module CockatriceFeeder
     JSON.parse(File.read(@@meta_dir+"tiers.json"))
   end
 
+  def self.deck_obj(link = "", name = "", commanders = [], date = nil, price = nil)
+    {
+      link: link,
+      name: name,
+      commanders: commanders,
+      date: nil,
+      price: nil,
+      cardlist: []
+    }
+  end
+
   def self.output_cod(deck, subfolder)
     comments = [
       deck[:name],
@@ -227,14 +237,7 @@ module CockatriceFeeder
       doc.css(".deck-wide-header a").each do |a|
         link = a.attribute("href").value
         if link.include?("/mtg-decks/")
-          decks << {
-            name: link.split("/").last,
-            commanders: [],
-            link: "https://tappedout.net"+link,
-            date: nil,
-            price: nil,
-            cardlist: []
-          }
+          decks << deck_obj("https://tappedout.net"+link, link.split("/").last)
         end
       end
     end
@@ -279,14 +282,7 @@ module CockatriceFeeder
 
   def self.edhrecavg_decklist
     commanders.map{|c| c["link"]}.map do |c|
-      {
-        name: c,
-        commanders: [c],
-        link: "https://edhrec-json.s3.amazonaws.com/en/decks/#{c}.json",
-        price: nil,
-        date: nil,
-        cardlist: []
-      }
+      deck_obj("https://edhrec-json.s3.amazonaws.com/en/decks/#{c}.json", c, [c])
     end
   end
 
@@ -300,7 +296,7 @@ module CockatriceFeeder
 
   #order ["views,desc", "price,desc", "likes,desc", "updated,desc"]
   #commander should be a name attribute from the commanders array of objects
-  def self.deckstats_decklist(commander = "nil", pages = (1..1), order = "likes,desc", price_min = "", price_max = "")
+  def self.deckstats_decklist(commander = "", pages = (1..1), order_by = "likes,desc", price_min = "", price_max = "")
     decklist = []
     pages.each do |page|
       url = [
@@ -317,7 +313,7 @@ module CockatriceFeeder
         "&search_number_cards_sideboard=",
         "&search_cards%5B%5D=",
         "&search_tags=",
-        "&search_order=#{URI.encode_www_form_component(order)}",
+        "&search_order=#{URI.encode_www_form_component(order_by)}",
         "&utf8=%E2%9C%94",
         "&page=#{page}"
       ].join("")
@@ -326,14 +322,7 @@ module CockatriceFeeder
 
       doc.css(".deck_row").each do |dr|
         link = dr.css("td")[1].css("a").first.attribute("href").value
-        decklist << {
-          link: link,
-          name: link.split("/")[-2],
-          commanders: [commander].reject(&:empty?),
-          price: nil,
-          date: nil,
-          cardlist: []
-        }
+        decklist << deck_obj(link,link.split("/")[-2],[commander].reject(&:empty?))
       end
     end
 
@@ -357,7 +346,11 @@ module CockatriceFeeder
         sec["cards"].map{|c| "#{c["amount"]} #{c["name"]}"}
       end.flatten
 
-      deck[:price] = doc.css(".deck_overview_price").first.content.gsub("$","").strip.split(".").first
+      deck[:price] = (
+        !doc.css(".deck_overview_price").first.nil? ?
+          doc.css(".deck_overview_price").first.content.gsub("$","").strip.split(".").first
+          : nil
+      )
 
       output_cod(deck,'deckstats')
     end
@@ -370,16 +363,16 @@ module CockatriceFeeder
       doc = Nokogiri::HTML(HTTParty.get("https://mtgdecks.net/Commander/decklists/page:#{page}").body)
       doc.css(".decks tr.previewable").each do |r|
         if r.css("td")[0].css(".label-danger").length == 0
-          decks << {
-            name: "", # r.css("td")[1].css("a")[0].content,
+          date = r.css("td")[6].css("strong")[0].content.
+            gsub("<span class=\"hidden-xs\">","").
+            gsub("</span>","").gsub(/\s+/, "")
+          price = r.css("td")[7].css("span.paper")[0].content.gsub("$","").gsub(/\s+/, "")
+
+          decks << deck_objs(
             link: "https://mtgdecks.net"+r.css("td")[1].css("a")[0].attribute("href").value,
-            date: r.css("td")[6].css("strong")[0].content.
-              gsub("<span class=\"hidden-xs\">","").
-              gsub("</span>","").gsub(/\s+/, ""),
-            price: r.css("td")[7].css("span.paper")[0].content.gsub("$","").gsub(/\s+/, ""),
-            commanders: [],
-            cardlist: []
-          }
+            date: date,
+            price: price
+          )
         end
       end
     end
@@ -435,7 +428,7 @@ module CockatriceFeeder
     puts "#{decks.length} decks found."
     decks.each {|d|
       CockatriceFeeder.mtgdecks_deck(d)
-      if d[:cardlist].length < 0
+      if d[:cardlist].length > 0
         total_decks += 1
       end
     }
@@ -445,7 +438,7 @@ module CockatriceFeeder
     puts "#{decks.length} decks found."
     decks.each {|d|
       CockatriceFeeder.deckstats_deck(d)
-      if d[:cardlist].length < 0
+      if d[:cardlist].length > 0
         total_decks += 1
       end
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cockatrice_feeder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matthew Steinwachs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,22 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: descriptive_statistics
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-description: A tool to scrape MTG decks from the internet along with some meta information
-  and create Cockatrice compatible deck files.
+description: A tool to scrape MTG EDH decks from the internet along with some meta
+  information and create Cockatrice compatible deck files.
 email: matt.steinwachs@gmail.com
 executables:
 - gobble
@@ -85,5 +71,5 @@ rubyforge_project:
 rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: Scrape and generate decks for cockatrice
+summary: Scrape and generate MTG EDH decks for cockatrice
 test_files: []