rory 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f460afe6851a0ebbff77cd5459bf5dc2e4637c6c
-  data.tar.gz: f22a44a3d6141f2db251415ce18724e172fb9ca1
+  metadata.gz: f32801437785ab13928284bd7d3085846dc8f04d
+  data.tar.gz: 60e766bfd8db4e300c3b661dfc47f7cbb55dbecd
 SHA512:
-  metadata.gz: 101bc4e7b9de76e550b74eae963664d84f04a70e497d3016f6f117b74ef0140a9939362b6a338fadb6b82558b430682a6a677550c9513341b103723ab176325a
-  data.tar.gz: afc2f14d5c59c4e4ba834813b3c2e82f5f6cbec9f8518c8a7f29e90c28dc9dc135904e70aa79da71189e5765b9e9826d24c5faba2dcae2766be8f5b94cafe227
+  metadata.gz: 6d51ac0184c96b228640b1169229794bc79443a0e7c10c4d399d0646926d66805595aa37d1be0d5bd5f0955159b3109be4971f8ffcd5101a195ef2af0f364092
+  data.tar.gz: 86475e130a4d29a19875e1c81b3da04d4bb2fc0bd2a55850d0cc9ed816dd0b3632436b8acc6d2ef308b8ee0cfac95237864c828a6d818ae560758852373c1b0a

data/lib/rory/controller.rb

@@ -91,10 +91,10 @@ module Rory
     end
 
     def set_response_defaults(opts)
-      opts[:content_type] ||= default_content_type
+      opts[:content_type] ||= default_content_type(opts)
       opts[:status] ||= 200
       opts[:headers] = {
-        'Content-type' => default_content_type,
+        'Content-type' => opts[:content_type],
         'charset' => 'UTF-8'
       }.merge(opts[:headers] || {})
     end
@@ -134,8 +134,8 @@ module Rory
       @response = dispatcher.render_not_found
     end
 
-    def default_content_type
-      if json_requested?
+    def default_content_type(opts = {})
+      if json_requested? || opts[:json]
         'application/json'
       else
         'text/html'

data/lib/rory/support.rb

@@ -31,16 +31,15 @@ module Rory
     end
 
     def encode_as_json(object)
-      hashed = if object.is_a?(Array)
-        object.map { |o| try_to_hash(o) }
-      else
-        try_to_hash(object)
-      end
-      hashed.to_json
+      try_to_hash(object).to_json
     end
 
     def try_to_hash(object)
-      if object.respond_to?(:to_hash)
+      if object.is_a?(Array)
+        object.map { |val| try_to_hash(val) }
+      elsif object.is_a?(Hash)
+        Hash[object.map { |key, val| [key, try_to_hash(val)] }]
+      elsif object.respond_to?(:to_hash)
         object.to_hash
       else
         object

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/spec/lib/rory/controller_spec.rb

@@ -236,5 +236,10 @@ describe Rory::Controller do
       allow(subject).to receive(:json_requested?).and_return(true)
       expect(subject.default_content_type).to eq('application/json')
     end
+
+    it "returns 'application/json' if options has :json key" do
+      allow(subject).to receive(:json_requested?).and_return(false)
+      expect(subject.default_content_type(:json => 'woo')).to eq('application/json')
+    end
   end
 end

data/spec/lib/rory/support_spec.rb

@@ -65,15 +65,15 @@ describe Rory::Support do
     end
   end
 
-  describe ".encode_as_json" do
-    it "returns given object as json" do
-      object = double(:to_json => :jsonified)
-      expect(described_class.encode_as_json(object)).to eq(:jsonified)
+  describe ".try_to_hash" do
+    it "returns given object if it does not respond to #to_hash" do
+      object = double
+      expect(described_class.try_to_hash(object)).to eq(object)
     end
 
     it "calls to_hash first if object responds to it" do
       object = double(:to_hash => { 'april' => 'friday' })
-      expect(described_class.encode_as_json(object)).to eq({ 'april' => 'friday' }.to_json)
+      expect(described_class.try_to_hash(object)).to eq({ 'april' => 'friday' })
     end
 
     it "converts each member of an array" do
@@ -81,7 +81,39 @@ describe Rory::Support do
         double(:to_hash => :smurf),
         double(:to_hash => :nerf)
       ]
-      expect(described_class.encode_as_json(object)).to eq([:smurf, :nerf].to_json)
+      expect(described_class.try_to_hash(object)).to eq([:smurf, :nerf])
+    end
+
+    it "converts deeply" do
+      object = [
+        {
+          :perf => double(:to_hash => :smurf),
+          :kerf => [
+            double(:to_hash => :plurf),
+            'yurf'
+          ],
+          :erf => { :burf => double(:to_hash => :wurf) }
+        },
+        double(:to_hash => :nerf)
+      ]
+      expect(described_class.try_to_hash(object)).to eq(
+        [
+          {
+            :perf => :smurf,
+            :kerf => [ :plurf, 'yurf' ],
+            :erf => { :burf => :wurf }
+          },
+          :nerf
+        ]
+      )
+    end
+  end
+
+  describe ".encode_as_json" do
+    it "calls #try_to_hash on object then jsonifies" do
+      foo_hashed = double(:to_json => :jsonified)
+      allow(described_class).to receive(:try_to_hash).with(:foo).and_return(foo_hashed)
+      expect(described_class.encode_as_json(:foo)).to eq(:jsonified)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ravi Gadad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack