Skip to content

Commit

Permalink
Fixed xml generated content caching
Browse files Browse the repository at this point in the history
  • Loading branch information
@gaspard
gaspard committed Aug 26, 2013
1 parent 021b585 commit 1efddc8
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 54 deletions.
1 change: 1 addition & 0 deletions History.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

* Minor changes
* Fixed gemspec to not include TextMate helper and selenium plugin.
* Fixed xml generated file caching.

== 1.2.6, 1.2.7 2013-08-16

Expand Down
4 changes: 2 additions & 2 deletions lib/zena/use/rendering.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ def render_and_cache(options={})
return
end

if data = result.delete(:data)
if data = result[:data]
send_data(data , result)
elsif file = result.delete(:file)
elsif file = result[:file]
send_file(file , result)
else
# Should never happen
Expand Down
8 changes: 5 additions & 3 deletions test/functional/nodes_controller_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -727,17 +727,19 @@ def test_cache_xml_format
test_site(:zena)
without_files('/test.host/public') do
name = "section#{nodes_zip(:people)}.xml"
cache_path = "#{SITES_ROOT}/test.host/public/en/#{name}"
with_caching do
assert !File.exist?("#{SITES_ROOT}/test.host/public/fr/#{name}")
assert !File.exist?(cache_path)
login(:lion)
doc = secure!(Template) { Template.create('title'=>'Node', 'format'=>'xml', 'text' => '<?xml version="1.0" encoding="utf-8"?><node><title do="title"/></node>', 'parent_id'=>nodes_id(:default))}
assert !doc.new_record?, "Not a new record"
assert doc.publish
login(:anon)
get 'show', :prefix => 'en', :path => [name]
assert_response :success
assert_equal "<?xml version=\"1.0\" encoding=\"utf-8\"?><node><title>people</title></node>", @response.body
assert File.exist?("#{SITES_ROOT}/test.host/public/en/#{name}")
assert_equal '<?xml version="1.0" encoding="utf-8"?><node><title>people</title></node>', @response.body
assert File.exist?(cache_path)
assert_equal '<?xml version="1.0" encoding="utf-8"?><node><title>people</title></node>', File.read(cache_path)
end
end
end
Expand Down
98 changes: 49 additions & 49 deletions zena.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Gem::Specification.new do |s|

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Gaspard Bucher"]
s.date = %q{2013-08-17}
s.date = %q{2013-08-22}
s.default_executable = %q{zena}
s.description = %q{zena is a Ruby on Rails CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
s.email = %q{gaspard@teti.ch}
Expand Down Expand Up @@ -2225,84 +2225,84 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<property>, ["= 2.3.3"])
s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
s.add_runtime_dependency(%q<daemons>, [">= 0"])
s.add_runtime_dependency(%q<property>, ["= 2.3.3"])
s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
s.add_runtime_dependency(%q<hpricot>, [">= 0"])
s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
s.add_runtime_dependency(%q<open4>, [">= 0"])
s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
s.add_runtime_dependency(%q<authlogic>, ["= 2.1.9"])
s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
s.add_runtime_dependency(%q<hpricot>, [">= 0"])
s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
s.add_runtime_dependency(%q<open4>, [">= 0"])
s.add_runtime_dependency(%q<daemons>, [">= 0"])
s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
else
s.add_dependency(%q<property>, ["= 2.3.3"])
s.add_dependency(%q<tzinfo>, [">= 0"])
s.add_dependency(%q<syntax>, ["= 1.0.0"])
s.add_dependency(%q<daemons>, [">= 0"])
s.add_dependency(%q<property>, ["= 2.3.3"])
s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
s.add_dependency(%q<rails>, ["= 2.3.18"])
s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
s.add_dependency(%q<hpricot>, [">= 0"])
s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
s.add_dependency(%q<versions>, ["= 0.3.1"])
s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
s.add_dependency(%q<json>, ["= 1.5.1"])
s.add_dependency(%q<yamltest>, ["= 0.7.0"])
s.add_dependency(%q<open4>, [">= 0"])
s.add_dependency(%q<rubyless>, ["= 0.8.10"])
s.add_dependency(%q<gettext>, ["= 2.1.0"])
s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
s.add_dependency(%q<authlogic>, ["= 2.1.9"])
s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
s.add_dependency(%q<json>, ["= 1.5.1"])
s.add_dependency(%q<shoulda>, ["= 2.10.3"])
s.add_dependency(%q<differ>, ["= 0.1.2"])
s.add_dependency(%q<hpricot>, [">= 0"])
s.add_dependency(%q<rubyless>, ["= 0.8.10"])
s.add_dependency(%q<yamltest>, ["= 0.7.0"])
s.add_dependency(%q<rails>, ["= 2.3.18"])
s.add_dependency(%q<versions>, ["= 0.3.1"])
s.add_dependency(%q<gem_plugin>, [">= 0"])
s.add_dependency(%q<open4>, [">= 0"])
s.add_dependency(%q<daemons>, [">= 0"])
s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
s.add_dependency(%q<tzinfo>, [">= 0"])
s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
end
else
s.add_dependency(%q<property>, ["= 2.3.3"])
s.add_dependency(%q<tzinfo>, [">= 0"])
s.add_dependency(%q<syntax>, ["= 1.0.0"])
s.add_dependency(%q<daemons>, [">= 0"])
s.add_dependency(%q<property>, ["= 2.3.3"])
s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
s.add_dependency(%q<rails>, ["= 2.3.18"])
s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
s.add_dependency(%q<hpricot>, [">= 0"])
s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
s.add_dependency(%q<versions>, ["= 0.3.1"])
s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
s.add_dependency(%q<json>, ["= 1.5.1"])
s.add_dependency(%q<yamltest>, ["= 0.7.0"])
s.add_dependency(%q<open4>, [">= 0"])
s.add_dependency(%q<rubyless>, ["= 0.8.10"])
s.add_dependency(%q<gettext>, ["= 2.1.0"])
s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
s.add_dependency(%q<authlogic>, ["= 2.1.9"])
s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
s.add_dependency(%q<json>, ["= 1.5.1"])
s.add_dependency(%q<shoulda>, ["= 2.10.3"])
s.add_dependency(%q<differ>, ["= 0.1.2"])
s.add_dependency(%q<hpricot>, [">= 0"])
s.add_dependency(%q<rubyless>, ["= 0.8.10"])
s.add_dependency(%q<yamltest>, ["= 0.7.0"])
s.add_dependency(%q<rails>, ["= 2.3.18"])
s.add_dependency(%q<versions>, ["= 0.3.1"])
s.add_dependency(%q<gem_plugin>, [">= 0"])
s.add_dependency(%q<open4>, [">= 0"])
s.add_dependency(%q<daemons>, [">= 0"])
s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
s.add_dependency(%q<tzinfo>, [">= 0"])
s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
end
end

0 comments on commit 1efddc8

Please sign in to comment.