iknow_view_models 2.8.5 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 906f5e8368cc9b69c01b0fdf55f2f8475fc452cad35b5708f2bab63051892a93
-  data.tar.gz: cce586636fa5abcc641b70f36afa264cf8f0c586d3c2ec3964e0e940d1981a4f
+  metadata.gz: d8f4644f2bf2710cf5f455959e820599c3452b2e460888fefeb2abd78f356db8
+  data.tar.gz: ec9f0b4cb3009b4e64fa3c77cfea24c716062220ba2de95d566ac0a758a10836
 SHA512:
-  metadata.gz: 22de8467817ea6757571e10c7a53b5c2e187c1d5a82f5a67dba801db1aec0dfd40e3beb1eb2e6b3bc00d72f69a604d7216608fe9432cb876374af8134806c95c
-  data.tar.gz: 9d4206f0b9a7eb1359ecdcacdd4627873467b0dd1b9f990b981937fc8fe253faa99cbfa962865f714842251d2b38a0b434b266953127433b5b06c0d112954732
+  metadata.gz: 1a268fef9e337366301b6d4bbc72138a06b8e6fdcc4929091550be15a36867d533d2a7394de88cdeb2d98a719572b0f1d9f6d7210eca5150f8b0ae40f959ed47
+  data.tar.gz: e327ca86167c3b94de129ffac178c6188c7a86ec5251c2a6779e6d85a820f6b518740264ffcd8a417e4d46ad7a78ebb2770ce25a95e74af6f42ba8904932a890

data/.envrc

@@ -0,0 +1 @@
+eval "$(lorri direnv)"

data/.gitignore

@@ -5,6 +5,8 @@
 .yardoc
 .byebug_history
 Gemfile.lock
+nix/gem/Gemfile
+nix/gem/gemset.nix
 InstalledFiles
 _yardoc
 coverage

data/iknow_view_models.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json_schema"
   spec.add_dependency "lazily"
   spec.add_dependency "renum"
+  spec.add_dependency "oj"
 
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler"

data/lib/iknow_view_models/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IknowViewModels
-  VERSION = '2.8.5'
+  VERSION = '2.8.6'
 end

data/lib/view_model/controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require "view_model"
+require 'view_model'
+require 'oj'
 
 module ViewModel::Controller
   extend ActiveSupport::Concern
@@ -18,7 +19,7 @@ module ViewModel::Controller
 
   # Render viewmodel(s) to a JSON API response as a String
   def prerender_viewmodel(viewmodel, status: nil, serialize_context: viewmodel.class.try(:new_serialize_context))
-    Jbuilder.encode do |json|
+    encode_jbuilder do |json|
       json.data do
         ViewModel.serialize(viewmodel, json, serialize_context: serialize_context)
       end
@@ -45,7 +46,7 @@ module ViewModel::Controller
     json_view = wrap_json_view(json_view)
     json_references = wrap_json_view(json_references)
 
-    Jbuilder.encode do |json|
+    encode_jbuilder do |json|
       json.data json_view
       if json_references.present?
         json.references do
@@ -104,8 +105,23 @@ module ViewModel::Controller
     end
   end
 
+  def encode_jbuilder
+    builder = Jbuilder.new do |json|
+      yield json
+    end
+
+    # Jbuilder#encode no longer uses MultiJson, but instead calls `.to_json`. In
+    # the context of ActiveSupport, we don't want this, because AS replaces the
+    # .to_json interface with its own .as_json, which demands that everything is
+    # reduced to a Hash before it can be JSON encoded. Using this is not only
+    # slightly more expensive in terms of allocations, but also defeats the
+    # purpose of our precompiled `CompiledJson` terminals. Instead serialize
+    # using OJ with options equivalent to those used by MultiJson.
+    Oj.dump(builder.attributes!, mode: :compat, time_format: :ruby, use_to_json: true)
+  end
+
   def render_jbuilder(status:)
-    response = Jbuilder.encode do |json|
+    response = encode_jbuilder do |json|
       yield json
     end
 

data/nix/gem/generate.rb

@@ -0,0 +1,41 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i ruby -p ruby -p bundler -p bundix
+# frozen_string_literal: true
+
+# Bundix doesn't support `gemspec` directive in Gemfiles, as it doesn't copy the
+# gemspec (and its dependencies) into the store.
+# This workaround is from https://github.com/manveru/bundix/issues/10#issuecomment-405879379
+
+require 'shellwords'
+
+def sh(*args)
+  warn args.shelljoin
+  system(*args) || raise
+end
+
+sh 'bundle', 'lock'
+
+require 'fileutils'
+require 'bundler'
+
+lockfile = Bundler::LockfileParser.new(File.read('Gemfile.lock'))
+gems = lockfile.specs.select { |spec| spec.source.is_a?(Bundler::Source::Rubygems) }
+sources = [URI('https://rubygems.org/')] | gems.map(&:source).flat_map(&:remotes)
+
+FileUtils.mkdir_p 'nix/gem'
+Dir.chdir 'nix/gem' do
+  ['Gemfile', 'Gemfile.lock', 'gemset.nix'].each do |f|
+    File.delete(f) if File.exist?(f)
+  end
+
+  File.open('Gemfile', 'w') do |gemfile|
+    sources.each { |source| gemfile.puts "source #{source.to_s.inspect}" }
+    gemfile.puts
+
+    gems.each do |gem|
+      gemfile.puts "gem #{gem.name.inspect}, #{gem.version.to_s.inspect}"
+    end
+  end
+
+  sh 'bundix', '-l'
+end

data/shell.nix

@@ -0,0 +1,20 @@
+with import <nixpkgs> {};
+
+(bundlerEnv {
+  name = "dev";
+  gemdir = ./nix/gem;
+
+  gemConfig = (defaultGemConfig.override { postgresql = postgresql_11; });
+
+  ruby = ruby_2_6.overrideAttrs (attrs: {
+    patches = (attrs.patches or []) ++ [
+      # RubyGems has a regression where you can no longer build certain gems
+      # outside their directory. Until this is merged, patch from the pull
+      # request.
+      (fetchpatch {
+        url = https://patch-diff.githubusercontent.com/raw/rubygems/rubygems/pull/2596.patch;
+        sha256 = "0m1s5brd30bqcr8v99sczihm83g270philx83kkw5bpix462fdm3";
+      })
+    ];
+  });
+}).env

data/test/helpers/controller_test_helpers.rb

@@ -198,12 +198,15 @@ class DummyController
 end
 
 # Provide dummy Rails env
-module Rails
-  def self.env
+module RailsDummyEnv
+  def env
     'production'
   end
 end
 
+module Rails; end
+Rails.singleton_class.prepend(RailsDummyEnv)
+
 module ActionController
   class Parameters
   end

data/test/unit/view_model/active_record/cache_test.rb

@@ -15,12 +15,16 @@ require "view_model/active_record"
 
 DUMMY_RAILS_CACHE = ActiveSupport::Cache::MemoryStore.new
 
-module Rails
-  def self.cache
+module RailsDummyCache
+  def cache
     DUMMY_RAILS_CACHE
   end
 end
 
+# Ensure we have a dummy Rails, and then prepend our dummy cache
+module Rails; end
+Rails.singleton_class.prepend(RailsDummyCache)
+
 class ViewModel::ActiveRecord
   class CacheTest < ActiveSupport::TestCase
     using ViewModel::Utils::Collections

data/test/unit/view_model/active_record/controller_test.rb

@@ -557,5 +557,4 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     assert_equal({ 'data' => LabelView.new(old_label).to_hash },
                  labelcontroller.hash_response)
   end
-
 end

data/test/unit/view_model/controller_test.rb

@@ -0,0 +1,43 @@
+require 'minitest/autorun'
+require 'minitest/unit'
+require 'minitest/hooks'
+
+require_relative '../../helpers/arvm_test_utilities.rb'
+require_relative '../../helpers/viewmodel_spec_helpers.rb'
+
+require 'view_model'
+require 'view_model/controller'
+
+class ViewModel::ControllerTest < ActiveSupport::TestCase
+  include ARVMTestUtilities
+  extend Minitest::Spec::DSL
+
+  describe 'rendering prerendered json terminals' do
+    let(:controller) do
+      Class.new do
+        def self.rescue_from(*); end
+        include ViewModel::Controller
+        public :encode_jbuilder
+      end
+    end
+
+    let(:terminal) { { 'a' => 100 } }
+
+    let(:encoded_terminal) do
+      ViewModel::Controller::CompiledJson.new(Oj.dump(terminal, mode: :compat))
+    end
+
+    let(:expected_dump) { encode(terminal) }
+    let(:computed_dump) { encode(encoded_terminal) }
+
+    def encode(value)
+      controller.new.encode_jbuilder do |json|
+        json.x value
+      end
+    end
+
+    it 'passes through the prerendered data' do
+      assert_equal(expected_dump, computed_dump)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.6
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -340,6 +354,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".envrc"
 - ".gitignore"
 - ".idea/codeStyleSettings.xml"
 - ".travis.yml"
@@ -399,6 +414,8 @@ files:
 - lib/view_model/traversal_context.rb
 - lib/view_model/utils.rb
 - lib/view_model/utils/collections.rb
+- nix/gem/generate.rb
+- shell.nix
 - test/config/database.yml
 - test/helpers/arvm_test_models.rb
 - test/helpers/arvm_test_utilities.rb
@@ -427,6 +444,7 @@ files:
 - test/unit/view_model/active_record/version_test.rb
 - test/unit/view_model/active_record_test.rb
 - test/unit/view_model/callbacks_test.rb
+- test/unit/view_model/controller_test.rb
 - test/unit/view_model/deserialization_error/unique_violation_test.rb
 - test/unit/view_model/record_test.rb
 - test/unit/view_model/traversal_context_test.rb
@@ -484,6 +502,7 @@ test_files:
 - test/unit/view_model/active_record/version_test.rb
 - test/unit/view_model/active_record_test.rb
 - test/unit/view_model/callbacks_test.rb
+- test/unit/view_model/controller_test.rb
 - test/unit/view_model/deserialization_error/unique_violation_test.rb
 - test/unit/view_model/record_test.rb
 - test/unit/view_model/traversal_context_test.rb