cuba-sugar 0.2.2 → 0.2.4

data/cuba-sugar.gemspec

@@ -1,18 +1,17 @@
 Gem::Specification.new do |s|
   s.name              = "cuba-sugar"
-  s.version           = "0.2.2"
+  s.version           = "0.2.4"
   s.summary           = "Give Cuba some Sugar!"
-  s.description       = "Useful stuff to use with cuba-contrib"
+  s.description       = "Useful stuff to use with cuba"
   s.authors           = ["elcuervo"]
   s.email             = ["yo@brunoaguirre.com"]
   s.homepage          = "http://github.com/elcuervo/cuba-sugar"
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files test`.split("\n")
 
-  s.add_dependency("cuba")
-  s.add_dependency("cuba-contrib")
-  s.add_dependency("json")
-  s.add_dependency("rack_csrf")
+  s.add_dependency("cuba", "~> 3.0")
+  s.add_dependency("json", "~> 1.6.6")
+  s.add_dependency("rack_csrf", "~> 2.4.0")
 
-  s.add_development_dependency("cutest")
+  s.add_development_dependency("cutest", "~> 1.1.3")
 end

data/lib/cuba/sugar.rb

@@ -1,18 +1,7 @@
-require "cuba/contrib"
 require "rack/csrf"
 
 module Cuba::Sugar
 
-  # Sugar to access root of a page
-  #
-  # @example
-  # on post, root do
-  #   as do
-  #     "Welcome!"
-  #   end
-  # end
-  def root; "" end
-
   # Sugar to access an option verb
   #
   # @example

data/test/as.rb

@@ -12,9 +12,9 @@ test "set status and headers through helper" do
 
   env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/users" }
 
-  _, _, resp = Cuba.call(env)
+  code, headers, resp = Cuba.call(env)
 
-  assert_equal 201, resp.status
-  assert_equal ["User Created"], resp.body
-  assert_equal "http://somewhere.com/users/705", resp.headers["Content-Location"]
+  assert_equal 201, code
+  assert_equal ["User Created"], resp
+  assert_equal "http://somewhere.com/users/705", headers["Content-Location"]
 end

data/test/as_json.rb

@@ -15,10 +15,10 @@ test "set a block to return json" do
 
   env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/drinks" }
 
-  _, _, resp = Cuba.call(env)
+  code, headers, resp = Cuba.call(env)
 
-  assert_equal 201, resp.status
-  assert_equal "application/json", resp.headers["Content-Type"]
-  assert_equal [rum_and_coke.to_json], resp.body
-  assert_equal "http://somewhere.com/drinks/42", resp.headers["Content-Location"]
+  assert_equal 201, code
+  assert_equal "application/json", headers["Content-Type"]
+  assert_equal [rum_and_coke.to_json], resp
+  assert_equal "http://somewhere.com/drinks/42", headers["Content-Location"]
 end

data/test/csrf.rb

@@ -1,7 +1,9 @@
 require File.expand_path("helper", File.dirname(__FILE__))
+require 'cuba/render'
 
 test "set status and headers through helper" do
   Cuba.plugin Cuba::Sugar
+  Cuba.plugin Cuba::Render
   Cuba.define do
     on "users" do
       as do
@@ -12,9 +14,9 @@ test "set status and headers through helper" do
 
   env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/users", 'rack.session' => {} }
 
-  _, _, resp = Cuba.call(env)
+  code, headers, resp = Cuba.call(env)
 
   assert env.fetch("rack.session").has_key?("csrf.token")
-  assert /_csrf/ =~ resp.body.first
+  assert /_csrf/ =~ resp.first
   assert_equal 44, env.fetch("rack.session").fetch("csrf.token").size
 end

data/test/helpers.rb

@@ -20,5 +20,5 @@ test "set status and headers through helpers" do
 
   _, _, resp = Cuba.call(env)
 
-  assert_equal ["I will shout: HELLO"], resp.body
+  assert_equal ["I will shout: HELLO"], resp
 end

data/test/redirect.rb

@@ -10,8 +10,8 @@ test "redirect helper" do
 
   env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/old" }
 
-  _, _, resp = Cuba.call(env)
+  code, headers, _ = Cuba.call(env)
 
-  assert_equal 302, resp.status
-  assert_equal "/new", resp.headers["Location"]
+  assert_equal 302, code
+  assert_equal "/new", headers["Location"]
 end

data/test/subdomain.rb

@@ -22,6 +22,6 @@ test "eval only in a given subdomain" do
   _, _, sub_resp = Cuba.call(subdomain_env)
   _, _, resp = Cuba.call(standard_env)
 
-  assert_equal ["Subdomain"], sub_resp.body
-  assert_equal ["Main"], resp.body
+  assert_equal ["Subdomain"], sub_resp
+  assert_equal ["Main"], resp
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba-sugar
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,64 +9,53 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000Z
+date: 2012-03-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
-  requirement: &70204609640940 !ruby/object:Gem::Requirement
+  requirement: &70145888408160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204609640940
-- !ruby/object:Gem::Dependency
-  name: cuba-contrib
-  requirement: &70204609640500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70204609640500
+  version_requirements: *70145888408160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70204605330560 !ruby/object:Gem::Requirement
+  requirement: &70145888407580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70204605330560
+  version_requirements: *70145888407580
 - !ruby/object:Gem::Dependency
   name: rack_csrf
-  requirement: &70204605330140 !ruby/object:Gem::Requirement
+  requirement: &70145888407060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70204605330140
+  version_requirements: *70145888407060
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &70204605329720 !ruby/object:Gem::Requirement
+  requirement: &70145888406560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70204605329720
-description: Useful stuff to use with cuba-contrib
+  version_requirements: *70145888406560
+description: Useful stuff to use with cuba
 email:
 - yo@brunoaguirre.com
 executables: []
@@ -108,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Give Cuba some Sugar!