kijkwijzer 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a1eef3b10869119fe141d42e5d75390e21876ad2
-  data.tar.gz: 2b349974b172e52ddecfce7e4a56af80ea32fa37
+SHA256:
+  metadata.gz: af0948d919a2baa520ea0fbe6850cd8a74b241a9e00bad76064d3aa723d0d8b4
+  data.tar.gz: 665557ad474bb0c71d7e747ea4af1e9a0d7a8271e9d6ca3984b771bbe3af43df
 SHA512:
-  metadata.gz: 7af3c2818d785a49153bdd096211a5c9c02f3614e53a97f193ab233b87e9dda858a4d72f2e86d6d08c3e19f317a096e76ca60e2ee0c2fdc64a39b434ecb14388
-  data.tar.gz: f36bad1f64533fc89a5153576306bd39112ed858b79750c26c24b6728105a5ea112ee6882deb463673415c55a7696891a891d744ace468790bde6571dd7a7b30
+  metadata.gz: 8e6967d69d49728712381248768c622906b4450471f73c78b62462d9452f6b2956fe407e418ad3dec4317d9ee52ff6dbcc1764f74444c92508c58d7447641aa1
+  data.tar.gz: 7fcde1ba4a440bf813418437eb8d65374d72528e73be52f017d123e37ea76583bed348b54521dbe3512cc1c631310d9151c0e1d33b0fe76361a790534856f601

data/kijkwijzer.gemspec

@@ -20,7 +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 "bundler", "> 2"
   spec.add_development_dependency "rspec", "~> 3.4"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "> 12"
 end

data/lib/kijkwijzer/result.rb

@@ -22,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.4"
+  VERSION = "0.1.5"
 end

data/lib/kijkwijzer.rb

@@ -34,18 +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
-        production_type_match = result.text.match(/Productietype\:\s(.*)\.(\sProductie)/)
-        production_year_match = result.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 = 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
+        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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Maarten Brouwers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
 description: Retrieves the kijkwijzer rating for a particular title and year
 email:
 - github.com@murb.nl
@@ -94,7 +94,7 @@ homepage: https://github.com/murb/kijkwijzer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,9 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-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: []