granola 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d181cf15a32af62964d9d54b21589ed2bfaffcf
-  data.tar.gz: 2fe3d728942d5e4dbf68b92f80c49349bed8c10d
+  metadata.gz: 61316a397f01835165e7961ce698174bbf8c3c26
+  data.tar.gz: 9287b8229f817fbe765051a4f3b066601740d6af
 SHA512:
-  metadata.gz: 984bc4b6f1f0a38dc57be7c2a40ba3f144d18adc40179c6eaee1dda7848ffae42582d4c36dbeae81988b9bb6622c115c8cbff654f2e91f3053de20a7b3d038ce
-  data.tar.gz: 892e590017554fad8a5e5bc375d23ecb67220d1b7261fcf37fdf5a3de3793911acc642c74881c5cbc1160663af1e1c7e5115066c92b7de6cbdccbe1da2723753
+  metadata.gz: cfeacf1ba025637fa153c3e437a22128a355d8d948b34c638aed537dd3b7d136fde490fcac0c1e87c2dd0faa1b056d2363855ed5cf28e2f1125183f91db92a84
+  data.tar.gz: c13007b46a27490727db0ceb9fbb5cc9ed7ca8ff246ce9115e4a913467c47f76952a7fd72ec470128c82107415d16f44b345339c669c3a4a600187c6811cdf41

data/README.md

@@ -1,5 +1,8 @@
 # Granola, a JSON serializer
 
+![A tasty bowl of Granola](https://cloud.githubusercontent.com/assets/437/4827156/9e8d33da-5f76-11e4-8574-7803e84845f2.JPG)
+
+
 Granola aims to provide a simple interface to generate JSON responses based on
 your application's domain models. It doesn't make assumptions about anything and
 gets out of your way. You just write plain ruby.

data/lib/granola/helper.rb

@@ -32,7 +32,10 @@ module Granola::Helper
   # Returns a Class.
   def self.serializer_class_for(object)
     object = object.respond_to?(:to_ary) ? object.to_ary.fetch(0, nil) : object
-    const_get("#{object.class.name}Serializer")
+    name = object.class.name
+    Object.const_get("%sSerializer" % name)
+  rescue NameError
+    const_get("%sSerializer" % name)
   end
 
   # Internal: Null serializer that transparently handles rendering `nil` in case

data/lib/granola/rack.rb

@@ -25,13 +25,15 @@ module Granola::Rack
   #   with:           A specific serializer class to use. If this is `nil`,
   #                   `Helper.serializer_class_for` will be used to infer the
   #                   serializer class.
+  #   status:         The HTTP status to return on stale responses. Defaults to
+  #                   `200`.
   #   **json_options: Any other keywords passed will be forwarded to the
   #                   serializer's `#to_json` call.
   #
   # Raises NameError if no specific serializer is provided and we fail to infer
   #   one for this object.
   # Returns a Rack response tuple.
-  def json(object, with: nil, **json_options)
+  def json(object, with: nil, status: 200, **json_options)
     serializer = serializer_for(object, with: with)
     headers = {}
 
@@ -44,7 +46,9 @@ module Granola::Rack
     end
 
     stale_check = StaleCheck.new(
-      env, last_modified: serializer.last_modified, etag: serializer.cache_key
+      env,
+      last_modified: headers["Last-Modified".freeze],
+      etag: headers["ETag".freeze]
     )
 
     if stale_check.fresh?
@@ -53,7 +57,7 @@ module Granola::Rack
       json_string = serializer.to_json(json_options)
       headers["Content-Type".freeze] = serializer.mime_type
       headers["Content-Length".freeze] = json_string.length.to_s
-      [200, headers, [json_string]]
+      [status, headers, [json_string]]
     end
   end
 
@@ -109,8 +113,7 @@ module Granola::Rack
     # Returns Boolean.
     def fresh_by_time?
       return false unless env.key?(IF_MODIFIED_SINCE) && !last_modified.nil?
-      if_modified_since = Time.parse(env.fetch(IF_MODIFIED_SINCE))
-      last_modified <= if_modified_since
+      Time.parse(last_modified) <= Time.parse(env.fetch(IF_MODIFIED_SINCE))
     end
 
     # Internal: Checks if a request is fresh by etag, if applicable, by

data/lib/granola/version.rb

@@ -1,3 +1,3 @@
 module Granola
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: granola
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nicolas Sanguinetti