lunetas 0.1.1 → 0.1.2

data/README.md

@@ -13,8 +13,8 @@ a Regular Expression. It may respond to one or many HTTP methods. These response
 defined overwritting the methods get, put, post, delete, trace, head, etc.. It can
 also handle other non-native HTTP methods, using overwritting other_verb.
 
-What does all these means? Checkout an example. (Also you may want to take a look at
-the examples folder).
+What does all these means? Checkout an example. (You can also take a look at the
+examples folder).
 
 Usage
 -----

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/examples/content_types.rb

@@ -0,0 +1,23 @@
+require 'lunetas'
+require 'base64'
+
+class ContentTypes
+  include Lunetas::Candy
+  matches '^/test\.(\w+)', :format
+  set_content_type 'text/plain'
+
+  def get
+    case @format
+    when 'png'
+      set_content_type 'image/png'
+      Base64.decode64(DATA)
+    when 'html'
+      set_content_type 'text/html'
+      '<center>cool <img src="/test.png" alt="test" /></center>'
+    when 'txt'
+      'OH HAI ;D'
+    end
+  end
+
+  DATA = "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/I\nNwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJa\nSURBVDjLpZNPSFVREIe/c9/r+tD36vW/IA2rTUYlZbp0FQTRQqmgXFW7loIr\na+NWCFxFENQmgsyEQnGlSIFUVIsURKuHBZmlWWnee985Z6aNaWa0qFkOwzcz\nv/mNUVX+J9K/J9yAyarSrMIxEWpVQYUnIvSpcCV3Qud/rTe/TuAGTL0KN0xF\nS6XJ16LhBlCPRtP42Rck4+0FEc6tb9DBVQDXbxo0X38v2NaElq7DL4wiyQzq\nYjAZgswejA1I3naSTA02bj6t3UsA2282qDKR2n87K8E3fFwAO4e4BPUx32YW\nePk84kBdJfktNXwdOj8vws7tTfo5AFChOdjZmtUQJCnQdfUZXdfH6L45Ab7I\n2MgCmRLP8ONxfPKa0r2tWfE0L4kowvHU+jp8PIy6iMYLu1EXoz5BbcyhGhBf\nRG2M+/KMcOsZxHMcuPQTUEXJWiT6gorlzcgmTDqHQUEVWNTJOXbk7wMJ3lO5\nNIEKkbo4xDvwRcqPnAUTrjiviqc0v525x12gigip5RU8BWxUDSEqlmy+jCBT\nsco06mNMUIr4NDbhFUCwuEKPnX6BCStQAff1EahbBbAzg6TXHiSansAW6VkG\neDoWRtrmcTmCsJzixwckk7eR4qfFzhHFqV6S991oyUEmH7bN24SOFUb6dMec\nTG8+2pmpaITUHG72KT56j7oYk86RylXj2cXsaC+zY32nDrXq3VVWnrxljorn\nWllVS2W4cR/BmgDE4RLP98kxPgy1F5zl4uFL2vfHXwB4d9NkxdMiwjHvqXVF\ncJYnztLnLO01l//yTP8SPwD79F9Uvnnx1AAAAABJRU5ErkJggg==\n"
+end

data/lib/lunetas/candy/initialization.rb

@@ -4,6 +4,8 @@ module Lunetas::Candy::Initialization
     attr_reader :url
     # The url parameters hold by the instance.
     attr_reader :lunetas_url_instance_params
+    # Holds the current headers for the response.
+    attr_reader :lunetas_headers
 
     # The initialization of a class that includes a Candy, should be done
     # with rack environment and the url matches from its regular expression.
@@ -14,6 +16,7 @@ module Lunetas::Candy::Initialization
     #   (MatchData instance).to_a
     def initialize(env, url_matches)
       @req = Rack::Request.new(env)
+      @lunetas_headers = {}
       @lunetas_url_instance_params = url_matches
       @url = @lunetas_url_instance_params.shift
       begin

data/lib/lunetas/candy/request_wrapper.rb

@@ -31,7 +31,8 @@ module Lunetas::Candy::RequestWrapper
     # @param [Fixnum] status the redirect status.
     # @return [nil]
     def redirect(target, status = 302)
-      @lunetas_redirect = [status, {'Content-Type' => 'text/plain', 'Location' => target}, []]
+      set_header 'Location', target
+      @lunetas_redirect = [302, "Moved to #{target}"]
     end
 
     # Is lunetas running in development?
@@ -43,6 +44,22 @@ module Lunetas::Candy::RequestWrapper
         ENV['RACK_ENV'].nil? || ENV['RACK_ENV'] == 'development'
       end
     end
+
+    # Sets the ContentType for this instance. This overrides the class
+    # ContentType.
+    # @param [String] content_type the ContentType.
+    # @return [nil]
+    def set_content_type(content_type)
+      set_header 'Content-Type', content_type
+    end
+
+    # Sets a Header for this instance.
+    # @param [String, Symbol] header the Header to be set.
+    # @param [String] value the value of the Header.
+    # @return [nil]
+    def set_header(header, value)
+      @lunetas_headers[header.to_s] = value
+    end
   end
 end
 

data/lib/lunetas/candy/response_handler.rb

@@ -60,11 +60,11 @@ module Lunetas::Candy::ResponseHandler
       # @param [Fixnum] code the response code.
       # @return [Array] a Rack::Request response.
       def response(object, code = 200)
-        if @lunetas_redirect && @lunetas_redirect.is_a?(Array)
-          @lunetas_redirect
-        else
-          [code, {'Content-Type' => self.class.lunetas_content_type}, [object.to_s]]
+        @lunetas_headers['Content-Type'] ||= self.class.lunetas_content_type
+        if @lunetas_redirect
+          code, object = @lunetas_redirect
         end
+        [code, @lunetas_headers, [object.to_s]]
       end
   end
   

data/spec/lunetas/candy_spec.rb

@@ -73,6 +73,27 @@ describe Lunetas::Candy do
       @instance.bite[1]["Content-Type"].should == "text/plain"
     end
 
+    it 'should be able to change the ContentType per instance' do
+      @instance.set_content_type 'application/json'
+      @instance.bite[1]["Content-Type"].should == 'application/json'
+    end
+
+    it 'should be able to set a custom Header' do
+      @instance.set_header 'Chunky', 'bacon'
+      @instance.bite[1]['Chunky'].should == 'bacon'
+    end
+
+    it 'should be able to add a custom Header with a symbol' do
+      @instance.set_header :Chunky, 'bacon'
+      @instance.bite[1]['Chunky'].should == 'bacon'
+    end
+
+    it 'should keep the last Header set' do
+      @instance.set_header :Chunky, 'bacon'
+      @instance.set_header 'Chunky', 'b4c0n'
+      @instance.bite[1]['Chunky'].should == 'b4c0n'
+    end
+
     it 'should be able to redirect' do
       mock_env = mock_env('/just_a_test')
       mock_env['REQUEST_METHOD'] = 'REDIRECT'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lunetas
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Iv\xC3\xA1n Vald\xC3\xA9s (@ivanvc)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -05:00
+date: 2010-08-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - Rakefile
 - VERSION
 - examples/config.ru
+- examples/content_types.rb
 - examples/jay_son.rb
 - examples/redirect.rb
 - examples/testing.rb
@@ -146,6 +147,7 @@ test_files:
 - spec/lunetas/bag_spec.rb
 - spec/lunetas/candy_spec.rb
 - spec/spec_helper.rb
+- examples/content_types.rb
 - examples/jay_son.rb
 - examples/redirect.rb
 - examples/testing.rb