kijkwijzer 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af0948d919a2baa520ea0fbe6850cd8a74b241a9e00bad76064d3aa723d0d8b4
-  data.tar.gz: 665557ad474bb0c71d7e747ea4af1e9a0d7a8271e9d6ca3984b771bbe3af43df
+  metadata.gz: 364e7dcc3d6ce2901ccfbefe6d8cac8afc871b1a7d8618f65d2c04ee36fb53f1
+  data.tar.gz: c1fdd1b56dc80a0aac1f6f078fc35a7c57e766cabe78ebc2fa4377c381663b58
 SHA512:
-  metadata.gz: 8e6967d69d49728712381248768c622906b4450471f73c78b62462d9452f6b2956fe407e418ad3dec4317d9ee52ff6dbcc1764f74444c92508c58d7447641aa1
-  data.tar.gz: 7fcde1ba4a440bf813418437eb8d65374d72528e73be52f017d123e37ea76583bed348b54521dbe3512cc1c631310d9151c0e1d33b0fe76361a790534856f601
+  metadata.gz: 49de5dd1b013871fcc717f4ab685fb6def12d9ae75bf765b3d7152385f195befce5f0411be70da23ceb8c40fdf577dab88908ca7d9f44250e95f8e4afd30c2e9
+  data.tar.gz: ea041fe6040577be23c04deb7f5a48e8f85de0e7e2ffb0710183fd9bd70aac76cb789dd155b558987caa6a7b692f496e2b9c4195c5672f84a08ba2d29ab76a62

data/README.md

@@ -56,6 +56,16 @@ Then to display the movie results use the view helper `render_kijkwijzers`:
 
 Make sure you format the icons properly, otherwise you'll get huge icons ... I believe I've added plenty of classes for easy styling using css.
 
+## Changelog
+
+0.2.0 May 4, 2022
+Updated results scraping to their pudated HTML format
+
+0.1.5 November 16, 2021
+update dependencies / loosen dev requirements
+
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/kijkwijzer/result.rb

@@ -33,13 +33,17 @@ module Kijkwijzer
     class << self
       def new_from_nokogiri_result_fragment nokogiri_result_fragment
         r = self.new
-        r.title = nokogiri_result_fragment.css('b').text
-        production_type_match = nokogiri_result_fragment.text.match(/Productietype\:\s(.*)\.(\sProductie)/)
-        production_year_match = nokogiri_result_fragment.text.match(/\sProductiejaar\:\s(\d\d\d\d)\.\s/)
-        r.year = production_year_match[1].to_i if production_year_match
-        r.production_type = production_type_match[1] if production_type_match
-        r.ratings = nokogiri_result_fragment.css("img").collect{|a| a.attr("src").match(/\/upload\/pictogrammen\/\d*_\d*_(.*)\.png/)[1]}
-        return r
+        r.title = nokogiri_result_fragment.css('.c-search__title').text
+        production_type_year_match = nokogiri_result_fragment.css('.c-search__text').text.match(/\A\s*(.*)\s*\((\d\d\d\d)\)\s*$/)
+        if production_type_year_match
+          r.year = production_type_year_match[2].to_i if production_type_year_match[2]
+          r.production_type = production_type_year_match[1].strip if production_type_year_match[1]
+          r.ratings = nokogiri_result_fragment.css(".c-search__marks .c-search__mark").collect do |a|
+            class_fragment = a.attr("class").match(/\Ac-search__mark\sc-search__mark--(.*)$/)[1]
+            Kijkwijzer::POSSIBLE_RATINGS.find{|a| a[:nl_key] == class_fragment}&.[](:value)
+          end.compact
+          return r
+        end
       end
     end
   end

data/lib/kijkwijzer/version.rb

@@ -1,3 +1,3 @@
 module Kijkwijzer
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/lib/kijkwijzer.rb

@@ -7,24 +7,24 @@ require 'kijkwijzer/railtie' if defined?(Rails)
 
 module Kijkwijzer
   POSSIBLE_RATINGS = [
-    {name: "Alle leeftijden", value: "al", code: "al"},
-    {name: "6 jaar en ouder", value: "6", code: "6"},
-    {name: "9 jaar en ouder", value: "9", code: "9"},
-    {name: "12 jaar en ouder", value: "12", code: "12"},
-    {name: "16 jaar en ouder", value: "16", code: "16"},
-    {name: "Geweld", value: "violence", code: "g"},
-    {name: "Angst", value: "scary", code: "a"},
-    {name: "Seks", value: "sex", code: "s"},
-    {name: "Discriminatie", value: "discrimination", code: "d"},
-    {name: "Drugs en/of alcoholmisbruik", value: "drugs", code: "h"},
-    {name: "Grof taalgebruik", value: "language", code: "t"}
+    {nl_key: "alle-leeftijden", name: "Alle leeftijden", value: "al", code: "al"},
+    {nl_key: "leeftijd-6", name: "6 jaar en ouder", value: "6", code: "6"},
+    {nl_key: "leeftijd-9", name: "9 jaar en ouder", value: "9", code: "9"},
+    {nl_key: "leeftijd-12", name: "12 jaar en ouder", value: "12", code: "12"},
+    {nl_key: "leeftijd-16", name: "16 jaar en ouder", value: "16", code: "16"},
+    {nl_key: "geweld", name: "Geweld", value: "violence", code: "g"},
+    {nl_key: "angst", name: "Angst", value: "scary", code: "a"},
+    {nl_key: "seks", name: "Seks", value: "sex", code: "s"},
+    {nl_key: "discriminatie", name: "Discriminatie", value: "discrimination", code: "d"},
+    {nl_key: "drugs", name: "Drugs en/of alcoholmisbruik", value: "drugs", code: "h"},
+    {nl_key: "grof-taalgebruik", name: "Grof taalgebruik", value: "language", code: "t"}
   ]
   class << self
     def search_url(search)
-      "http://www.kijkwijzer.nl/index.php?id=3__i&searchfor=#{url_encode(search)}&tab=KIJKWIJZER"
+      "https://www.kijkwijzer.nl/zoeken/?query=#{url_encode(search)}&producties=0"
     end
     def get_content(search)
-      Nokogiri::HTML(open(search_url(search)))
+      Nokogiri::HTML(URI::open(search_url(search)))
     end
 
     # Search the Kijkwijzer database
@@ -33,9 +33,9 @@ module Kijkwijzer
     def search(search, filter={})
       res = get_content(search)
       results = []
-      res.css('.content_hok .nieuwsitem').each do |result|
+      res.css('.c-search__results .c-search__result').each do |result|
         r = Result.new_from_nokogiri_result_fragment(result)
-        results << r  if r.match_filter?(filter)
+        results << r if (r && r.match_filter?(filter))
       end
       results
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kijkwijzer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Maarten Brouwers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri