rack-reducer 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89560b1f9fb58a56452e6e9cbba2a9dd5e0159b938c804628750549da310c543
-  data.tar.gz: f7e9667193f0e4e6e5b413ceec8506919f784604d5be97746239688f3074ab8b
+  metadata.gz: c069005f0502425e332cd99bb9b27d11ab257baa937be74ce96b120e6af1cb70
+  data.tar.gz: 7c818a942e2d5b6fe50aa6832c74d11592d76e16d6cd92d31aeb4bc608092a3e
 SHA512:
-  metadata.gz: fa641c8d24f2bd6a52f523e447c43d1714c92db33175750b4728512bcdca9f5668a018a4be1b5a504fb3ad0188ace6e5e3911503c6a06d48cbf3d9a64aecf489
-  data.tar.gz: d60cbdae9d7d225024680262be9be5b8b92a923ad224452dfd7e383410e75d5ee717ac3842b9f0ed95ebb8b3789ef36bc3880794b62577f1162a6d67816df77b
+  metadata.gz: 3db32664cc591ecb2efa31d9bb39a4c3efb321e21a8fcabd5355416b7fca771ef9c2c90be57913f9b44bad100c95900e0ca8e2b14fcf3931f32cad8d70cd62e8
+  data.tar.gz: fc199821f33b07ae4f3684dd2f56367d89415bd16385ae6bb383df220e4266564ca8d6092443dea1bafbb50378660d173caceef36dd3f3c17d4afe52f7da81fa

data/README.md

@@ -161,7 +161,7 @@ class Artist < ApplicationRecord
     ->(name:) { by_name(name) },
     ->(genre:) { where(genre: genre) },
     ->(sort:) { order(sort.to_sym) }
-  ]
+  )
 
   scope :by_name, lambda { |name|
     where('lower(name) like ?', "%#{name.downcase}%")

data/lib/rack/reducer.rb

@@ -51,7 +51,7 @@ module Rack
     def apply(url_params)
       if url_params.empty?
         # Return early with the unfiltered dataset if no default filters exist
-        return @dataset if @default_filters.empty?
+        return fresh_dataset if @default_filters.empty?
 
         # Run only the default filters
         filters, params = @default_filters, EMPTY_PARAMS
@@ -66,7 +66,7 @@ module Rack
     private
 
     def reduce(params, filters)
-      filters.reduce(@dataset) do |data, filter|
+      filters.reduce(fresh_dataset) do |data, filter|
         next data unless filter.satisfies?(params)
 
         data.instance_exec(
@@ -76,6 +76,13 @@ module Rack
       end
     end
 
+    # Rails +Model.all+ relations get query-cached by default, which has caused
+    # filterless requests to load stale data. This method busts the query cache.
+    # See https://github.com/chrisfrank/rack-reducer/issues/11
+    def fresh_dataset
+      @dataset.clone
+    end
+
     EMPTY_PARAMS = {}.freeze
     private_constant :EMPTY_PARAMS
   end

data/lib/rack/reducer/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   class Reducer
-    VERSION = '2.0.0'
+    VERSION = '2.0.2'
   end
 end

data/spec/rails_spec.rb

@@ -2,9 +2,13 @@ require 'spec_helper'
 require_relative 'fixtures'
 
 Process.respond_to?(:fork) && RSpec.describe('in a Rails app') do
+  using SpecRefinements
   BuildRailsApp = lambda do
     require 'action_controller/railtie'
+    require 'active_record'
     require 'securerandom'
+    require 'sqlite3'
+
     app = Class.new(Rails::Application) do
       routes.append do
         get "/", to: "artists#index"
@@ -16,14 +20,33 @@ Process.respond_to?(:fork) && RSpec.describe('in a Rails app') do
       config.secret_key_base = SecureRandom.hex(64)
     end
 
+    ActiveRecord::Base.establish_connection("sqlite3::memory:")
+    ActiveRecord::Schema.define do
+      create_table :artists do |t|
+        t.string  :name
+        t.string  :genre
+        t.integer  :release_count
+      end
+    end
+
+    Artist = Class.new(ActiveRecord::Base)
+
+    Fixtures::DB[:artists].each { |row| Artist.create(row) }
+
     ArtistsController = Class.new(ActionController::API) do
+      RailsReducer = Rack::Reducer.new(
+        Artist.all,
+        ->(name:) { where('lower(name) like ?', "%#{name.downcase}%") },
+        ->(genre:) { where(genre: genre) },
+      )
+
       def index
-        @artists = Fixtures::ArtistReducer.apply(params)
+        @artists = RailsReducer.apply(params)
         render json: @artists
       end
 
       def query
-        @artists = Fixtures::ArtistReducer.apply(request.query_parameters)
+        @artists = RailsReducer.apply(request.query_parameters)
         render json: @artists
       end
     end
@@ -47,7 +70,22 @@ Process.respond_to?(:fork) && RSpec.describe('in a Rails app') do
     Process.wait(pid)
   end
 
-  it 'does not load ActiveSupport into global scope b/c of this spec' do
+  it 'tracks updates to the backend between requests' do
+    pid = Process.fork do
+      get("/") { |res| expect(res.json.count).to eq(6) }
+
+      Artist.create!(name: "RZA")
+
+      get("/") { |res| expect(res.json.count).to eq(7) }
+
+      Artist.find_by(name: "RZA").destroy
+
+      get("/") { |res| expect(res.json.count).to eq(6) }
+    end
+    Process.wait(pid)
+  end
+
+  it 'does not pollute the global Ruby scope' do
     expect { ''.blank? }.to raise_error(NoMethodError)
   end
 end

data/spec/reducer_spec.rb

@@ -26,13 +26,6 @@ RSpec.describe 'Rack::Reducer' do
     end
   end
 
-  it 'resets state between requests' do
-    get('/artists?name=Blake')
-    get('/artists') do |res|
-      expect(res.json.count).to eq(Fixtures::DB[:artists].count)
-    end
-  end
-
   it 'filters by a single param, e.g. genre' do
     get('/artists?genre=electronic') do |response|
       expect(response.body).to include('Björk')
@@ -64,6 +57,32 @@ RSpec.describe 'Rack::Reducer' do
     expect(Fixtures::ArtistReducer.apply(nil)).to be_truthy
   end
 
+  describe 'between requests' do
+    original_count = Fixtures::DB[:artists].count
+
+    it 'resets filter state' do
+      get('/artists?name=Blake')
+      get('/artists') do |res|
+        expect(res.json.count).to eq(Fixtures::DB[:artists].count)
+      end
+    end
+
+    it 'tracks updates to the backend' do
+      get('/artists')
+
+      Fixtures::DB[:artists][0][:name] = "Lizzo"
+      Fixtures::DB[:artists] << { name: 'New Artist' }
+
+      get('/artists') do |response|
+        expect(response.json.count).to eq(original_count + 1)
+        expect(response.json.dig(0, 'name')).to eq('Lizzo')
+      end
+
+      Fixtures::DB[:artists].pop
+      Fixtures::DB[:artists][0][:name] = "Blake Mills"
+    end
+  end
+
   describe 'with default filters' do
     let(:app) do
       sort = ->(sort: 'name') { sort_by { |item| item[sort.to_sym] }  }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-reducer
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Chris Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement