eventify 1.5.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0b04a77c626eb161c209936ab6d00d6094a06318
-  data.tar.gz: f933a1e78f4216df4e5d1de6537d73e7bc383d62
+SHA256:
+  metadata.gz: 87fc46638793a6f58c659b1f1d4410cc4fc15f323e829a7e62f97b169f22761b
+  data.tar.gz: 9076ebd85ff66f6b6a01efd54a30399c39e9c721325eaa2ec6187b7c4e11a73d
 SHA512:
-  metadata.gz: 54eb1cd19a4ed5266d8aa4c43fec637f6a35f494d1875ee8723121088e3b9986369df675aa0f452053342ccc55659f110369e57d1e73a4a56b615dba6d6ba802
-  data.tar.gz: e4c46c6419f92fc59999573f90d536403c9e79db7b7fd8797b3a1422533248f02ab4192800590d9dee4841c7b1e2ae9d5036d1d9f4f99c7d23268ceaabca656e
+  metadata.gz: fc41f7752a36c1c98466faaa31629e2736ea05825a9f7b8fa15a9aa54243a303d1d7d51aa92a4d1dad4ae67a778effe49bffd6d6a4b58a8420f823c48cd255b0
+  data.tar.gz: 0a08fc417a2950789bf9830667d9617453610ddd5257344d01659535a647e8f37d3b0eb1baf3c2f1df3d7062f86077da2ddb4f8bfea7f6acccdd9b6af183d752

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.5

data/Gemfile

@@ -1,14 +1,14 @@
-source "https://rubygems.org"
-
-group :development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "guard-bundler"
-  gem "wdm", platform: :mingw
-  gem "win32console", platform: :mingw
-  gem "ruby_gntp"
-end
-
-gemspec
-
-gem "coveralls", require: false
+source "https://rubygems.org"
+
+group :development do
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-bundler"
+  gem "wdm", platform: :mingw
+  gem "win32console", platform: :mingw
+  gem "ruby_gntp"
+end
+
+gemspec
+
+gem "coveralls", require: false

data/README.md

@@ -38,9 +38,9 @@ providers/organizers in an aggregate way.
 
 The following providers are currently supported:
 
-* [FBI](http://fbi.ee)
+* [Livenation](https://livenation.ee)
 * [Piletilevi](http://www.piletilevi.ee/)
-* [Solaris Kino](http://solariskino.ee/)
+* [Apollo Kino](https://www.apollokino.ee/)
 
 ## Adding New Providers
 

data/eventify.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "simple-rss"
-  spec.add_dependency "nokogiri", "~> 1.7.1"
+  spec.add_dependency "nokogiri", "~> 1.11.0"
   spec.add_dependency "sqlite3"
   spec.add_dependency "mail", "~> 2.7.0.rc1"
-  spec.add_dependency "faraday"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/eventify.rb

@@ -1,9 +1,9 @@
 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/fbi", __dir__)
+require File.expand_path("eventify/provider/livenation", __dir__)
 require File.expand_path("eventify/provider/piletilevi", __dir__)
-require File.expand_path("eventify/provider/solaris_kino", __dir__)
+require File.expand_path("eventify/provider/apollo_kino", __dir__)
 require File.expand_path("eventify/database", __dir__)
 require File.expand_path("eventify/mail", __dir__)
 
@@ -35,8 +35,8 @@ class Eventify
   def providers
     @providers ||= [
       Eventify::Provider::Piletilevi,
-      Eventify::Provider::FBI,
-      Eventify::Provider::SolarisKino
+      Eventify::Provider::Livenation,
+      Eventify::Provider::ApolloKino
     ]
   end
 end

data/lib/eventify/provider/apollo_kino.rb

@@ -0,0 +1,21 @@
+require "open-uri"
+require "nokogiri"
+require "time"
+
+module Eventify::Provider
+  class ApolloKino < Base
+    URL = "https://www.apollokino.ee/" 
+
+    class << self
+      def fetch
+        doc = Nokogiri::HTML(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")
+          new id: url, title: title_node.content, link: url, date: date
+        end
+      end
+    end
+  end
+end

data/lib/eventify/provider/base.rb

@@ -1,55 +1,55 @@
-class Eventify
-  module Provider
-    class Base
-      include Comparable
-
-      class << self
-        def fetch
-          raise NotImplementedError
-        end
-      end
-
-      attr_reader :id, :title, :link, :date
-
-      def initialize(event)
-        @id = event[:id] or raise MissingAttributeError.new("id is missing")
-        @title = event[:title] or raise MissingAttributeError.new("title is missing")
-        @link = event[:link] or raise MissingAttributeError.new("link is missing")
-        @date = event[:date]
-      end
-
-      def provider
-        @provider ||= self.class.name
-      end
-
-      def save
-        Database.save self 
-        self
-      end
-
-      def exists?
-        Database.exists? self
-      end
-
-      def ==(other)
-        id == other.id &&
-          provider == other.provider &&
-          title == other.title &&
-          link == other.link &&
-          date.to_i == other.date.to_i
-      end
-
-      alias_method :eql?, :==
-
-      def hash
-        "#{id}-#{provider}-#{title}-#{link}-#{date.to_i}".hash
-      end
-
-      def <=>(other)
-        title <=> other.title
-      end
-
-      MissingAttributeError = Class.new(RuntimeError)
-    end
-  end
-end
+class Eventify
+  module Provider
+    class Base
+      include Comparable
+
+      class << self
+        def fetch
+          raise NotImplementedError
+        end
+      end
+
+      attr_reader :id, :title, :link, :date
+
+      def initialize(event)
+        @id = event[:id] or raise MissingAttributeError.new("id is missing")
+        @title = event[:title] or raise MissingAttributeError.new("title is missing")
+        @link = event[:link] or raise MissingAttributeError.new("link is missing")
+        @date = event[:date]
+      end
+
+      def provider
+        @provider ||= self.class.name
+      end
+
+      def save
+        Database.save self 
+        self
+      end
+
+      def exists?
+        Database.exists? self
+      end
+
+      def ==(other)
+        id == other.id &&
+          provider == other.provider &&
+          title == other.title &&
+          link == other.link &&
+          date.to_i == other.date.to_i
+      end
+
+      alias_method :eql?, :==
+
+      def hash
+        "#{id}-#{provider}-#{title}-#{link}-#{date.to_i}".hash
+      end
+
+      def <=>(other)
+        title <=> other.title
+      end
+
+      MissingAttributeError = Class.new(RuntimeError)
+    end
+  end
+end

data/lib/eventify/provider/livenation.rb

@@ -0,0 +1,21 @@
+require "open-uri"
+require "nokogiri"
+require "json"
+require "time"
+
+module Eventify::Provider
+  class Livenation < Base
+    URL = "https://www.livenation.ee/event/allevents" 
+
+    class << self
+      def fetch
+        doc = Nokogiri::HTML(open(URL))
+        doc.search("script[type='application/ld+json']").map do |raw_item|
+          item = JSON.parse(raw_item.content)
+          next unless item["name"]
+          new id: item["url"], title: item["name"], link: item["url"], date: Time.parse(item["startDate"])
+        end.compact
+      end
+    end
+  end
+end

data/lib/eventify/provider/piletilevi.rb

@@ -1,16 +1,29 @@
-require "faraday"
+require "open-uri"
 require "json"
 
 module Eventify::Provider
   class Piletilevi < Base
-    URL = URI.parse("http://www.piletilevi.ee/ajaxCaller/method:getConcertsList/start:0/limit:500/id:58103/type:any/")
+    URL = URI.parse("https://www.piletilevi.ee/ajaxCaller/method:getConcertsListInfo/id:1089/type:catalog_category/order:date,asc")
 
     class << self
       def fetch
-        json = JSON.parse(Faraday.new(url: "#{URL.scheme}://#{URL.host}").get(URL.path).body, symbolize_names: true) rescue {}
-        entries = json[:responseData] && json[:responseData][:event] || []
+        first_page_json = fetch_page(1)
+        list_info = first_page_json["responseData"]["listInfo"]
+        total_pages = list_info["total"] / list_info["pageSize"] + 1
+        result = events(first_page_json) + (2..total_pages).flat_map { |page_number| events(fetch_page(page_number)) }
+        result
+      end
+
+      private
+      
+      def fetch_page(number)
+        JSON.parse(open("#{URL}/page:#{number}").read)
+      end
+
+      def events(json)
+        entries = json["responseData"]["event"]
         entries.map do |entry|
-          new id: entry[:id], title: entry[:title], link: entry[:link], date: Time.at(entry[:startTime][:stamp])
+          new id: entry["id"], title: entry["title"], link: entry["link"], date: Time.at(entry["startTime"]["stamp"])
         end
       end
     end

data/lib/eventify/version.rb

@@ -1,3 +1,3 @@
 class Eventify
-  VERSION = "1.5.1"
+  VERSION = "2.1.0"
 end

data/spec/eventify/configuration_spec.rb

@@ -1,51 +1,51 @@
-require "spec_helper"
-
-describe Eventify::Configuration do
-  before do
-    stub_const "Eventify::Configuration::PATH", File.join(Dir.tmpdir, "eventify-config.yml")
-    File.delete Eventify::Configuration::PATH if File.exists? Eventify::Configuration::PATH
-  end
-
-  context "#initialize" do
-    it "has default settings by default" do
-      configuration = Eventify::Configuration.new
-      configuration[:subscribers].should == ["user@example.org"]
-      configuration[:mail].should == Mail.delivery_method.settings.merge(openssl_verify_mode: "none")
-    end
-
-    it "allows to override settings" do
-      File.open(Eventify::Configuration::PATH, "w") { |f| f.write YAML.dump(foo: "baz") }
-
-      configuration = Eventify::Configuration.new(foo: "bar")
-      configuration[:foo].should == "bar"
-      configuration[:subscribers].should == ["user@example.org"]
-    end
-
-    it "loads settings from file too" do
-      File.open(Eventify::Configuration::PATH, "w") { |f| f.write YAML.dump(bar: "foo") }
-
-      configuration = Eventify::Configuration.new(foo: "bar")
-      configuration[:foo].should == "bar"
-      configuration[:bar].should == "foo"
-      configuration[:subscribers].should == ["user@example.org"]
-    end
-  end
-
-  context "#save" do
-    it "saves config as yaml" do
-      Eventify::Configuration.new(foo: "bar").save
-      YAML.load(File.read(Eventify::Configuration::PATH))[:foo].should == "bar"
-    end
-
-    it "saves subscribers as an array even if it is specified as a string" do
-      Eventify::Configuration.new(subscribers: "foo@bar.com").save
-      YAML.load(File.read(Eventify::Configuration::PATH))[:subscribers].should == ["foo@bar.com"]
-    end
-  end
-
-  context "#[]" do
-    it "retrieves configuration setting" do
-      Eventify::Configuration.new(baz: "bar")[:baz].should == "bar"
-    end
-  end
-end
+require "spec_helper"
+
+describe Eventify::Configuration do
+  before do
+    stub_const "Eventify::Configuration::PATH", File.join(Dir.tmpdir, "eventify-config.yml")
+    File.delete Eventify::Configuration::PATH if File.exists? Eventify::Configuration::PATH
+  end
+
+  context "#initialize" do
+    it "has default settings by default" do
+      configuration = Eventify::Configuration.new
+      expect(configuration[:subscribers]).to eq(["user@example.org"])
+      expect(configuration[:mail]).to eq(Mail.delivery_method.settings.merge(openssl_verify_mode: "none"))
+    end
+
+    it "allows to override settings" do
+      File.open(Eventify::Configuration::PATH, "w") { |f| f.write YAML.dump(foo: "baz") }
+
+      configuration = Eventify::Configuration.new(foo: "bar")
+      expect(configuration[:foo]).to eq("bar")
+      expect(configuration[:subscribers]).to eq(["user@example.org"])
+    end
+
+    it "loads settings from file too" do
+      File.open(Eventify::Configuration::PATH, "w") { |f| f.write YAML.dump(bar: "foo") }
+
+      configuration = Eventify::Configuration.new(foo: "bar")
+      expect(configuration[:foo]).to eq("bar")
+      expect(configuration[:bar]).to eq("foo")
+      expect(configuration[:subscribers]).to eq(["user@example.org"])
+    end
+  end
+
+  context "#save" do
+    it "saves config as yaml" do
+      Eventify::Configuration.new(foo: "bar").save
+      expect(YAML.load(File.read(Eventify::Configuration::PATH))[:foo]).to eq("bar")
+    end
+
+    it "saves subscribers as an array even if it is specified as a string" do
+      Eventify::Configuration.new(subscribers: "foo@bar.com").save
+      expect(YAML.load(File.read(Eventify::Configuration::PATH))[:subscribers]).to eq(["foo@bar.com"])
+    end
+  end
+
+  context "#[]" do
+    it "retrieves configuration setting" do
+      expect(Eventify::Configuration.new(baz: "bar")[:baz]).to eq("bar")
+    end
+  end
+end

data/spec/eventify/database_spec.rb

@@ -19,8 +19,8 @@ describe Eventify::Database do
       )
       Eventify::Database.save event2
 
-      Eventify::Database.events.size.should == 2
-      Eventify::Database.events.should == [event1, event2]
+      expect(Eventify::Database.events.size).to eq(2)
+      expect(Eventify::Database.events).to eq([event1, event2])
     end
 
     it "raises an error when event already exists" do
@@ -34,7 +34,7 @@ describe Eventify::Database do
 
       expect {
         Eventify::Database.save event
-      }.to raise_error
+      }.to raise_error(SQLite3::ConstraintException)
     end
   end
 
@@ -48,7 +48,7 @@ describe Eventify::Database do
       )
       Eventify::Database.save(event)
 
-      Eventify::Database.should exist(event)
+      expect(Eventify::Database).to exist(event)
     end
 
     it "false when event does not exist" do
@@ -59,7 +59,7 @@ describe Eventify::Database do
         date: Time.parse("2013-12-27 12:30:11"),
       )
 
-      Eventify::Database.should_not exist(event)
+      expect(Eventify::Database).not_to exist(event)
     end
 
     it "false when event id is different" do
@@ -78,7 +78,7 @@ describe Eventify::Database do
         date: Time.parse("2013-12-27 12:30:11"),
       )
 
-      Eventify::Database.should_not exist(event2)
+      expect(Eventify::Database).not_to exist(event2)
     end
 
     it "false when event link is different" do
@@ -97,7 +97,7 @@ describe Eventify::Database do
         date: Time.parse("2013-12-27 12:30:11"),
       )
 
-      Eventify::Database.should_not exist(event2)
+      expect(Eventify::Database).not_to exist(event2)
     end
 
     it "false when event provider is different" do
@@ -116,7 +116,7 @@ describe Eventify::Database do
         date: Time.parse("2013-12-27 12:30:11"),
       )
 
-      Eventify::Database.should_not exist(event2)
+      expect(Eventify::Database).not_to exist(event2)
     end
   end
 
@@ -137,6 +137,6 @@ describe Eventify::Database do
     )
     Eventify::Database.save(event2)
 
-    Eventify::Database.events.should == [event1, event2]
+    expect(Eventify::Database.events).to eq([event1, event2])
   end
 end