rabl 0.13.0 → 0.13.1

data/lib/rabl/digestor/rails3.rb

@@ -0,0 +1,10 @@
+module Rabl
+  class Digestor < ActionView::Digestor
+    def self.digest(name, format, finder, options = {})
+      cache_key = [name, format] + Array.wrap(options[:dependencies])
+      @@cache[cache_key.join('.')] ||= begin
+        Digestor.new(name, format, finder, options).digest
+      end
+    end
+  end
+end

data/lib/rabl/digestor/rails41.rb

@@ -0,0 +1,10 @@
+module Rabl
+  class Digestor < ActionView::Digestor
+    def self.digest(options = {})
+      cache_key = [options[:name]] + Array.wrap(options[:dependencies])
+      @@cache[cache_key.join('.')] ||= begin
+        Digestor.new({ :name => options[:name], :finder => options[:finder] }.merge!(options)).digest
+      end
+    end
+  end
+end

data/lib/rabl/digestor/rails5.rb

@@ -0,0 +1,4 @@
+module Rabl
+  class Digestor < ActionView::Digestor
+  end
+end

data/lib/rabl/engine.rb

@@ -417,5 +417,5 @@ module Rabl
           instance_eval(@_source)
         end
       end
-    end
+  end
 end

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -194,11 +194,14 @@ files:
 - fixtures/padrino_test/app/controllers/users.rb
 - fixtures/padrino_test/app/helpers/posts_helper.rb
 - fixtures/padrino_test/app/helpers/users_helper.rb
+- fixtures/padrino_test/app/views
 - fixtures/padrino_test/config.ru
 - fixtures/padrino_test/config/apps.rb
 - fixtures/padrino_test/config/boot.rb
 - fixtures/padrino_test/config/database.rb
+- fixtures/padrino_test/db/migrate
 - fixtures/padrino_test/db/schema.rb
+- fixtures/padrino_test/models
 - fixtures/padrino_test/public/favicon.ico
 - fixtures/padrino_test/test/app/controllers/posts_controller_test.rb
 - fixtures/padrino_test/test/app/controllers/users_controller_test.rb
@@ -213,6 +216,8 @@ files:
 - fixtures/rails2/app/helpers/application_helper.rb
 - fixtures/rails2/app/helpers/posts_helper.rb
 - fixtures/rails2/app/helpers/users_helper.rb
+- fixtures/rails2/app/models
+- fixtures/rails2/app/views
 - fixtures/rails2/config/boot.rb
 - fixtures/rails2/config/database.yml
 - fixtures/rails2/config/environment.rb
@@ -228,6 +233,7 @@ files:
 - fixtures/rails2/config/locales/en.yml
 - fixtures/rails2/config/preinitializer.rb
 - fixtures/rails2/config/routes.rb
+- fixtures/rails2/db/migrate
 - fixtures/rails2/db/schema.rb
 - fixtures/rails2/db/seeds.rb
 - fixtures/rails2/public/404.html
@@ -256,6 +262,8 @@ files:
 - fixtures/rails3/app/controllers/application_controller.rb
 - fixtures/rails3/app/controllers/posts_controller.rb
 - fixtures/rails3/app/controllers/users_controller.rb
+- fixtures/rails3/app/models
+- fixtures/rails3/app/views
 - fixtures/rails3/config.ru
 - fixtures/rails3/config/application.rb
 - fixtures/rails3/config/boot.rb
@@ -271,6 +279,7 @@ files:
 - fixtures/rails3/config/initializers/session_store.rb
 - fixtures/rails3/config/locales/en.yml
 - fixtures/rails3/config/routes.rb
+- fixtures/rails3/db/migrate
 - fixtures/rails3/db/seeds.rb
 - fixtures/rails3/lib/tasks/.gitkeep
 - fixtures/rails3/public/404.html
