kijkwijzer 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7862fefdeb6957f0fe8b1ba7967597e070cfb384
-  data.tar.gz: 3c6a6553a97881ffca954e472dc425d735f64955
+SHA256:
+  metadata.gz: 364e7dcc3d6ce2901ccfbefe6d8cac8afc871b1a7d8618f65d2c04ee36fb53f1
+  data.tar.gz: c1fdd1b56dc80a0aac1f6f078fc35a7c57e766cabe78ebc2fa4377c381663b58
 SHA512:
-  metadata.gz: 2d33cd979d304a835c93d8d563544113e7734d9af29aa36688b8d6e74a4004e9568c6997db299aebbc32b3a3761edb2627cfbe58e5d93738cb6d452daf74698c
-  data.tar.gz: 5a6d7cb28a20bee779678908455fa8b317bd32f7a69615d635ac44b4004b3bd8b9a806675a56e0da14d12a4f339f19c98668aa33c2162cd6ea2371f1ffc4681a
+  metadata.gz: 49de5dd1b013871fcc717f4ab685fb6def12d9ae75bf765b3d7152385f195befce5f0411be70da23ceb8c40fdf577dab88908ca7d9f44250e95f8e4afd30c2e9
+  data.tar.gz: ea041fe6040577be23c04deb7f5a48e8f85de0e7e2ffb0710183fd9bd70aac76cb789dd155b558987caa6a7b692f496e2b9c4195c5672f84a08ba2d29ab76a62

data/.travis.yml

@@ -1,3 +1,8 @@
 language: ruby
+sudo: false
 rvm:
   - 2.1.5
+  - 2.5.0
+script:
+- export RAILS_ENV=test
+- bundle exec rspec

data/README.md

@@ -1,4 +1,6 @@
 # Kijkwijzer
+[![Code Climate](https://codeclimate.com/github/murb/kijkwijzer.png)](https://codeclimate.com/github/murb/kijkwijzer) [![Build Status](https://travis-ci.org/murb/kijkwijzer.svg?branch=master)](https://travis-ci.org/murb/kijkwijzer) [![Gem Version](https://badge.fury.io/rb/kijkwijzer.svg)](http://badge.fury.io/rb/kijkwijzer)
+
 
 [Kijkwijzer](http://kijkwijzer.nl) is the [Dutch film/television-screening system](https://en.wikipedia.org/wiki/Television_content_rating_systems#Netherlands). Since there is no proper API, this gem was made to remove the scraping bit from my own app-source. Additionally some helper methods have been added to make displaying the icons easier (the icons are included in this gem as a SVG-iconset).
 
@@ -54,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.
@@ -62,7 +74,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/kijkwijzer/fork )
+1. Fork it ( https://github.com/murb/kijkwijzer/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/kijkwijzer.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "nokogiri"
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "> 2"
+  spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency "rake", "> 12"
 end

data/lib/kijkwijzer/result.rb

@@ -22,5 +22,29 @@ module Kijkwijzer
     def to_s
       "#<Kijkwijzer::Result @title=\"#{title}\", @year=#{year}>"
     end
+
+    # Filters use a key value hash to which the results should conform
+    #
+    # @return [TrueClass, FalseClass]
+    def match_filter?(filter)
+      !(filter.collect{|k, v| include_r = (self.send(k) == v)}.include? false)
+    end
+
+    class << self
+      def new_from_nokogiri_result_fragment nokogiri_result_fragment
+        r = self.new
+        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
 end

data/lib/kijkwijzer/version.rb

@@ -1,3 +1,3 @@
 module Kijkwijzer
-  VERSION = "0.1.3"
+  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,19 +33,9 @@ module Kijkwijzer
     def search(search, filter={})
       res = get_content(search)
       results = []
-      res.css('.content_hok .nieuwsitem').each do |result|
-        r = Result.new()
-        r.title = result.css('b').text
-        meta_parse = result.text.match(/Productietype\:\s(.*)\.\sProductiejaar\:\s(\d\d\d\d)\.\s/)
-        r.year = meta_parse[2].to_i
-        r.production_type = meta_parse[1]
-        p result.css("img").collect{|a| a}
-        r.ratings = result.css("img").collect{|a| a.attr("src").match(/\/upload\/pictogrammen\/\d*_\d*_(.*)\.png/)[1]}
-        include_r = true
-        filter.each do |key, value|
-          include_r = (r.send(key) == value)
-        end
-        results << r  if include_r
+      res.css('.c-search__results .c-search__result').each do |result|
+        r = Result.new_from_nokogiri_result_fragment(result)
+        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.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Maarten Brouwers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -26,32 +26,46 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
 description: Retrieves the kijkwijzer rating for a particular title and year
 email:
 - github.com@murb.nl
@@ -80,7 +94,7 @@ homepage: https://github.com/murb/kijkwijzer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,10 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.29
+signing_key:
 specification_version: 4
 summary: Retrieves the kijkwijzer rating for a particular title and year
 test_files: []
-has_rdoc: