rabl-rails 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2874d3a8bc282b5f68501b4b20a238a764a7a50e
-  data.tar.gz: 84d6d590864951016038bee486096ef7637efc5f
+  metadata.gz: dfd78996e96f1bf4dc99f2ffe80c69b57e1d7c72
+  data.tar.gz: e7c0c4bcf0d10beba1a814962ac15fd5c55434e7
 SHA512:
-  metadata.gz: 6022f49acacdc484fc278c2e770db3f418f89602c17821d83e06339c824228fe4990e37aa9e197cf402155caad62fd35474ac522d2b13aff71e537e13708ed8e
-  data.tar.gz: cfbc8c2ae6a2f39a1202ec502c6a4fa1d7d0a39952633ac6f27375865ef764f974cfa438168c49d623833816ca71b33dcfe583b482542a0e4d6679f5c71380d8
+  metadata.gz: b75c2a1b05cd16037797aa5a2eedb63041be6e0670cef0e0658cadd709e514e96d718d52f6d4e7b616873e91e280439eb08f7a09c4409eebc65ebe5c95f8a704
+  data.tar.gz: 87a2345a2b7b02dda10ceadfedbe6e231f3af9fd365fd4ab4d35019184ce7318420d5c92cb02b0013b2a591d0f6765c24cc75b50ea5cf4258d161665fd28bd76

data/.gitignore

@@ -8,3 +8,5 @@ rdoc
 pkg
 Gemfile.lock
 
+.ruby-version
+.byebug_history

data/.travis.yml

@@ -9,4 +9,6 @@ rvm:
   - jruby-19mode
   - rbx-2
   - 2.0.0
-  - 2.1.0
+  - 2.1.8
+before_install:
+  - gem update bundler

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.4.3
+  * Fix custom responder compatibility with responders 2.1 (itkin)
+  * Fix bug when template was already loaded by ActionView and causing a nil
+    error
+
 ## 0.4.2
   * Allow to pass locals to partials
   * Add condition to `attributes`
@@ -78,7 +83,6 @@
   * Warning message printed on logger when JSON engine fail to load
 
 ## 0.1.1
-
   * Add CHANGELOG
   * Remove unused test in loop
   * Speed up rendering by not double copying variable from context

data/Gemfile

@@ -20,6 +20,11 @@ gem 'railties', rails
 
 group :test do
   gem 'minitest', minitest_version
+  gem 'actionpack', rails
+
+  if rails_version > '4.0.0'
+    gem 'actionview', rails
+  end
 end
 
 gem 'plist'

data/README.md

@@ -279,7 +279,7 @@ end
 
 # user.json.rabl
 merge { |u| partial('users/base', object: u, locals: { display_credit_card: true }) }
