gscomp 0.0.2 → 0.0.4

data/lib/gscomp/version.rb

@@ -1,3 +1,3 @@
 module Gscomp
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/gscomp.rb

@@ -11,7 +11,10 @@ require 'gtk2'
 
 
 module Gscomp
-  class Taras
+  HostAddress = 'http://localhost:3000/' # 'http://195.230.96.80/'
+  HostAuth = {:login => 'tester', :passwd => 'qwzxas'}
+
+  class Prices
     private 
       def initialize
         # Разрешаем отображение окна со всеми дочерними элементами
@@ -84,7 +87,6 @@ module Gscomp
           end
         end
         pref.destroy
-
       end
 
       def on_click_about
@@ -104,24 +106,26 @@ module Gscomp
       # Инициализация
       def get_client_id 
         # Регистрация на сервере
-        uri = URI.parse('http://localhost:3000/idfactory')
-        uri.user = 'tester'
-        uri.password = 'qwzxas'
-        begin
-          Net::HTTP.get(uri)
-        rescue
-          nil 
-        end 
+        uri = URI.parse(HostAddress + 'idfactory')
+        Net::HTTP.start(uri.host, uri.port) {|http|
+          req = Net::HTTP::Get.new(uri.path)
+          req.basic_auth HostAuth[:login], HostAuth[:passwd]
+          response = http.request(req)
+          response.body
+        }
       end
 
       # Запрос задания
       def get_job (client_id)
-        uri = URI.parse('http://localhost:3000/products')
-        uri.user = 'tester'
-        uri.password = 'qwzxas'
-        uri.query = URI.encode_www_form({:id => client_id})
+        uri = URI.parse(HostAddress + 'products')
         begin     
-          JSON::parse(Net::HTTP.get(uri))
+          Net::HTTP.start(uri.host, uri.port) {|http|
+            req = Net::HTTP::Get.new(uri.path)
+            req.basic_auth HostAuth[:login], HostAuth[:passwd]
+            req.set_form_data({:client_id => client_id})
+            response = http.request(req)
+            JSON::parse(response.body)
+          }
         rescue
           nil
         end
@@ -240,7 +244,8 @@ module Gscomp
               :price => price.nil? ? '' : price[:price],
               :currency => price.nil? ? '' : price[:currency],
               :page_id => r['page_id'].to_s,
-              :link => r['link']
+              :link => r['link'],
+              :good => (name.length > 0 and price[:price].length > 0 and price[:currency].length > 0).to_s
             }
           end
           @processed += 1
@@ -250,15 +255,19 @@ module Gscomp
 
       # Отправка результатов
       def send_job(result)
-        uri = URI.parse('http://localhost:3000/products')
-        uri.user = 'tester'
-        uri.password = 'qwzxas'
-        return Net::HTTP.post_form(uri, {:result => result.to_json})
+        uri = URI.parse(HostAddress + 'products')
+        req = Net::HTTP::Post.new(uri.path)
+        req.basic_auth HostAuth[:login], HostAuth[:passwd]
+        req.set_form_data({:result => result.to_json})
+        Net::HTTP.new(uri.host, uri.port).start {|http| 
+          http.request(req)
+        }
       end
+
     public
       def process_packet
         sleep 1 while not (client_id = get_client_id())
-        #puts client_id
+        puts client_id
 
         attempt = 10
         sleep 1 while not (job = get_job(client_id) and attempt -= 1)
@@ -266,7 +275,7 @@ module Gscomp
         # puts job
 
         records = process_job(job)
-        # puts records
+        puts records
 
         result = {
            :client_id => client_id,
@@ -277,20 +286,21 @@ module Gscomp
         send_result = send_job(result) 
         case send_result
           when Net::HTTPSuccess, Net::HTTPRedirection
-            p 'Good'
+            p "Ответ - " + send_result.body
           else
             # p result.error
         end
       end    
 
       def main
-        uu = Thread.new do
+        # uu = Thread.new do
           # Запускаем цикл обработки событий
           loop do
             process_packet()
             sleep @power
-          end
-        end
+         end
+        #end
+
 
         GLib::Timeout.add(1000) { on_timer }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gscomp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,13 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000Z
+date: 2012-06-20 00:00:00.000000000Z
 dependencies: []
 description: GS computation
 email:
 - gs@gmail.com
-executables:
-- gscomp
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -23,7 +22,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/gscomp
 - gscomp.gemspec
 - gscomp.sublime-project
 - gscomp.sublime-workspace

data/bin/gscomp

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-system("gem install gscomp")
-
-require 'gscomp'
-
-tt = Gscomp::Taras.new()
-tt.main()