@@ -303,6 +312,8 @@ files:
 - fixtures/rails3_2/app/helpers/posts_helper.rb
 - fixtures/rails3_2/app/helpers/users_helper.rb
 - fixtures/rails3_2/app/mailers/.gitkeep
+- fixtures/rails3_2/app/models
+- fixtures/rails3_2/app/views
 - fixtures/rails3_2/config.ru
 - fixtures/rails3_2/config/application.rb
 - fixtures/rails3_2/config/boot.rb
@@ -319,6 +330,7 @@ files:
 - fixtures/rails3_2/config/initializers/wrap_parameters.rb
 - fixtures/rails3_2/config/locales/en.yml
 - fixtures/rails3_2/config/routes.rb
+- fixtures/rails3_2/db/migrate
 - fixtures/rails3_2/db/schema.rb
 - fixtures/rails3_2/db/seeds.rb
 - fixtures/rails3_2/doc/README_FOR_APP
@@ -360,6 +372,8 @@ files:
 - fixtures/rails4/app/controllers/users_controller.rb
 - fixtures/rails4/app/helpers/application_helper.rb
 - fixtures/rails4/app/mailers/.keep
+- fixtures/rails4/app/models
+- fixtures/rails4/app/views
 - fixtures/rails4/bin/bundle
 - fixtures/rails4/bin/rails
 - fixtures/rails4/bin/rake
@@ -380,6 +394,7 @@ files:
 - fixtures/rails4/config/initializers/wrap_parameters.rb
 - fixtures/rails4/config/locales/en.yml
 - fixtures/rails4/config/routes.rb
+- fixtures/rails4/db/migrate
 - fixtures/rails4/db/seeds.rb
 - fixtures/rails4/lib/assets/.keep
 - fixtures/rails4/lib/tasks/.keep
@@ -400,18 +415,99 @@ files:
 - fixtures/rails4/test/test_helper.rb
 - fixtures/rails4/vendor/assets/javascripts/.keep
 - fixtures/rails4/vendor/assets/stylesheets/.keep
