galerts 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6009e0cc575e3e29b23c52092d9337e77a582414
-  data.tar.gz: ecbcc802873932a82f197a078d7c28505ae929e6
+  metadata.gz: 1927bb3f13800cfe9ddcaf6c383d889fbbbe1c87
+  data.tar.gz: 056d5825cd3e7f496e7a11f0adb85d1b0713257b
 SHA512:
-  metadata.gz: 63e25781b9b34015324e1b1f9cd870e0ae90c23a27a4155c4fe13af3d9d20e7c0ee672421d0cdaff7d07d0f52feb415c765739f40ae1b1515547871b5e1ba24b
-  data.tar.gz: 69d91d46534509f7292bd3b0a965df7ace6109b673d45379940b914f7da45dfe3aa5929169ff3987ead6a622fad51c978f14e409f29748f1ad512c100d4542ae
+  metadata.gz: e880895f8a19ed362c90d6bba1d71fde1208ab7b85b11ca51c6863f1d0a6bfbdc9c17ef548eb4e2dd24454074a4f01bb4d49e5288533b56591017a4f987a9497
+  data.tar.gz: 045a1ead22b3f32571b63759846b41e506ca345c078a61950e7ba3f258d4e2665d9bd06460b1548f6770d0e2602f84400cb713f3a18bbdee343d69a6d64e0dcc

data/lib/galerts/alert.rb

@@ -1,11 +1,12 @@
 module Galerts
   class Alert
-    attr_accessor :query, :id, :data_id, :domain, :frequency, :sources, :language, :how_many, :region, :delivery, :feed_url
+    attr_accessor :query, :id, :data_id, :data_id_2, :domain, :frequency, :sources, :language, :how_many, :region, :delivery, :feed_url
     def initialize(query, options = {})
 
       default_options = {
         id: 0,
         data_id: 0,
+        data_id_2: 0,
         domain: DOMAIN,
         frequency: RT,
         sources: AUTOMATIC,
@@ -38,6 +39,7 @@ module Galerts
       @query = query
       @id = options[:id]
       @data_id = options[:data_id]
+      @data_id_2 = options[:data_id_2]
       @domain = options[:domain]
       @frequency = options[:frequency]
       @sources = options[:sources]

data/lib/galerts/manager.rb

@@ -60,6 +60,7 @@ module Galerts
           query: alert[2][3][1],
           feed_url:     "#{ALERTS_URL}/feeds/#{alert.last}/#{alert[2][6][0][11]}",
           data_id:      alert[1],
+          data_id_2:    alert[2][6][0].last,
           domain:       alert[2][3][2],
           language:     alert[2][3][3][1],
           region:       alert[2][3].last == 1 ? alert[2][3][3][2] : ANYWHERE,
@@ -109,12 +110,13 @@ module Galerts
       # TODO: need more readable
       if action == 0 # create
         params = {
-          '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']]]]"
+          # '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']]]]"
+          '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',null,null,\"#{alert.data_id_2}\"]]]]"
         }
         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}\",\"#{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,\"#{alert.id}\"]]]]"
+          'params' => "[null,\"#{alert.data_id}\",[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,\"#{alert.id}\",null,null,\"#{alert.data_id_2}\"]]]]"
         }
         return URI.encode_www_form(params)
       elsif action == 2 # delete
@@ -129,6 +131,7 @@ module Galerts
       alert = Alert.new(query, options)
 
       x = alerts_page.css('div#gb-main div.main-page script').text.split(',').grep(/AMJH/).first.tr('"/\"','')
+      alert.data_id_2 = alerts_page.css('div#gb-main div.main-page script').text.split(',').grep(/AB2X/).first.tr('"/\"','').tr('\]','')
       response = @agent.post("#{CREATE_ALERT_URL}x=#{x}", build_params(alert, 0), {'Content-Type' => 'application/x-www-form-urlencoded'})
 
       if response.body == ALERT_EXIST
@@ -151,7 +154,8 @@ module Galerts
     end
 
     def update(alert)
-      x = alerts_page.css('div#gb-main div.main-page script').text.split(',').last(12).first.tr('"/\"','')
+      x = alerts_page.css('div#gb-main div.main-page script').text.split(',').grep(/AMJH/).first.tr('"/\"','')
+      alert.data_id_2 = alerts_page.css('div#gb-main div.main-page script').text.split(',').grep(/AB2X/).first.tr('"/\"','').tr('\]','')
       response = @agent.post("#{MODIFY_ALERT_URL}x=#{x}", build_params(alert, 1), {'Content-Type' => 'application/x-www-form-urlencoded'})
 
       if response.body == ALERT_EXIST
@@ -172,7 +176,8 @@ module Galerts
     end
 
     def delete(alert)
-      x = alerts_page.css('div#gb-main div.main-page script').text.split(',').last(12).first.tr('"/\"','')
+      x = alerts_page.css('div#gb-main div.main-page script').text.split(',').grep(/AMJH/).first.tr('"/\"','')
+      alert.data_id_2 = alerts_page.css('div#gb-main div.main-page script').text.split(',').grep(/AB2X/).first.tr('"/\"','').tr('\]','')
       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

data/lib/galerts/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: galerts
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Emre Can Yılmaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize