meetupevents 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 914741e8bcdd0fed0f6b27b0c5d9241c554a4866
-  data.tar.gz: b89ea644ca6c0f17dabfc34acf7330b1ece772a2
+  metadata.gz: ffa7ca6b2984146b1cf0fcfa7a02c32971c0ff99
+  data.tar.gz: f4db03beb765de6bc253af91ccb60e583bb0c2fe
 SHA512:
-  metadata.gz: 7b79c339eb8009fdff40a420b70725ad911500bfbddb10dd9678653d1f8c23cfceb709ef795cc9451c1c89bbf614dd88d52a7da22c16aa88e3684fcb2d220399
-  data.tar.gz: b2d923ef7bdf6fb2b33ff05044e4319a7c4b0532750054de16c5cfdbfc29e06b2a7f92b047efe578411218a117cde9934c72165ecc91dfe5e57fec4bb7c05843
+  metadata.gz: 6b132607df41d06c26f3afc0638dbf79b4d05e74f499eb609aff5a840224155774417764e2a7c13954c95c6579d1cfaba4df8fc6d7ec214e2b45e680d22c34dc
+  data.tar.gz: 0ca2c7c663779674976a46d646155cb11b00b754f27c2f7a6279307781c6c9319753f4f421a4850ef7ea80a529ed25c96207e725e885f4e8aa067f6d8a139bdf

data/lib/meetupevents/city.rb

@@ -11,11 +11,13 @@ module Meetup
     attr_reader :country
     attr_reader :events
     attr_reader :groups
+    attr_reader :topic
 
-    def initialize(name:, location:, country:)
+    def initialize(name:, location:, country:, topic: 'none')
       @name = name
       @location = location
       @country = country
+      @topic = topic
     end
 
     def groups
@@ -27,7 +29,9 @@ module Meetup
 
     def events
       return @events if @events
-      located_events = Meetup::LocatedEvents.new(location: @location)
+      located_events = Meetup::LocatedEvents.new(city: @name,
+                                                 country: @country,
+                                                 topic: @topic)
       @events = located_events.events
     end
 

data/lib/meetupevents/event.rb

@@ -5,30 +5,50 @@ require_relative 'location'
 module Meetup
   # Class to set up a Meetup Event
   class Event
-    attr_reader :name, :status, :city, :venue, :time, :location
+    attr_reader :name, :status, :city, :venue,
+                :time, :location, :url, :topic
 
-    def initialize(name:, status:, city:, venue:, time:, location:)
+    def initialize(name:, status:, city:, venue:, time:,
+                   location:, url:, topic:)
       @name = name
       @status = status
       @city = city
       @time = time
       @venue = venue
       @location = location
+      @url = url
+      @topic = topic
     end
   end
 
   # Class to extract the located events from meetup
   class LocatedEvents
     attr_reader :events
+    def get_event_location(e)
+      if e['venue']
+        Meetup::Location.new(e['venue']['lat'],
+                             e['venue']['lon'])
+      else
+        Meetup::Location.new(e['group']['group_lat'],
+                             e['group']['group_lon'])
+      end
+    end
+    # TOO SLOW
+    # def get_event_category(g)
+    #   print g['group']['urlname']
+    #   groupurl = g['group']['urlname'] #.encode(Encoding.find('ASCII'))
+    #   g = Meetup::MeetupApi.find_group_by_url(groupurl)
+    #   g['category'] ? g['category']['short_name'] : 'None'
+    # end
 
-    def initialize(location:)
-      raw_events = MeetupApi.get_events(location.lat,
-                                        location.lon)
+    def initialize(country:, city:, topic:)
+      raw_events = MeetupApi.get_events_city(country, city, topic)
       @events = raw_events.map do |g|
         Meetup::Event.new(name: g['name'], status: g['status'],
-                          city: g['venue'] ? g['venue']['city'] : '', # may nil
+                          city: city,
                           venue: g['venue'] ? g['venue']['name'] : '', # may nil
-                          time: g['time'], location: location)
+                          time: g['time'], location: get_event_location(g),
+                          url: g['event_url'], topic: topic)
       end
     end
   end

data/lib/meetupevents/meetupevents.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'http'
+require 'cgi'
 module Meetup
   # Meetup api
   class MeetupApi
@@ -51,8 +52,20 @@ module Meetup
       response['results']
     end
 
+    # Get all cities of a country
+    def self.get_cities_by_country(country)
+      api_url = URI.join(API_URL, "/#{API_VERSION}/", 'cities')
+      cities_response = HTTP.get(api_url,
+                                 params: { country: country,
+                                           signed: true,
+                                           key: access_key })
+      response = JSON.parse(cities_response.to_s)
+      # add_log(response, "events_at_#{place}")
+      response
+    end
+
     # Gets events based on the location. Place var just for fixtures
-    def self.get_events(lat, lon)
+    def self.get_events_location(lat, lon)
       api_url = URI.join(API_URL, '/find/events/')
       events_response = HTTP.get(api_url,
                                  params: { lon: lon,
@@ -64,6 +77,21 @@ module Meetup
       response
     end
 
+    def self.get_events_city(country, city, topic)
+      params = { country: country,
+                 city: city,
+                 topic: topic,
+                 signed: true,
+                 key: access_key }
+      params.tap{ |h| h.delete(:topic) } unless topic != 'none'
+      api_url = URI.join(API_URL, "/#{API_VERSION}/", 'open_events')
+      events_response = HTTP.get(api_url,
+                                 params: params)
+      response = JSON.parse(events_response.to_s)
+      # add_log(response, "events_at_#{place}")
+      response['results']
+    end
+
     # Finds groups based on a location text query
     def self.get_groups(country_code, location_raw_text)
       api_url = URI.join(API_URL, '/find/groups')
@@ -79,6 +107,7 @@ module Meetup
 
     # Finds groups based on a location text query
     def self.find_group_by_url(urlname)
+      urlname = CGI.escape(urlname)
       api_url = URI.join(API_URL, "/#{urlname}")
       groups_response = HTTP.get(api_url,
                                  params: { signed: true,

data/lib/meetupevents/version.rb

@@ -1,3 +1,3 @@
 module Meetup
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meetupevents
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Isaac Martinez, Fabio Daio, Roberto Yebra