rabl 0.6.3 → 0.6.5

data/.travis.yml

@@ -1,11 +1,9 @@
 # http://about.travis-ci.org/docs/user/build-configuration/
 before_script: "git submodule update --init"
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - rbx-18mode
-  - ree
 notifications:
   recipients:
     - nesquena@gmail.com

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.6.5
+
+  * Fixed issue with multi_json version use ~> 1.0 (Thanks @sferik)
+
+## 0.6.4
+
+ * Further improvements to template path resolution for Rails (Thanks @radar)
+ * Change multi_json to be > 1.1.0 to support 1.2.0 with Oj support (Thanks @jherdman)
+
 ## 0.6.3
 
  * Adds Rails 3.2 Integration Test

data/Gemfile

@@ -15,7 +15,5 @@ group :test do
   gem 'rack-test', :require => "rack/test"
   gem 'activerecord', :require => "active_record"
   gem 'sqlite3'
-  gem 'padrino', '>= 0.10.2'
   gem 'sinatra', '>= 1.2.0'
-  gem 'rails', '>= 2.3.0'
 end

data/README.md

@@ -78,12 +78,12 @@ node(:read) { |post| post.read_by?(@user) }
 
 Which would output the following JSON or XML when visiting `http://localhost:3000/posts.json`
 
-```json
-[{  post :
+```js
+[{  "post" :
   {
-    id : 5, title: "...", subject: "...",
-    user : { full_name : "..." },
-    read : true
+    "id" : 5, title: "...", subject: "...",
+    "user" : { full_name : "..." },
+    "read" : true
   }
 }]
 ```
@@ -463,7 +463,7 @@ Note that RABL can be nested arbitrarily deep within child nodes to allow for th
 ### Caching ###
 
 Caching works by saving the entire template output to the configured cache_store in your application. Note that caching is currently **only available** for
-Rails but support for other frameworks is planned in a future release. 
+Rails but support for other frameworks is planned in a future release.
 
 For Rails, requires `action_controller.perform_caching` to be set to true in your environment, and for `cache` to be set to a key (object that responds to cache_key method, array or string).
 
@@ -568,8 +568,7 @@ See the [examples](https://github.com/nesquena/rabl/tree/master/examples) direct
 
 Check out the [Issues](https://github.com/nesquena/rabl/issues) tab for a full list:
 
- * Better Tilt template support (precompiling templates)
- * Benchmarks and performance optimizations
+ * Rigorous benchmarking and performance optimizations
 
 ## Continuous Integration ##
 
@@ -595,6 +594,7 @@ Thanks to [Miso](http://gomiso.com) for allowing me to create this for our appli
 * [Andrey Voronkov](https://github.com/Antiarchitect) - Added BSON format support
 * [Alli Witheford](https://github.com/alzeih) - Added Plist format support
 * [David Sommers](https://github.com/databyte) - Added template caching support for Rails
+* [Ryan Bigg](https://github.com/radar) - Improved template resolution code
 
 and many more contributors listed in the [CHANGELOG](https://github.com/nesquena/rabl/blob/master/CHANGELOG.md).
 

data/Rakefile

@@ -12,9 +12,24 @@ Rake::TestTask.new(:test) do |test|
   test.ruby_opts = ['-rubygems']
 end
 
-desc "Prepares the fixtures for being tested by installing dependencies"
+# Running integration tests
+# rake test:clean
+# rake test:stup
+# rake test:full
+
+fixture_list = "{padrino_test,sinatra_test,rails2,rails3,rails3_2}"
+
+desc "Clean up the fixtures being tested by cleaning and installing dependencies"
+task "test:clean" do
+  Dir[File.dirname(__FILE__) + "/fixtures/#{fixture_list}"].each do |fixture|
+    puts "\n*** Cleaning up for #{File.basename(fixture)} tests ***\n"
+    puts `cd #{fixture}; rm Gemfile.lock`
+  end
+end
+
+desc "Prepares the fixtures being tested by installing dependencies"
 task "test:setup" do
-  Dir[File.dirname(__FILE__) + "/fixtures/{padrino_test,sinatra_test,rails2,rails3,rails3_2}"].each do |fixture|
+  Dir[File.dirname(__FILE__) + "/fixtures/#{fixture_list}"].each do |fixture|
     puts "\n*** Setting up for #{File.basename(fixture)} tests ***\n"
     `export BUNDLE_GEMFILE=#{fixture}/Gemfile` if ENV['TRAVIS']
     puts `cd #{fixture}; bundle install;`
@@ -23,7 +38,7 @@ end
 
 desc "Executes the fixture tests"
 task "test:fixtures" do
-  Dir[File.dirname(__FILE__) + "/fixtures/{padrino_test,sinatra_test,rails2,rails3,rails3_2}"].each do |fixture|
+  Dir[File.dirname(__FILE__) + "/fixtures/#{fixture_list}"].each do |fixture|
     puts "\n*** Running tests for #{File.basename(fixture)}... ***\n"
     puts `cd #{fixture}; bundle check; bundle exec rake test:rabl`
   end

data/lib/rabl/partials.rb

@@ -23,7 +23,7 @@ module Rabl
     def object_to_hash(object, options={}, &block)
       return object unless is_object?(object) || is_collection?(object)
       return [] if is_collection?(object) && object.blank? # empty collection
-      engine_options = options.merge(:format => "hash", :root => (options[:root] || false))
+      engine_options = options.reverse_merge(:format => "hash", :root => (options[:root] || false))
       Rabl::Engine.new(options[:source], engine_options).render(@_scope, :object => object, &block)
     end
 
@@ -31,35 +31,65 @@ module Rabl
     # fetch_source("show", :view_path => "...") => "...contents..."
     def fetch_source(file, options={})
       Rabl.source_cache(file, options[:view_path]) do
-        if defined? Padrino
-          view_path = Array(options[:view_path] || context_scope.settings.views)
-          # use Padrino's own template resolution mechanism
-          file_path, _ = context_scope.instance_eval { resolve_template(file) }
-          # Padrino chops the extension, stitch it back on
-          file_path = File.join(view_path.first.to_s, (file_path.to_s + ".rabl"))
+        file_path = if defined? Padrino
+          fetch_padrino_source(file, options)
         elsif defined?(Rails) && context_scope
-          # use Rails template resolution mechanism if possible (find_template)
-          source_format = request_format if defined?(request_format)
-          view_path = Array(options[:view_path] || context_scope.view_paths.to_a)
-          if source_format && context_scope.respond_to?(:lookup_context) # Rails 3
-            lookup_proc = lambda { |partial| context_scope.lookup_context.find_template(file, [], partial) }
-            template = lookup_proc.call(false) rescue lookup_proc.call(true)
-            file_path = template.identifier if template
-          elsif source_format && context_scope.respond_to?(:view_paths) # Rails 2
-            template = context_scope.view_paths.find_template(file, source_format, false)
-            file_path = template.filename if template
-          else # fallback to manual
-            file_path = Dir[File.join("{#{view_path.join(",")}}", file + ".{*.,}rabl")].first
-          end
+          fetch_rails_source(file, options)
         elsif defined? Sinatra
-          view_path = Array(options[:view_path] || context_scope.settings.views)
-          file_path = Dir[File.join("{#{view_path.join(",")}}", file + ".{*.,}rabl")].first
+          fetch_sinatra_source(file, options)
         end
 
-        raise "Cannot find rabl template '#{file}' within registered views!" unless File.exist?(file_path.to_s)
+        raise "Cannot find rabl template '#{file}' within registered view paths!" unless File.exist?(file_path.to_s)
         [File.read(file_path.to_s), file_path.to_s] if file_path
       end
     end
 
+    private
+
+    # Returns the rabl template path for padrino views using configured views
+    def fetch_padrino_source(file, options={})
+      view_path = Array(options[:view_path] || context_scope.settings.views)
+      # use Padrino's own template resolution mechanism
+      file_path, _ = context_scope.instance_eval { resolve_template(file) }
+      # Padrino chops the extension, stitch it back on
+      File.join(view_path.first.to_s, (file_path.to_s + ".rabl"))
+    end
+
+    # Returns the rabl template path for Rails, including special lookups for Rails 2 and 3
+    def fetch_rails_source(file, options={})
+      # use Rails template resolution mechanism if possible (find_template)
+      source_format = request_format if defined?(request_format)
+      view_path = Array(options[:view_path] || context_scope.view_paths.to_a)
+      if source_format && context_scope.respond_to?(:lookup_context) # Rails 3
+        lookup_proc = lambda { |partial| context_scope.lookup_context.find_template(file, [], partial) }
+        template = lookup_proc.call(false) rescue lookup_proc.call(true)
+        template.identifier if template
+      elsif source_format && context_scope.respond_to?(:view_paths) # Rails 2
+        template = context_scope.view_paths.find_template(file, source_format, false)
+        template.filename if template
+      else # manual file lookup
+        fetch_manual_template(view_path, file)
+      end
+    end
+
+    # Returns the rabl template path for sinatra views using configured views
+    def fetch_sinatra_source(file, options={})
+      view_path = Array(options[:view_path] || context_scope.settings.views)
+      fetch_manual_template(view_path, file)
+    end
+
+    # Returns the rabl template by looking up files within the view_path and specified file path
+    def fetch_manual_template(view_path, file)
+      Dir[File.join("{#{view_path.join(",")}}", "{#{file},#{partialized(file)}}" + ".{*.,}rabl")].first
+    end
+
+    # Returns a partialized version of a file path
+    # partialized("v1/variants/variant") => "v1/variants/_variant"
+    def partialized(file)
+      partial_file = file.split(File::SEPARATOR)
+      partial_file[-1] = "_#{partial_file[-1]}" unless partial_file[-1].start_with?("_")
+      partial_file.join(File::SEPARATOR)
+    end
+
   end # Partials
-end # Rabl
+end # Rabl

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.6.3"
+  VERSION = "0.6.5"
 end

data/rabl.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'multi_json',           '~> 1.1.0'
   s.add_dependency 'activesupport',        '>= 2.3.14'
+  s.add_dependency 'multi_json',           '~> 1.0'
 
   s.add_development_dependency 'riot',     '~> 0.12.3'
   s.add_development_dependency 'rr',       '~> 1.0.2'

data/test/engine_test.rb

@@ -33,13 +33,13 @@ context "Rabl::Engine" do
     context "with cache and options" do
       setup do
         template = rabl %q{
-          cache 'foo', expires_in: 'bar'
+          cache 'foo', :expires_in => 'bar'
         }
         template.render(Object.new)
         template.instance_eval('@engine')
       end
 
-      asserts_topic.assigns(:_cache) { ['foo', { expires_in: 'bar' }] }
+      asserts_topic.assigns(:_cache) { ['foo', { :expires_in => 'bar' }] }
     end
 
     context "without cache" do

data/test/plist_engine_test.rb

@@ -32,8 +32,8 @@ context "Rabl::Engine" do
         }
         scope = Object.new
         scope.instance_variable_set :@user, User.new
-        template.render(scope)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>person</key>\n\t<dict/>\n</dict>\n</plist>\n"
+        template.render(scope).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>person</key>\n\t<dict/>\n</dict>\n</plist>\n".split("").sort
     end
 
     context "#collection" do
@@ -44,8 +44,8 @@ context "Rabl::Engine" do
         }
         scope = Object.new
         scope.instance_variable_set :@users, [User.new, User.new]
-        template.render(scope)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<array>\n\t<dict>\n\t\t<key>user</key>\n\t\t<dict/>\n\t</dict>\n\t<dict>\n\t\t<key>user</key>\n\t\t<dict/>\n\t</dict>\n</array>\n</plist>\n"
+        template.render(scope).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<array>\n\t<dict>\n\t\t<key>user</key>\n\t\t<dict/>\n\t</dict>\n\t<dict>\n\t\t<key>user</key>\n\t\t<dict/>\n\t</dict>\n</array>\n</plist>\n".split("").sort
 
       asserts "that it sets root node for objects" do
         template = rabl %{
@@ -53,8 +53,8 @@ context "Rabl::Engine" do
         }
         scope = Object.new
         scope.instance_variable_set :@users, [User.new, User.new]
-        template.render(scope)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>person</key>\n\t<array>\n\t\t<dict>\n\t\t\t<key>person</key>\n\t\t\t<dict/>\n\t\t</dict>\n\t\t<dict>\n\t\t\t<key>person</key>\n\t\t\t<dict/>\n\t\t</dict>\n\t</array>\n</dict>\n</plist>\n"
+        template.render(scope).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>person</key>\n\t<array>\n\t\t<dict>\n\t\t\t<key>person</key>\n\t\t\t<dict/>\n\t\t</dict>\n\t\t<dict>\n\t\t\t<key>person</key>\n\t\t\t<dict/>\n\t\t</dict>\n\t</array>\n</dict>\n</plist>\n".split("").sort
 
     end
 
@@ -67,8 +67,8 @@ context "Rabl::Engine" do
         }
         scope = Object.new
         scope.instance_variable_set :@user, User.new(:name => 'irvine')
-        template.render(scope)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>name</key>\n\t\t<string>irvine</string>\n\t</dict>\n</dict>\n</plist>\n"
+        template.render(scope).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>name</key>\n\t\t<string>irvine</string>\n\t</dict>\n</dict>\n</plist>\n".split("").sort
 
       asserts "that it can add attribute under a different key name through :as" do
         template = rabl %{
@@ -77,8 +77,8 @@ context "Rabl::Engine" do
         }
         scope = Object.new
         scope.instance_variable_set :@user, User.new(:name => 'irvine')
-        template.render(scope)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>city</key>\n\t\t<string>irvine</string>\n\t</dict>\n</dict>\n</plist>\n"
+        template.render(scope).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>city</key>\n\t\t<string>irvine</string>\n\t</dict>\n</dict>\n</plist>\n".split("").sort
 
       asserts "that it can add attribute under a different key name through hash" do
         template = rabl %{
@@ -87,8 +87,8 @@ context "Rabl::Engine" do
         }
         scope = Object.new
         scope.instance_variable_set :@user, User.new(:name => 'irvine')
-        template.render(scope)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>city</key>\n\t\t<string>irvine</string>\n\t</dict>\n</dict>\n</plist>\n"
+        template.render(scope).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>city</key>\n\t\t<string>irvine</string>\n\t</dict>\n</dict>\n</plist>\n".split("").sort
 
     end
 
@@ -98,15 +98,15 @@ context "Rabl::Engine" do
         template = rabl %{
           code(:foo) { 'bar' }
         }
-        template.render(Object.new)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>foo</key>\n\t<string>bar</string>\n</dict>\n</plist>\n"
+        template.render(Object.new).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>foo</key>\n\t<string>bar</string>\n</dict>\n</plist>\n".split("").sort
 
       asserts "that it can be passed conditionals" do
         template = rabl %{
           code(:foo, :if => lambda { |i| false }) { 'bar' }
         }
-        template.render(Object.new)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict/>\n</plist>\n"
+        template.render(Object.new).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict/>\n</plist>\n".split("").sort
 
     end
 
@@ -120,8 +120,8 @@ context "Rabl::Engine" do
         }
         scope = Object.new
         scope.instance_variable_set :@user, User.new(:name => 'leo', :city => 'LA')
-        template.render(scope)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>name</key>\n\t\t<string>leo</string>\n\t\t<key>user</key>\n\t\t<dict>\n\t\t\t<key>city</key>\n\t\t\t<string>LA</string>\n\t\t</dict>\n\t</dict>\n</dict>\n</plist>\n"
+        template.render(scope).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>user</key>\n\t<dict>\n\t\t<key>name</key>\n\t\t<string>leo</string>\n\t\t<key>user</key>\n\t\t<dict>\n\t\t\t<key>city</key>\n\t\t\t<string>LA</string>\n\t\t</dict>\n\t</dict>\n</dict>\n</plist>\n".split("").sort
 
       asserts "that it can create a child node with different key" do
         template = rabl %{
@@ -269,7 +269,7 @@ context "Rabl::Engine" do
 
     context "#code" do
 
-      asserts "that it can create an arbitraty code node" do
+      asserts "that it can create an arbitrary code node" do
         template = rabl %{
           code(:foo) { 'bar' }
         }
@@ -295,8 +295,8 @@ context "Rabl::Engine" do
         }
         scope = Object.new
         scope.instance_variable_set :@user, User.new(:name => 'leo', :city => 'LA')
-        template.render(scope)
-      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>name</key>\n\t<string>leo</string>\n\t<key>user</key>\n\t<dict>\n\t\t<key>city</key>\n\t\t<string>LA</string>\n\t</dict>\n</dict>\n</plist>\n"
+        template.render(scope).split("").sort
+      end.equals "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n<dict>\n\t<key>name</key>\n\t<string>leo</string>\n\t<key>user</key>\n\t<dict>\n\t\t<key>city</key>\n\t\t<string>LA</string>\n\t</dict>\n</dict>\n</plist>\n".split("").sort
 
       asserts "that it can create a child node with different key" do
         template = rabl %{

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,28 +10,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-27 00:00:00 Z
+date: 2012-03-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: multi_json
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 2.3.14
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: multi_json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.3.14
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency