kijkwijzer 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b209b4c4e789335dcd55660460babce377f4dd8f
-  data.tar.gz: c11814b1549ea455d10f4ee15b2c093265e0bb3c
+SHA256:
+  metadata.gz: af0948d919a2baa520ea0fbe6850cd8a74b241a9e00bad76064d3aa723d0d8b4
+  data.tar.gz: 665557ad474bb0c71d7e747ea4af1e9a0d7a8271e9d6ca3984b771bbe3af43df
 SHA512:
-  metadata.gz: f17b634e82c6c35959fe0ec7119a90b93355833cf19b5d55889965473be69d694f593ddae152f0b5c2c302de3a8e60a7d3d0275db05bf38546bddd23b3db23cb
-  data.tar.gz: 0288bf24e007af2f6d682f0d95c748afd26494ca4d00ae7c1ea79a6087c93f6c3cf35d71686dc013c8008ec13434d85ec7e5282ce91bac82ebff57be0d2eba53
+  metadata.gz: 8e6967d69d49728712381248768c622906b4450471f73c78b62462d9452f6b2956fe407e418ad3dec4317d9ee52ff6dbcc1764f74444c92508c58d7447641aa1
+  data.tar.gz: 7fcde1ba4a440bf813418437eb8d65374d72528e73be52f017d123e37ea76583bed348b54521dbe3512cc1c631310d9151c0e1d33b0fe76361a790534856f601

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,6 +1,8 @@
 # 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 i made this gem to remove the scraping bit from my own app-source.
+
+[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).
 
 ## Installation
 
@@ -62,7 +64,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

@@ -12,13 +12,9 @@ module Kijkwijzer
       @ratings.collect do |rating|
         rating = rating.to_s.downcase
         rv = nil
-        rv = rating if ["al","6","9","12","16"].include? rating
-        rv = "violence" if ["violence","g"].include? rating
-        rv = "scary" if ["scary","a"].include? rating
-        rv = "sex" if ["sex","s"].include? rating
-        rv = "drugs" if ["drugs","h"].include? rating
-        rv = "discrimination" if ["discrimination","d"].include? rating
-        rv = "language" if ["language","t"].include? rating
+        Kijkwijzer::POSSIBLE_RATINGS.each do |pr|
+          rv = pr[:value] if (rating == pr[:value] or rating == pr[:code])
+        end
         rv
       end.compact
     end
@@ -26,5 +22,25 @@ 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('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
+      end
+    end
   end
 end

data/lib/kijkwijzer/version.rb

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

data/lib/kijkwijzer.rb

@@ -6,6 +6,19 @@ require 'kijkwijzer/result'
 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"}
+  ]
   class << self
     def search_url(search)
       "http://www.kijkwijzer.nl/index.php?id=3__i&searchfor=#{url_encode(search)}&tab=KIJKWIJZER"
@@ -21,17 +34,8 @@ module Kijkwijzer
       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]
-        r.ratings = result.css("img").collect{|a| a.attr("src").match(/\/images\/icons\/M_(.*)\.png/)[1]}
-        include_r = true
-        filter.each do |key, value|
-          include_r = (r.send(key) == value)
-        end
-        results << r  if include_r
+        r = Result.new_from_nokogiri_result_fragment(result)
+        results << r  if 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.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Maarten Brouwers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2021-11-16 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,9 +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: []