rabl-rails 0.4.3 → 0.5.0

data/test/test_helpers.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'set'
 
-class TestHelpers < MINITEST_TEST_CLASS
+class TestHelpers < Minitest::Test
   include RablRails::Helpers
 
   def test_collection_with_default

data/test/test_library.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestLibrary < MINITEST_TEST_CLASS
+class TestLibrary < Minitest::Test
   RablRails::Library.send(:attr_reader, :cached_templates)
 
   describe 'library' do
@@ -62,7 +62,7 @@ class TestLibrary < MINITEST_TEST_CLASS
 
       it 'compiles source without caching it if options is not set' do
         @context.virtual_path = 'users/base'
-        template = with_configuration :cache_templates, false do
+        with_configuration :cache_templates, false do
           @library.compile_template_from_source("attribute :id", @context)
         end
 
@@ -70,4 +70,4 @@ class TestLibrary < MINITEST_TEST_CLASS
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Christopher Cocchi-Perrier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,57 +16,71 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
   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
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+description: Fast Rails 4+ templating system with JSON, XML and PList support
 email:
 - cocchi.c@gmail.com
 executables: []
@@ -83,6 +97,7 @@ files:
 - lib/rabl-rails.rb
 - lib/rabl-rails/compiler.rb
 - lib/rabl-rails/configuration.rb
+- lib/rabl-rails/exceptions.rb
 - lib/rabl-rails/handler.rb
 - lib/rabl-rails/helpers.rb
 - lib/rabl-rails/library.rb
@@ -91,15 +106,13 @@ files:
 - lib/rabl-rails/nodes/child.rb
 - lib/rabl-rails/nodes/code.rb
 - lib/rabl-rails/nodes/condition.rb
+- lib/rabl-rails/nodes/extend.rb
 - lib/rabl-rails/nodes/glue.rb
-- lib/rabl-rails/nodes/node.rb
 - lib/rabl-rails/railtie.rb
-- lib/rabl-rails/renderer.rb
 - lib/rabl-rails/renderers/hash.rb
 - lib/rabl-rails/renderers/json.rb
 - lib/rabl-rails/renderers/plist.rb
 - lib/rabl-rails/renderers/xml.rb
-- lib/rabl-rails/responder.rb
 - lib/rabl-rails/template.rb
 - lib/rabl-rails/version.rb
 - lib/rabl-rails/visitors.rb
@@ -117,7 +130,6 @@ files:
 - test/test_hash_visitor.rb
 - test/test_helpers.rb
 - test/test_library.rb
-- test/test_render.rb
 homepage: https://github.com/ccocchi/rabl-rails
 licenses:
 - MIT
@@ -130,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -138,10 +150,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
-summary: Fast Rails 3+ templating system with JSON, XML and PList support
+summary: Fast Rails 4+ templating system with JSON, XML and PList support
 test_files:
 - test/helper.rb
 - test/renderers/test_hash_renderer.rb
@@ -153,4 +165,3 @@ test_files:
 - test/test_hash_visitor.rb
 - test/test_helpers.rb
 - test/test_library.rb
-- test/test_render.rb

data/lib/rabl-rails/nodes/node.rb

@@ -1,9 +0,0 @@
-module RablRails
-  module Nodes
-    module Node
-      def accept(visitor)
-        visitor.visit(self)
-      end
-    end
-  end
-end

data/lib/rabl-rails/renderer.rb

@@ -1,97 +0,0 @@
-require 'rabl-rails/renderers/hash'
-require 'rabl-rails/renderers/json'
-require 'rabl-rails/renderers/xml'
-require 'rabl-rails/renderers/plist'
-
-module RablRails
-  module Renderer
-    class TemplateNotFound < StandardError; end
-    class PartialError < StandardError; end
-
-    class LookupContext
-      T = Struct.new(:source)
-
-      def initialize(view_path, format)
-        @view_path = view_path || 'app/views'
-        @format = format.downcase
-      end
-
-      def rendered_format
-        @format.to_sym
-      end
-
-      #
-      # Manually find given rabl template file with given format.
-      # View path can be set via options, otherwise default Rails
-      # path is used
-      #
-      def find_template(name, opt, partial = false)
-        paths = Dir["#@view_path/#{name}{.#@format,}.rabl"]
-        file_path = paths.find { |path| File.exist?(path) }
-
-        if file_path
-          T.new(File.read(file_path))
-        else
-          raise TemplateNotFound
-        end
-      end
-    end
-
-    #
-    # Context class to emulate normal Rails view
-    # context
-    #
-    class ViewContext
-      attr_reader :format
-
-      def initialize(path, options)
-        @virtual_path = path
-        @format = options.delete(:format) || :json
-        @_assigns = {}
-        @options = options
-
-        options[:locals].each { |k, v| @_assigns[k.to_s] = v } if options[:locals]
-      end
-
-      def assigns
-        @_assigns
-      end
-
-      def params
-        { format: format }
-      end
-
-      def lookup_context
-        @lookup_context ||= LookupContext.new(@options[:view_path], format)
-      end
-    end
-
-    #
-    # Renders object with the given rabl template.
-    #
-    # Object can also be passed as an option :
-    # { locals: { object: obj_to_render } }
-    #
-    # Default render format is JSON, but can be changed via
-    # an option: { format: 'xml' }
-    #
-    # If template includes uses of instance variables (usually
-    # defined in the controller), you can passed them as locals
-    # options.
-    # For example, if you have this template:
-    #   object :@user
-    #   node(:read) { |u| u.has_read?(@post) }
-    #
-    # Your method call should look like this:
-    #   RablRails.render(user, 'users/show', locals: { post: Post.new })
-    #
-    def render(object, template, options = {})
-      object = options[:locals].delete(:object) if !object && options[:locals]
-
-      c = ViewContext.new(template, options)
-      t = c.lookup_context.find_template(template, [], false)
-
-      Library.instance.get_rendered_template(t.source, c, resource: object)
-    end
-  end
-end

data/lib/rabl-rails/responder.rb

@@ -1,47 +0,0 @@
-module RablRails
-  #
-  # Override default responder's api behavior to not
-  # user to_format methods on a resource as a default
-  # representation but instead use a rabl template
-  #
-  class Responder < ActionController::Responder
-    def initialize(controller, resources, options = {})
-      super
-      if options[:locals]
-        options[:locals][:resource] = resource
-      else
-        options[:locals] = { resource: resource }
-      end
-    end
-
-    def to_format
-      if get? || response_overridden?
-        default_render
-      elsif has_errors?
-        display_errors
-      else
-        api_behavior
-      end
-    end
-
-    protected
-
-    def api_behavior
-      if post?
-        template = if controller.respond_to?(:responder_default_template, true)
-          controller.send(:responder_default_template)
-        else
-          RablRails.configuration.responder_default_template
-        end
-        options[:prefixes] = controller._prefixes
-        options[:template] ||= template
-
-        controller.default_render options.merge(status: :created)
-      else
-        head :no_content
-      end
-    rescue ActionView::MissingTemplate => e
-      super
-    end
-  end
-end

data/test/test_render.rb

@@ -1,86 +0,0 @@
-require 'helper'
-require 'pathname'
-require 'tmpdir'
-
-class TestRender < MINITEST_TEST_CLASS
-  @@tmp_path = Pathname.new(Dir.mktmpdir)
-
-  def setup
-    @user = User.new(1, 'Marty')
-    @tmp_path = @@tmp_path
-  end
-
-  def test_object_as_option
-    File.open(@tmp_path + "nil.json.rabl", "w") do |f|
-      f.puts %q{
-        object :@user
-        attributes :name
-      }
-    end
-    assert_equal %q({"user":{"name":"Marty"}}), RablRails.render(nil, 'nil', locals: { object: @user }, view_path: @tmp_path)
-  end
-
-  def test_load_source_from_file
-    File.open(@tmp_path + "show.json.rabl", "w") do |f|
-      f.puts %q{
-        object :@user
-        attributes :id, :name
-      }
-    end
-    assert_equal %q({"user":{"id":1,"name":"Marty"}}), RablRails.render(@user, 'show', view_path: @tmp_path)
-  end
-
-  def test_template_not_found
-    assert_raises(RablRails::Renderer::TemplateNotFound) { RablRails.render(@user, 'not_found') }
-  end
-
-  def test_with_locals_options
-    File.open(@tmp_path + "instance.json.rabl", "w") do |f|
-      f.puts %q{
-        object false
-        node(:username) { |_| @user.name }
-      }
-    end
-    assert_equal %q({"username":"Marty"}), RablRails.render(nil, 'instance', view_path: @tmp_path, locals: { user: @user })
-  end
-
-  def test_extend_with_view_path
-    File.open(@tmp_path + "extend.json.rabl", "w") do |f|
-      f.puts %q{
-        object :@user
-        extends 'base'
-      }
-    end
-
-    File.open(@tmp_path + "base.json.rabl", "w") do |f|
-      f.puts %q{
-        attribute :name, as: :extended_name
-      }
-    end
-
-    assert_equal %q({"user":{"extended_name":"Marty"}}), RablRails.render(@user, 'extend', view_path: @tmp_path)
-  end
-
-  def test_format_as_symbol_or_string
-    File.open(@tmp_path + "show.json.rabl", "w") do |f|
-      f.puts %q{
-        object :@user
-        attributes :id, :name
-      }
-    end
-
-    assert_equal %q({"user":{"id":1,"name":"Marty"}}), RablRails.render(@user, 'show', view_path: @tmp_path, format: :json)
-    assert_equal %q({"user":{"id":1,"name":"Marty"}}), RablRails.render(@user, 'show', view_path: @tmp_path, format: 'json')
-    assert_equal %q({"user":{"id":1,"name":"Marty"}}), RablRails.render(@user, 'show', view_path: @tmp_path, format: 'JSON')
-  end
-
-  def test_format_omitted
-    File.open(@tmp_path + "show.rabl", "w") do |f|
-      f.puts %q{
-        object :@user
-        attributes :id, :name
-      }
-    end
-    assert_equal %q({"user":{"id":1,"name":"Marty"}}), RablRails.render(@user, 'show', view_path: @tmp_path)
-  end
-end