grape-rabl 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d621405f4d7c383ff47dea4a2db866618aaeff12
-  data.tar.gz: 3ec7ec4c04e7bd20a390fa55acba8ac84171e6d2
+  metadata.gz: c4a8470660f6399543eefa3e7f27972b76b8f0cc
+  data.tar.gz: 3493ecbd9a3b87e659ae004a312a2d473f5cdd26
 SHA512:
-  metadata.gz: 66582082999fe94194742f88ba1d4644dcce4dd83717403ea0202a45544c114f6a1e47c2358205c7d951509bee9771a43501ae8e7ad5684b39f1eadcd0584a42
-  data.tar.gz: 399b670fd1ac71cac4b0b4fe40006274dbe58b878ffe95a031f7b172a354fe2013aea1d725c6348e7e589c96c8128b7b677d5d80a6592b169b2ea1e323576e86
+  metadata.gz: 6c22e0830abc4a6a8793109f432123b1897a35d4c94c0c863446497ef8cc769373f032f2c32272a73b062c6897960f5fc7b28172cbf2b1da62c8893fa7bbedd9
+  data.tar.gz: 9cfd783255db7b1288f30133052c78130d62d8101bff90c15f763ed88d99dd31ee55400551acc141930daa5b53e58fad93b4832a15c019f1a6628eb8af61e711

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+#### v0.4.0
+
+* Make grape-rabl thread-safe. [#37](https://github.com/LTe/grape-rabl/issues/37) [@kushkella](https://github.com/kushkella)
+
 #### v0.3.1
 
 * The `render` method will no longer modify endpoint options at runtime. [#35](https://github.com/LTe/grape-rabl/issues/35) [@yesmeck](https://github.com/yesmeck)

data/lib/grape-rabl/formatter.rb

@@ -1,86 +1,88 @@
 require 'json'
 
 module Grape
-  module Formatter
-    module Rabl
+  module Rabl
+    class Formatter
       class << self
-        attr_reader :env
-        attr_reader :endpoint
+        def tilt_cache
+          @tilt_cache ||= ::Tilt::Cache.new
+        end
+      end
 
-        def call(object, env)
-          @env = env
-          @endpoint = env['api.endpoint']
+      attr_reader :env, :endpoint, :object
 
-          if rablable?
-            rabl do |template|
-              engine = tilt_template(template)
-              output = engine.render endpoint, locals
-              if layout_template
-                layout_template.render(endpoint) { output }
-              else
-                output
-              end
+      def initialize(object, env)
+        @env      = env
+        @endpoint = env['api.endpoint']
+        @object   = object
+      end
+
+      def render
+        if rablable?
+          rabl do |template|
+            engine = tilt_template(template)
+            output = engine.render endpoint, locals
+            if layout_template
+              layout_template.render(endpoint) { output }
+            else
+              output
             end
-          else
-            Grape::Formatter::Json.call object, env
           end
+        else
+          Grape::Formatter::Json.call object, env
         end
+      end
 
-        private
-
-        def view_path(template)
-          if template.split('.')[-1] == 'rabl'
-            File.join(env['api.tilt.root'], template)
-          else
-            File.join(env['api.tilt.root'], (template + '.rabl'))
-          end
-        end
+      private
 
-        def rablable?
-          !!rabl_template
+      def view_path(template)
+        if template.split('.')[-1] == 'rabl'
+          File.join(env['api.tilt.root'], template)
+        else
+          File.join(env['api.tilt.root'], (template + '.rabl'))
         end
+      end
 
-        def rabl
-          fail 'missing rabl template' unless rabl_template
-          set_view_root unless env['api.tilt.root']
-          yield rabl_template
-        end
+      def rablable?
+        !!rabl_template
+      end
 
-        def locals
-          env['api.tilt.rabl_locals'] || endpoint.options[:route_options][:rabl_locals] || {}
-        end
+      def rabl
+        fail 'missing rabl template' unless rabl_template
+        set_view_root unless env['api.tilt.root']
+        yield rabl_template
+      end
 
-        def rabl_template
-          env['api.tilt.rabl'] || endpoint.options[:route_options][:rabl]
-        end
+      def locals
+        env['api.tilt.rabl_locals'] || endpoint.options[:route_options][:rabl_locals] || {}
+      end
 
-        def set_view_root
-          fail "Use Rack::Config to set 'api.tilt.root' in config.ru"
-        end
+      def rabl_template
+        env['api.tilt.rabl'] || endpoint.options[:route_options][:rabl]
+      end
 
-        def tilt_template(template)
-          if Grape::Rabl.configuration.cache_template_loading
-            tilt_cache.fetch(template) { ::Tilt.new(view_path(template), tilt_options) }
-          else
-            ::Tilt.new(view_path(template), tilt_options)
-          end
-        end
+      def set_view_root
+        fail "Use Rack::Config to set 'api.tilt.root' in config.ru"
+      end
 
-        def tilt_cache
-          @tilt_cache ||= ::Tilt::Cache.new
+      def tilt_template(template)
+        if Grape::Rabl.configuration.cache_template_loading
+          Grape::Rabl::Formatter.tilt_cache.fetch(template) { ::Tilt.new(view_path(template), tilt_options) }
+        else
+          ::Tilt.new(view_path(template), tilt_options)
         end
+      end
 
-        def tilt_options
-          { format: env['api.format'], view_path: env['api.tilt.root'] }
-        end
+      def tilt_options
+        { format: env['api.format'], view_path: env['api.tilt.root'] }
+      end
 
-        def layout_template
-          layout_path = view_path(env['api.tilt.layout'] || 'layouts/application')
-          if Grape::Rabl.configuration.cache_template_loading
-            tilt_cache.fetch(layout_path) { ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path) }
-          else
-            ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path)
-          end
+      def layout_template
+        layout_path = view_path(env['api.tilt.layout'] || 'layouts/application')
+        if Grape::Rabl.configuration.cache_template_loading
+          Grape::Rabl::Formatter.tilt_cache.fetch(layout_path) { ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path) }
+        else
+          ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path)
         end
       end
     end

data/lib/grape-rabl/render.rb

@@ -1,10 +1,12 @@
-module GrapeRabl
-  module Render
-    def render(options = {})
-      env['api.tilt.rabl'] = options[:rabl]
-      env['api.tilt.rabl_locals'] = options[:locals]
+module Grape
+  module Rabl
+    module Render
+      def render(options = {})
+        env['api.tilt.rabl'] = options[:rabl]
+        env['api.tilt.rabl_locals'] = options[:locals]
+      end
     end
   end
 end
 
-Grape::Endpoint.send(:include, GrapeRabl::Render)
+Grape::Endpoint.send(:include, Grape::Rabl::Render)

data/lib/grape-rabl/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Rabl
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/lib/grape/rabl.rb

@@ -1 +1,13 @@
 require 'grape-rabl'
+
+module Grape
+  module Formatter
+    module Rabl
+      class << self
+        def call(object, env)
+          Grape::Rabl::Formatter.new(object, env).render
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: grape-rabl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Niełacny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Use rabl in grape
@@ -73,11 +73,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -116,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Use rabl in grape