Skip to content

Code improvements #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jjb wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Code improvements #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
462cabd
accommodate new API behavior
jjb Mar 2, 2018
a258cd5
indent with 2 spaces instead of 8
jjb Mar 2, 2018
71c6370
remove cruft comments
jjb Mar 2, 2018
3fed302
remove support for <1.9
jjb Mar 2, 2018
054c8ea
don't use return when not necessary
jjb Mar 2, 2018
2cd6e7f
use non-indented style for private section
jjb Mar 2, 2018
3a1dd39
ruby 2 hash style
jjb Mar 2, 2018
6f99ed5
remove unnecessary/inconsistent ()
jjb Mar 2, 2018
26238d3
tidy up block style
jjb Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
source "http://rubygems.org"
# Add dependencies required to use your gem here.
# Example:
# gem "activesupport", ">= 2.3.5"

# Add dependencies to develop your gem here.
# Include everything needed to run rake, tests, features, etc.
group :development do
gem "minitest", ">= 0"
# gem "bundler", "~> 1.0.0"
# gem "jeweler", "~> 1.5.2"
# gem "rcov", ">= 0"
# gem "rocco"
end
363 changes: 173 additions & 190 deletions lib/stathat.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,196 +6,179 @@
require 'singleton'

module StatHat
class Common
CLASSIC_VALUE_URL = "https://api.stathat.com/v"
CLASSIC_COUNT_URL = "https://api.stathat.com/c"
EZ_URL = "https://api.stathat.com/ez"

class << self
def send_to_stathat(url, args)
uri = URI.parse(url)

begin
uri.query = URI.encode_www_form(args)
rescue NoMethodError => e
# backwards compatability for pre 1.9.x
uri.query = args.map { |arg, val| arg.to_s + "=" + CGI::escape(val.to_s) }.join('&')
end

resp = Net::HTTP.get(uri)
return Response.new(resp)
end
end
end

class SyncAPI
class << self
def ez_post_value(stat_name, ezkey, value, timestamp=nil)
args = { :stat => stat_name,
:ezkey => ezkey,
:value => value }
args[:t] = timestamp unless timestamp.nil?
Common::send_to_stathat(Common::EZ_URL, args)
end

def ez_post_count(stat_name, ezkey, count, timestamp=nil)
args = { :stat => stat_name,
:ezkey => ezkey,
:count => count }
args[:t] = timestamp unless timestamp.nil?
Common::send_to_stathat(Common::EZ_URL, args)
end

def post_count(stat_key, user_key, count, timestamp=nil)
args = { :key => stat_key,
:ukey => user_key,
:count => count }
args[:t] = timestamp unless timestamp.nil?
Common::send_to_stathat(Common::CLASSIC_COUNT_URL, args)
end

def post_value(stat_key, user_key, value, timestamp=nil)
args = { :key => stat_key,
:ukey => user_key,
:value => value }
args[:t] = timestamp unless timestamp.nil?
Common::send_to_stathat(Common::CLASSIC_VALUE_URL, args)
end
end
end

class API
class << self
def ez_post_value(stat_name, ezkey, value, timestamp=nil, &block)
Reporter.instance.ez_post_value(stat_name, ezkey, value, timestamp, block)
end

def ez_post_count(stat_name, ezkey, count, timestamp=nil, &block)
Reporter.instance.ez_post_count(stat_name, ezkey, count, timestamp, block)
end

def post_count(stat_key, user_key, count, timestamp=nil, &block)
Reporter.instance.post_count(stat_key, user_key, count, timestamp, block)
end

def post_value(stat_key, user_key, value, timestamp=nil, &block)
Reporter.instance.post_value(stat_key, user_key, value, timestamp, block)
end
end
end

class Reporter
include Singleton

def initialize
@que = Queue.new
@runlock = Mutex.new
run_pool()
end

def finish()
stop_pool
# XXX serialize queue?
end

def post_value(stat_key, user_key, value, timestamp, cb)
args = { :key => stat_key,
:ukey => user_key,
:value => value }
args[:t] = timestamp unless timestamp.nil?
enqueue(Common::CLASSIC_VALUE_URL, args, cb)
end

def post_count(stat_key, user_key, count, timestamp, cb)
args = { :key => stat_key,
:ukey => user_key,
:count => count }
args[:t] = timestamp unless timestamp.nil?
enqueue(Common::CLASSIC_COUNT_URL, args, cb)
end

def ez_post_value(stat_name, ezkey, value, timestamp, cb)
args = { :stat => stat_name,
:ezkey => ezkey,
:value => value }
args[:t] = timestamp unless timestamp.nil?
enqueue(Common::EZ_URL, args, cb)
end

def ez_post_count(stat_name, ezkey, count, timestamp, cb)
args = { :stat => stat_name,
:ezkey => ezkey,
:count => count }
args[:t] = timestamp unless timestamp.nil?
enqueue(Common::EZ_URL, args, cb)
end

private
def run_pool
@runlock.synchronize { @running = true }
@pool = []
5.times do |i|
@pool[i] = Thread.new do
while true do
point = @que.pop
# XXX check for error?
begin
resp = Common::send_to_stathat(point[:url], point[:args])
if point[:cb]
point[:cb].call(resp)
end
rescue
pp $!
end
@runlock.synchronize {
break unless @running
}
end
end
end
end

def stop_pool()
@runlock.synchronize {
@running = false
}
@pool.each do |th|
th.join if th && th.alive?
end
end

def enqueue(url, args, cb=nil)
return false unless @running
point = {:url => url, :args => args, :cb => cb}
@que << point
true
end
end

class Response
def initialize(body)
@body = body
@parsed = nil
end

def valid?
return status == 200
end

def status
parse
return @parsed['status']
end

def msg
parse
return @parsed['msg']
end

private
def parse
return unless @parsed.nil?
@parsed = JSON.parse(@body)
end
class Common
CLASSIC_VALUE_URL = "https://api.stathat.com/v"
CLASSIC_COUNT_URL = "https://api.stathat.com/c"
EZ_URL = "https://api.stathat.com/ez"

class << self
def send_to_stathat(url, args)
uri = URI.parse(url)
uri.query = URI.encode_www_form(args)
resp = Net::HTTP.get_response(uri)
Response.new(resp.body, resp.code.to_i)
end
end
end

class SyncAPI
class << self
def ez_post_value(stat_name, ezkey, value, timestamp=nil)
args = { stat: stat_name, ezkey: ezkey, value: value }
args[:t] = timestamp unless timestamp.nil?
Common::send_to_stathat(Common::EZ_URL, args)
end

def ez_post_count(stat_name, ezkey, count, timestamp=nil)
args = { stat: stat_name, ezkey: ezkey, count: count }
args[:t] = timestamp unless timestamp.nil?
Common::send_to_stathat(Common::EZ_URL, args)
end

def post_count(stat_key, user_key, count, timestamp=nil)
args = { key: stat_key, ukey: user_key, count: count }
args[:t] = timestamp unless timestamp.nil?
Common::send_to_stathat(Common::CLASSIC_COUNT_URL, args)
end

def post_value(stat_key, user_key, value, timestamp=nil)
args = { key: stat_key, ukey: user_key, value: value }
args[:t] = timestamp unless timestamp.nil?
Common::send_to_stathat(Common::CLASSIC_VALUE_URL, args)
end
end
end

class API
class << self
def ez_post_value(stat_name, ezkey, value, timestamp=nil, &block)
Reporter.instance.ez_post_value(stat_name, ezkey, value, timestamp, block)
end

def ez_post_count(stat_name, ezkey, count, timestamp=nil, &block)
Reporter.instance.ez_post_count(stat_name, ezkey, count, timestamp, block)
end

def post_count(stat_key, user_key, count, timestamp=nil, &block)
Reporter.instance.post_count(stat_key, user_key, count, timestamp, block)
end

def post_value(stat_key, user_key, value, timestamp=nil, &block)
Reporter.instance.post_value(stat_key, user_key, value, timestamp, block)
end
end
end

class Reporter
include Singleton

def initialize
@que = Queue.new
@runlock = Mutex.new
run_pool
end

def finish
stop_pool
# XXX serialize queue?
end

def post_value(stat_key, user_key, value, timestamp, cb)
args = { key: stat_key, ukey: user_key, value: value }
args[:t] = timestamp unless timestamp.nil?
enqueue(Common::CLASSIC_VALUE_URL, args, cb)
end

def post_count(stat_key, user_key, count, timestamp, cb)
args = { key: stat_key, ukey: user_key, count: count }
args[:t] = timestamp unless timestamp.nil?
enqueue(Common::CLASSIC_COUNT_URL, args, cb)
end

def ez_post_value(stat_name, ezkey, value, timestamp, cb)
args = { stat: stat_name, ezkey: ezkey, value: value }
args[:t] = timestamp unless timestamp.nil?
enqueue(Common::EZ_URL, args, cb)
end

def ez_post_count(stat_name, ezkey, count, timestamp, cb)
args = { stat: stat_name, ezkey: ezkey, count: count }
args[:t] = timestamp unless timestamp.nil?
enqueue(Common::EZ_URL, args, cb)
end

private

def run_pool
@runlock.synchronize { @running = true }
@pool = []
5.times do |i|
@pool[i] = Thread.new do
while true do
point = @que.pop
# XXX check for error?
begin
resp = Common::send_to_stathat(point[:url], point[:args])
if point[:cb]
point[:cb].call(resp)
end
rescue
pp $!
end
@runlock.synchronize do
break unless @running
end
end
end
end
end

def stop_pool
@runlock.synchronize { @running = false }
@pool.each do |th|
th.join if th && th.alive?
end
end

def enqueue(url, args, cb=nil)
return false unless @running
point = { url: url, args: args, cb: cb }
@que << point
true
end
end

class Response
def initialize(body, http_status)
@body = body
@http_status = http_status
@parsed = nil
end

def valid?
(200..299).cover? status
end

def status
if @body
parse
@parsed['status']
else
@http_status
end
end

def msg
parse
@parsed['msg']
end

private

def parse
return unless @parsed.nil?
@parsed = JSON.parse(@body)
end
end
end
8 changes: 0 additions & 8 deletions test/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
require 'rubygems'
#require 'bundler'
#begin
# Bundler.setup(:default, :development)
#rescue Bundler::BundlerError => e
# $stderr.puts e.message
# $stderr.puts "Run `bundle install` to install missing gems"
# exit e.status_code
#end
require 'minitest/unit'

$LOAD_PATH.unshift(File.dirname(__FILE__))
Expand Down
Loading