rack-pretty_json 0.0.2 → 1.0.0

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--format documentation

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+script: rake spec
+
+branches:
+  only: master
+
+rvm:
+  - "1.9.3"
+  - jruby-19mode
+
+notifications:
+  email:
+    - damien+rack-pretty_json@mindglob.com

data/README.md

@@ -1,5 +1,8 @@
 # Rack::PrettyJson
 
+[![Build Status](https://travis-ci.org/damien/rack-pretty_json.png)](https://travis-ci.org/damien/rack-pretty_json)
+[![Dependency Status](https://gemnasium.com/damien/rack-pretty_json.png)](https://gemnasium.com/damien/rack-pretty_json)
+
 Make your json responses PRETTY!
 
 ## Installation

data/Rakefile

@@ -13,5 +13,5 @@ task :testapp do
 end
 
 YARD::Rake::YardocTask.new do |t|
-  t.options = %w(--markup markdown)
+  t.options = %w()
 end

data/lib/rack/pretty_json.rb

@@ -1,4 +1,5 @@
-require "yajl"
+require "stringio"
+require "multi_json"
 require "rack"
 require "rack/pretty_json/version"
 
@@ -29,7 +30,10 @@ module Rack
         # - pretty json format has been requested
         # - we're in development mode
         if always_process? || requsted_pretty_version?(query_hash) || development?
-          body = make_pretty!(body)
+          body_io = ::StringIO.new
+          body.each { |line| body_io << line }
+
+          body = ::StringIO.new make_pretty!(body_io.string)
         end
       end
 
@@ -60,18 +64,8 @@ module Rack
     # @param [String] body a valid JSON string
     # @return #each
     def make_pretty!(body)
-      # Convert the response body into a StringIO
-      json = StringIO.new
-      body.each { |line| json << line }
-      json.rewind
-
-      # Stream our raw data through the parser
-      data = Yajl::Parser.parse(json, :pretty => true)
-      pretty_json = StringIO.new
-      Yajl::Encoder.encode(data, pretty_json, :pretty => true)
-      pretty_json.rewind
-
-      pretty_json
+      data = MultiJson.load(body)
+      MultiJson.dump(data, :pretty => true)
     end
 
   end

data/lib/rack/pretty_json/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module PrettyJson
-    VERSION = "0.0.2"
+    VERSION = "1.0.0"
   end
 end

data/rack-pretty_json.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Rack::PrettyJson::VERSION
 
-  gem.add_dependency "rack", "~> 1.4.1"
-  gem.add_dependency "yajl-ruby", "~> 1.1.0"
+  gem.add_dependency "rack", "~> 1.5.2"
+  gem.add_dependency "multi_json", "~> 1.7.2"
 
+  gem.add_development_dependency "rack-test"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "yard"
-  gem.add_development_dependency "redcarpet"
 end

data/spec/rack-pretty_json_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe "Rack::PrettyJson" do
+  include Rack::Test::Methods
+
+  let(:app) { app, options = Rack::Builder.parse_file File.expand_path("./support/pretty_json.ru", File.dirname(__FILE__)) ; app }
+  let(:options) { app, options = Rack::Builder.parse_file File.expand_path("./support/pretty_json.ru", File.dirname(__FILE__)) ; options }
+
+  context "when run with the default configuration options" do
+    it "works" do
+      get "/"
+      last_response.should be_ok
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,11 +1,7 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper.rb"` to ensure that it is only
-# loaded once.
-#
+$LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
+require "rack/test"
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
 end

data/spec/support/pretty_json.ru

@@ -2,7 +2,6 @@ $:.unshift File.expand_path("../../../lib/", __FILE__)
 
 require "rack"
 require "rack/pretty_json"
-require "stringio"
 
 module TestApp
 

metadata

@@ -1,82 +1,120 @@
 --- !ruby/object:Gem::Specification
 name: rack-pretty_json
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  prerelease:
+  version: 1.0.0
 platform: ruby
 authors:
 - Damien Wilson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70290189854620 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
-  type: :runtime
+        version: 1.5.2
+    none: false
   prerelease: false
-  version_requirements: *70290189854620
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &70290189853760 !ruby/object:Gem::Requirement
+  name: multi_json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.7.2
+    none: false
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *70290189853760
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70290189853120 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *70290189853120
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70290189852260 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *70290189852260
+  type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70290189851320 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70290189851320
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: &70290189849840 !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *70290189849840
+  type: :development
 description: Pretty JSON for pretty people
 email:
 - damien@mindglob.com
@@ -84,9 +122,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -94,33 +132,43 @@ files:
 - lib/rack/pretty_json.rb
 - lib/rack/pretty_json/version.rb
 - rack-pretty_json.gemspec
+- spec/rack-pretty_json_spec.rb
 - spec/spec_helper.rb
 - spec/support/pretty_json.ru
 homepage: https://www.github.com/damien/rack-pretty_json/
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      segments:
+      - 0
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      segments:
+      - 0
+      hash: 2
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.17
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Rack::PrettyJSON reformats JSON responses for easier readability.
 test_files:
+- spec/rack-pretty_json_spec.rb
 - spec/spec_helper.rb
 - spec/support/pretty_json.ru
-has_rdoc: 
+has_rdoc:

data/.yardopts

@@ -1 +0,0 @@
---markup markdown