ww 0.4.1 → 0.4.2

data/Rakefile

@@ -58,7 +58,7 @@ spec = Gem::Specification.new do |s|
 	s.add_dependency('sinatra', '>=0.9.4')
 	s.add_dependency('rack', '>=1.0.1')
 	s.add_dependency('haml', '>=2.2.13')
-	s.add_dependency('json', '>=1.2.0')
+	#s.add_dependency('json', '>=1.2.0')
 	#s.required_ruby_version = '>= 1.8.2'
 
 	s.files = %w(README.rdoc ChangeLog MIT-LICENSE Rakefile) +

data/lib/ww.rb

@@ -1,5 +1,5 @@
 module Ww
-  Version = '0.4.1'
+  Version = '0.4.2'
   autoload 'SpyEye', 'ww/spy_eye'
   autoload 'Server', 'ww/server'
 end

data/lib/ww/double/spy/request.rb

@@ -4,6 +4,25 @@ autoload :JSON, 'json'
 autoload :YAML, 'yaml'
 
 module Ww::Double::Spy
+  if defined?(ActiveSupport::JSON)
+    def decode_json(json_string)
+      ActiveSupport::JSON.decode(json_string)
+    end
+  else
+    unless defined?(::JSON)
+      begin
+        require 'json_pure'
+      rescue LoadError
+        require 'json'
+      end
+    end
+    def decode_json(json_string)
+      ::JSON.parse(json_string)
+    end
+  end
+
+  module_function :decode_json
+
   class Request < ::Rack::Request
     attr_reader :time
     @@req_parsers = []
@@ -13,11 +32,11 @@ module Ww::Double::Spy
     end
 
     regist_request_parser %r{[application|text]/json} do |body|
-      JSON.parse(body)
+      ::Ww::Double::Spy.decode_json(body)
     end
 
     regist_request_parser %r{[application|text]/json} do |body|
-      JSON.parse(body)
+      ::Ww::Double::Spy.decode_json(body)
     end
 
     regist_request_parser %r{[application|text]/yaml} do |body|

data/lib/ww/spy_eye.rb

@@ -28,7 +28,7 @@ module Ww
     end
 
     def call(env)
-      [200, {"Content-Type" => "text/html"}, template.render(self)]
+      [200, {"Content-Type" => "text/html"}, [template.render(self)]]
     end
 
     private

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - moro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +09:00
+date: 2010-08-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,20 +59,6 @@ dependencies:
         version: 2.2.13
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :runtime
-  version_requirements: *id004
 description: Double Web, framework to build double Web server.
 email: moronatural@gmail.com
 executables: []