Skip to content

Commit

Permalink
bump version to 1.8.0.alpha1
Browse files Browse the repository at this point in the history
  • Loading branch information
did committed Mar 22, 2024
1 parent 67c0de7 commit e843a9e
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 50 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gemspec

group :development do
# gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '4d1bd56'
gem 'locomotivecms_common', path: '../common'
# gem 'locomotivecms_common', path: '../common'
# gem 'duktape', path: '../tmp/duktape.rb'
# gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
# gem 'duktape', github: 'did/duktape.rb', branch: 'any-fixnum'
Expand Down
77 changes: 35 additions & 42 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
PATH
remote: ../common
specs:
locomotivecms_common (0.5.0)
activesupport (>= 5)
attr_extras (~> 7.1.0)
colorize
stringex (~> 2.8.5)

PATH
remote: .
specs:
locomotivecms_steam (1.7.1)
locomotivecms_steam (1.8.0.alpha1)
RedCloth (~> 4.3.2)
bcrypt (~> 3.1.11)
chronic (~> 0.10.2)
dragonfly (>= 1.2, < 1.5)
duktape (~> 2.0.1.1)
execjs (~> 2.8.1)
execjs (~> 2.9.1)
httparty (~> 0.16.0)
kramdown (~> 2.3.0)
liquid (~> 4.0.4)
locomotivecms_common (~> 0.5.0)
locomotivecms_common (~> 0.6.0.alpha1)
mime-types (~> 3.5.0)
mimetype-fu (~> 0.1.2)
moneta (~> 1.6.0)
Expand All @@ -37,8 +28,8 @@ PATH
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.3)
activesupport (7.1.2)
RedCloth (4.3.4)
activesupport (7.1.3.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -48,16 +39,16 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
attr_extras (7.1.0)
base64 (0.2.0)
bcrypt (3.1.20)
bigdecimal (3.1.4)
bigdecimal (3.1.7)
bson (4.15.0)
chronic (0.10.2)
colorize (1.1.0)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
coveralls (0.8.23)
json (>= 1.8, < 3)
Expand All @@ -67,67 +58,71 @@ GEM
tins (~> 1.6)
crass (1.0.6)
date (3.3.4)
diff-lcs (1.5.0)
diff-lcs (1.5.1)
docile (1.4.0)
dragonfly (1.4.0)
addressable (~> 2.3)
multi_json (~> 1.0)
rack (>= 1.3)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
duktape (2.0.1.1)
execjs (2.8.1)
execjs (2.9.1)
flamegraph (0.9.5)
haml (6.2.3)
haml (6.2.5)
temple (>= 0.8.2)
thor
tilt
httparty (0.16.4)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
i18n-spec (0.6.0)
iso
iso (0.4.0)
i18n
json (2.6.3)
json (2.7.1)
json_spec (1.1.5)
multi_json (~> 1.0)
rspec (>= 2.0, < 4.0)
kramdown (2.3.2)
rexml
liquid (4.0.4)
locomotivecms_common (0.6.0.alpha1)
activesupport (>= 5)
attr_extras (~> 7.1.0)
colorize
stringex (~> 2.8.5)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
memory_profiler (1.0.1)
mime-types (3.5.1)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1003)
mime-types-data (3.2024.0305)
mimetype-fu (0.1.2)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.20.0)
minitest (5.22.3)
moneta (1.6.0)
mongo (2.18.3)
bson (>= 4.14.1, < 5.0.0)
morphine (0.1.1)
multi_json (1.15.0)
multi_xml (0.6.0)
mutex_m (0.2.0)
net-imap (0.4.5)
net-imap (0.4.10)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-smtp (0.4.0.1)
net-protocol
nio4r (2.6.0)
nio4r (2.7.0)
nokogiri (1.14.5)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
Expand All @@ -137,11 +132,11 @@ GEM
pony (1.13.1)
mail (>= 2.0)
public_suffix (5.0.4)
puma (6.4.0)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.7.3)
rack (3.0.8)
rack-cache (1.14.0)
rack (3.0.9.1)
rack-cache (1.16.0)
rack (>= 0.4)
rack-mini-profiler (0.10.7)
rack (>= 1.2.0)
Expand All @@ -158,16 +153,15 @@ GEM
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-core (3.12.3)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rspec-expectations (3.12.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-mocks (3.12.7)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
ruby2_keywords (0.0.5)
rspec-support (3.12.2)
sanitize (6.0.2)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -176,13 +170,13 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
stackprof (0.2.25)
stackprof (0.2.26)
stringex (2.8.6)
sync (0.5.0)
temple (0.10.3)
term-ansicolor (1.7.1)
term-ansicolor (1.7.2)
tins (~> 1.0)
thor (1.3.0)
thor (1.3.1)
tilt (2.3.0)
timecop (0.9.8)
timeout (0.4.1)
Expand All @@ -201,7 +195,6 @@ DEPENDENCIES
haml (~> 6.2.3)
i18n-spec (~> 0.6.0)
json_spec (~> 1.1.5)
locomotivecms_common!
locomotivecms_steam!
memory_profiler
mongo (~> 2.18.2)
Expand Down
2 changes: 1 addition & 1 deletion lib/locomotive/steam/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# 1.0.0.alpha < 1.0.0.alpha1 < 1.0.0.beta < 1.0.0.beta2 < 1.0.0.beta11 < 1.0.0.rc1 < 1.0.0
module Locomotive
module Steam
VERSION = '1.7.1'
VERSION = '1.8.0.alpha1'
end
end
4 changes: 2 additions & 2 deletions locomotivecms_steam.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'dragonfly', '>= 1.2', '< 1.5'
spec.add_dependency 'moneta', '~> 1.6.0'

spec.add_dependency 'execjs', '~> 2.8.1'
spec.add_dependency 'execjs', '~> 2.9.1'

spec.add_dependency 'kramdown', '~> 2.3.0'
spec.add_dependency 'RedCloth', '~> 4.3.2'
Expand All @@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'duktape', '~> 2.0.1.1'
spec.add_dependency 'pony', '~> 1.12'

spec.add_dependency 'locomotivecms_common', '~> 0.5.0'
spec.add_dependency 'locomotivecms_common', '~> 0.6.0.alpha1'

spec.required_ruby_version = ['>= 3.0']
end
8 changes: 4 additions & 4 deletions spec/unit/middlewares/cache_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@

let(:response) { nil }

before { expect(cache).to receive(:read).with('40ba2b3cfde6e2f8539c9ffa02fab139').and_return(response) }
before { expect(cache).to receive(:read).with('7f3fe1e49370f63970331ec3194d4590').and_return(response) }

context 'the cache is empty' do

before { expect(cache).to receive(:write).with('40ba2b3cfde6e2f8539c9ffa02fab139', Marshal.dump([200, {}, ["Hello world!"]])) }
before { expect(cache).to receive(:write).with('7f3fe1e49370f63970331ec3194d4590', Marshal.dump([200, {}, ["Hello world!"]])) }

it 'tells the CDN to cache the page and also cache it internally' do
is_expected.to eq ['max-age=0, s-maxage=3600, public, must-revalidate', 'Accept-Language']
Expand All @@ -69,7 +69,7 @@

subject { send_request[:env]['steam.cache_etag'] }

it { is_expected.to eq '40ba2b3cfde6e2f8539c9ffa02fab139' }
it { is_expected.to eq '7f3fe1e49370f63970331ec3194d4590' }

end

Expand Down Expand Up @@ -104,7 +104,7 @@

context 'based on the ETag' do

let(:etag) { '40ba2b3cfde6e2f8539c9ffa02fab139' }
let(:etag) { '7f3fe1e49370f63970331ec3194d4590' }

it 'returns a 304 (Not modified) without no cache headers' do
expect(subject.first).to eq 304
Expand Down

0 comments on commit e843a9e

Please sign in to comment.