diff --git a/History.txt b/History.txt index eb030339..34a1e15c 100644 --- a/History.txt +++ b/History.txt @@ -1,4 +1,4 @@ -== 1.0.0 +== 1.0.0 2011-06-15 * Major changes * [link] and other url related zafu tags ([form]) *do not typecast to String* by default: @@ -21,6 +21,7 @@ * Fixed ajax bugs for edge cases ([add] + [drop], etc). * Fixed security in ACL when using t_url Ajax. * Fixed role importation with prop_eval (validation). + * Fixed safe_method caching bug on site bootstrapping. == 1.0.0.rc3 2011-05-26 diff --git a/app/models/node.rb b/app/models/node.rb index 01758c03..7371c34a 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -621,7 +621,7 @@ def create_nodes_from_folder(opts) return res end - entries = Dir.entries(folder).reject { |f| f =~ /^[\.~]/ }.map do |filename| + entries = Dir.entries(folder).reject { |f| f =~ /^[\.~]|^__/ }.map do |filename| String.from_filename(filename) end.sort diff --git a/lib/zena.rb b/lib/zena.rb index 6f875648..b94a0c75 100644 --- a/lib/zena.rb +++ b/lib/zena.rb @@ -220,7 +220,7 @@ def use(*args) def init config = Rails.configuration enable_tools - puts "** zena #{Zena::VERSION} #{tools_enabled == [] ? '' : '('+tools_enabled.join(', ')+') '}starting" + puts "** zena #{Zena::VERSION} starting (c) Gaspard Bucher 2011" puts "** Bricks: #{Bricks::CONFIG.map{|k,v| k}.sort.join(', ')}" add_load_paths(config) diff --git a/lib/zena/info.rb b/lib/zena/info.rb index 0c4a47a7..53149611 100644 --- a/lib/zena/info.rb +++ b/lib/zena/info.rb @@ -1,4 +1,4 @@ module Zena - VERSION = '1.0.0.rc4' + VERSION = '1.0.0' ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')) end diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb index a70272cc..d404b80f 100644 --- a/test/unit/node_test.rb +++ b/test/unit/node_test.rb @@ -955,8 +955,8 @@ def test_create_nodes_from_archive should 'create with correct vclass' do letter = subject.detect {|n| n.title == 'letter'} - assert_kind_of Note, letter assert_equal 'Letter', letter.klass + assert_kind_of Note, letter end end # with instances of vclass diff --git a/zena.gemspec b/zena.gemspec index 7c526744..5aec5d63 100644 --- a/zena.gemspec +++ b/zena.gemspec @@ -5,9 +5,9 @@ Gem::Specification.new do |s| s.name = %q{zena} - s.version = "1.0.0.rc4" + s.version = "1.0.0" - s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Gaspard Bucher"] s.date = %q{2011-06-15} s.default_executable = %q{zena}