zena 1.0.0.beta2 → 1.0.0.beta3

data/test/unit/zena/acts/enrollable_test.rb

@@ -106,9 +106,15 @@ class EnrollableTest < Zena::Unit::TestCase
             secure(Node) { nodes(:tree_jpg) }
           end
 
-          should 'remove role on property set to blank' do
-            assert_difference('NodesRoles.count', -1) do
+          should 'not remove role until last prop is blank' do
+            assert_difference('NodesRoles.count', 0) do
               assert subject.update_attributes('origin' => '')
+            end
+          end
+
+          should 'remove role when all prop are blank' do
+            assert_difference('NodesRoles.count', -1) do
+              assert subject.update_attributes('origin' => '', 'tz' => '')
               assert_nil subject.origin
               assert_nil subject.cached_role_ids
             end
@@ -135,7 +141,7 @@ class EnrollableTest < Zena::Unit::TestCase
 
             # 2. create a new version and publish
             assert_difference('NodesRoles.count', -1) do
-              subject.update_attributes('origin' => '')
+              subject.update_attributes('origin' => '', 'tz' => '')
               assert subject.publish
             end
 
@@ -149,12 +155,21 @@ class EnrollableTest < Zena::Unit::TestCase
             end
           end
 
+          should 'respond to zafu_roles' do
+            assert_equal %w{Original}, subject.zafu_roles.map(&:name)
+          end
+
+          should 'use cached_role_ids in zafu_roles' do
+            Role.connection.execute("DELETE FROM nodes_roles")
+            assert_equal %w{Original}, subject.zafu_roles.map(&:name)
+          end
+
           context 'with new property index defined in role' do
             setup do
               column = secure(Column) { columns(:Letter_paper) }
               column.update_attributes(:index => 'string')
             end
-            
+
             subject do
               secure(Node) { nodes(:letter) }
             end
@@ -169,11 +184,21 @@ class EnrollableTest < Zena::Unit::TestCase
         end # with roles assigned
 
         should 'not allow arbitrary attributes' do
-          assert_raise(ActiveRecord::UnknownAttributeError) do
-            assert subject.update_attributes('assigned' => 'flat Eric', 'bad' => 'property')
+          assert !subject.update_attributes('assigned' => 'flat Eric', 'bad' => 'property')
+        end
+        
+        should 'not raise on bad attributes' do
+          assert_nothing_raised do
+            subject.attributes = {'elements' => 'Statistical Learning'}
           end
         end
 
+        should 'add an error on first bad attributes' do
+          subject.attributes = {'elements' => 'Statistical Learning'}
+          assert !subject.save
+          assert_equal 'unknown attribute', subject.errors[:elements]
+        end
+
         should 'not allow property bypassing' do
           assert !subject.update_attributes('properties' => {'bad' => 'property'})
           assert_equal 'property not declared', subject.errors[:bad]
@@ -189,7 +214,11 @@ class EnrollableTest < Zena::Unit::TestCase
             assert !subject.respond_to?(:origin)
           end
         end # with properties assigned through role
-      end # from a classwith roles
+
+        should 'respond to zafu_possible_roles' do
+          assert_equal %w{Original Task Letter}, subject.zafu_possible_roles.map {|r| r.name}
+        end
+      end # from a class with roles
     end # on a node
 
     context 'creating a node' do

data/test/unit/zena/acts/serializable_test.rb

@@ -75,11 +75,23 @@ class SerializableTest < Zena::Unit::TestCase
 
         should 'ignore legacy properties in xml' do
           hash = Hash.from_xml(subject.to_xml)['node']
-          assert_not_nil subject.prop['tz']
-          assert_nil hash['tz']
+          assert_not_nil subject.prop['foo']
+          assert_nil hash['foo']
         end
       end
 
     end # on a node
+
+    context 'on many nodes' do
+      subject do
+        xml = secure(Node) { Node.search_records(:qb => 'images in site') }.to_xml(:root => 'nodes')
+        Hash.from_xml(xml)
+      end
+
+      should 'use nodes as root' do
+        assert subject['nodes']
+        assert_equal 4, subject['nodes'].size
+      end
+    end # on many nodes
   end # A visitor with read access
 end