-
+```
 
 ### Nesting
 

data/lib/rabl-rails/configuration.rb

@@ -50,4 +50,4 @@ module RablRails
       end
     end
   end
-end
+end

data/lib/rabl-rails/library.rb

@@ -68,7 +68,9 @@ module RablRails
     end
 
     def fetch_source(path, view)
-      view.lookup_context.find_template(path, [], false).source
+      t = view.lookup_context.find_template(path, [], false)
+      t = t.refresh(view) unless t.source
+      t.source
     end
   end
-end
+end

data/lib/rabl-rails/railtie.rb

@@ -5,5 +5,9 @@ module RablRails
         ActionView::Template.register_template_handler :rabl, RablRails::Handlers::Rabl
       end
     end
+
+    config.after_initialize do
+      ActionController::Base.responder = RablRails::Responder if RablRails.configuration.use_custom_responder
+    end
   end
-end
+end

data/lib/rabl-rails/renderer.rb

@@ -27,7 +27,7 @@ module RablRails
       #
       def find_template(name, opt, partial = false)
         paths = Dir["#@view_path/#{name}{.#@format,}.rabl"]
-        file_path = paths.find { |path| File.exists?(path) }
+        file_path = paths.find { |path| File.exist?(path) }
 
         if file_path
           T.new(File.read(file_path))
@@ -94,4 +94,4 @@ module RablRails
       Library.instance.get_rendered_template(t.source, c, resource: object)
     end
   end
-end
+end

data/lib/rabl-rails/responder.rb

@@ -20,13 +20,13 @@ module RablRails
       elsif has_errors?
         display_errors
       else
-        api_behavior(nil)
+        api_behavior
       end
     end
 
     protected
 
-    def api_behavior(error)
+    def api_behavior
       if post?
         template = if controller.respond_to?(:responder_default_template, true)
           controller.send(:responder_default_template)
@@ -41,7 +41,7 @@ module RablRails
         head :no_content
       end
     rescue ActionView::MissingTemplate => e
-      super(e)
+      super
     end
   end
-end
+end

data/lib/rabl-rails/version.rb

@@ -1,3 +1,3 @@
 module RablRails
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/rabl-rails.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/ccocchi/rabl-rails"
   s.summary     = "Fast Rails 3+ templating system with JSON, XML and PList support"
   s.description = "Fast Rails 3+ templating system with JSON, XML and PList support"
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")
@@ -18,4 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>= 3.1'
   s.add_dependency 'railties', '>= 3.1'
   s.add_dependency 'thread_safe', '~> 0.3.1'
+
+  s.add_development_dependency 'actionpack', '>= 3.1'
 end

data/test/helper.rb

@@ -7,6 +7,9 @@ require 'minitest/autorun'
 
 require 'rabl-rails'
 require 'plist'
+require 'action_dispatch/http/mime_type'
+require 'action_view'
+require 'active_support/core_ext/string/starts_ends_with'
 
 if RUBY_ENGINE == 'jruby'
   require 'nokogiri'
@@ -20,6 +23,8 @@ else
   Minitest::Unit::TestCase
 end
 
+ActionView::Template.register_template_handler :rabl, RablRails::Handlers::Rabl
+
 module Configurable
   def with_configuration(key, value)
     accessor = "#{key}="
@@ -84,4 +89,4 @@ class User
     @id = id
     @name = name
   end
-end
+end

data/test/test_compiler.rb

@@ -1,13 +1,17 @@
 require 'helper'
+require 'pathname'
+require 'tmpdir'
 
 class TestCompiler < MINITEST_TEST_CLASS
+  @@tmp_path = Pathname.new(Dir.mktmpdir)
+
   describe 'compiler' do
     def extract_attributes(nodes)
       nodes.map(&:hash)
     end
 
     before do
-      @view = Context.new
+      @view     = ActionView::Base.new(@@tmp_path, {})
       @compiler = RablRails::Compiler.new(@view)
     end
 
@@ -155,13 +159,13 @@ class TestCompiler < MINITEST_TEST_CLASS
     end
 
     it "compiles child with inline partial notation" do
-      mock_template = RablRails::CompiledTemplate.new
-      mock_template.add_node(RablRails::Nodes::Attribute.new(id: :id))
-
-      t = RablRails::Library.instance.stub :compile_template_from_path, mock_template do
-        @compiler.compile_source(%{child(:user, :partial => 'users/base') })
+      File.open(@@tmp_path + 'user.rabl', 'w') do |f|
+        f.puts %q{
+          attributes :id
+        }
       end
 
+      t = @compiler.compile_source(%{child(:user, :partial => 'user') })
       child_node = t.nodes.first
 
       assert_equal(:user, child_node.name)
@@ -202,32 +206,40 @@ class TestCompiler < MINITEST_TEST_CLASS
     end
 
     it "extends other template" do
-      template = RablRails::CompiledTemplate.new
-      template.add_node RablRails::Nodes::Attribute.new(id: :id)
-
-      library = MiniTest::Mock.new
-      library.expect :compile_template_from_path, template, ['users/base', @view]
-
-      t = RablRails::Library.stub :instance, library do
-        @compiler.compile_source(%{ extends 'users/base' })
+      File.open(@@tmp_path + 'user.rabl', 'w') do |f|
+        f.puts %q{
+          attributes :id
+        }
       end
+      t = @compiler.compile_source(%{ extends 'user' })
       assert_equal([{ :id => :id }], extract_attributes(t.nodes))
-      library.verify
     end
 
     it "compiles extend without overwriting nodes previously defined" do
-      template = RablRails::CompiledTemplate.new
-      template.add_node(RablRails::Nodes::Condition.new(->{ true }, ->{ 'foo' }))
-
-      t = RablRails::Library.instance.stub :compile_template_from_path, template do
-        @compiler.compile_source(%{
-          condition(-> { false }) { 'bar' }
-          extends('users/xtnd')
-        })
+      File.open(@@tmp_path + 'xtnd.rabl', 'w') do |f|
+        f.puts %q{
+          condition(-> { true }) { 'foo' }
+        }
       end
+      t = @compiler.compile_source(%{
+        condition(-> { false }) { 'bar' }
+        extends 'xtnd'
+      })
       assert_equal(2, t.nodes.size)
     end
 
+    it "extends template that has been compiled previously by ActionView" do
+      File.open(@@tmp_path + 'user.rabl', 'w') do |f|
+        f.puts %q{
+          attributes :id
+        }
+      end
+      t = @view.lookup_context.find_template('user')
+      t.send(:compile!, @view)
+      t = @compiler.compile_source(%{ extends 'user' })
+      assert_equal([{ :id => :id }], extract_attributes(t.nodes))
+    end
+
     it "compiles node" do
       t = @compiler.compile_source(%{ node(:foo) { bar } })
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Christopher Cocchi-Perrier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: Fast Rails 3+ templating system with JSON, XML and PList support
 email:
 - cocchi.c@gmail.com
@@ -105,7 +119,8 @@ files:
 - test/test_library.rb
 - test/test_render.rb
 homepage: https://github.com/ccocchi/rabl-rails
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -123,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fast Rails 3+ templating system with JSON, XML and PList support
@@ -139,4 +154,3 @@ test_files:
 - test/test_helpers.rb
 - test/test_library.rb
 - test/test_render.rb
-has_rdoc: