x_runtime 0.1.0 → 0.2.0

data/Gemfile

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

data/Gemfile.lock

@@ -1,16 +1,13 @@
 GEM
   remote: http://ruby.taobao.org/
   specs:
-    active_support (3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.3)
+    json (1.7.5)
     rack (1.4.1)
     rake (0.9.2.2)
     rdoc (3.12)
@@ -21,7 +18,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_support
   jeweler
   rack
   rake

data/README.markdown

@@ -26,7 +26,13 @@ XRuntime是一个Rack的middleware,配合Redis用来分析Http Server每个URI
 2. redis对象
 
 可以指定XRuntime使用的Redis的key前缀或者叫命名空间:    
-`XRuntime::NameSpace = "RuntimeEx::Threshold"`
+`XRuntime::NameSpace = "RuntimeEx::Threshold"`  
+
+[http://localhost:4567/xruntime](/xruntime)支持Http basic auth验证:
+
+    use Rack::XRuntime, 100, Redis.connect(:url => "redis://localhost:6380/") do |name, password|
+      name == "cui" and password == "hello"
+    end
 
 ### Sinatra
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/x_runtime/middleware.rb

@@ -1,30 +1,28 @@
 module XRuntime
   class Middleware
     # threshold => ms
-    def initialize(app, threshold, redis)
+    def initialize(app, threshold, redis, &auth)
       @app = app
       @threshold = threshold.to_f
       @redis = redis
+      @portal = Portal.new(ds)
+      @portal = Rack::Auth::Basic.new(@portal, &auth) if block_given?
     end
     
     def ds
-      @@ds ||= DataSet.new(redis_key, script)
+      @ds ||= DataSet.new(redis_key, script)
     end
     
     def script
-      @@script ||= Script.new(@redis)
+      @script ||= Script.new(@redis)
     end
 
     def call(env)
-      status, headers, body = nil
-    
       if env['REQUEST_PATH'] == "/xruntime"
-        status, headers, body = call_portal(env)
+        call_portal(env)
       else
-        status, headers, body = call_app(env)
+        call_app(env)
       end
-
-      [status, headers, body]
     end
   
     def call_app(env)
@@ -40,8 +38,7 @@ module XRuntime
     end
   
     def call_portal(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]]
+      @portal.call(env)
     end
     
     def logredis(cost,uri)

data/lib/x_runtime/portal.rb

@@ -0,0 +1,12 @@
+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/lib/x_runtime.rb

@@ -10,14 +10,15 @@ $:.unshift(File.dirname(__FILE__))
 
 module XRuntime
   NameSpace = "RuntimeEx::Threshold"
+  
+  autoload :Middleware, "x_runtime/middleware"
+  autoload :DataSet,    "x_runtime/data_set"
+  autoload :Script,     "x_runtime/script"
+  autoload :Portal,     "x_runtime/portal"
+  autoload :Template,   "x_runtime/template"
+  autoload :Utils,      "x_runtime/utils"
 end
 
-XRuntime.autoload :Middleware, "x_runtime/middleware"
-XRuntime.autoload :DataSet,    "x_runtime/data_set"
-XRuntime.autoload :Script,     "x_runtime/script"
-XRuntime.autoload :Template,   "x_runtime/template"
-XRuntime.autoload :Utils,      "x_runtime/utils"
-
 module Rack
   XRuntime = XRuntime::Middleware
 end

data/test/server.rb

@@ -2,8 +2,17 @@ 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/")
-use Rack::XRuntime, 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)

data/x_runtime.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "x_runtime"
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["\u{5d14}\u{5ce5}"]
+  s.date = "2012-08-20"
+  s.description = "\u{7531}\u{4e8e}\u{4f7f}\u{7528}\u{5230}Redis\u{7684}lua script,\u{6240}\u{4ee5}\u{9700}\u{8981}\u{4f60}\u{7684}Redis\u{670d}\u{52a1}\u{652f}\u{6301},redis-server\u{7248}\u{672c}>2.6.x,redis(ruby gem)>3.0.1."
+  s.email = "zheng.cuizh@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.markdown"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/x_runtime.rb",
+    "lib/x_runtime/array.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/template.erb",
+    "lib/x_runtime/template.rb",
+    "lib/x_runtime/utils.rb",
+    "test/client.rb",
+    "test/helper.rb",
+    "test/server.rb",
+    "test/test_x_runtime.rb",
+    "x_runtime.gemspec"
+  ]
+  s.homepage = "http://github.com/charlescui/x_runtime"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "XRuntime\u{662f}\u{4e00}\u{4e2a}Rack\u{7684}middleware,\u{914d}\u{5408}Redis\u{7528}\u{6765}\u{5206}\u{6790}Http Server\u{6bcf}\u{4e2a}URI\u{8bf7}\u{6c42}\u{65f6}\u{957f}"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<redis>, ["~> 3.0.1"])
+    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"])
+    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"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: x_runtime
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: active_support
-  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'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +94,7 @@ files:
 - lib/x_runtime/array.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/template.erb
@@ -119,6 +104,7 @@ files:
 - test/helper.rb
 - test/server.rb
 - test/test_x_runtime.rb
+- x_runtime.gemspec
 homepage: http://github.com/charlescui/x_runtime
 licenses:
 - MIT
@@ -134,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1659196055007791068
+      hash: 3835881030075432585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: