zena 1.0.0.beta3 → 1.0.0.rc1

data/test/sites/ocean/users.yml

@@ -4,29 +4,16 @@ DEFAULTS:
   lang:            en
 
 incognito:
-  first_name:      Miss
-  name:            Incognito
   groups:          public
   status:          moderated
 
-ocean_su:
-  first_name:      Hyper
-  name:            Super
-  login:           ocean_su
-  crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('ocean_su') %>
-  status:          su
-
 whale:
-  first_name:      Miss
-  name:            Whale
   login:           whale
   crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('whale') %>
   groups:          public, aqua, masters
   status:          admin
 
 messy:
-  first_name:      Very
-  name:            Messy
   login:           messy
   crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('messy') %>
   groups:          aqua, masters

data/test/sites/zena/columns.yml

@@ -1,15 +1,37 @@
-Task_assigned:
+DEFAULTS:
   ptype:           string
 
+
+Task_assigned:
+
 Original_origin:
-  ptype:           string
   index:           string
 
 Original_weight:
   ptype:           integer
 
 Original_tz:
-  ptype:           string
 
-Letter_paper:
-  ptype:           string
+Letter_paper:  
+
+Letter_search:
+  index:           ml_string
+
+Letter_search_mono:
+  index:           string
+
+Contact_name:
+  index:           string
+
+Post_date:
+  index:           '.idx_datetime1'
+  ptype:           datetime
+  
+Contact_first_name:
+
+Contact_email:
+
+Contact_address:
+
+Contact_country:
+  

data/test/sites/zena/idx_projects.yml

@@ -0,0 +1,5 @@
+wiki_index:
+  node:            wiki
+  blog_title:      "a wiki with Zena"
+  reference_name:  ref
+  contact_name:    cont

data/test/sites/zena/nodes.yml

@@ -1,3 +1,5 @@
+# When creating nodes, parent nodes *MUST* appear before their children or
+# the fullpath won't build correctly.
 DEFAULTS:
   updated_at:      2006-04-11
   created_at:      2006-03-10
@@ -24,7 +26,7 @@ people:
 
 ant:
   zip:             13
-  class:           BaseContact
+  class:           Contact
   parent:          people
   user:            ant
 
@@ -37,18 +39,18 @@ myLife:
 
 anonymous:
   zip:             47
-  class:           BaseContact
+  class:           Contact
   parent:          people
   user:            lion
 
 tiger:
   zip:             14
-  class:           BaseContact
+  class:           Contact
   parent:          people
 
 lion:
   zip:             15
-  class:           BaseContact
+  class:           Contact
   parent:          people
   user:            lion
 
@@ -99,22 +101,19 @@ status:
 
 lake:
   zip:             23
-  class:           BaseContact
-  node_name:       lakeAddress
+  class:           Contact
   parent:          cleanWater
   user:            ant
 
 lake_jpg:
   zip:             24
   class:           Image
-  node_name:       lake
   parent:          cleanWater
   user:            ant
 
 water_pdf:
   zip:             25
   class:           Document
-  node_name:       water
   parent:          cleanWater
 
 crocodiles:
@@ -145,7 +144,7 @@ bananas:
 
 wiki:
   zip:             29
-  class:           Project
+  class:           Blog
   parent:          projects
   user:            lion
   inherit:         no
@@ -157,14 +156,12 @@ wiki:
 bird_jpg:
   zip:             30
   class:           Image
-  node_name:       bird
   parent:          wiki
   user:            anon
 
 flower_jpg:
   zip:             31
   class:           Image
-  node_name:       flower
   parent:          wiki
   user:            anon
 
@@ -225,7 +222,6 @@ nature:
 tree_jpg:
   zip:             40
   class:           Image
-  node_name:       tree
   parent:          nature
   user:            ant
   roles:           zena_Original
@@ -233,7 +229,6 @@ tree_jpg:
 forest_pdf:
   zip:             41
   class:           Document
-  node_name:       forest
   parent:          nature
   user:            ant
 
@@ -247,91 +242,72 @@ letter:
 wikiSkin:
   zip:             43
   class:           Skin
-  node_name:       wikiSkin
   # yes it's not good to have this here but changing it would mess up many tests.
   parent:          collections
 
 wiki_Project_changes_xml_zafu:
   class:           Template
-  node_name:       Project-changes-xml
   parent:          wikiSkin
 
 wiki_Page_changes_zafu:
   class:           Template
-  node_name:       Page-changes
   parent:          wikiSkin
 
 wiki_Node_zafu:
   class:           Template
-  node_name:       Node
   parent:          wikiSkin
 
-
-
-
 skins:
   class:           Page
   parent:          zena
 
 default:
   class:           Skin
-  node_name:       default
   parent:          skins
 
 Node_search_zafu:
   class:           Template
-  node_name:       Node-search
   parent:          default
 
 style_css:
   zip:             53
   class:           TextDocument
-  node_name:       style
   parent:          default
 
 Node_zafu:
   class:           Template
-  node_name:       Node
   parent:          default
 
 Node_admin_layout_zafu:
   class:           Template
-  node_name:       Node-+adminLayout
   parent:          default
 
 Node_index_zafu:
   class:           Template
-  node_name:       Node-+index
   parent:          default
 
 Node_not_found_zafu:
   class:           Template
-  node_name:       Node-+notFound
   parent:          default
 
 Node_popup_layout_zafu:
   class:           Template
-  node_name:       Node-+popupLayout
   parent:          default
 
 notes_zafu:
   class:           Template
-  node_name:       notes
   parent:          default
 
 Node_test_zafu:
   class:           Template
-  node_name:       Node-test
   parent:          default
 
 Project_zafu:
   class:           Template
-  node_name:       Project
   parent:          default
 
 Node_login_zafu:
   class:           Template
-  node_name:       Node-+login
   parent:          default
 
 translations:

data/test/sites/zena/relations.yml

@@ -11,12 +11,14 @@ node_has_tags:
   source_role:     tagged
   target_role:     set_tag
   target_icon:     "<img src='/images/tag_blue.png' alt='tag'/>"
+  rel_group:       'doc.tags'
 
 node_has_references:
   source_kpath:    N
   target_kpath:    N
   source_role:     reference_for
   target_role:     reference
+  rel_group:       'doc.ref'
 
 node_has_an_icon:
   source_kpath:    N
@@ -34,6 +36,7 @@ project_has_a_hot_element:
   target_kpath:    N
   target_unique:   yes
   target_icon:     "<img src='/images/lightbulb.png' alt='hot'/>"
+  rel_group:       'web'
 
 project_has_a_home:
   source_kpath:    NPP
@@ -43,6 +46,7 @@ project_has_a_home:
   source_role:     home_for
   target_role:     home
   target_icon:     "<img src='/images/home.png' alt='home'/>"
+  rel_group:       'web'
 
 project_has_collaborators:
   source_kpath:    NPP
@@ -51,6 +55,7 @@ project_has_collaborators:
   source_role:     collaborator_for
   target_role:     collaborator
   target_icon:     "<img src='/images/user.png' alt='collaborator'/>"
+  rel_group:       'people'
 
 post_has_blogs:
   source_kpath:    NNP

data/test/sites/zena/roles.yml

@@ -6,14 +6,29 @@ DEFAULTS:
 Letter:
   kpath:           NNL
   real_class:      Note
-  idx_text_high:   "#{title} paper:#{paper}"
+  prop:
+    idx_text_high: "%Q{#{title} paper:#{paper}}"
+    # We build a 'search' property that is indexed to do funky searching without
+    # fulltext
+    prop_eval:     "{'search' => %Q{#{title} paper:#{paper}}, 'search_mono' => %Q{#{paper} mono}}"
 
 Post:
   kpath:           NNP
   real_class:      Note
-  dyn_keys:        reading, book
   auto_create_discussion: yes
 
+Reference:
+  kpath:           NR
+  real_class:      Node
+  idx_scope:       "{'reference' => 'references'}"
+
+Contact:
+  kpath:           NRC
+  real_class:      Node
+  idx_scope:       "{'reference' => 'references', 'contact' => 'project'}"
+  prop:
+    prop_eval:     "{'title' => \"#{first_name} #{name}\"}"
+
 Tracker:
   kpath:           NPA
   real_class:      Page
@@ -22,6 +37,7 @@ Tracker:
 Tag:
   kpath:           NPT
   real_class:      Page
+  idx_scope:       "{'tag' => %w{project self}}"
 
 Task:
   kpath:           N
@@ -29,4 +45,10 @@ Task:
 
 Original:
   kpath:           N
-  type:            Role
+  type:            Role
+
+Blog:
+  kpath:           NPPB
+  real_class:      Project
+  idx_class:       IdxProject
+  idx_scope:       "{'blog' => 'self'}"

data/test/sites/zena/sites.yml

@@ -1,7 +1,6 @@
 zena:
   host:            test.host
   root:            zena
-  su:              su
   anon:            anon
   public_group:    public
   site_group:      workers
@@ -14,4 +13,5 @@ zena:
   api_group:       managers
   prop:
     recaptcha_pub: 'pub'
-    recaptcha_priv: 'priv'
+    recaptcha_priv: 'priv'
+    usr_prototype_attributes: "{'klass' => 'Contact', 'address' => 'Iping', 'name' => login}"

data/test/sites/zena/users.yml

@@ -4,25 +4,11 @@ DEFAULTS:
   lang:            en
 
 anon:
-  first_name:      Anonymous
-  name:            User
   groups:          public
   status:          moderated
-  contact:         anonymous
-
-su:
-  login:           su
-  crypted_password: <%= Zena::CryptoProvider::Initial.encrypt('su') %>
-  first_name:      Super
-  name:            User
-  status:          su
-  contact:         anonymous
-  single_access_token: HORIZONS
+  node:            anonymous
 
 ant:
-  first_name:      Solenopsis
-  name:            Invicta
-  email:           ant@zenadmin.info
   login:           ant
   crypted_password: <%= Zena::CryptoProvider::Initial.encrypt('ant') %>
   time_zone:       Europe/Zurich
@@ -31,9 +17,6 @@ ant:
   lang:            fr
 
 tiger:
-  first_name:      Panther
-  name:            Tigris Sumatran
-  email:           tiger@zenadmin.info
   login:           tiger
   crypted_password: <%= Zena::CryptoProvider::Initial.encrypt('tiger') %>
   single_access_token: mytoken
@@ -41,9 +24,6 @@ tiger:
   status:          user
 
 lion:
-  first_name:      Panthera
-  name:            Leo Verneyi
-  email:           lion@zenadmin.info
   login:           lion
   crypted_password: <%= Zena::CryptoProvider::Initial.encrypt('lion') %>
   groups:          public, workers, admin

data/test/sites/zena/versions.yml

@@ -28,9 +28,12 @@ ant_en:
   user:            ant
   prop:
     title:         Solenopsis Invicta
+    first_name:    Solenopsis
+    name:          Invicta
     summary:       I am an ant
     text:          Ant works hard
     first_name:    Solenopsis
+    email:         ant@zenadmin.info
     name:          Invicta
     address:       Deep Hole 54
     postal_code:   2001
@@ -52,10 +55,11 @@ tiger_en:
   node:            tiger
   user:            tiger
   prop:
-    title:         Tiger
+    title:         Panthera Tigris Sumatran
     summary:       "\"panthera tigris on wikipedia\":http://en.wikipedia.org/wiki/Image:Panthera_tigris_sumatran_subspecies.jpg"
-    first_name:    Panther
+    first_name:    Panthera
     name:          Tigris Sumatran
+    email:         tiger@zenadmin.info
     address:       "Small Island\nIn the Wild"
     postal_code:   1998
     city:          Sumatra
@@ -68,9 +72,10 @@ lion_en:
   node:            lion
   user:            lion
   prop:
-    title:         Lion
+    title:         Panthera Leo Verneyi
     first_name:    Panthera
     name:          Leo Verneyi
+    email:         lion@zenadmin.info
     address:       Kalahari Desert
     postal_code:   2036
     city:          Africa
@@ -158,6 +163,7 @@ proposition_en:
   created_at:      2008-08-10
   prop:
     title:         Proposition
+    date:          2006-04-05
 
 proposition_rep_en:
   node:            proposition
@@ -202,7 +208,7 @@ lake_en:
   node:            lake
   user:            ant
   prop:
-    title:         Tanganyika
+    title:         Lake Tanganyika
     summary:       "More information on \"wikipedia\":http://en.wikipedia.org/wiki/Lake_Tanganyika."
     text:          "!014!"
     first_name:    Lake
@@ -243,6 +249,8 @@ crocodiles_en:
   user:            ant
   publish_from:
   status:          red
+  prop:
+    title:         crocodiles
 
 opening_fr:
   node:            opening
@@ -251,10 +259,11 @@ opening_fr:
   prop:
     comment:       french opening
     title:         ouverture du parc
+    date:          2011-01-16
 
 bananas_en:
   node:            bananas
-  user:            lion
+  user:            ant
   created_at:      2007-03-10
   updated_at:      2007-04-11
   publish_from:    2007-03-10
@@ -265,7 +274,7 @@ wiki_en:
   node:            wiki
   user:            lion
   prop:
-    title:         a wiki with zena
+    title:         a wiki with Zena
 
 bird_jpg_en:
   node:            bird_jpg
@@ -331,8 +340,8 @@ lake_red_en:
   number:          2
   prop:
     title:         The lake we love
-    first_name:    Lake
-    name:          Tanganyika
+    first_name:    The lake
+    name:          we love
 
 opening_en:
   node:            opening
@@ -341,6 +350,7 @@ opening_en:
   number:          2
   prop:
     title:         parc opening
+    date:          2011-01-16
     text:          |
       We are glad to announce the opening of our new project !
       
@@ -354,6 +364,7 @@ opening_red_fr:
   status:          red
   number:          3
   prop:
+    date:          2011-01-16
     comment:       new redaction for opening
     title:         super ouverture
 
@@ -472,11 +483,11 @@ wiki_project_changes_xml_en:
     summary:       Layout for the wiki skin.
     text:          |
       <?xml version="1.0" encoding="UTF-8"?>
-      <name><r:show attr='node_name'/></name>
+      <name><r:show attr='title'/></name>
       <changes do='nodes' in='project' order='updated_at DESC' limit='10'>
         <node do='each'>
           <type><r:show attr='type'/></type>
-          <name><r:show attr='node_name'/></name>
+          <name><r:show attr='title'/></name>
           <id><r:show attr='id'/></id>
         </note>
       </notes>
@@ -521,10 +532,10 @@ wiki_node_en:
   user:            tiger
   prop:
     comment:       master template for wiki
-    title:         main template
+    title:         Node
     summary:       master template for wiki skin.
     text:          |
-      <r:include template='/default/Node'>
+      <r:include template='/Default skin/Node'>
         <r:with part='main'>
           WIKI
         </r:with>
@@ -571,6 +582,7 @@ style_css_en:
   user:            tiger
   prop:
     text:          "[FILE:db/init/base/skins/default/style.css]"
+    title:         style
     content_type:  text/css
     ext:           css
     size:          5262
@@ -580,6 +592,7 @@ Node_zafu_en:
   user:            tiger
   prop:
     text:          "[FILE:app/views/zafu/default/Node.zafu]"
+    title:         Node
     format:        html
     tkpath:        N
     target_klass:  Node
@@ -589,6 +602,7 @@ Node_admin_layout_zafu_en:
   user:            tiger
   prop:
     text:          "[FILE:app/views/zafu/default/Node-+adminLayout.zafu]"
+    title:         Node-+adminLayout
     format:        html
     tkpath:        N
     mode:          "+adminLayout"
@@ -599,6 +613,7 @@ Node_index_zafu_en:
   user:            tiger
   prop:
     text:          "[FILE:db/init/base/skins/default/Node-+index.zafu]"
+    title:         Node-+index
     format:        html
     tkpath:        N
     mode:          "+index"
@@ -609,6 +624,7 @@ Node_not_found_zafu_en:
   user:            tiger
   prop:
     text:          "[FILE:app/views/zafu/default/Node-+notFound.zafu]"
+    title:         Node-+notFound
     format:        html
     tkpath:        N
     mode:          "+notFound"
@@ -619,6 +635,7 @@ Node_popup_layout_zafu_en:
   user:            tiger
   prop:
     text:          "[FILE:app/views/zafu/default/Node-+popupLayout.zafu]"
+    title:         Node-+popupLayout
     format:        html
     tkpath:        N
     mode:          "+popupLayout"
@@ -629,6 +646,7 @@ Node_test_en:
   user:            tiger
   prop:
     text:          "[FILE:test/fixtures/files/Node-test.zafu]"
+    title:         Node-test
     format:        html
     tkpath:        N
     mode:          test
@@ -639,6 +657,7 @@ notes_zafu_en:
   user:            tiger
   prop:
     text:          "[FILE:db/init/base/skins/default/notes.zafu]"
+    title:         notes
     format:        html
 
 Project_zafu_en:
@@ -646,6 +665,7 @@ Project_zafu_en:
   user:            tiger
   prop:
     text:          "[FILE:db/init/base/skins/default/Project.zafu]"
+    title:         Project
     format:        html
     tkpath:        NPP
     target_klass:  Project
@@ -655,6 +675,7 @@ Node_login_zafu_en:
   user:            tiger
   prop:
     text:          "[FILE:app/views/zafu/default/Node-+login.zafu]"
+    title:         Node-+login
     format:        html
     tkpath:        N
     mode:          "+login"
@@ -666,6 +687,7 @@ translations_de:
   lang:            de
   prop:
     text:          "[FILE:test/fixtures/files/translations_de.yml]"
+    title:         translations
     content_type:  text/yaml
     ext:           yml
     size:          50
@@ -676,6 +698,7 @@ translations_fr:
   lang:            fr
   prop:
     text:          "[FILE:test/fixtures/files/translations_fr.yml]"
+    title:         translations
     content_type:  text/yaml
     ext:           yml
     size:          50