jellyfish 0.5.0 → 0.5.1

data/.gitignore

@@ -1,2 +1,3 @@
 pkg
 *.rbc
+sinatra

data/CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## Jellyfish 0.5.1 -- 2012-10-19
+
+* Removed accidentally added sinatra files.
+
 ## Jellyfish 0.5.0 -- 2012-10-18
 
 ### Incompatible changes

data/Gemfile

@@ -1,7 +1,4 @@
 
 source 'http://rubygems.org'
-
 gemspec
-
 gem 'rake'
-gem 'bacon'

data/README.md

@@ -2,6 +2,8 @@
 
 by Lin Jen-Shin ([godfat](http://godfat.org))
 
+![logo](https://github.com/godfat/jellyfish/raw/master/jellyfish.png)
+
 ## LINKS:
 
 * [github](https://github.com/godfat/jellyfish)
@@ -10,8 +12,8 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 
 ## DESCRIPTION:
 
-Pico web framework for building API-centric web applications, either
-Rack applications or Rack middlewares. Under 200 lines of code.
+Pico web framework for building API-centric web applications.
+For Rack applications or Rack middlewares. Under 200 lines of code.
 
 ## DESIGN:
 

data/Rakefile

@@ -16,7 +16,7 @@ task 'gem:spec' do
     require 'jellyfish/version'
     s.name    = 'jellyfish'
     s.version = Jellyfish::VERSION
-    s.add_development_dependency('rack')
+    %w[rack bacon].each{ |g| s.add_development_dependency(g) }
   end
 
   Gemgem.write

data/jellyfish.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "jellyfish"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-10-18"
-  s.description = "Pico web framework for building API-centric web applications, either\nRack applications or Rack middlewares. Under 200 lines of code."
+  s.date = "2012-10-19"
+  s.description = "Pico web framework for building API-centric web applications.\nFor Rack applications or Rack middlewares. Under 200 lines of code."
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
   ".gitignore",
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   "example/rainbows.rb",
   "example/server.sh",
   "jellyfish.gemspec",
+  "jellyfish.png",
   "lib/jellyfish.rb",
   "lib/jellyfish/public/302.html",
   "lib/jellyfish/public/404.html",
@@ -30,54 +31,13 @@ Gem::Specification.new do |s|
   "lib/jellyfish/sinatra.rb",
   "lib/jellyfish/test.rb",
   "lib/jellyfish/version.rb",
-  "sinatra/builder_test.rb",
-  "sinatra/coffee_test.rb",
-  "sinatra/contest.rb",
-  "sinatra/creole_test.rb",
-  "sinatra/delegator_test.rb",
-  "sinatra/encoding_test.rb",
-  "sinatra/erb_test.rb",
-  "sinatra/extensions_test.rb",
-  "sinatra/filter_test.rb",
-  "sinatra/haml_test.rb",
-  "sinatra/helper.rb",
-  "sinatra/helpers_test.rb",
-  "sinatra/integration/app.rb",
-  "sinatra/integration_helper.rb",
-  "sinatra/integration_test.rb",
-  "sinatra/less_test.rb",
-  "sinatra/liquid_test.rb",
-  "sinatra/mapped_error_test.rb",
-  "sinatra/markaby_test.rb",
-  "sinatra/markdown_test.rb",
-  "sinatra/middleware_test.rb",
-  "sinatra/nokogiri_test.rb",
-  "sinatra/rack_test.rb",
-  "sinatra/radius_test.rb",
-  "sinatra/rdoc_test.rb",
-  "sinatra/readme_test.rb",
-  "sinatra/request_test.rb",
-  "sinatra/response_test.rb",
-  "sinatra/result_test.rb",
-  "sinatra/route_added_hook_test.rb",
-  "sinatra/routing_test.rb",
-  "sinatra/sass_test.rb",
-  "sinatra/scss_test.rb",
-  "sinatra/server_test.rb",
-  "sinatra/settings_test.rb",
-  "sinatra/sinatra_test.rb",
-  "sinatra/slim_test.rb",
-  "sinatra/static_test.rb",
-  "sinatra/streaming_test.rb",
-  "sinatra/templates_test.rb",
-  "sinatra/textile_test.rb",
   "task/.gitignore",
   "task/gemgem.rb",
   "test/sinatra/test_base.rb"]
   s.homepage = "https://github.com/godfat/jellyfish"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
-  s.summary = "Pico web framework for building API-centric web applications, either"
+  s.summary = "Pico web framework for building API-centric web applications."
   s.test_files = ["test/sinatra/test_base.rb"]
 
   if s.respond_to? :specification_version then
@@ -85,10 +45,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rack>, [">= 0"])
+      s.add_development_dependency(%q<bacon>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<bacon>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<bacon>, [">= 0"])
   end
 end

data/lib/jellyfish/version.rb

@@ -1,4 +1,4 @@
 
 module Jellyfish
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -27,9 +27,25 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Pico web framework for building API-centric web applications, either
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Pico web framework for building API-centric web applications.
 
-  Rack applications or Rack middlewares. Under 200 lines of code.'
+  For Rack applications or Rack middlewares. Under 200 lines of code.'
 email:
 - godfat (XD) godfat.org
 executables: []
@@ -49,6 +65,7 @@ files:
 - example/rainbows.rb
 - example/server.sh
 - jellyfish.gemspec
+- jellyfish.png
 - lib/jellyfish.rb
 - lib/jellyfish/public/302.html
 - lib/jellyfish/public/404.html
@@ -56,47 +73,6 @@ files:
 - lib/jellyfish/sinatra.rb
 - lib/jellyfish/test.rb
 - lib/jellyfish/version.rb
-- sinatra/builder_test.rb
-- sinatra/coffee_test.rb
-- sinatra/contest.rb
-- sinatra/creole_test.rb
-- sinatra/delegator_test.rb
-- sinatra/encoding_test.rb
-- sinatra/erb_test.rb
-- sinatra/extensions_test.rb
-- sinatra/filter_test.rb
-- sinatra/haml_test.rb
-- sinatra/helper.rb
-- sinatra/helpers_test.rb
-- sinatra/integration/app.rb
-- sinatra/integration_helper.rb
-- sinatra/integration_test.rb
-- sinatra/less_test.rb
-- sinatra/liquid_test.rb
-- sinatra/mapped_error_test.rb
-- sinatra/markaby_test.rb
-- sinatra/markdown_test.rb
-- sinatra/middleware_test.rb
-- sinatra/nokogiri_test.rb
-- sinatra/rack_test.rb
-- sinatra/radius_test.rb
-- sinatra/rdoc_test.rb
-- sinatra/readme_test.rb
-- sinatra/request_test.rb
-- sinatra/response_test.rb
-- sinatra/result_test.rb
-- sinatra/route_added_hook_test.rb
-- sinatra/routing_test.rb
-- sinatra/sass_test.rb
-- sinatra/scss_test.rb
-- sinatra/server_test.rb
-- sinatra/settings_test.rb
-- sinatra/sinatra_test.rb
-- sinatra/slim_test.rb
-- sinatra/static_test.rb
-- sinatra/streaming_test.rb
-- sinatra/templates_test.rb
-- sinatra/textile_test.rb
 - task/.gitignore
 - task/gemgem.rb
 - test/sinatra/test_base.rb
@@ -123,7 +99,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Pico web framework for building API-centric web applications, either
+summary: Pico web framework for building API-centric web applications.
 test_files:
 - test/sinatra/test_base.rb
 has_rdoc: 

data/sinatra/builder_test.rb

@@ -1,95 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-begin
-require 'builder'
-
-class BuilderTest < Test::Unit::TestCase
-  def builder_app(options = {}, &block)
-    mock_app {
-      set :views, File.dirname(__FILE__) + '/views'
-      set options
-      get '/', &block
-    }
-    get '/'
-  end
-
-  it 'renders inline Builder strings' do
-    builder_app { builder 'xml.instruct!' }
-    assert ok?
-    assert_equal %{<?xml version="1.0" encoding="UTF-8"?>\n}, body
-  end
-
-  it 'defaults content type to xml' do
-    builder_app { builder 'xml.instruct!' }
-    assert ok?
-    assert_equal "application/xml;charset=utf-8", response['Content-Type']
-  end
-
-  it 'defaults allows setting content type per route' do
-    builder_app do
-      content_type :html
-      builder 'xml.instruct!'
-    end
-    assert ok?
-    assert_equal "text/html;charset=utf-8", response['Content-Type']
-  end
-
-  it 'defaults allows setting content type globally' do
-    builder_app(:builder => { :content_type => 'html' }) do
-      builder 'xml.instruct!'
-    end
-    assert ok?
-    assert_equal "text/html;charset=utf-8", response['Content-Type']
-  end
-
-  it 'renders inline blocks' do
-    builder_app {
-      @name = "Frank & Mary"
-      builder do |xml|
-        xml.couple @name
-      end
-    }
-    assert ok?
-    assert_equal "<couple>Frank &amp; Mary</couple>\n", body
-  end
-
-  it 'renders .builder files in views path' do
-    builder_app {
-      @name = "Blue"
-      builder :hello
-    }
-    assert ok?
-    assert_equal %(<exclaim>You're my boy, Blue!</exclaim>\n), body
-  end
-
-  it "renders with inline layouts" do
-    mock_app {
-      layout do
-        %(xml.layout { xml << yield })
-      end
-      get('/') { builder %(xml.em 'Hello World') }
-    }
-    get '/'
-    assert ok?
-    assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
-  end
-
-  it "renders with file layouts" do
-    builder_app {
-      builder %(xml.em 'Hello World'), :layout => :layout2
-    }
-    assert ok?
-    assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
-  end
-
-  it "raises error if template not found" do
-    mock_app {
-      get('/') { builder :no_such_template }
-    }
-    assert_raise(Errno::ENOENT) { get('/') }
-  end
-end
-
-rescue LoadError
-  warn "#{$!.to_s}: skipping builder tests"
-end

data/sinatra/coffee_test.rb

@@ -1,92 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-begin
-require 'coffee-script'
-require 'execjs'
-
-begin
-  ExecJS.compile '1'
-rescue Exception
-  raise LoadError, 'unable to execute JavaScript'
-end
-
-class CoffeeTest < Test::Unit::TestCase
-  def coffee_app(options = {}, &block)
-    mock_app {
-      set :views, File.dirname(__FILE__) + '/views'
-      set(options)
-      get '/', &block
-    }
-    get '/'
-  end
-
-  it 'renders inline Coffee strings' do
-    coffee_app { coffee "alert 'Aye!'\n" }
-    assert ok?
-    assert body.include?("alert('Aye!');")
-  end
-
-  it 'defaults content type to javascript' do
-    coffee_app { coffee "alert 'Aye!'\n" }
-    assert ok?
-    assert_equal "application/javascript;charset=utf-8", response['Content-Type']
-  end
-
-  it 'defaults allows setting content type per route' do
-    coffee_app do
-      content_type :html
-      coffee "alert 'Aye!'\n"
-    end
-    assert ok?
-    assert_equal "text/html;charset=utf-8", response['Content-Type']
-  end
-
-  it 'defaults allows setting content type globally' do
-    coffee_app(:coffee => { :content_type => 'html' }) do
-      coffee "alert 'Aye!'\n"
-    end
-    assert ok?
-    assert_equal "text/html;charset=utf-8", response['Content-Type']
-  end
-
-  it 'renders .coffee files in views path' do
-    coffee_app { coffee :hello }
-    assert ok?
-    assert_include body, "alert(\"Aye!\");"
-  end
-
-  it 'ignores the layout option' do
-    coffee_app { coffee :hello, :layout => :layout2 }
-    assert ok?
-    assert_include body, "alert(\"Aye!\");"
-  end
-
-  it "raises error if template not found" do
-    mock_app {
-      get('/') { coffee :no_such_template }
-    }
-    assert_raise(Errno::ENOENT) { get('/') }
-  end
-
-  it "passes coffee options to the coffee engine" do
-    coffee_app { coffee "alert 'Aye!'\n", :no_wrap => true }
-    assert ok?
-    assert_body "alert('Aye!');"
-  end
-
-  it "passes default coffee options to the coffee engine" do
-    mock_app do
-      set :coffee, :no_wrap => true # default coffee style is :nested
-      get '/' do
-        coffee "alert 'Aye!'\n"
-      end
-    end
-    get '/'
-    assert ok?
-    assert_body "alert('Aye!');"
-  end
-end
-
-rescue LoadError
-  warn "#{$!.to_s}: skipping coffee tests"
-end