+- fixtures/rails5/.gitignore
+- fixtures/rails5/Gemfile
+- fixtures/rails5/README.md
+- fixtures/rails5/Rakefile
+- fixtures/rails5/app/assets/config/manifest.js
+- fixtures/rails5/app/assets/images/.keep
+- fixtures/rails5/app/assets/javascripts/application.js
+- fixtures/rails5/app/assets/javascripts/cable.js
+- fixtures/rails5/app/assets/javascripts/channels/.keep
+- fixtures/rails5/app/assets/stylesheets/application.css
+- fixtures/rails5/app/channels/application_cable/channel.rb
+- fixtures/rails5/app/channels/application_cable/connection.rb
+- fixtures/rails5/app/controllers/application_controller.rb
+- fixtures/rails5/app/controllers/concerns/.keep
+- fixtures/rails5/app/controllers/posts_controller.rb
+- fixtures/rails5/app/controllers/users_controller.rb
+- fixtures/rails5/app/helpers/application_helper.rb
+- fixtures/rails5/app/jobs/application_job.rb
+- fixtures/rails5/app/mailers/application_mailer.rb
+- fixtures/rails5/app/models
+- fixtures/rails5/app/views
+- fixtures/rails5/bin/bundle
+- fixtures/rails5/bin/rails
+- fixtures/rails5/bin/rake
+- fixtures/rails5/bin/setup
+- fixtures/rails5/bin/spring
+- fixtures/rails5/bin/update
+- fixtures/rails5/config.ru
+- fixtures/rails5/config/application.rb
+- fixtures/rails5/config/boot.rb
+- fixtures/rails5/config/cable.yml
+- fixtures/rails5/config/database.yml
+- fixtures/rails5/config/environment.rb
+- fixtures/rails5/config/environments/development.rb
+- fixtures/rails5/config/environments/production.rb
+- fixtures/rails5/config/environments/test.rb
+- fixtures/rails5/config/initializers/application_controller_renderer.rb
+- fixtures/rails5/config/initializers/assets.rb
+- fixtures/rails5/config/initializers/backtrace_silencers.rb
+- fixtures/rails5/config/initializers/cookies_serializer.rb
+- fixtures/rails5/config/initializers/filter_parameter_logging.rb
+- fixtures/rails5/config/initializers/inflections.rb
+- fixtures/rails5/config/initializers/mime_types.rb
+- fixtures/rails5/config/initializers/new_framework_defaults.rb
+- fixtures/rails5/config/initializers/session_store.rb
+- fixtures/rails5/config/initializers/wrap_parameters.rb
+- fixtures/rails5/config/locales/en.yml
+- fixtures/rails5/config/puma.rb
+- fixtures/rails5/config/routes.rb
+- fixtures/rails5/config/secrets.yml
+- fixtures/rails5/config/spring.rb
+- fixtures/rails5/db/migrate
+- fixtures/rails5/db/schema.rb
+- fixtures/rails5/db/seeds.rb
+- fixtures/rails5/lib/assets/.keep
+- fixtures/rails5/lib/tasks/.keep
+- fixtures/rails5/log/.keep
+- fixtures/rails5/public/404.html
+- fixtures/rails5/public/422.html
+- fixtures/rails5/public/500.html
+- fixtures/rails5/public/apple-touch-icon-precomposed.png
+- fixtures/rails5/public/apple-touch-icon.png
+- fixtures/rails5/public/favicon.ico
+- fixtures/rails5/public/robots.txt
+- fixtures/rails5/test/controllers/.keep
+- fixtures/rails5/test/fixtures/.keep
+- fixtures/rails5/test/fixtures/files/.keep
+- fixtures/rails5/test/helpers/.keep
+- fixtures/rails5/test/integration/.keep
+- fixtures/rails5/test/mailers/.keep
+- fixtures/rails5/test/models/.keep
+- fixtures/rails5/test/test_helper.rb
+- fixtures/rails5/tmp/.keep
+- fixtures/rails5/vendor/assets/javascripts/.keep
+- fixtures/rails5/vendor/assets/stylesheets/.keep
 - fixtures/sinatra_test/Gemfile
 - fixtures/sinatra_test/Rakefile
 - fixtures/sinatra_test/app.rb
 - fixtures/sinatra_test/config.ru
+- fixtures/sinatra_test/db/migrate
+- fixtures/sinatra_test/models
 - fixtures/sinatra_test/test/functional/posts_controller_test.rb
 - fixtures/sinatra_test/test/functional/users_controller_test.rb
 - fixtures/sinatra_test/test/test_helper.rb
+- fixtures/sinatra_test/views
 - lib/rabl.rb
 - lib/rabl/builder.rb
 - lib/rabl/cache_engine.rb
 - lib/rabl/configuration.rb
 - lib/rabl/digestor.rb
+- lib/rabl/digestor/rails3.rb
+- lib/rabl/digestor/rails41.rb
+- lib/rabl/digestor/rails5.rb
 - lib/rabl/engine.rb
 - lib/rabl/helpers.rb
 - lib/rabl/multi_builder.rb
@@ -467,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rabl
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: General ruby templating with json, bson, xml and msgpack support

data/fixtures/ashared/views_rails_3/users/phone_number.xml.rabl

@@ -1,8 +0,0 @@
-attributes :prefix, :suffix, :area_code
-attributes :is_primary => :primary
-
-if locals[:reversed]
-  node(:reversed) { |n| n.formatted.reverse }
-else
-  node(:formatted) { |n| n.formatted }
-end

data/fixtures/padrino_test/test/app/controllers/posts_controller_test.rb

@@ -1,108 +0,0 @@
-# Lives in <rabl>/test/integration/posts_controller_test.rb
-# Symlinked to fixture applications
-
-begin # Padrino
-  require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
-rescue LoadError # Rails
-  require File.expand_path(File.dirname(__FILE__) + '/../test_helper.rb')
-end
-
-context "PostsController" do
-  helper(:json_output) { JSON.parse(last_response.body) }
-
-  setup do
-    create_users!
-    Post.delete_all
-    @post1 = Post.create(:title => "Foo", :body => "Bar", :user_id => @user1.id)
-    @post2 = Post.create(:title => "Baz", :body => "Bah", :user_id => @user2.id)
-    @post3 = Post.create(:title => "Kaz", :body => "Paz", :user_id => @user3.id)
-    @posts = [@post1, @post2, @post3]
-  end
-
-  context "for index action" do
-    setup do
-      get "/posts", :format => :json
-    end
-
-    # Attributes (regular)
-    asserts("contains post titles") do
-      json_output['articles'].map { |o| o["article"]["title"] }
-    end.equals { @posts.map(&:title) }
-
-    asserts("contains post bodies") do
-      json_output['articles'].map { |o| o["article"]["body"] }
-    end.equals { @posts.map(&:body) }
-
-    # Attributes (custom name)
-    asserts("contains post posted_at") do
-      json_output['articles'].map { |o| o["article"]["posted_at"] }
-    end.equals { @posts.map(&:created_at).map(&:iso8601) }
-
-    # Child
-    asserts("contains post user child username") do
-      json_output['articles'].map { |o| o["article"]["user"]["username"] }
-    end.equals { @posts.map(&:user).map(&:username) }
-
-    asserts("contains post user child role") do
-      json_output['articles'].map { |o| o["article"]["user"]["role"] }
-    end.equals { ["normal", "normal", "admin"] }
-
-    # Child Numbers of the Child User
-    asserts("contains post user child numbers") do
-      json_output['articles'].map { |o| o["article"]["user"]["pnumbers"][0]["pnumber"]["formatted"] }
-    end.equals { @posts.map(&:user).map(&:phone_numbers).map(&:first).map(&:formatted) }
-
-    # Glue (username to article)
-    asserts("contains glued usernames") do
-      json_output['articles'].map { |o| o["article"]["author_name"] }
-    end.equals { @posts.map(&:user).map(&:username) }
-
-    # Conditional Child (admin)
-    asserts("contains admin child only for admins") do
-      json_output['articles'].map { |o| o["article"]["admin"]["username"] if o["article"].has_key?("admin") }.compact
-    end.equals { [@user3.username] }
-
-    # Conditional Node (created_by_admin)
-    asserts("contains created_by_admin node for admins") do
-      json_output['articles'].last['article']['created_by_admin']
-    end.equals { true }
-
-    denies("contains no created_by_admin node for non-admins") do
-      json_output['articles'].first['article']
-    end.includes(:created_by_admin)
-  end # index action
-
-  context "for show action" do
-    setup do
-      get "/posts/#{@post1.id}", :format => :json
-      json_output['post']
-    end
-
-     # Attributes (regular)
-    asserts("contains post title") { topic['title'] }.equals { @post1.title }
-    asserts("contains post body")  { topic['body'] }.equals { @post1.body }
-
-    # Attributes (custom name)
-    asserts("contains post posted_at") { topic['posted_at'] }.equals { @post1.created_at.iso8601 }
-
-    # Child
-    asserts("contains post user child username") { topic["user"]["username"] }.equals { @post1.user.username }
-    asserts("contains post user child role") { topic["user"]["role"] }.equals { "normal" }
-
-    # Child Numbers of the Child User
-    asserts("contains post user child numbers") do
-      topic["user"]["pnumbers"][0]["pnumber"]["formatted"]
-    end.equals { @post1.user.phone_numbers[0].formatted }
-
-    # Glue (username to article)
-    asserts("contains glued username") { topic["author_name"] }.equals { @post1.user.username }
-
-    # Non-ORM Date Node Partial
-    context "for date node" do
-      setup { json_output['post']['created_date'] }
-      asserts("contains date partial with day")   { topic['day'] }.equals { @post1.created_at.day }
-      asserts("contains date partial with hour")  { topic['hour'] }.equals { @post1.created_at.hour }
-      asserts("contains date partial with full")  { topic['full'] }.equals { @post1.created_at.iso8601 }
-    end # date node
-  end # show action
-end

data/fixtures/padrino_test/test/app/controllers/users_controller_test.rb

@@ -1,87 +0,0 @@
-# Lives in <rabl>/test/integration/users_controller_test.rb
-# Symlinked to fixture applications
-
-begin # Sinatra
-  require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
-rescue LoadError # Rails
-  require File.expand_path(File.dirname(__FILE__) + '/../test_helper.rb')
-end
-
-context "UsersController" do
-  helper(:json_output) { JSON.parse(last_response.body) }
-
-  setup do
-    create_users!
-  end
-
-  context "for index action" do
-    # Tests `collection @users` extending from 'show' template
-
-    setup do
-      get "/users"
-    end
-
-    # Attributes (regular)
-    asserts("contains user usernames") do
-      json_output.map { |u| u["user"]["username"] }
-    end.equals { @users.map(&:username) }
-    asserts("contains email") do
-      json_output.map { |u| u["user"]["email"] }
-    end.equals { @users.map(&:email) }
-    asserts("contains location") do
-      json_output.map { |u| u["user"]["location"] }
-    end.equals { @users.map(&:location) }
-
-    # Attributes (custom name)
-    asserts("contains registered_at") do
-      json_output.map { |u| u["user"]["registered_at"] }
-    end.equals { @users.map(&:created_at).map(&:iso8601) }
-
-    # Node (renders based on attribute)
-    asserts("contains role") do
-      json_output.map { |u| u["user"]["role"] }
-    end.equals ['normal', 'normal', 'admin']
-
-    # Child (custom collection name)
-    asserts("contains formatted phone numbers") do
-      json_output.map { |u| u["user"]["pnumbers"].map { |n| n["pnumber"]["formatted"] } }
-    end.equals { @users.map { |u| u.phone_numbers.map(&:formatted) } }
-
-    # Node (renders collection partial)
-    asserts("contains formatted node numbers") do
-      json_output.map { |u| u["user"]["node_numbers"].map { |n| n["formatted"] } }
-    end.equals { @users.map { |u| u.phone_numbers.map(&:formatted) } }
-  end # index
-
-  context "for show action" do
-    # Tests `object :user => :person` custom parent node name
-    setup do
-      get "/users/#{@user1.id}"
-    end
-
-    # Attributes (regular)
-    asserts("contains username") { json_output["person"]["username"] }.equals { @user1.username }
-    asserts("contains email") { json_output["person"]["email"] }.equals { @user1.email }
-    asserts("contains location") { json_output["person"]["location"] }.equals { @user1.location }
-    # Attributes (custom name)
-    asserts("contains registered_at") { json_output["person"]["registered_at"] }.equals { @user1.created_at.iso8601 }
-    # Node (renders based on attribute)
-    asserts("contains role node") { json_output["person"]["role"] }.equals "normal"
-
-    # Child (custom collection name)
-    asserts("contains first phone number") {
-      json_output["person"]["pnumbers"][0]["pnumber"]["formatted"]
-    }.equals { @user1.phone_numbers[0].formatted }
-    asserts("contains second phone number") {
-      json_output["person"]["pnumbers"][1]["pnumber"]["formatted"]
-    }.equals { @user1.phone_numbers[1].formatted }
-
-    # Node (renders collection partial)
-    asserts("contains first node number") {
-      json_output["person"]["node_numbers"][0]["formatted"]
-    }.equals { @user1.phone_numbers[0].formatted }
-    asserts("contains second node number") {
-      json_output["person"]["node_numbers"][1]["formatted"]
-    }.equals { @user1.phone_numbers[1].formatted }
-  end # show
-end