x_runtime 0.3.2 → 0.4.0

data/Gemfile

@@ -2,4 +2,5 @@ source "http://ruby.taobao.org"
 gem 'rack'
 gem 'rake'
 gem 'jeweler'
-gem 'redis', '~>3.0.1'
+gem 'redis', '~>3.0.1'
+gem 'sinatra'

data/Gemfile.lock

@@ -9,10 +9,17 @@ GEM
       rdoc
     json (1.7.5)
     rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     redis (3.0.1)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
@@ -22,3 +29,4 @@ DEPENDENCIES
   rack
   rake
   redis (~> 3.0.1)
+  sinatra

data/README.markdown

@@ -30,26 +30,45 @@ XRuntime是一个Rack的middleware,配合Redis用来分析Http Server每个URI
 可以指定XRuntime使用的Redis的key前缀或者叫命名空间:    
 `XRuntime::NameSpace = "RuntimeEx::Threshold"`  
 
-[http://localhost:4567/xruntime](/xruntime)支持Http basic auth验证:
+### Server
 
-    use Rack::XRuntime, 100, Redis.connect(:url => "redis://localhost:6380/") do |name, password|
-      name == "cui" and password == "hello"
-    end
+可以通过自带的Http页面查看请求数据，这些页面可以设置Http basic auth验证以保护起来	 
+只要在加载XRuntime::Server的时候，传递一个proc作为认证条件即可   
+可以在配置url路由的时候指定XRuntime::Server的挂载路径，然后就可以通过该路径访问页面   
 
 ### Sinatra
 
+收集数据 `config.ru`:  
+
     use Rack::XRuntime, 100, Redis.connect(:url => "redis://localhost:6380/")
 
+查看数据 `config.ru`:  
+
+``` ruby
+run Rack::URLMap.new \
+  "/"       => Server.new,
+  "/xruntime" => XRuntime::Server.new{|name, password|name == "cui" and password == "hello"}
+```
+
 ### Rails3
 
-    # config/environment.rb
-    config.middleware.insert_after Rack::Runtime, Rack::XRuntime, 100, Redis.connect(:url => "redis://localhost:6380/")
+收集数据 `config/environment.rb`:   
+
+``` ruby
+config.middleware.insert_after Rack::Runtime, Rack::XRuntime, 100, Redis.connect(:url => "redis://localhost:6380/")
+```
+
+查看数据 `config/route.rb`:   
+
+``` ruby
+mount Rack::XRuntime.new{|name, password|name == "cui" and password == "hello"}, :at => "/xruntime"
+```
 
 ### Test
 
 请先修改test/server.rb和test/client.rb中的Redis参数,我的地址是localhost:6380,这个请改为你的地址。
 
-* 先启动服务 `ruby test/server.rb`
+* 先启动服务 `rackup test/server.ru`
 * 再产生测试数据 `ruby test/client.rb`
 	
 执行完毕后可以打开浏览器访问[/xruntime](http://localhost:4567/xruntime),看是否已经准确的记录了一些数据

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/x_runtime/middleware.rb

@@ -1,12 +1,12 @@
 module XRuntime
   class Middleware
+    
     # threshold => ms
-    def initialize(app, threshold, redis, &auth)
+    def initialize(app, threshold, redis)
       @app = app
       @threshold = threshold.to_f
       @redis = redis
-      @portal = Portal.new(ds)
-      @portal = Rack::Auth::Basic.new(@portal, &auth) if block_given?
+      XRuntime.middleware = self
     end
     
     def ds
@@ -16,16 +16,12 @@ module XRuntime
     def script
       @script ||= Script.new(@redis)
     end
-
-    def call(env)
-      if env['REQUEST_PATH'] == "/xruntime"
-        call_portal(env)
-      else
-        call_app(env)
-      end
+  
+    def redis_key
+      @key ||= "#{XRuntime::NameSpace}::#{@threshold}"
     end
   
-    def call_app(env)
+    def call(env)
       start_time = Time.now
       status, headers, body = @app.call(env)
       request_time = (Time.now - start_time).to_f*1000
@@ -36,18 +32,10 @@ module XRuntime
     
       [status, headers, body]
     end
-  
-    def call_portal(env)
-      @portal.call(env)
-    end
     
     def logredis(cost,uri)
       ds.add(uri, cost)
     end
   
-    def redis_key
-      @key ||= "#{XRuntime::NameSpace}::#{@threshold}"
-    end
-  
   end#end of Middleware
 end

data/lib/x_runtime/server.rb

@@ -0,0 +1,15 @@
+module XRuntime
+  class Server
+    def initialize(app=nil, &auth)
+      @server = lambda {|env|
+        @req = Rack::Request.new(env)
+        [200, {'Content-Type' => 'text/html'}, [Template.new(XRuntime.middleware.ds, :limit => (@req.params["limit"] ? @req.params["limit"].to_i : 20), :offset => @req.params["offset"].to_i).render]]
+      }
+      @server = Rack::Auth::Basic.new(@server, &auth) if auth
+    end
+        
+    def call(env)
+      @server.call(env)
+    end
+  end
+end

data/lib/x_runtime.rb

@@ -7,12 +7,14 @@ require "fileutils"
 $:.unshift(File.dirname(__FILE__))
 
 module XRuntime
-  NameSpace = "RuntimeEx::Threshold"
+  NameSpace     = "RuntimeEx::Threshold"
+  extend        self
+  attr_accessor :middleware
   
   autoload :Middleware, "x_runtime/middleware"
   autoload :DataSet,    "x_runtime/data_set"
   autoload :Script,     "x_runtime/script"
-  autoload :Portal,     "x_runtime/portal"
+  autoload :Server,     "x_runtime/server"
   autoload :Template,   "x_runtime/template"
   autoload :Utils,      "x_runtime/utils"
 end

data/test/client.rb

@@ -4,7 +4,7 @@ def alpha
 end
 
 def rand_url(size=1)
-  "http://localhost:4567/#{(1..size).to_a.inject(''){|s,t|s+=alpha[rand(alpha.size-1)].to_s}}"
+  "http://localhost:9292/#{(1..size).to_a.inject(''){|s,t|s+=alpha[rand(alpha.size-1)].to_s}}"
 end
 
 100.times do

data/test/server.ru

@@ -0,0 +1,23 @@
+# run with : rackup server.ru
+
+require "sinatra/base"
+require "#{File.dirname(__FILE__)}/../lib/x_runtime"
+
+# redis-server version must > 2.6.0 for lua script.
+
+class Server < Sinatra::Base
+  # use XRuntime::Middleware, 10, Redis.connect(:url => "redis://localhost:6380/")
+  # XRuntime::Middleware is same as Rack::XRuntime
+  use Rack::XRuntime, 10, Redis.connect(:url => "redis://localhost:6379/")
+
+  get /.*/ do
+    # sleep(1)
+    sleep(0.01*rand(10))
+    "Hello, I'am x_runtime"
+  end
+end
+
+# Use with basic auth
+run Rack::URLMap.new \
+  "/"       => Server.new,
+  "/xruntime" => XRuntime::Server.new{|name, password|name == "cui" and password == "hello"}

data/x_runtime.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "x_runtime"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["\u{5d14}\u{5ce5}"]
@@ -26,15 +26,15 @@ Gem::Specification.new do |s|
     "lib/x_runtime.rb",
     "lib/x_runtime/data_set.rb",
     "lib/x_runtime/middleware.rb",
-    "lib/x_runtime/portal.rb",
     "lib/x_runtime/redis.lua",
     "lib/x_runtime/script.rb",
+    "lib/x_runtime/server.rb",
     "lib/x_runtime/template.erb",
     "lib/x_runtime/template.rb",
     "lib/x_runtime/utils.rb",
     "test/client.rb",
     "test/helper.rb",
-    "test/server.rb",
+    "test/server.ru",
     "test/test_x_runtime.rb",
     "x_runtime.gemspec"
   ]
@@ -52,17 +52,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<redis>, ["~> 3.0.1"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<redis>, ["~> 3.0.1"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<redis>, ["~> 3.0.1"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: x_runtime
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.1
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 由于使用到Redis的lua script,所以需要你的Redis服务支持,redis-server版本>2.6.x,redis(ruby
   gem)>3.0.1.
 email: zheng.cuizh@gmail.com
@@ -93,15 +109,15 @@ files:
 - lib/x_runtime.rb
 - lib/x_runtime/data_set.rb
 - lib/x_runtime/middleware.rb
-- lib/x_runtime/portal.rb
 - lib/x_runtime/redis.lua
 - lib/x_runtime/script.rb
+- lib/x_runtime/server.rb
 - lib/x_runtime/template.erb
 - lib/x_runtime/template.rb
 - lib/x_runtime/utils.rb
 - test/client.rb
 - test/helper.rb
-- test/server.rb
+- test/server.ru
 - test/test_x_runtime.rb
 - x_runtime.gemspec
 homepage: http://github.com/charlescui/x_runtime
@@ -119,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4238907334465737071
+      hash: 336817792487171531
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/x_runtime/portal.rb

@@ -1,12 +0,0 @@
-module XRuntime
-  class Portal
-    def initialize(ds)
-      @ds = ds
-    end
-    
-    def call(env)
-      @req = Rack::Request.new(env)
-      [200, {}, [Template.new(@ds, :limit => (@req.params["limit"] ? @req.params["limit"].to_i : 20), :offset => @req.params["offset"].to_i).render]]
-    end
-  end
-end

data/test/server.rb

@@ -1,21 +0,0 @@
-require "sinatra"
-require_relative "../lib/x_runtime"
-
-# redis-server version must > 2.6.0 for lua script.
-
-# use XRuntime::Middleware, 10, Redis.connect(:url => "redis://localhost:6380/")
-
-# XRuntime::Middleware is same as Rack::XRuntime
-
-# use Rack::XRuntime, 10, Redis.connect(:url => "redis://localhost:6380/")
-
-# Use with basic auth
-use Rack::XRuntime, 10, Redis.connect(:url => "redis://localhost:6380/") do |name, password|
-  name == "cui" and password == "hello"
-end
-
-get /.*/ do
-  # sleep(1)
-  sleep(0.01*rand(10))
-  "Hello, I'am x_runtime"
-end