rabl 0.13.1 → 0.14.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. checksums.yaml +5 -5
  2. data/.travis.yml +4 -2
  3. data/CHANGELOG.md +4 -0
  4. data/README.md +16 -10
  5. data/Rakefile +12 -3
  6. data/fixtures/ashared/NOTES +46 -0
  7. data/fixtures/ashared/controllers_rails_5/posts_controller.rb +17 -0
  8. data/fixtures/ashared/controllers_rails_5/users_controller.rb +11 -0
  9. data/fixtures/{rails5/app → ashared}/helpers/application_helper.rb +0 -0
  10. data/fixtures/rails3/db/schema.rb +42 -0
  11. data/fixtures/rails4/Gemfile +5 -1
  12. data/fixtures/rails4/config/environments/test.rb +3 -0
  13. data/fixtures/rails4/db/schema.rb +42 -0
  14. data/fixtures/rails5/Gemfile +1 -0
  15. data/fixtures/rails5/Rakefile +1 -1
  16. data/fixtures/rails5/app/controllers/posts_controller.rb +1 -0
  17. data/fixtures/rails5/app/controllers/users_controller.rb +1 -0
  18. data/fixtures/rails5/app/helpers +1 -0
  19. data/fixtures/rails5/config/initializers/mime_types.rb +2 -0
  20. data/fixtures/rails5/test/functional/posts_controller_test.rb +1 -0
  21. data/fixtures/rails5/test/functional/users_controller_test.rb +1 -0
  22. data/fixtures/rails5_api/.gitignore +21 -0
  23. data/fixtures/rails5_api/Gemfile +46 -0
  24. data/fixtures/rails5_api/README.md +24 -0
  25. data/fixtures/rails5_api/Rakefile +13 -0
  26. data/fixtures/rails5_api/app/channels/application_cable/channel.rb +4 -0
  27. data/fixtures/rails5_api/app/channels/application_cable/connection.rb +4 -0
  28. data/fixtures/rails5_api/app/controllers/application_controller.rb +2 -0
  29. data/fixtures/rails5_api/app/controllers/concerns/.keep +0 -0
  30. data/fixtures/rails5_api/app/controllers/posts_controller.rb +1 -0
  31. data/fixtures/rails5_api/app/controllers/users_controller.rb +1 -0
  32. data/fixtures/rails5_api/app/helpers +1 -0
  33. data/fixtures/rails5_api/app/jobs/application_job.rb +2 -0
  34. data/fixtures/rails5_api/app/mailers/application_mailer.rb +4 -0
  35. data/fixtures/rails5_api/app/models +1 -0
  36. data/fixtures/rails5_api/app/views +1 -0
  37. data/fixtures/rails5_api/bin/bundle +3 -0
  38. data/fixtures/rails5_api/bin/rails +9 -0
  39. data/fixtures/rails5_api/bin/rake +9 -0
  40. data/fixtures/rails5_api/bin/setup +34 -0
  41. data/fixtures/rails5_api/bin/spring +17 -0
  42. data/fixtures/rails5_api/bin/update +29 -0
  43. data/fixtures/rails5_api/config.ru +5 -0
  44. data/fixtures/rails5_api/config/application.rb +30 -0
  45. data/fixtures/rails5_api/config/boot.rb +3 -0
  46. data/fixtures/rails5_api/config/cable.yml +9 -0
  47. data/fixtures/rails5_api/config/database.yml +25 -0
  48. data/fixtures/rails5_api/config/environment.rb +5 -0
  49. data/fixtures/rails5_api/config/environments/development.rb +47 -0
  50. data/fixtures/rails5_api/config/environments/production.rb +78 -0
  51. data/fixtures/rails5_api/config/environments/test.rb +42 -0
  52. data/fixtures/rails5_api/config/initializers/application_controller_renderer.rb +6 -0
  53. data/fixtures/rails5_api/config/initializers/backtrace_silencers.rb +7 -0
  54. data/fixtures/rails5_api/config/initializers/cors.rb +16 -0
  55. data/fixtures/rails5_api/config/initializers/filter_parameter_logging.rb +4 -0
  56. data/fixtures/rails5_api/config/initializers/inflections.rb +16 -0
  57. data/fixtures/rails5_api/config/initializers/mime_types.rb +5 -0
  58. data/fixtures/rails5_api/config/initializers/new_framework_defaults.rb +18 -0
  59. data/fixtures/rails5_api/config/initializers/wrap_parameters.rb +14 -0
  60. data/fixtures/rails5_api/config/locales/en.yml +23 -0
  61. data/fixtures/rails5_api/config/puma.rb +47 -0
  62. data/fixtures/rails5_api/config/routes.rb +8 -0
  63. data/fixtures/rails5_api/config/secrets.yml +22 -0
  64. data/fixtures/rails5_api/config/spring.rb +6 -0
  65. data/fixtures/rails5_api/db/migrate +1 -0
  66. data/fixtures/rails5_api/db/schema.rb +41 -0
  67. data/fixtures/rails5_api/db/seeds.rb +7 -0
  68. data/fixtures/rails5_api/lib/tasks/.keep +0 -0
  69. data/fixtures/rails5_api/log/.keep +0 -0
  70. data/fixtures/rails5_api/public/robots.txt +5 -0
  71. data/fixtures/rails5_api/test/controllers/.keep +0 -0
  72. data/fixtures/rails5_api/test/fixtures/.keep +0 -0
  73. data/fixtures/rails5_api/test/fixtures/files/.keep +0 -0
  74. data/fixtures/rails5_api/test/functional/posts_controller_test.rb +1 -0
  75. data/fixtures/rails5_api/test/functional/users_controller_test.rb +1 -0
  76. data/fixtures/rails5_api/test/integration/.keep +0 -0
  77. data/fixtures/rails5_api/test/mailers/.keep +0 -0
  78. data/fixtures/rails5_api/test/models/.keep +0 -0
  79. data/fixtures/rails5_api/test/test_helper.rb +39 -0
  80. data/fixtures/rails5_api/tmp/.keep +0 -0
  81. data/lib/rabl.rb +1 -1
  82. data/lib/rabl/builder.rb +13 -3
  83. data/lib/rabl/configuration.rb +2 -0
  84. data/lib/rabl/engine.rb +2 -0
  85. data/lib/rabl/railtie.rb +17 -0
  86. data/lib/rabl/version.rb +1 -1
  87. data/rabl.gemspec +1 -1
  88. data/test/builder_test.rb +26 -0
  89. data/test/engine_test.rb +6 -0
  90. data/test/integration/rails5/posts_controller_test.rb +251 -0
  91. data/test/integration/rails5/users_controller_test.rb +87 -0
  92. data/test/models/user.rb +10 -9
  93. metadata +74 -6
  94. data/fixtures/rails5/app/controllers/posts_controller.rb +0 -17
  95. data/fixtures/rails5/app/controllers/users_controller.rb +0 -11
@@ -0,0 +1,6 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # ApplicationController.renderer.defaults.merge!(
4
+ # http_host: 'example.org',
5
+ # https: false
6
+ # )
@@ -0,0 +1,7 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
4
+ # Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
5
+
6
+ # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
7
+ # Rails.backtrace_cleaner.remove_silencers!
@@ -0,0 +1,16 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Avoid CORS issues when API is called from the frontend app.
4
+ # Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests.
5
+
6
+ # Read more: https://github.com/cyu/rack-cors
7
+
8
+ # Rails.application.config.middleware.insert_before 0, Rack::Cors do
9
+ # allow do
10
+ # origins 'example.com'
11
+ #
12
+ # resource '*',
13
+ # headers: :any,
14
+ # methods: [:get, :post, :put, :patch, :delete, :options, :head]
15
+ # end
16
+ # end
@@ -0,0 +1,4 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Configure sensitive parameters which will be filtered from the log file.
4
+ Rails.application.config.filter_parameters += [:password]
@@ -0,0 +1,16 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Add new inflection rules using the following format. Inflections
4
+ # are locale specific, and you may define rules for as many different
5
+ # locales as you wish. All of these examples are active by default:
6
+ # ActiveSupport::Inflector.inflections(:en) do |inflect|
7
+ # inflect.plural /^(ox)$/i, '\1en'
8
+ # inflect.singular /^(ox)en/i, '\1'
9
+ # inflect.irregular 'person', 'people'
10
+ # inflect.uncountable %w( fish sheep )
11
+ # end
12
+
13
+ # These inflection rules are supported but not enabled by default:
14
+ # ActiveSupport::Inflector.inflections(:en) do |inflect|
15
+ # inflect.acronym 'RESTful'
16
+ # end
@@ -0,0 +1,5 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Add new mime types for use in respond_to blocks:
4
+ # Mime::Type.register "text/richtext", :rtf
5
+ Mime::Type.register 'application/vnd.rabl-test_v1+json', :rabl_test_v1
@@ -0,0 +1,18 @@
1
+ # Be sure to restart your server when you modify this file.
2
+ #
3
+ # This file contains migration options to ease your Rails 5.0 upgrade.
4
+ #
5
+ # Read the Guide for Upgrading Ruby on Rails for more info on each option.
6
+
7
+ # Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
8
+ # Previous versions had false.
9
+ ActiveSupport.to_time_preserves_timezone = true
10
+
11
+ # Require `belongs_to` associations by default. Previous versions had false.
12
+ Rails.application.config.active_record.belongs_to_required_by_default = true
13
+
14
+ # Do not halt callback chains when a callback returns false. Previous versions had true.
15
+ ActiveSupport.halt_callback_chains_on_return_false = false
16
+
17
+ # Configure SSL options to enable HSTS with subdomains. Previous versions had false.
18
+ Rails.application.config.ssl_options = { hsts: { subdomains: true } }
@@ -0,0 +1,14 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # This file contains settings for ActionController::ParamsWrapper which
4
+ # is enabled by default.
5
+
6
+ # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
7
+ ActiveSupport.on_load(:action_controller) do
8
+ wrap_parameters format: [:json]
9
+ end
10
+
11
+ # To enable root element in JSON for ActiveRecord objects.
12
+ # ActiveSupport.on_load(:active_record) do
13
+ # self.include_root_in_json = true
14
+ # end
@@ -0,0 +1,23 @@
1
+ # Files in the config/locales directory are used for internationalization
2
+ # and are automatically loaded by Rails. If you want to use locales other
3
+ # than English, add the necessary files in this directory.
4
+ #
5
+ # To use the locales, use `I18n.t`:
6
+ #
7
+ # I18n.t 'hello'
8
+ #
9
+ # In views, this is aliased to just `t`:
10
+ #
11
+ # <%= t('hello') %>
12
+ #
13
+ # To use a different locale, set it with `I18n.locale`:
14
+ #
15
+ # I18n.locale = :es
16
+ #
17
+ # This would use the information in config/locales/es.yml.
18
+ #
19
+ # To learn more, please read the Rails Internationalization guide
20
+ # available at http://guides.rubyonrails.org/i18n.html.
21
+
22
+ en:
23
+ hello: "Hello world"
@@ -0,0 +1,47 @@
1
+ # Puma can serve each request in a thread from an internal thread pool.
2
+ # The `threads` method setting takes two numbers a minimum and maximum.
3
+ # Any libraries that use thread pools should be configured to match
4
+ # the maximum value specified for Puma. Default is set to 5 threads for minimum
5
+ # and maximum, this matches the default thread size of Active Record.
6
+ #
7
+ threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
8
+ threads threads_count, threads_count
9
+
10
+ # Specifies the `port` that Puma will listen on to receive requests, default is 3000.
11
+ #
12
+ port ENV.fetch("PORT") { 3000 }
13
+
14
+ # Specifies the `environment` that Puma will run in.
15
+ #
16
+ environment ENV.fetch("RAILS_ENV") { "development" }
17
+
18
+ # Specifies the number of `workers` to boot in clustered mode.
19
+ # Workers are forked webserver processes. If using threads and workers together
20
+ # the concurrency of the application would be max `threads` * `workers`.
21
+ # Workers do not work on JRuby or Windows (both of which do not support
22
+ # processes).
23
+ #
24
+ # workers ENV.fetch("WEB_CONCURRENCY") { 2 }
25
+
26
+ # Use the `preload_app!` method when specifying a `workers` number.
27
+ # This directive tells Puma to first boot the application and load code
28
+ # before forking the application. This takes advantage of Copy On Write
29
+ # process behavior so workers use less memory. If you use this option
30
+ # you need to make sure to reconnect any threads in the `on_worker_boot`
31
+ # block.
32
+ #
33
+ # preload_app!
34
+
35
+ # The code in the `on_worker_boot` will be called if you are using
36
+ # clustered mode by specifying a number of `workers`. After each worker
37
+ # process is booted this block will be run, if you are using `preload_app!`
38
+ # option you will want to use this block to reconnect to any threads
39
+ # or connections that may have been created at application boot, Ruby
40
+ # cannot share connections between processes.
41
+ #
42
+ # on_worker_boot do
43
+ # ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
44
+ # end
45
+
46
+ # Allow puma to be restarted by `rails restart` command.
47
+ plugin :tmp_restart
@@ -0,0 +1,8 @@
1
+ Rails.application.routes.draw do
2
+ resources :users
3
+ resources :posts do
4
+ member do
5
+ get 'renderer'
6
+ end
7
+ end
8
+ end
@@ -0,0 +1,22 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Your secret key is used for verifying the integrity of signed cookies.
4
+ # If you change this key, all old signed cookies will become invalid!
5
+
6
+ # Make sure the secret is at least 30 characters and all random,
7
+ # no regular words or you'll be exposed to dictionary attacks.
8
+ # You can use `rails secret` to generate a secure secret key.
9
+
10
+ # Make sure the secrets in this file are kept private
11
+ # if you're sharing your code publicly.
12
+
13
+ development:
14
+ secret_key_base: 62de20421b0c0b633ba96ebc33fa2aa67af1a89d2d7a031721526887cef59648b0bdd1cd109db47b865c6edbaa98da992b7f2ae1944ebab515839276e1e0582a
15
+
16
+ test:
17
+ secret_key_base: c2460a288fb4918b55bd17f4666c2ff1a2460d4003ca06a0c0b1e7f1fb82df7f7ffd4d7b4b185ac198e1e451365dc3b0d535a44ab854086d17d6587dea367f72
18
+
19
+ # Do not keep production secrets in the repository,
20
+ # instead read values from the environment.
21
+ production:
22
+ secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
@@ -0,0 +1,6 @@
1
+ %w(
2
+ .ruby-version
3
+ .rbenv-vars
4
+ tmp/restart.txt
5
+ tmp/caching-dev.txt
6
+ ).each { |path| Spring.watch(path) }
@@ -0,0 +1 @@
1
+ fixtures/rails5_api/db/../../ashared/migrate
@@ -0,0 +1,41 @@
1
+ # This file is auto-generated from the current state of the database. Instead
2
+ # of editing this file, please use the migrations feature of Active Record to
3
+ # incrementally modify your database, and then regenerate this schema definition.
4
+ #
5
+ # Note that this schema.rb definition is the authoritative source for your
6
+ # database schema. If you need to create the application database on another
7
+ # system, you should be using db:schema:load, not running all the migrations
8
+ # from scratch. The latter is a flawed and unsustainable approach (the more migrations
9
+ # you'll amass, the slower it'll run and the greater likelihood for issues).
10
+ #
11
+ # It's strongly recommended that you check this file into your version control system.
12
+
13
+ ActiveRecord::Schema.define(version: 20111002092024) do
14
+
15
+ create_table "phone_numbers", force: :cascade do |t|
16
+ t.integer "user_id"
17
+ t.boolean "is_primary"
18
+ t.string "area_code"
19
+ t.string "prefix"
20
+ t.string "suffix"
21
+ t.string "name"
22
+ end
23
+
24
+ create_table "posts", force: :cascade do |t|
25
+ t.integer "user_id"
26
+ t.string "title"
27
+ t.text "body"
28
+ t.datetime "created_at"
29
+ t.datetime "updated_at"
30
+ end
31
+
32
+ create_table "users", force: :cascade do |t|
33
+ t.string "username"
34
+ t.string "email"
35
+ t.string "location"
36
+ t.boolean "is_admin"
37
+ t.datetime "created_at"
38
+ t.datetime "updated_at"
39
+ end
40
+
41
+ end
@@ -0,0 +1,7 @@
1
+ # This file should contain all the record creation needed to seed the database with its default values.
2
+ # The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
3
+ #
4
+ # Examples:
5
+ #
6
+ # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
7
+ # Character.create(name: 'Luke', movie: movies.first)
File without changes
File without changes
@@ -0,0 +1,5 @@
1
+ # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
2
+ #
3
+ # To ban all spiders from the entire site uncomment the next two lines:
4
+ # User-agent: *
5
+ # Disallow: /
@@ -0,0 +1 @@
1
+ fixtures/rails5_api/test/functional/../../../../test/integration/rails5/posts_controller_test.rb
@@ -0,0 +1 @@
1
+ fixtures/rails5_api/test/functional/../../../../test/integration/rails5/users_controller_test.rb
File without changes
File without changes
@@ -0,0 +1,39 @@
1
+ # Load Silence Functionality
2
+ require File.expand_path(File.dirname(__FILE__) + "/../../../test/silence.rb")
3
+
4
+ # Load Environment
5
+ silence_warnings do
6
+ ENV["RAILS_ENV"] = "test"
7
+ require File.expand_path('../../config/environment', __FILE__)
8
+ require 'rails/test_help'
9
+ end
10
+
11
+ # Load Riot Test Environment
12
+ require File.expand_path(File.dirname(__FILE__) + "/../../../test/integration/test_init.rb")
13
+
14
+ # silence_stream was removed for Rails 5 because it's not thread-safe.
15
+ # Duplicate that work here:
16
+ # See https://github.com/rails/rails/pull/13392
17
+ def silence_stream(stream)
18
+ old_stream = stream.dup
19
+ stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
20
+ stream.sync = true
21
+ yield
22
+ ensure
23
+ stream.reopen(old_stream)
24
+ old_stream.close
25
+ end
26
+
27
+ # Run Migrations
28
+ silence_stream(STDOUT) do
29
+ dbconf = YAML::load(File.open('config/database.yml'))[Rails.env]
30
+ ActiveRecord::Base.establish_connection(dbconf)
31
+ ActiveRecord::Base.logger = Logger.new(File.open('log/database.log', 'a'))
32
+ silence_stream(STDOUT) { ActiveRecord::Migrator.up('db/migrate') }
33
+ end
34
+
35
+ class Riot::Situation
36
+ def app
37
+ Rails.application
38
+ end
39
+ end
File without changes
@@ -83,6 +83,6 @@ end
83
83
  if defined?(Padrino)
84
84
  require 'padrino-core'
85
85
  Padrino.after_load { Rabl.register! }
86
- elsif defined?(Rails) && Rails.version =~ /^2/
86
+ elsif defined?(Rails.version) && Rails.version =~ /^2/
87
87
  Rabl.register!
88
88
  end
@@ -1,3 +1,5 @@
1
+ require 'active_support/inflector' # for the sake of camelcasing keys
2
+
1
3
  module Rabl
2
4
  class Builder
3
5
  include Helpers
@@ -138,7 +140,7 @@ module Rabl
138
140
  return unless @_object && attribute_present?(name) && resolve_condition(options)
139
141
 
140
142
  attribute = data_object_attribute(name)
141
- name = (options[:as] || name).to_sym
143
+ name = create_key(options[:as] || name)
142
144
  @_result[name] = attribute
143
145
  end
144
146
  alias_method :attributes, :attribute
@@ -151,7 +153,7 @@ module Rabl
151
153
 
152
154
  result = block.call(@_object)
153
155
  if name.present?
154
- @_result[name.to_sym] = result
156
+ @_result[create_key(name)] = result
155
157
  elsif result.is_a?(Hash) # merge hash into root hash
156
158
  @_result.merge!(result)
157
159
  end
@@ -174,7 +176,7 @@ module Rabl
174
176
 
175
177
  object = { object => name } if data.is_a?(Hash) && object # child :users => :people
176
178
 
177
- engines << { name.to_sym => object_to_engine(object, engine_options, &block) }
179
+ engines << { create_key(name) => object_to_engine(object, engine_options, &block) }
178
180
  end
179
181
 
180
182
  # Glues data from a child node to the json_output
@@ -248,5 +250,13 @@ module Rabl
248
250
  yield
249
251
  end
250
252
  end
253
+
254
+ def create_key(name)
255
+ if Rabl.configuration.camelize_keys
256
+ name.to_s.camelize(Rabl.configuration.camelize_keys == :upper ? :upper : :lower).to_sym
257
+ else
258
+ name.to_sym
259
+ end
260
+ end
251
261
  end
252
262
  end
@@ -52,6 +52,7 @@ module Rabl
52
52
  attr_accessor :replace_empty_string_values_with_nil_values
53
53
  attr_accessor :exclude_nil_values
54
54
  attr_accessor :exclude_empty_values_in_collections
55
+ attr_accessor :camelize_keys
55
56
 
56
57
  DEFAULT_XML_OPTIONS = { :dasherize => true, :skip_types => false }
57
58
 
@@ -81,6 +82,7 @@ module Rabl
81
82
  @replace_empty_string_values_with_nil_values = false
82
83
  @exclude_nil_values = false
83
84
  @exclude_empty_values_in_collections = false
85
+ @camelize_keys = false
84
86
  end
85
87
 
86
88
  # @return The JSON engine used to encode Rabl templates into JSON
@@ -27,6 +27,8 @@ module Rabl
27
27
  # Renders the representation based on source, object, context_scope and locals
28
28
  # Rabl::Engine.new("...source...", { :format => "xml" }).apply(context_scope, { :foo => "bar", :object => @user })
29
29
  def apply(context_scope, locals, &block)
30
+ locals = locals.dup unless locals.nil?
31
+
30
32
  set_instance_variables!(context_scope, locals)
31
33
 
32
34
  reset_settings!
@@ -1,6 +1,23 @@
1
1
  module Rabl
2
2
  class Railtie < Rails::Railtie
3
3
  initializer "rabl.initialize" do |app|
4
+ # Force Rails to load view templates even in API mode
5
+ # Stolen shamelessly from jbuilder: https://github.com/rails/jbuilder/blob/master/lib/jbuilder/railtie.rb
6
+ if Rails::VERSION::MAJOR >= 5
7
+ module ::ActionController
8
+ module ApiRendering
9
+ include ActionView::Rendering
10
+ end
11
+ end
12
+
13
+ ActiveSupport.on_load :action_controller do
14
+ if self == ActionController::API
15
+ include ActionController::Helpers
16
+ include ActionController::ImplicitRender
17
+ end
18
+ end
19
+ end
20
+
4
21
  ActiveSupport.on_load(:action_view) do
5
22
  Rabl.register!
6
23