cynic 0.0.3.4 → 0.0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eba83ffc70d526a9bd125bd744a45d6d1523646
-  data.tar.gz: 08016075298c30877a1002fa864af77e21f1b309
+  metadata.gz: 4d3f7a1b07f7ec9818bdda6bd95a0f8699ad8446
+  data.tar.gz: 46214dc5a9ed1b61e18f652e4bfd96cfc699340b
 SHA512:
-  metadata.gz: 4e8fb783d5827d5d765637b2e1d62532f0508c40795590f632c23f5d756c2aa0668d92fd89f7fef3af74588a2dfc3bf0ae940fbc8c689b6027211e5ae1c76a11
-  data.tar.gz: 30defcf46ad77ab6bfca77b7647ba9e40cbed8f6443d7e9e8f244b6415a09857f18dcc2a3532fee01351414ea7d96235c30da95cd48d2c180d0bfa908d0b4d8d
+  metadata.gz: 78b60f352309b42f6b0229a694a5b09f9b2736aaa06029af31b51dcdc6ff16e2b2a5ffbde19cad4d49bfd0de5577bed1940d785bf389fc563186f66dc6041b0c
+  data.tar.gz: a600c0bd234a9b9aa29dc5e6a0e15f8063f10e6fc43cd7b3f761687a3cbb6a3681944e3c8c9d5f677b4e280466d2bec3d5ee5878f3e18d20200aed038295bc9d

data/lib/cynic/app.rb

@@ -18,47 +18,31 @@ module Cynic
     
     def call(env)
       @env = env
-      send_response
+      response.send
     end
     
     def request
-      @request ||= Rack::Request.new(@env)
+      Rack::Request.new(@env)
     end
     
     def routing_to_request
       routing.go_to request.request_method.downcase.to_sym, @env["REQUEST_PATH"]
     end
     
-    def send_response
-      [status, headers, response]
-    end
-    
     def response
-      Response.new(execute_controller_actions)
+      Response.new(execute_controller_actions, request)
     end
     
     def execute_controller_actions
       route = self.routing_to_request
-      if route.object.respond_to? :request=
-        route.params.each do |k,v|
-          request.update_param(k, v)
-        end
-        route.object.request = request 
+      
+      route.params.each do |k,v|
+        request.update_param(k, v)
       end
+      route.object.request = request 
+      
       route.object.response(route.method)
     end
     
-    def status
-      200
-    end
-    
-    def content_type
-      request.content_type || "text/html"
-    end
-    
-    def headers
-      {"CONTENT-TYPE" => content_type}
-    end
-    
   end
 end

data/lib/cynic/controller.rb

@@ -3,6 +3,7 @@ module Cynic
     attr_accessor :request
     class << self
       attr_accessor :before_actions
+      
       def before_actions
         @before_actions ||= Hash.new { Set.new }
       end
@@ -32,6 +33,10 @@ module Cynic
     end
 
     def params
+      request.params.each do |k,v|
+        request.update_param(k.to_sym, v) if k.is_a? String
+      end
+      
       request.params
     end
     

data/lib/cynic/response.rb

@@ -1,11 +1,35 @@
 module Cynic
   class Response
-    attr_reader :body
-    def initialize(body)
+    attr_reader :body, :content_type, :headers, :status
+    
+    def initialize(body, request)
       @body = body
+      @content_type = set_content_type(request)
     end
+    
     def each(&block)
       block.call @body
     end
+    
+    def status
+      200
+    end
+    
+    def set_content_type(request)
+      if request.params.has_key? "format"
+        "text/#{request.params['format']}"
+      else
+        request.content_type =~ /text/ ? request.content_type : "text/html"
+      end
+    end
+    
+    def headers
+      {"CONTENT-TYPE" => content_type}
+    end
+    
+    def send
+      [status, headers, self]
+    end
+    
   end
 end

data/lib/cynic/version.rb

@@ -1,3 +1,3 @@
 module Cynic
-  VERSION = "0.0.3.4"
+  VERSION = "0.0.3.5"
 end

data/spec/lib/cynic/controller_spec.rb

@@ -13,16 +13,17 @@ end
 
 describe Cynic::Controller do
   let(:controller) { CynicController.new }
+  let(:env) { {"REQUEST_METHOD" => "GET", "REQUEST_PATH" => "/cynic", "rack.input" => "wtf", "QUERY_STRING" => "id=1",  "CONTENT_TYPE" => "text/json"} }
+  
   before { CynicController.instance_variable_set(:@before_actions, nil)}
   
   describe "#request" do
     before { 
-      request = double("Rack::Request")
-      request.stub(:params) { {id: 1} }
+      request = Rack::Request.new(env)
       controller.request = request
     }
     it "has params" do
-      expect(controller.params).to eq({id: 1})
+      expect(controller.params[:id]).to eq "1"
     end
   end
   describe "#render" do

data/spec/lib/cynic/response_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 describe Cynic::Response do
-  let(:response) { Cynic::Response.new("This is the body") }
+  let(:env) { {"REQUEST_METHOD" => "GET", "REQUEST_PATH" => "/cynic", "rack.input" => "wtf", "CONTENT_TYPE" => "text/json"} }
+  let(:response) { Cynic::Response.new("This is the body", Rack::Request.new(env)) }
   describe "#each" do
     it "responds" do
       expect(response).to respond_to :each
@@ -11,4 +12,20 @@ describe Cynic::Response do
       expect(response.each {|k| k }).to eq "This is the body"
     end
   end
+  
+  describe "content_type" do
+    it "sets it to json" do
+      expect(response.content_type).to eq "text/json"
+    end
+    
+    it "sets it to html if unknown" do
+      env["CONTENT_TYPE"] = "app/something"
+      expect(response.content_type).to eq "text/html"
+    end
+    
+    it "the params takes prority" do
+      env["QUERY_STRING"] = "format=jsonp"
+      expect(response.content_type).to eq "text/jsonp"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cynic
 version: !ruby/object:Gem::Version
-  version: 0.0.3.4
+  version: 0.0.3.5
 platform: ruby
 authors:
 - Bookis Smuin