eventify 3.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd35658a298a68c09bba8dd2fb5d1fece295d85896d413f9ff71e3f6bec59045
-  data.tar.gz: 992323d93ed64553ccc2d92f26c98082a75cda566ca91eebc2529bee796d257f
+  metadata.gz: cfd7ad797c2f6b778904c736597f27989ba121c13ec8993acfef3f342531534b
+  data.tar.gz: 43814be3826b24b4c67c6e480c58cf5abd9e1ffea0680bbd35f63c5904d178f0
 SHA512:
-  metadata.gz: 2a516c267b2f36c12e5e8698d164b8e0e343177f8a440eb2841443d9e4c8fa7e27dd2d4f12d969d58f3f2cdc01009318a2983fd5b0f3b17c841df8e20bd790e0
-  data.tar.gz: c2471416f81f9a3ed312149205ac0e0ee4772b511e6085a0d3d105354a721dcd17a445122799aa543d9e815b80bd93311e63adb3c07d4a26473ec9dc39518a2a
+  metadata.gz: d9ef84b47f8f77ae3d18eff968fb938efab4b4e73e8412a4db209eecf315168e249c775caf873b959f57c8a7ba7c6de3312305536461a5e30cbde5064185e3c4
+  data.tar.gz: 9ca8da1b182aa553ddfc0d06fdbc2fb07b0ef68d06cf67349d4ba8be5cfb397936024365aa888129d1874ec21ea7d1b3085987cff94c56b4f0cad69f9f9f34a6

data/README.md

@@ -1,69 +1,67 @@
-# Eventify
-[![Gem Version](https://badge.fury.io/rb/eventify.png)](http://badge.fury.io/rb/eventify)
-[![Build Status](https://api.travis-ci.org/jarmo/eventify.png)](http://travis-ci.org/jarmo/eventify)
-[![Coverage](https://coveralls.io/repos/jarmo/eventify/badge.png?branch=master)](https://coveralls.io/r/jarmo/eventify)
-[![Dependency Status](https://gemnasium.com/jarmo/eventify.png)](https://gemnasium.com/jarmo/eventify)
-[![Code Climate](https://codeclimate.com/github/jarmo/eventify.png)](https://codeclimate.com/github/jarmo/eventify)
-
-Are you tired of missing some cool concerts/events because you just didn't know them
-happening? Are you tired of not getting good sitting places because you heard
-of some event too late?
-
-If the answer was yes to either of these questions then Eventify can help you!
-
-Eventify will notify you about upcoming events from different
-providers/organizers in an aggregate way.
-
-## Installation
-
-    $ gem install eventify
-
-## Usage
-
-* Create configuration file with your e-mail address:
-
-    `$ ruby -reventify -e "Eventify::Configuration.new(subscribers: ['foo@bar.com']).save"`
-
-* Run it from command line and add it into `cron`:
-
-    `$ ruby -reventify -e "Eventify.new.process_new_events"`
-
-* Check your e-mail for information about upcoming events.
-
-* Edit configuration settings if defaults won't work for you:
-    
-     `$ vi ~/.eventify/config.yaml`
-
-## Supported Providers
-
-The following providers are currently supported:
-
-* [Livenation](https://livenation.ee)
-* [Piletilevi](http://www.piletilevi.ee/)
-* [Apollo Kino](https://www.apollokino.ee/)
-
-## Adding New Providers
-
-Adding new providers is easy. You just need to create a class with one method
-satisfying the contract:
-
-```ruby
-require "eventify"
-
-class MyCustomProvider < Eventify::Provider::Base
-  def self.fetch
-    # fetch some atom feed
-    rss = SimpleRSS.parse open("http://example.org/rss.xml")
-    rss.entries.map { |entry| new id: entry.guid, title: entry.title, link: entry.link, date: entry.pubDate }
-  end
-end
-
-# use that provider with Eventify
-eventify = Eventify.new
-eventify.providers = [MyCustomProvider]
-eventify.process_new_events
-```
-
-## License
-
-See [LICENSE](https://github.com/jarmo/eventify/blob/master/LICENSE).
+# Eventify
+[![Gem Version](https://badge.fury.io/rb/eventify.png)](http://badge.fury.io/rb/eventify)
+[![Coverage](https://coveralls.io/repos/jarmo/eventify/badge.png?branch=master)](https://coveralls.io/r/jarmo/eventify)
+[![Code Climate](https://codeclimate.com/github/jarmo/eventify.png)](https://codeclimate.com/github/jarmo/eventify)
+
+Are you tired of missing some cool concerts/events because you just didn't know them
+happening? Are you tired of not getting good sitting places because you heard
+of some event too late?
+
+If the answer was yes to either of these questions then Eventify can help you!
+
+Eventify will notify you about upcoming events from different
+providers/organizers in an aggregated way.
+
+## Installation
+
+    $ gem install eventify
+
+## Usage
+
+* Create configuration file with your e-mail address:
+
+    `$ ruby -reventify -e "Eventify::Configuration.new(subscribers: ['foo@bar.com']).save"`
+
+* Run it from command line and add it into `cron`:
+
+    `$ ruby -reventify -e "Eventify.new.process_new_events"`
+
+* Check your e-mail for information about upcoming events.
+
+* Edit configuration settings if defaults won't work for you:
+
+     `$ vi ~/.eventify/config.yaml`
+
+## Supported Providers
+
+The following providers are currently supported:
+
+* [Livenation](https://livenation.ee)
+* [Piletilevi](http://www.piletilevi.ee/)
+* [Apollo Kino](https://www.apollokino.ee/)
+
+## Adding New Providers
+
+Adding new providers is easy. You just need to create a class with one method
+satisfying the contract:
+
+```ruby
+require "eventify"
+
+class MyCustomProvider < Eventify::Provider::Base
+  def self.fetch
+    # fetch some atom feed
+    rss = SimpleRSS.parse open("http://example.org/rss.xml")
+    rss.entries.map { |entry| new id: entry.guid, title: entry.title, link: entry.link, date: entry.pubDate }
+  end
+end
+
+# use that provider with Eventify
+eventify = Eventify.new
+eventify.providers = [MyCustomProvider]
+eventify.process_new_events
+```
+
+## License
+
+See [LICENSE](https://github.com/jarmo/eventify/blob/master/LICENSE).

data/lib/eventify/database.rb

@@ -5,17 +5,17 @@ class Eventify::Database
 
   class << self
     def exists?(event)
-      results = sqlite.execute "select 1 from event where id=? and provider=? and link=?", event.id, event.provider, event.link
+      results = sqlite.execute "select 1 from event where id=? and provider=? and link=?", [event.id, event.provider, event.link]
       !results.empty?
     end
 
     def save(event)
       sqlite.execute "insert into event values(?, ?, ?, ?, ?)", 
-        event.id,
+        [event.id,
         event.provider,
         event.title,
         event.link,
-        event.date.to_s
+        event.date.to_s]
     end
 
     def events

data/lib/eventify/provider/apollo_kino.rb

@@ -4,15 +4,15 @@ require "time"
 
 module Eventify::Provider
   class ApolloKino < Base
-    URL = "https://www.apollokino.ee/" 
+    URL = "https://www.apollokino.ee/eng/movies?3064-actionType=1" 
 
     class << self
       def fetch
-        doc = Nokogiri::HTML(URI.open(URI.join(URL, "eng/soon"), {"Accept-Encoding" => "gzip,deflate"}))
-        doc.search(".EventList-container > div").map do |item|
-          title_node = item.at("h2 a")
-          url = URI.join(URL, title_node["href"]).to_s
-          date = Time.strptime(item.at(".event-releaseDate b").content, "%d.%m.%Y")
+        doc = Nokogiri::HTML(URI.open(URL))
+        doc.search(".schedule__item").map do |item|
+          title_node = item.at(".movie-card__title a")
+          url = title_node["href"]
+          date = Time.strptime(item.at(".movie-card__label").content.gsub(/In Cinemas /, ""), "%m/%d/%Y")
           new id: url, title: title_node.content, link: url, date: date
         end
       end

data/lib/eventify/provider/piletilevi.rb

@@ -3,13 +3,13 @@ require "json"
 
 module Eventify::Provider
   class Piletilevi < Base
-    URL = URI.parse("https://www.piletilevi.ee/ajaxCaller/method:getConcertsListInfo/id:1089/type:catalog_category/order:date,asc")
+    URL = URI.parse("https://www.piletilevi.ee/api/v1/events?language=et&page=:PAGE:&pageSize=36&sortBy=date&sortOrder=ASC")
+    EVENT_BASE_URL = URI.parse("https://www.piletilevi.ee/piletid/:ID:/:SLUG:")
 
     class << self
       def fetch
         first_page_json = fetch_page(1)
-        list_info = first_page_json["responseData"]["listInfo"]
-        total_pages = list_info["total"] / list_info["pageSize"] + 1
+        total_pages = first_page_json["totalPages"]
         result = events(first_page_json) + (2..total_pages).flat_map { |page_number| events(fetch_page(page_number)) }
         result
       end
@@ -17,15 +17,14 @@ module Eventify::Provider
       private
       
       def fetch_page(number)
-        JSON.parse(URI.open("#{URL}/page:#{number}").read)
+        JSON.parse(URI.open(URL.to_s.gsub(":PAGE:", number.to_s)).read)
       end
 
       def events(json)
-        entries = json["responseData"]["event"]
+        entries = json["items"]
         entries.map do |entry|
-          link = URI.parse(entry["link"])
-          link.scheme = "https" unless link.scheme
-          new id: entry["id"], title: entry["title"], link: link.to_s, date: Time.at(entry["startTime"]["stamp"])
+          link = URI.parse(EVENT_BASE_URL.to_s.gsub(":ID:", entry["id"]).gsub(":SLUG:", entry["sluggedName"]))
+          new id: entry["id"], title: entry["name"], link: link.to_s, date: Time.parse(entry["eventStartAt"])
         end
       end
     end

data/lib/eventify/version.rb

@@ -1,3 +1,3 @@
 class Eventify
-  VERSION = "3.0.0"
+  VERSION = "4.0.1"
 end

data/lib/eventify.rb

@@ -1,42 +1,42 @@
-require File.expand_path("eventify/version", __dir__)
-require File.expand_path("eventify/configuration", __dir__)
-require File.expand_path("eventify/provider/base", __dir__)
-require File.expand_path("eventify/provider/livenation", __dir__)
-require File.expand_path("eventify/provider/piletilevi", __dir__)
-require File.expand_path("eventify/provider/apollo_kino", __dir__)
-require File.expand_path("eventify/database", __dir__)
-require File.expand_path("eventify/mail", __dir__)
-
-class Eventify
-  attr_reader :configuration
-
-  def initialize(configuration=Eventify::Configuration.new)
-    @configuration = configuration
-  end
-
-  def all_events
-    @all_events ||= providers.flat_map(&:fetch).uniq
-  end
-
-  def new_events
-    @new_events ||= all_events.reject(&:exists?)
-  end
-
-  def process_new_events
-    all_new_events = new_events
-    return if all_new_events.empty?
-
-    Eventify::Mail.deliver all_new_events, @configuration
-    all_new_events.each(&:save)
-  end
-
-  attr_writer :providers
-
-  def providers
-    @providers ||= [
-      Eventify::Provider::Piletilevi,
-      Eventify::Provider::Livenation,
-      Eventify::Provider::ApolloKino
-    ]
-  end
-end
+require File.expand_path("eventify/version", __dir__)
+require File.expand_path("eventify/configuration", __dir__)
+require File.expand_path("eventify/provider/base", __dir__)
+require File.expand_path("eventify/provider/livenation", __dir__)
+require File.expand_path("eventify/provider/piletilevi", __dir__)
+require File.expand_path("eventify/provider/apollo_kino", __dir__)
+require File.expand_path("eventify/database", __dir__)
+require File.expand_path("eventify/mail", __dir__)
+
+class Eventify
+  attr_reader :configuration
+
+  def initialize(configuration=Eventify::Configuration.new)
+    @configuration = configuration
+  end
+
+  def all_events
+    @all_events ||= providers.flat_map(&:fetch).uniq
+  end
+
+  def new_events
+    @new_events ||= all_events.reject(&:exists?)
+  end
+
+  def process_new_events
+    all_new_events = new_events
+    return if all_new_events.empty?
+
+    Eventify::Mail.deliver all_new_events, @configuration
+    all_new_events.each(&:save)
+  end
+
+  attr_writer :providers
+
+  def providers
+    @providers ||= [
+      Eventify::Provider::Piletilevi,
+      Eventify::Provider::Livenation,
+      Eventify::Provider::ApolloKino
+    ]
+  end
+end

data/spec/eventify/provider/apollo_kino_spec.rb

@@ -3,21 +3,21 @@ require "spec_helper"
 describe Eventify::Provider::ApolloKino do
   context "#fetch" do
     it "fetches events" do
-      stub_request(:get, URI.join(Eventify::Provider::ApolloKino::URL, "eng/soon").to_s).to_return(body: File.read(File.expand_path("../../support/apollo_kino.html", __dir__)))
+      stub_request(:get, Eventify::Provider::ApolloKino::URL.to_s).to_return(body: File.read(File.expand_path("../../support/apollo_kino.html", __dir__)))
 
       events = Eventify::Provider::ApolloKino.fetch
       expect(events).to eq([
         Eventify::Provider::ApolloKino.new(
-          title: "Võimlemisklubi Janika TALVEKONTSERT",
-          link: "https://www.apollokino.ee/eng/event/4127/title/v%C3%B5imlemisklubi_janika_talvekontsert/",
-          date: Time.parse("2021-01-31"),
-          id: "https://www.apollokino.ee/eng/event/4127/title/v%C3%B5imlemisklubi_janika_talvekontsert/"
+          title: "Ingeborg Bachmann - Journey Into the Desert",
+          link: "https://www.apollokino.ee/eng/event/5325/ingeborg_bachmann_-_journey_into_the_desert?theatreAreaID=1004",
+          date: Time.parse("2024-06-14"),
+          id: "https://www.apollokino.ee/eng/event/5325/ingeborg_bachmann_-_journey_into_the_desert?theatreAreaID=1004"
         ),
         Eventify::Provider::ApolloKino.new(
-          title: "Jurassic World: Dominion",
-          link: "https://www.apollokino.ee/eng/event/4064/title/jurassic_world_dominion/",
-          date: Time.parse("2022-06-10"),
-          id: "https://www.apollokino.ee/eng/event/4064/title/jurassic_world_dominion/",
+          title: "Inside Out 2",
+          link: "https://www.apollokino.ee/eng/event/5395/inside_out_2?theatreAreaID=1004",
+          date: Time.parse("2024-07-15"),
+          id: "https://www.apollokino.ee/eng/event/5395/inside_out_2?theatreAreaID=1004",
         ),
       ])
     end

data/spec/eventify/provider/piletilevi_spec.rb

@@ -3,28 +3,28 @@ require "spec_helper"
 describe Eventify::Provider::Piletilevi do
   context "#fetch" do
     it "fetches events" do
-      stub_request(:get, "#{Eventify::Provider::Piletilevi::URL}/page:1").to_return(body: File.read(File.expand_path("../../support/piletilevi-page1.json", __dir__)))
-      stub_request(:get, "#{Eventify::Provider::Piletilevi::URL}/page:2").to_return(body: File.read(File.expand_path("../../support/piletilevi-page2.json", __dir__)))
+      stub_request(:get, "https://www.piletilevi.ee/api/v1/events?language=et&page=1&pageSize=36&sortBy=date&sortOrder=ASC").to_return(body: File.read(File.expand_path("../../support/piletilevi-page1.json", __dir__)))
+      stub_request(:get, "https://www.piletilevi.ee/api/v1/events?language=et&page=2&pageSize=36&sortBy=date&sortOrder=ASC").to_return(body: File.read(File.expand_path("../../support/piletilevi-page2.json", __dir__)))
 
       events = Eventify::Provider::Piletilevi.fetch
       expect(events).to eq([
         Eventify::Provider::Piletilevi.new(
-          title:"Apsilankyk edukaciniame zoologijos sode ZOOPARK.LT",
-          link: "https://www.piletilevi.ee/est/piletid/varia/apsilankyk-edukaciniame-zoologijos-sode-zooparklt-53017/",
-          date: Time.at(1535871600),
-          id: 53017
+          title:"Eesti Kontserdi kinkepilet",
+          link: "https://www.piletilevi.ee/piletid/4XLFLKGPOI/eesti-kontserdi-kinkepilet",
+          date: Time.parse("2018-10-25T20:59:00Z"),
+          id: "4XLFLKGPOI"
         ),
         Eventify::Provider::Piletilevi.new(
-          title: "Huumoriteater ''ENSV kohvik''",
-          link: "https://www.kinkekaart.ee/est/piletid/teater/komoodia/huumoriteater-ensv-kohvik-318916/",
-          date: Time.at(1577898000),
-          id: 21428
+          title: "Vaba Lava Kinkepilet",
+          link: "https://www.piletilevi.ee/piletid/JM77KMXFXY/vaba-lava-kinkepilet",
+          date: Time.parse("2018-12-31T10:00:00Z"),
+          id: "JM77KMXFXY"
         ),
         Eventify::Provider::Piletilevi.new(
-          title: "Viiuldaja katusel / J. Steini / J.Bocki / S. Harnicki muusikal",
-          link: "https://www.piletilevi.ee/est/piletid/muusika/muusikal/viiuldaja-katusel-j-steini-jbocki-s-harnicki-muusikal-40385/",
-          date: Time.at(1610038800),
-          id: 40385
+          title: "Misiganes",
+          link: "https://www.piletilevi.ee/piletid/5XLFLKGPOI/misiganes",
+          date: Time.parse("2019-10-25T20:59:00Z"),
+          id: "5XLFLKGPOI"
         )        
       ])
     end