rabl 0.10.0 → 0.10.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGZiYTEyMDU5MmE3YjVjODlkNzg5MzcwZDRkZTA2YzRmMDVlMjMzZA==
+    ZDMwMmY3ZDU1N2QwN2Y3OGNjZmRlOTljMGRiZGE1NDU3ZjQwYmViNQ==
   data.tar.gz: !binary |-
-    ZDY1ZGI4OTY4MGRjODk3ODJhZDZhMjA1ZDViOTI0NWJjMjFhNzc4YQ==
+    NzliNzM2YThjMmUxNzg3OTdhYzc5M2FiMmVhNmEwOTljYjBjYWI5Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTQ5YTlmM2Y2M2RlYTYzNzY4YmVkYjVmZTEzZGE2ODgwODY0NzdlYmEyNmI0
-    ODQwZjQ2MzgwYmY3ZjI5NGExZTRjODY5YWQwY2JlOGE5OWU0NWYxZTVjNzM4
-    MjI1YWE4ZGViMTUyMzA4ODM1YTE1MmU0OThhNTc4MDExMjhjN2U=
+    OTQ5YWQ4ZjYwNmRiMzc4YmRlYzIyYWZhZTA4Nzk3NzAyMWQxMDNlMzU5ZDdl
+    M2JiOTBhYTQxNDUwZjIwZjhhYmQ0ZWMyMDFiYTkyODhkMmU0MWNhMDNjY2Y5
+    MGQ3NTAzZDM0YmM0NzUwNmU1YjZjZTRhOTdhNjZmYzI5NjE4ZDA=
   data.tar.gz: !binary |-
-    YmQ0NDM2ODQwNzQzZDI4OTQ1N2NkYWNlZDdhMGIzMmMwZmRiYjU1MGM5YTll
-    ZjQwNWFmMmEwMDU2ZTczZGRkYWRlZDk1Y2MxY2Y3YjEyZTA1OWQwZTc2MmU4
-    ZmJiMWVmYjVkODFjMWE3NTYxZTFhNmFjOWFkZTliMTkwYjAzMjQ=
+    MmRiZjE3ZGYyZjU3M2FlZWViYjkzYjgzZjU4MTU3YjA4Y2JkZjFmNjE0NjA1
+    MDcyMTc2M2E2MjgyMGE2ZTI3NWZkN2IyN2MyZWE5MGJiMWM3ZWI4OGQyZDI1
+    NmZmMjRmMGE5YWQ3MjE5ODI0N2JkY2IwNDEzZGMwMjUzMWRlOGM=

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.10.1 (May 28th)
+
+* Fix nasty formatting bug that broke XML (@bhicks)
+
 ## 0.10.0 (May 24th)
 
 * Fix typo in readme about new options (@PikachuEXE)

data/fixtures/rails3_2/test/functional/posts_controller_test.rb

@@ -221,19 +221,18 @@ context "PostsController" do
       end.equals { @posts.map{ |p| cache_hit([p, nil, 'hash'])[:title] } }
     end # index action, caching, json
 
-    # TODO make this work again
-    # context "for index action with caching in xml" do
-    #   setup do
-    #     get "/posts", format: :xml
-    #   end
-
-    #   asserts("contains post titles") do
-    #     doc = REXML::Document.new topic.body
-    #     doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
-    #   end.equals { @posts.map(&:title) }
-
-    #   asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml'] }
-    # end # index action, caching, xml
+    context "for index action with caching in xml" do
+      setup do
+        get "/posts", format: :xml
+      end
+
+      asserts("contains post titles") do
+        doc = REXML::Document.new topic.body
+        doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
+      end.equals { @posts.map(&:title) }
+
+      asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml'] }
+    end # index action, caching, xml
 
     context "for show action with caching" do
       setup do

data/fixtures/rails4/test/functional/posts_controller_test.rb

@@ -206,19 +206,18 @@ context "PostsController" do
       end.equals { @posts.map { |p| cache_hit([p, nil, 'hash', 'e373525f49a3b3b044af05255e84839d'])[:title] } }
     end # index action, caching, json
 
-    # TODO make this work again
-    # context "for index action with caching in xml" do
-    #   setup do
-    #     get "/posts", format: :xml
-    #   end
-
-    #   asserts("contains post titles") do
-    #     doc = REXML::Document.new topic.body
-    #     doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
-    #   end.equals { @posts.map(&:title) }
-
-    #   asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml', 'e83f65eee5ffb454c418a59105f222c4'] }
-    # end # index action, caching, xml
+    context "for index action with caching in xml" do
+      setup do
+        get "/posts", format: :xml
+      end
+
+      asserts("contains post titles") do
+        doc = REXML::Document.new topic.body
+        doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
+      end.equals { @posts.map(&:title) }
+
+      asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml', 'e83f65eee5ffb454c418a59105f222c4'] }
+    end # index action, caching, xml
 
     context "for show action with caching" do
       setup do

data/lib/rabl/engine.rb

@@ -269,7 +269,6 @@ module Rabl
       @_options[:extends] = []
       @_options[:root_name]  = nil
       @_options[:scope] = scope
-      @_options[:format] ||= self.request_format
     end
 
     # Caches the results of the block based on object cache_key
@@ -315,6 +314,7 @@ module Rabl
     def set_instance_variables!(scope, locals, &block)
       @_locals, @_scope = locals, scope
       self.copy_instance_variables_from(@_scope, [:@assigns, :@helpers])
+      @_options[:format] ||= self.request_format
       set_locals(locals)
       set_source(locals, &block)
     end

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/test/engine_test.rb

@@ -23,6 +23,30 @@ context "Rabl::Engine" do
     asserts_topic.assigns :_view_path
   end
 
+  context "#request_format" do
+    context "is json by default" do
+      setup do
+        template = RablTemplate.new("code") { "" }
+        template.render(Object.new)
+        engine = template.instance_eval('@engine')
+        engine.instance_eval('@_options')[:format]
+      end
+
+      asserts_topic.equals('json')
+    end
+
+    context "with a specified format" do
+      setup do
+        template = RablTemplate.new("code", format: 'xml') { "" }
+        template.render(Object.new)
+        engine = template.instance_eval('@engine')
+        engine.instance_eval('@_options')[:format]
+      end
+
+      asserts_topic.equals('xml')
+    end
+  end
+
   context "#cache" do
     context "with cache" do
       setup do

data/test/integration/rails3_2/posts_controller_test.rb

@@ -221,19 +221,18 @@ context "PostsController" do
       end.equals { @posts.map{ |p| cache_hit([p, nil, 'hash'])[:title] } }
     end # index action, caching, json
 
-    # TODO make this work again
-    # context "for index action with caching in xml" do
-    #   setup do
-    #     get "/posts", format: :xml
-    #   end
-
-    #   asserts("contains post titles") do
-    #     doc = REXML::Document.new topic.body
-    #     doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
-    #   end.equals { @posts.map(&:title) }
-
-    #   asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml'] }
-    # end # index action, caching, xml
+    context "for index action with caching in xml" do
+      setup do
+        get "/posts", format: :xml
+      end
+
+      asserts("contains post titles") do
+        doc = REXML::Document.new topic.body
+        doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
+      end.equals { @posts.map(&:title) }
+
+      asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml'] }
+    end # index action, caching, xml
 
     context "for show action with caching" do
       setup do

data/test/integration/rails4/posts_controller_test.rb

@@ -206,19 +206,18 @@ context "PostsController" do
       end.equals { @posts.map { |p| cache_hit([p, nil, 'hash', 'e373525f49a3b3b044af05255e84839d'])[:title] } }
     end # index action, caching, json
 
-    # TODO make this work again
-    # context "for index action with caching in xml" do
-    #   setup do
-    #     get "/posts", format: :xml
-    #   end
-
-    #   asserts("contains post titles") do
-    #     doc = REXML::Document.new topic.body
-    #     doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
-    #   end.equals { @posts.map(&:title) }
-
-    #   asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml', 'e83f65eee5ffb454c418a59105f222c4'] }
-    # end # index action, caching, xml
+    context "for index action with caching in xml" do
+      setup do
+        get "/posts", format: :xml
+      end
+
+      asserts("contains post titles") do
+        doc = REXML::Document.new topic.body
+        doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
+      end.equals { @posts.map(&:title) }
+
+      asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml', 'e83f65eee5ffb454c418a59105f222c4'] }
+    end # index action, caching, xml
 
     context "for show action with caching" do
       setup do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -152,7 +152,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- TODO
 - examples/base.json.rabl
 - examples/demo.json.rabl
 - examples/inherited.json.rabl

data/TODO

@@ -1 +0,0 @@
-= TODO