galerts 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acad8b524b6c3f82060ad16e5734a1a36b84eac0
-  data.tar.gz: 35faf06afbbf3c3980706d2fa05e47e8cdd2f42c
+  metadata.gz: e5cb0c39e02378baf953220a1a115b974de39d7b
+  data.tar.gz: a50d19fb9b533aa49cc893ad47177bc3a3748763
 SHA512:
-  metadata.gz: f4b933dbe9f0f12691efd8e5cb3483f83d2e24adfe73f9d4eb5967a16686ff40ad80236555aad70d84f5166f99ba2c86faa322910dd93055ea5809209134c1b0
-  data.tar.gz: ea40cffb5e1da121f9f43caeda72a41fd57e93b4e9e0c9c6497149da1c2f6af1b3f0fc2fc6edff75a7e34273239dec08828bd5d05bb63cfb1e39f9097a1cfa47
+  metadata.gz: 2fb5d10dde9537a902a3f673bdd53a8cbd29fb5c7928f8a56365d09c5ded9428e9c1e381e6d4c698b24b704dc9b499af4129ed59fb9703be0b3e01cf3f91b4ea
+  data.tar.gz: 6ae338a36a44410083d0259de4e14dccf718fa876f04d71eb5750fc17688d829cba79115194753403eb8ee618e5362b01dc5f0b45ca46655bf5e436c681e525c

data/README.md

@@ -27,10 +27,11 @@ manager = Galerts::Manager.new('example@gmail.com', 'password')
 
 #   List alerts
 alerts = manager.alerts
+sample_alert = alerts.last
 
 #   Create a new alert for on Google News Turkey in real time delivering alerts
 #   via RSS
-manager.create("my keywords", {
+new_alert = manager.create("my keywords", {
   :frequency => Galerts::RT,
   :domain => 'com.tr',
   :language => "tr",
@@ -41,19 +42,17 @@ manager.create("my keywords", {
   }
 )
 
-alert = manager.alerts.last
-
 #   Update the query of this alert
-alert.query = "updated keyword"
-manager.update(alert)
+sample_alert.query = "updated keyword"
+manager.update(sample_alert)
 
 #   Find examples
 manager.find_by_query("keyword")
 manager.find_by_delivery(Galerts::RSS)
 manager.find({query: "keyword", delivery: Galerts::RSS})
 
-#   Delete an alert with alerts data_id
-manager.delete("alerts data_id")
+#   Delete an alert
+manager.delete(sample_alert)
 
 ```
 

data/lib/galerts.rb

@@ -1,64 +1,7 @@
-module Galerts
-  # URLs
-  CREATE_ALERT_URL = 'https://www.google.com/alerts/create?'
-  DELETE_ALERT_URL = 'https://www.google.com/alerts/delete?'
-  MODIFY_ALERT_URL = 'https://www.google.com/alerts/modify?'
-  GOOGLE_LOGIN_URL = 'https://accounts.google.com/ServiceLogin?'
-  ALERTS_URL = 'https://www.google.com/alerts'
-  LOGIN_URL = "#{GOOGLE_LOGIN_URL}service=alerts&continue=#{ALERTS_URL}"
-
-  # Google Return HTML Definitions
-  ALERT_EXIST       = "[null,11,null,\"\"]"
-  ALERT_SOMETHING_WENT_WRONG = "[null,7,null,\"\"]"
-  ALERT_NOT_EXIST = "[null,5,null,\"\"]"
-  # Google Value
-  BEST_RESULTS = 'Only the best results'
-  ALL_RESULTS = 'All results'
-
-  HOW_MANY_TYPES = {
-    ALL_RESULTS  => 2,
-    BEST_RESULTS => 3
-  }
-
-  RSS = 'rss'
-  EMAIL = 'email'
-
-  DELIVERY_TYPES = {
-    EMAIL => 1,
-    RSS => 2
-  }
-
-
-  RT = 'As it happens'
-  DAILY = 'Once a day'
-  WEEKLY = 'Once a week'
-
-  FREQ_TYPES = {
-    RT => 1,
-    DAILY => 2,
-    WEEKLY => 3
-  }
-
-
-  BLOGS = 'Blogs'
-  NEWS = 'News'
-  WEB = 'Web'
-  VIDEOS = 'Videos'
-  BOOKS = 'Books'
-  DISCUSSIONS = 'Discussions'
-
-  SOURCES_TYPES = {
-    BLOGS => 1,
-    NEWS => 2,
-    WEB => 3,
-    VIDEOS => 5,
-    BOOKS => 6,
-    DISCUSSIONS => 7
-  }
-end
-
+require File.expand_path('../galerts/defaults', __FILE__)
 require File.expand_path('../galerts/alert', __FILE__)
 require File.expand_path('../galerts/manager', __FILE__)
 require File.expand_path('../galerts/version', __FILE__)
 
-
+module Galerts
+end

data/lib/galerts/alert.rb

@@ -6,12 +6,12 @@ module Galerts
       default_options = {
         id: 0,
         data_id: 0,
-        domain: 'com',
+        domain: DOMAIN,
         frequency: RT,
-        sources: '',
-        language: 'tr',
+        sources: AUTOMATIC,
+        language: LANGUAGE,
         how_many: ALL_RESULTS,
-        region: 'TR',
+        region: ANYWHERE,
         delivery: RSS,
         feed_url: nil
       }

data/lib/galerts/defaults.rb

@@ -0,0 +1,67 @@
+module Galerts
+  # URLs
+  CREATE_ALERT_URL = 'https://www.google.com/alerts/create?'
+  DELETE_ALERT_URL = 'https://www.google.com/alerts/delete?'
+  MODIFY_ALERT_URL = 'https://www.google.com/alerts/modify?'
+  GOOGLE_LOGIN_URL = 'https://accounts.google.com/ServiceLogin?'
+  ALERTS_URL = 'https://www.google.com/alerts'
+  LOGIN_URL = "#{GOOGLE_LOGIN_URL}service=alerts&continue=#{ALERTS_URL}"
+
+  # Google Return HTML Definitions
+  ALERT_EXIST       = "[null,11,null,\"\"]"
+  ALERT_SOMETHING_WENT_WRONG = "[null,7,null,\"\"]"
+  ALERT_NOT_EXIST = "[null,5,null,\"\"]"
+  # Google Value
+  BEST_RESULTS = 'Only the best results'
+  ALL_RESULTS = 'All results'
+
+  HOW_MANY_TYPES = {
+    ALL_RESULTS  => 2,
+    BEST_RESULTS => 3
+  }
+
+
+  RSS = 'rss'
+  EMAIL = 'email'
+
+  DELIVERY_TYPES = {
+    EMAIL => 1,
+    RSS => 2
+  }
+
+
+  RT = 'As it happens'
+  DAILY = 'Once a day'
+  WEEKLY = 'Once a week'
+
+  FREQ_TYPES = {
+    RT => 1,
+    DAILY => 2,
+    WEEKLY => 3
+  }
+
+
+  BLOGS = 'Blogs'
+  NEWS = 'News'
+  WEB = 'Web'
+  VIDEOS = 'Videos'
+  BOOKS = 'Books'
+  DISCUSSIONS = 'Discussions'
+
+  SOURCES_TYPES = {
+    BLOGS => 1,
+    NEWS => 2,
+    WEB => 3,
+    VIDEOS => 5,
+    BOOKS => 6,
+    DISCUSSIONS => 7
+  }
+
+
+  # Default alert value
+  DOMAIN = 'com'
+  AUTOMATIC = ''
+  LANGUAGE = 'en'
+  REGION = 'US'
+  ANYWHERE = 'anywhere'
+end

data/lib/galerts/manager.rb

@@ -60,7 +60,7 @@ module Galerts
           data_id:      alert[1],
           domain:       alert[2][3][2],
           language:     alert[2][3][3][1],
-          region:       alert[2][3][3][2],
+          region:       alert[2][3].last == 1 ? alert[2][3][3][2] : ANYWHERE,
           frequency:    FREQ_TYPES.invert[alert[2][6][0][4]],
           sources:      SOURCES_TYPES.invert[alert[2][4]],
           how_many:     HOW_MANY_TYPES.invert[alert[2][5]],
@@ -71,18 +71,6 @@ module Galerts
       result
     end
 
-    def find(attrs = {})
-      alerts.select{|a| attrs.keys.inject(true) {|memo,k| memo = memo && attrs[k] == a.send(k) }}
-    end
-
-    # Metaprogramming for find_by commands
-    variables = Galerts::Alert.new("").instance_variables.map {|m| m.to_s.delete('@')}
-    variables.each do |variable|
-      define_method("find_by_#{variable}") do |argument|
-        find({variable.to_sym => argument})
-      end
-    end
-
     def build_params(alert, action)
       # set delivery and frequency parameters
       if alert.delivery == EMAIL
@@ -108,15 +96,28 @@ module Galerts
         sources_text = sources_text.chop + ']'
       end
 
+      if alert.region == ANYWHERE
+        region = REGION
+        anywhere = true
+      else
+        region = alert.region
+        anywhere = false
+      end
+
       # TODO: need more readable
       if action == 0 # create
         params = {
-          'params' => "[null,[null,null,null,[null,\"#{alert.query}\",\"#{alert.domain}\",[null,\"#{alert.language}\",\"#{alert.region}\"],null,null,null,#{alert.region == "" ? 1 : 0},1],#{sources_text},#{HOW_MANY_TYPES[alert.how_many]},[[null,#{delivery_and_frequency},\"#{alert.language + '-' + alert.region.upcase}\",null,null,null,null,null,'0']]]]"
+          'params' => "[null,[null,null,null,[null,\"#{alert.query}\",\"#{alert.domain}\",[null,\"#{alert.language}\",\"#{region}\"],null,null,null,#{anywhere ? 0 : 1},1],#{sources_text},#{HOW_MANY_TYPES[alert.how_many]},[[null,#{delivery_and_frequency},\"#{alert.language + '-' + region.upcase}\",null,null,null,null,null,'0']]]]"
         }
         return URI.encode_www_form(params)
       elsif action == 1 # edit
         params = {
-          'params' => "[null,\"#{alert.data_id}\",[null,null,null,[null,\"#{alert.query}\",\"#{alert.domain}\",[null,\"#{alert.language}\",\"#{alert.region}\"],null,null,null,#{alert.region == "" ? 1 : 0},1],#{sources_text},#{HOW_MANY_TYPES[alert.how_many]},[[null,#{delivery_and_frequency},\"#{alert.language + '-' + alert.region.upcase}\",null,null,null,null,null,\"#{alert.id}\"]]]]"
+          'params' => "[null,\"#{alert.data_id}\",[null,null,null,[null,\"#{alert.query}\",\"#{alert.domain}\",[null,\"#{alert.language}\",\"#{region}\"],null,null,null,#{anywhere ? 1 : 0},1],#{sources_text},#{HOW_MANY_TYPES[alert.how_many]},[[null,#{delivery_and_frequency},\"#{alert.language + '-' + region.upcase}\",null,null,null,null,null,\"#{alert.id}\"]]]]"
+        }
+        return URI.encode_www_form(params)
+      elsif action == 2 # delete
+        params = {
+          'params' => "[null,\"#{alert.data_id}\"]"
         }
         return URI.encode_www_form(params)
       end
@@ -166,23 +167,28 @@ module Galerts
       end
     end
 
-    def build_delete_params(data_id)
-      params = {
-        'params' => "[null,\"#{data_id}\"]"
-      }
-      params = URI.encode_www_form(params)
-    end
-
-    def delete(data_id)
+    def delete(alert)
       x = alerts_page.css('div#gb-main div.main-page script').text.split(',').last[1..-4]
-      response = @agent.post("#{DELETE_ALERT_URL}x=#{x}", build_delete_params(data_id), {'Content-Type' => 'application/x-www-form-urlencoded'})
+      response = @agent.post("#{DELETE_ALERT_URL}x=#{x}", build_params(alert, 2), {'Content-Type' => 'application/x-www-form-urlencoded'})
 
       if response.body == ALERT_NOT_EXIST
         raise "Alert not exist!"
       elsif response.body == ALERT_SOMETHING_WENT_WRONG
         raise "Something went wrong!" # internal error, html changed maybe
       end
+      true
+    end
+
+    def find(attrs = {})
+      alerts.select{|a| attrs.keys.inject(true) {|memo,k| memo = memo && attrs[k] == a.send(k) }}
     end
 
+    # Metaprogramming for find_by commands
+    variables = Galerts::Alert.new("").instance_variables.map {|m| m.to_s.delete('@')}
+    variables.each do |variable|
+      define_method("find_by_#{variable}") do |argument|
+        find({variable.to_sym => argument})
+      end
+    end
   end
 end

data/lib/galerts/version.rb

@@ -1,3 +1,3 @@
 module Galerts
-  VERSION = '0.0.5'.freeze unless defined?(::Galerts::VERSION)
+  VERSION = '1.0.0'.freeze unless defined?(::Galerts::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galerts
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Emre Can Yılmaz
@@ -37,6 +37,7 @@ files:
 - galerts.gemspec
 - lib/galerts.rb
 - lib/galerts/alert.rb
+- lib/galerts/defaults.rb
 - lib/galerts/manager.rb
 - lib/galerts/version.rb
 homepage: https://github.com/pivotus/galerts