marley 0.8.1 → 0.8.2

data/lib/marley/joints/forum.rb

@@ -36,11 +36,7 @@ module Marley
         def thread_vals;values_tree;end
         def thread; tree;end
         def write_cols
-          new? ? super.push(:topic_id, :path) : super
-        end
-        def before_save
-          super
-          self.topic_id||=self.class.max(:topic_id).to_i+1
+          new? ? super.push(:path) : super
         end
         def reply
           new_child(:title => "re: #{title}")

data/lib/marley/plugins/orm_materialized_path.rb

@@ -30,17 +30,18 @@ module Marley
         def children_path_arr; children_path.split(SEP).map &:to_i; end
         def new_child(vals={}); self.class.new({PATH_COL => children_path}.update(vals)); end
         def depth; path_arr.length; end
+        def rest_cols;super - [PATH_COL];end
 
         def tree
-          res=block_given? ? (yield self) : [self,[]]
+          res=[block_given? ? (yield self) : [self,[]]]
           tree_ds.all.sort {|x,y| x.children_path_arr <=> y.children_path_arr}.each do |node|
-            node.path_arr.inject(res) {|arr,i| arr[-1]} << (block_given? ? (yield node) : [node,[]])
+            (1..(node.path_arr.length*2)).inject(res) {|arr,i| arr[-1]} << (block_given? ? (yield node) : [node,[]])
           end
-          res
+          res[0]
         end
         def values_tree
           tree do |n|
-            foo=n.rest_cols.map{|c| n.send(c)} << []
+            n.rest_cols.map{|c| n.send(c)} << []
           end
         end
       end

data/rdoc/forum_joint.rb

@@ -13,13 +13,12 @@ DB.create_table :users do
 end
 DB.create_table :messages do
   primary_key :id
-  integer :topic_id, :index => true
   text :path, :index => true
   integer :user_id, :index => true
   datetime :date_created, :index => true
   text :message_type, :index => true
   text :title,  :index => true,:null => false
-  clob :content
+  clob :message
 end
 DB.create_table :messages_users do
   primary_key :id

data/rdoc/forum_load.rb

@@ -6,11 +6,11 @@ require 'factory_girl'
 Sequel::Model.send(:alias_method, :save!, :save)
 
 USERS=5
-TOPICS=5
+TOPICS=40
 TAGS=3
-REPLIES=[4,2]
+REPLIES=4
 FactoryGirl.define do 
-  [:name,:title,:tag,:content].each do |seq|
+  [:name,:title,:tag,:message].each do |seq|
     sequence seq do |n|
       "#{seq.to_s}#{n}"
     end
@@ -23,7 +23,7 @@ FactoryGirl.define do
   factory :post,:class => MR::PublicMessage do |n|
     user
     title
-    content
+    message
     _public_tags ''
     _private_tags ''
   end
@@ -31,7 +31,7 @@ FactoryGirl.define do
     user
     recipients ''
     title
-    content
+    message
     _private_tags ''
   end
   factory :public_tag,:class => MR::PublicTag do |n|
@@ -50,10 +50,11 @@ USERS.times do
     end
   end
 end
-REPLIES.each do |r|
+REPLIES.times do
   MR::PublicMessage.all.each do |m|
     rep=m.reply
-    rep.user_id=m[:id].modulo USERS 
+    rep.user_id=m[:id].modulo(USERS) + 1
+    rep.message='asdfasdfasdfasdfasdfasdf'
     rep.save
   end
 end

data/reggae.ebnf

@@ -35,7 +35,7 @@ new_rec_value ::= boolean_value
 
 search_value ::= boolean_value
 
-schema_value ::= '[' col_spec | schema_value (',' colspec | schema_value)? ']'
+schema_value ::= '[' col_spec | instance_value | instance_list_value (',' colspec | instance_value | instance_list_value)? ']'
 
 items_value ::= '[' '[' col_value (',' col_value)* ']' (',' '[' col_value (',' col_value)* ']')* ']'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marley
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Herb Daily
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-29 00:00:00 -03:00
+date: 2012-04-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency