zena 1.0.0.rc1 → 1.0.0.rc2

data/History.txt

@@ -1,3 +1,11 @@
+== 1.0.0.rc2 2011-02-14
+
+* major changes
+ * Fixed Template bug with special '+' modes.
+ * Fixed migration bug (should use NULL as brick name for app).
+ * Fixed custom query loading bug (when brick is not activated).
+ * Fixed Mongrel bug (incompatibility with Rails 2.3.8).
+
 == 1.0.0.rc1 2011-02-11
 
 * major changes

data/app/models/template.rb

@@ -29,7 +29,7 @@ class Template < TextDocument
         'skin_id'   => record[:section_id],
       }
     end
-    
+
     safe_property :tkpath, :mode, :target_klass, :format
   end
 
@@ -67,7 +67,7 @@ class Template < TextDocument
         if title =~ /^([A-Z][a-zA-Z]+?)(-(([a-zA-Z_\+]*)(-([a-zA-Z_]+)|))|)(\.|\Z)/
           # title changed force  update
           prop['target_klass']  = $1            unless prop.target_klass_changed?
-          prop['mode']   = ($4 || '').url_name  unless prop.mode_changed?
+          prop['mode']   = ($4 || '')           unless prop.mode_changed?
           prop['format'] = ($6 || 'html')       unless prop.format_changed?
         else
           # title set but it is not a master template name
@@ -78,7 +78,7 @@ class Template < TextDocument
       end
 
       if version.edited?
-         prop['mode'] = prop['mode'].gsub(/[^a-zA-Z]/, '') if prop['mode']
+         prop['mode'] = prop['mode'].gsub(/[^a-zA-Z\+]/, '') if prop['mode']
 
         if !prop['target_klass'].blank?
           # update title

data/bricks/mongrel/zena/deploy.rb

@@ -19,7 +19,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         asset_port = Bricks.raw_config['asset_port']
         if asset_port == self[:mongrel_port].to_i - 1
           mongrel_port  = asset_port
-          mongrel_count = self[:mongrel_count] + 1
+          mongrel_count = self[:mongrel_count].to_i + 1
         elsif asset_port.nil?
           # no asset port: OK.
         else

data/bricks/mongrel/zena/init.rb

@@ -0,0 +1,85 @@
+# This fixes a bug between Rails 2.3.8 and Mongrel
+# Error calling Dispatcher.dispatch #<NoMethodError: undefined method `[]' for nil:NilClass>
+#
+if Rails.version == '2.3.8' && Gem.available?('mongrel', Gem::Requirement.new('~>1.1.5')) && self.class.const_defined?(:Mongrel)
+
+  # Pulled right from latest rack. Old looked like this in 1.1.0 version.
+  #
+  # def [](k)
+  #   super(@names[k] ||= @names[k.downcase])
+  # end
+  #
+  module Rack
+    module Utils
+      class HeaderHash < Hash
+        def [](k)
+          super(@names[k]) if @names[k]
+          super(@names[k.downcase])
+        end
+      end
+    end
+  end
+
+  # Code pulled from the ticket above.
+  #
+  class Mongrel::CGIWrapper
+    def header_with_rails_fix(options = 'text/html')
+      @head['cookie'] = options.delete('cookie').flatten.map { |v| v.sub(/^\n/,'') } if options.class != String and options['cookie']
+      header_without_rails_fix(options)
+    end
+    alias_method_chain :header, :rails_fix
+  end
+
+  # Pulled right from 2.3.8 ActionPack. Simple diff was
+  #
+  # if headers.include?('Set-Cookie')
+  #   headers['cookie'] = headers.delete('Set-Cookie').split("\n")
+  # end
+  #
+  # to
+  #
+  # if headers['Set-Cookie']
+  #   headers['cookie'] = headers.delete('Set-Cookie').split("\n")
+  # end
+  #
+  module ActionController
+    class CGIHandler
+      def self.dispatch_cgi(app, cgi, out = $stdout)
+        env = cgi.__send__(:env_table)
+        env.delete "HTTP_CONTENT_LENGTH"
+        cgi.stdinput.extend ProperStream
+        env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/"
+        env.update({
+          "rack.version" => [0,1],
+          "rack.input" => cgi.stdinput,
+          "rack.errors" => $stderr,
+          "rack.multithread" => false,
+          "rack.multiprocess" => true,
+          "rack.run_once" => false,
+          "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
+        })
+        env["QUERY_STRING"] ||= ""
+        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
+        env["REQUEST_PATH"] ||= "/"
+        env.delete "PATH_INFO" if env["PATH_INFO"] == ""
+        status, headers, body = app.call(env)
+        begin
+          out.binmode if out.respond_to?(:binmode)
+          out.sync = false if out.respond_to?(:sync=)
+          headers['Status'] = status.to_s
+          if headers['Set-Cookie']
+            headers['cookie'] = headers.delete('Set-Cookie').split("\n")
+          end
+          out.write(cgi.header(headers))
+          body.each { |part|
+            out.write part
+            out.flush if out.respond_to?(:flush)
+          }
+        ensure
+          body.close if body.respond_to?(:close)
+        end
+      end
+    end
+  end
+
+end

data/db/init/base/skins/default/style.css

@@ -26,7 +26,9 @@ input { padding:3px 4px;}
 .summary p { margin:0; font-style:italic; font-family:Georgia,Times,serif;}
 #context { width:180px; float:left; border-right:1px solid grey;}
 #context a { color:#aaa; }
+#context .admin_links a { color:inherit; }
 #context a:hover { color:#04a; }
+#context .admin_links a:hover { color:inherit; }
 ol { padding-left:14px;}
 
 #content { margin-left: 200px; }

data/lib/bricks/loader.rb

@@ -21,13 +21,18 @@ module Bricks
         !File.exist?(f)
       end
     end
-
+    
+    # Find all paths matching 'sub_path' in the active bricks.
+    def paths_for(sub_path)
+      bricks.map {|f| Dir["#{f}/#{sub_path}"] }.flatten
+    end
+    
     def models_paths
-      bricks.map {|f| Dir["#{f}/models"] }.flatten
+      paths_for('models')
     end
 
     def init_paths
-      bricks.map {|f| Dir["#{f}/zena/init.rb"] }.flatten
+      paths_for('zena/init.rb')
     end
 
     def migrations_for(brick)
@@ -39,15 +44,13 @@ module Bricks
     end
 
     def zafu_tests
-      ["#{Zena::ROOT}/bricks/*/zena/test/zafu", "#{RAILS_ROOT}/bricks/*/zena/test/zafu"]
+      paths_for('zena/test/zafu')
     end
 
     def test_files
-      [
-        'bricks/*/zena/test/unit/*_test.rb',
-        'bricks/*/zena/test/functional/*_test.rb',
-        'bricks/*/zena/test/integration/*_test.rb',
-      ]
+      paths_for('zena/test/unit/*_test.rb') +
+      paths_for('zena/test/functional/*_test.rb') +
+      paths_for('zena/test/integration/*_test.rb')
      end
 
     # FIXME: remove

data/lib/tasks/zena.rake

@@ -273,7 +273,7 @@ namespace :zena do
       paths['_app'] = "#{RAILS_ROOT}/db/migrate"
 
       bricks.each do |brick_name, path|
-        Zena::Migrator.migrate(paths[brick_name], brick_name, nil)
+        Zena::Migrator.migrate(paths[brick_name], brick_name == '_app' ? nil : brick_name, nil)
       end
       #ActiveRecord::Migrator.migrate("db/migrate/", nil)
     end

data/lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.0.0.rc1'
+  VERSION        = '1.0.0.rc2'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/use/query_node.rb

@@ -105,7 +105,7 @@ module Zena
         after_process :insert_links_fields
         after_process :secure_query
 
-        load_custom_queries ["#{RAILS_ROOT}/bricks/*/queries"]
+        load_custom_queries Bricks.paths_for('queries')
 
         CORE_CONTEXTS = %w{parent project section}
 

data/test/functional/nodes_controller_test.rb

@@ -264,9 +264,21 @@ class NodesControllerTest < Zena::Controller::TestCase
         end # with a bad value
 
       end # by changing skin
-
+      
     end # updating a node
+    
+    # ======================================= Template update
+    context 'updating a template' do
+      subject do
+        {:action => 'update', :controller => 'nodes', :id => nodes_zip(:Node_zafu), :node => {:mode => '+index'}}
+      end
 
+      should 'update template with new mode' do
+        put_subject
+        assert_equal '+index', assigns(:node).mode
+      end
+    end # updating a template
+    
     context 'using xml' do
       context 'without being in the api_group' do
         setup do

data/test/unit/site_test.rb

@@ -31,6 +31,11 @@ class SiteTest < Zena::Unit::TestCase
 
       # should return a new project as root node
       assert_kind_of Project, subject.root_node
+
+      # should install base skin
+      index_zafu = secure(Node) { subject.root_node.find(:first, "template where title like 'Node%login' in site") }
+      assert_kind_of Template, index_zafu
+      assert_equal '+login', index_zafu.mode
     end
   end
 

data/test/unit/template_test.rb

@@ -134,7 +134,7 @@ class TemplateTest < Zena::Unit::TestCase
 
       context 'with a format' do
         subject do
-          secure(Template) { Template.create(:parent_id=>nodes_id(:default), :title => 'Node-tree', :format => 'xml') }
+          secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => 'Node-tree', :format => 'xml') }
         end
 
         should 'use format in title' do
@@ -143,6 +143,30 @@ class TemplateTest < Zena::Unit::TestCase
         end
       end # with a blank title
 
+      context 'with a special mode' do
+        subject do
+          secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => 'Node', :mode => '+edit') }
+        end
+
+        should 'use mode in title' do
+          assert !subject.new_record?
+          assert_equal 'Node-+edit', subject.title
+        end
+        
+        context 'in the title' do
+          subject do
+            secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => 'Node-+index') }
+          end
+
+          should 'description' do
+            assert_difference('Template.count', 1) do
+              assert_equal '+index', subject.mode
+            end
+          end
+        end # in the title
+        
+      end # with a special mode
+
       context 'with class format and mode in title' do
         subject do
           secure!(Document) { Document.create(:parent_id => nodes_id(:default), :title => 'Project-collab-xml.zafu')}

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.0.0.rc1"
+  s.version = "1.0.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2011-02-11}
+  s.date = %q{2011-02-14}
   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}
@@ -272,6 +272,7 @@ Gem::Specification.new do |s|
      "bricks/math/zena/init.rb",
      "bricks/mongrel/README",
      "bricks/mongrel/zena/deploy.rb",
+     "bricks/mongrel/zena/init.rb",
      "bricks/passenger/README",
      "bricks/passenger/zena/deploy.rb",
      "bricks/pdf/.document",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  hash: 977940574
+  hash: 977940575
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc1
-  version: 1.0.0.rc1
+  - rc2
+  version: 1.0.0.rc2
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +01:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -614,6 +614,7 @@ files:
 - bricks/math/zena/init.rb
 - bricks/mongrel/README
 - bricks/mongrel/zena/deploy.rb
+- bricks/mongrel/zena/init.rb
 - bricks/passenger/README
 - bricks/passenger/zena/deploy.rb
 - bricks/pdf/.document