data/test/unit/zena/use/i18n_test.rb

@@ -1,14 +1,14 @@
 require 'test_helper'
 
 class I18nTest < Zena::View::TestCase
-  
+
   context 'With a logged in user' do
     setup do
       login(:lion)
       visiting(:cleanWater)
       I18n.locale = 'en'
     end
-    
+
     context 'translating with _' do
       should 'return translation for current lang' do
         assert_equal '%A, %B %d %Y', _('full_date')
@@ -20,7 +20,7 @@ class I18nTest < Zena::View::TestCase
         assert_equal 'yoba', _('yoba')
       end
     end # translating with _
-    
+
     context 'on lang_links' do
       should 'highlight current lang with em' do
         assert_match %r{<em>en</em>}, lang_links
@@ -38,7 +38,7 @@ class I18nTest < Zena::View::TestCase
       I18n.locale = 'en'
       visiting(:cleanWater)
     end
-    
+
     context 'translating with _' do
       should 'return translation for current lang' do
         assert_equal '%A, %B %d %Y', _('full_date')
@@ -50,7 +50,7 @@ class I18nTest < Zena::View::TestCase
         assert_equal 'yoba', _('yoba')
       end
     end # translating with _
-    
+
     context 'on lang_links' do
       should 'highlight current lang with em' do
         assert_match %r{<em>en</em>}, lang_links
@@ -61,4 +61,31 @@ class I18nTest < Zena::View::TestCase
       end
     end # on lang_links
   end # Without a login
+
+  context 'With a translation dict' do
+    setup do
+      login(:anon)
+      visitor.lang = 'fr'
+    end
+
+    subject do
+      Zena::Use::I18n::TranslationDict.new(nodes_id(:translations))
+    end
+
+    should 'load data on first request' do
+      assert_nil subject.instance_variable_get(:@dict)
+      assert_equal "j'aime", subject.get('I love')
+      assert_kind_of Hash, subject.instance_variable_get(:@dict)
+      assert_equal "foo", subject.get('foo')
+    end
+
+    should 'load data in new object' do
+      visitor.lang = 'de'
+      assert_equal "Ich liebe", subject.get('I love')
+      visitor.lang = 'fr'
+      # should not reload
+      assert_equal "Ich liebe", subject.get('I love')
+    end
+  end # With a translation dict
+
 end

data/test/unit/zena/use/query_node_test.rb

@@ -60,6 +60,18 @@ class QueryNodeTest < Zena::Unit::TestCase
         assert_equal Hash['versions_count', '2'], subject.db_attr
       end
     end
+
+    should 'return an array on find all' do
+      assert_kind_of Array, subject.find(:all, 'images in site')
+    end
+
+    should 'return a record on find first' do
+      assert_kind_of Node, subject.find(:first, 'images in site')
+    end
+
+    should 'return a number on find count' do
+      assert_equal 4, subject.find(:count, 'images in site')
+    end
   end # An object with QueryNode::ModelMethods
 
   context 'Building a query' do
@@ -72,7 +84,7 @@ class QueryNodeTest < Zena::Unit::TestCase
         assert subject.main_class < Document
       end
     end # with a real class filter
-    
+
     context 'with root' do
       subject do
         Node.build_query(:all, 'root')

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.0.0.beta2"
+  s.version = "1.0.0.beta3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-07-24}
+  s.date = %q{2010-09-17}
   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}
@@ -291,6 +291,10 @@ Gem::Specification.new do |s|
      "bricks/data2pdf/test/unit/test_rendering.rb",
      "bricks/math/lib/bricks/math.rb",
      "bricks/math/zena/init.rb",
+     "bricks/mongrel/README",
+     "bricks/mongrel/zena/deploy.rb",
+     "bricks/passenger/README",
+     "bricks/passenger/zena/deploy.rb",
      "bricks/sphinx/MIT-LICENSE",
      "bricks/sphinx/README",
      "bricks/sphinx/lib/use_sphinx.rb",
@@ -430,6 +434,7 @@ Gem::Specification.new do |s|
      "db/migrate/20100526090140_renamed_contact_model_to_base_contact.rb",
      "db/migrate/20100527130937_change_column_index_to_string.rb",
      "db/migrate/20100531135128_add_fulltext_builder_fields.rb",
+     "db/migrate/20100915062903_add_api_group_id_to_site.rb",
      "doc/README_FOR_APP",
      "doc/fixtures.graffle",
      "doc/fixtures.pdf",
@@ -508,6 +513,12 @@ Gem::Specification.new do |s|
      "lib/zena/parser/zazen_tags.rb",
      "lib/zena/parser/zena_rules.rb",
      "lib/zena/refactor/act_as_content.rb",
+     "lib/zena/remote.rb",
+     "lib/zena/remote/connection.rb",
+     "lib/zena/remote/interface.rb",
+     "lib/zena/remote/klass.rb",
+     "lib/zena/remote/mock.rb",
+     "lib/zena/remote/node.rb",
      "lib/zena/routes.rb",
      "lib/zena/site_worker.rb",
      "lib/zena/test_controller.rb",
@@ -1790,6 +1801,7 @@ Gem::Specification.new do |s|
      "test/integration/zafu_compiler/basic.yml",
      "test/integration/zafu_compiler/calendar.yml",
      "test/integration/zafu_compiler/complex.yml",
+     "test/integration/zafu_compiler/complex_ok.yml",
      "test/integration/zafu_compiler/conditional.yml",
      "test/integration/zafu_compiler/data.yml",
      "test/integration/zafu_compiler/dates.yml",
@@ -1875,6 +1887,7 @@ Gem::Specification.new do |s|
      "test/unit/reference_test.rb",
      "test/unit/relation_proxy_test.rb",
      "test/unit/relation_test.rb",
+     "test/unit/remote_test.rb",
      "test/unit/role_test.rb",
      "test/unit/section_test.rb",
      "test/unit/site_test.rb",
@@ -2116,6 +2129,7 @@ Gem::Specification.new do |s|
      "test/unit/reference_test.rb",
      "test/unit/relation_proxy_test.rb",
      "test/unit/relation_test.rb",
+     "test/unit/remote_test.rb",
      "test/unit/role_test.rb",
      "test/unit/section_test.rb",
      "test/unit/site_test.rb",
@@ -2166,11 +2180,11 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0.3.12"])
       s.add_runtime_dependency(%q<rails>, ["= 2.3.8"])
-      s.add_runtime_dependency(%q<rubyless>, [">= 0.6.0"])
+      s.add_runtime_dependency(%q<rubyless>, [">= 0.7.0"])
       s.add_runtime_dependency(%q<property>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_runtime_dependency(%q<zafu>, [">= 0.6.2"])
+      s.add_runtime_dependency(%q<zafu>, [">= 0.7.1"])
       s.add_runtime_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
@@ -2183,16 +2197,16 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_runtime_dependency(%q<differ>, [">= 0.1.1"])
       s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<querybuilder>, [">= 0.8.0"])
+      s.add_runtime_dependency(%q<querybuilder>, [">= 0.9.0"])
     else
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
       s.add_dependency(%q<tzinfo>, [">= 0.3.12"])
       s.add_dependency(%q<rails>, ["= 2.3.8"])
-      s.add_dependency(%q<rubyless>, [">= 0.6.0"])
+      s.add_dependency(%q<rubyless>, [">= 0.7.0"])
       s.add_dependency(%q<property>, [">= 1.1.0"])
       s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_dependency(%q<zafu>, [">= 0.6.2"])
+      s.add_dependency(%q<zafu>, [">= 0.7.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_dependency(%q<syntax>, ["= 1.0.0"])
@@ -2205,17 +2219,17 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<differ>, [">= 0.1.1"])
       s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<querybuilder>, [">= 0.8.0"])
+      s.add_dependency(%q<querybuilder>, [">= 0.9.0"])
     end
   else
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
     s.add_dependency(%q<tzinfo>, [">= 0.3.12"])
     s.add_dependency(%q<rails>, ["= 2.3.8"])
-    s.add_dependency(%q<rubyless>, [">= 0.6.0"])
+    s.add_dependency(%q<rubyless>, [">= 0.7.0"])
     s.add_dependency(%q<property>, [">= 1.1.0"])
     s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
     s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-    s.add_dependency(%q<zafu>, [">= 0.6.2"])
+    s.add_dependency(%q<zafu>, [">= 0.7.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
     s.add_dependency(%q<syntax>, ["= 1.0.0"])
@@ -2228,7 +2242,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<differ>, [">= 0.1.1"])
     s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<querybuilder>, [">= 0.8.0"])
+    s.add_dependency(%q<querybuilder>, [">= 0.9.0"])
   end
 end
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - beta2
-  version: 1.0.0.beta2
+  - beta3
+  version: 1.0.0.beta3
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 +02:00
+date: 2010-09-17 00:00:00 +02:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,9 +69,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 6
+        - 7
         - 0
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -125,9 +125,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 6
-        - 2
-        version: 0.6.2
+        - 7
+        - 1
+        version: 0.7.1
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -303,9 +303,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 8
+        - 9
         - 0
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id021
 description: 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).
@@ -590,6 +590,10 @@ files:
 - bricks/data2pdf/test/unit/test_rendering.rb
 - bricks/math/lib/bricks/math.rb
 - bricks/math/zena/init.rb
+- bricks/mongrel/README
+- bricks/mongrel/zena/deploy.rb
+- bricks/passenger/README
+- bricks/passenger/zena/deploy.rb
 - bricks/sphinx/MIT-LICENSE
 - bricks/sphinx/README
 - bricks/sphinx/lib/use_sphinx.rb
@@ -729,6 +733,7 @@ files:
 - db/migrate/20100526090140_renamed_contact_model_to_base_contact.rb
 - db/migrate/20100527130937_change_column_index_to_string.rb
 - db/migrate/20100531135128_add_fulltext_builder_fields.rb
+- db/migrate/20100915062903_add_api_group_id_to_site.rb
 - doc/README_FOR_APP
 - doc/fixtures.graffle
 - doc/fixtures.pdf
@@ -807,6 +812,12 @@ files:
 - lib/zena/parser/zazen_tags.rb
 - lib/zena/parser/zena_rules.rb
 - lib/zena/refactor/act_as_content.rb
+- lib/zena/remote.rb
+- lib/zena/remote/connection.rb
+- lib/zena/remote/interface.rb
+- lib/zena/remote/klass.rb
+- lib/zena/remote/mock.rb
+- lib/zena/remote/node.rb
 - lib/zena/routes.rb
 - lib/zena/site_worker.rb
 - lib/zena/test_controller.rb
@@ -2089,6 +2100,7 @@ files:
 - test/integration/zafu_compiler/basic.yml
 - test/integration/zafu_compiler/calendar.yml
 - test/integration/zafu_compiler/complex.yml
+- test/integration/zafu_compiler/complex_ok.yml
 - test/integration/zafu_compiler/conditional.yml
 - test/integration/zafu_compiler/data.yml
 - test/integration/zafu_compiler/dates.yml
@@ -2174,6 +2186,7 @@ files:
 - test/unit/reference_test.rb
 - test/unit/relation_proxy_test.rb
 - test/unit/relation_test.rb
+- test/unit/remote_test.rb
 - test/unit/role_test.rb
 - test/unit/section_test.rb
 - test/unit/site_test.rb
@@ -2440,6 +2453,7 @@ test_files:
 - test/unit/reference_test.rb
 - test/unit/relation_proxy_test.rb
 - test/unit/relation_test.rb
+- test/unit/remote_test.rb
 - test/unit/role_test.rb
 - test/unit/section_test.rb
 - test/unit/site_test.rb