marley 0.7.2 → 0.8.0

data/lib/marley/controllers.rb

@@ -4,7 +4,7 @@ module Marley
     def initialize(model)
       @model=model
       if $request[:path][1].to_s.match(/^\d+$/) #references a specific instance by ID
-        @instance=@model[$request[:path][1].to_i]
+        @instance=@model.list_dataset(:"#{@model.table_name}__id" => $request[:path][1].to_i).all[0]
         raise RoutingError unless @instance
         @method_name=$request[:path][2].sub(/[\?\&\+]$/,'') rescue nil #ditch trailing characters, if any
         if @method_name

data/lib/marley/joints/forum.rb

@@ -1,38 +1,48 @@
-
 module Marley
   module Plugins
     class MessageThreading < Plugin
+      def apply(*klasses)
+        super
+        klasses.flatten.each do |klass|
+          Marley.plugin('orm_materialized_path').apply(klass)
+        end
+      end
       module ClassMethods
         def topics(params=nil)
           filters=[]
           if params && params[:tags]
             filters << {:id => MR::Tag.join(:messages_tags, :tag_id => :id).select(:message_id).filter(:tag => params[:tags])}
           end
-          filters.inject(self.dataset.filter(:parent_id => nil)) {|ds,f| ds.filter(f)}
+          filters.inject(self.roots) {|ds,f| ds.filter(f)}
+        end
+        def list(params={})
+          reggae_instance_list(params)
         end
-        def list(params=nil)
-          (params.is_a?(Sequel::Dataset) ?  params : topics(params)).eager(associations).all.map{|t| t.thread}
+        def reggae_instance_list(params={})
+          t=topics(params).all
+          if t.length==0
+            Marley::ReggaeMsg.new(:title => 'Nothing Found')
+          else
+            Marley::ReggaeInstanceList.new(
+              :name => resource_name,
+              :schema => t[0].reggae_schema(true) << [:resource,resource_name,RESTRICT_RO],
+              :items => t.map{|t| t.thread_vals}
+            )
+          end
         end
       end
       module InstanceMethods
+        def thread_vals;values_tree;end
+        def thread; tree;end
         def write_cols
-          super.push(:topic_id, :parent_id)
-        end
-        def children
-          self.class.filter(:parent_id => id).eager(associations)
-        end
-        def thread
-          return reggae_instance if children.all.length==0
-          foo=reggae_instance
-          foo[2] = children.all.map{|m| m.thread} 
-          foo
+          new? ? super.push(:topic_id, :path) : super
         end
         def before_save
           super
           self.topic_id||=self.class.max(:topic_id).to_i+1
         end
         def reply
-          self.class.new(self.values.dup.delete_if{|k,v| k==:id}.merge({:parent_id => self[:id],:title => "re: #{title}"}))
+          new_child(:title => "re: #{title}")
         end
       end
     end
@@ -43,11 +53,11 @@ module Marley
             self.reggae_link(:new, 'New Post'),
             self.reggae_link(:list, 'All Posts'),
             self.reggae_link(:recent_topics, 'Recent Topics'),
-            Marley::ReggaeSection.new({:title => 'Topics Tagged With:', :navigation => MR::Tag.filter(:id => topics.join(:messages_tags).where(:messages__id => :message_id).select(:tag_id)).map{|t| reggae_link('list',t.tag,"#{resource_name}[tags]=#{t.tag}")}})
+            Marley::ReggaeSection.new({:title => 'Public Tags', :navigation => MR::PublicTag.filter(:id => topics.all.map{|t|}).map{|t| reggae_link('list',t.tag,"#{resource_name}[_public_tags]=#{t.tag}")}})
           ]
         end
         def recent_topics
-          list(:date_created > Date.today - 2)
+          list(lambda {date_created > Date.today - 2})
         end
       end
     end

data/lib/marley/joints/messages.rb

@@ -35,7 +35,7 @@ module Marley
             [:recipients] + super
           end
           Marley::Utils.many_to_many_join(self, MR::User)
-          def self.list_dataset
+          def self.list_dataset(params={})
             super.filter(:messages__id => DB[:messages_users].filter(:user_id => current_user[:id]).select(:message_id))
           end
           def current_user_role

data/lib/marley/joints/tags.rb

@@ -5,7 +5,9 @@ module Marley
       def apply(*klasses)
         klasses.each do |klass|
           klass=MR.const_get(klass) if klass.is_a?(String)
+
           klass.derived_after_cols![:new?][:all] << @tag_col_name.to_sym
+          klass.extend @class_methods_mod
           @instance_methods_mod.send(:append_features,klass)
           Marley::Utils.many_to_many_join(klass, @tag_class)
         end
@@ -16,33 +18,29 @@ module Marley
         tag_col_name=@tag_col_name="_#{@tag_type}_tags"
         tag_class=@tag_class=MR.const_get(@tag_col_name.sub(/^_/,'').singularize.camelcase)
         tags_ds_name=@tags_ds_name="#{tag_col_name.sub(/^_/,'')}_dataset"
+        tags_meth=tag_class.resource_name.pluralize.to_sym
+        @class_methods_mod=Module.new do |m|
+          define_method(:list_dataset) {|*args|
+            super.eager_graph({tags_meth => proc{|ds| ds.filter(:tags__user_id => tag_class.associations.include?(:user) ? current_user[:id] : nil)}})
+          }
+        end
         @instance_methods_mod=Module.new do |m|
-          attr_accessor tag_col_name
+          attr_writer tag_col_name
           define_method(:write_cols) {
             super << tag_col_name.to_sym
           }
-
-          #list dataset should take care of most of this
-          
-          define_method("#{tag_col_name}_ds".to_sym) { #e.g. _private_tags_ds
-            send(tags_ds_name).filter({:tags__user_id => (tag_class.associations.include?(:user) ? self.class.current_user[:id] : nil)})
-          }
           define_method(tag_col_name.to_sym) {    #e.g. _private_tags
-            send("#{tag_col_name}_ds").map {|t| t.tag}.join(', ') unless new?
-          }
-          define_method("add#{tag_col_name}".to_sym) {|tags|  #e.g. add_private_tags
-            vals_hash={:user_id => (tag_class.associations.include?(:user) ? self.class.current_user[:id] : nil)}
-            tags.to_s.split(',').each {|tag| self.send("add#{tag_col_name.singularize}",tag_class.find_or_create(vals_hash.update(:tag => tag))) }
+            send(tags_meth).map {|t| t.tag}.join(', ') unless new?
           }
           define_method("replace#{tag_col_name}".to_sym) {  #e.g. replace_private_tags
-            send("#{tag_col_name}_ds").each {|tag| send("remove#{tag_col_name}".singularize,tag)}
+            send(tags_meth).each {|tag| send("remove#{tag_col_name}".singularize,tag)}
             send("add#{tag_col_name}",instance_variable_get("@#{tag_col_name}"))
           }
           define_method(:after_save) {
             super
-            methods.select {|m| m.match(/^replace_.+_tags/)}.each do |replace_method|
-              send(replace_method)
-            end
+            send("#{tags_meth}_dataset").filter({:tags__user_id => (tag_class.associations.include?(:user) ? self.class.current_user[:id] : nil)}).each {|tag| send("remove#{tag_col_name}".singularize,tag)}
+            vals_hash={:user_id => (tag_class.associations.include?(:user) ? self.class.current_user[:id] : nil)}
+            instance_variable_get("@#{tag_col_name}").to_s.split(/\s*,\s*/).each {|tag| self.send("add#{tag_col_name.singularize}",tag_class.find_or_create(vals_hash.update(:tag => tag))) }
           }
         end
       end
@@ -53,7 +51,7 @@ module Marley
       module Resources
         class Tag < Sequel::Model
           sti
-          def self.list_dataset
+          def self.list_dataset(params={})
             dataset.order(:tag)
           end
           def validate
@@ -74,7 +72,7 @@ module Marley
         end
         class PrivateTag < Tag
           MR::User.join_to(self) if MR::User
-          def self.list_dataset
+          def self.list_dataset(params={})
             current_user_ds.order(:tag)
           end
         end

data/lib/marley/plugins/orm_materialized_path.rb

@@ -0,0 +1,49 @@
+module Marley
+  module Plugins
+    class OrmMaterializedPath < Plugin
+      @default_opts={:path_col => :path, :path_separator => '-'}
+      def apply(klasses)
+        super
+      end
+      def initialize(opts={})
+        super
+        [ClassMethods,InstanceMethods].each do |mod|
+          mod.const_set(:PATH_COL,@opts[:path_col])
+          mod.const_set(:SEP,@opts[:path_separator])
+        end
+      end
+      module ClassMethods
+        def roots(params={})
+          list_dataset.filter({PATH_COL => nil}.update(params))
+        end
+        def path_col_num
+          columns.index(PATH_COL)
+        end
+      end
+      module InstanceMethods
+        def tree_ds; self.class.list_dataset.filter(PATH_COL.like("#{children_path}%")); end
+        def _path;send(PATH_COL);end
+        def path_arr; _path.to_s.split(SEP).map &:to_i; end
+        def root_id; path_arr[0]; end
+        def parent_id; path_arr[-1]; end
+        def children_path;("#{_path}#{id}#{SEP}");end
+        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 tree
+          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,[]])
+          end
+          res
+        end
+        def values_tree
+          tree do |n|
+            foo=n.rest_cols.map{|c| n.send(c)} << []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/marley/plugins/orm_rest_convenience.rb

@@ -9,13 +9,14 @@ module Marley
       @default_opts={
         :required_plugins => [:rest_convenience],
         :class_attrs =>[ [:model_actions,{:get => [:new, :list]}] ],
-        :lazy_class_attrs =>  [ :new?,[:instance_actions,{:all => nil}],
-        [:derived_before_cols,{:all => []}],
-        [:derived_after_cols,{:all => []}],
-        [:reject_cols,{true => [/^id$/,/_type$/,/date_(created|updated)/], false => [/_type$/]}],
-        [:ro_cols,{true => [/^id$/,/_id$/], false => [/^id$/,/_id$/,/date_(created|updated)/]}],
-        [:hidden_cols,{:all => [/_id$/]}],
-        [:required_cols,{:all => []}] ]
+        :lazy_class_attrs =>  [ :new?,
+          [:instance_actions,{:all => nil}],
+          [:derived_before_cols,{:all => []}],
+          [:derived_after_cols,{:all => []}],
+          [:reject_cols,{true => [/^id$/,/_type$/,/date_(created|updated)/], false => [/_type$/]}],
+          [:ro_cols,{true => [/^id$/,/_id$/], false => [/^id$/,/_id$/,/date_(created|updated)/]}],
+          [:hidden_cols,{:all => [/_id$/]}],
+          [:required_cols,{:all => []}] ]
       }
       module ClassMethods
         def controller; Marley::ModelController.new(self); end
@@ -25,11 +26,24 @@ module Marley
 
         def foreign_key_name; :"#{(respond_to?(:table_name) ? table_name : resource_name).to_s.singularize}_id"; end
 
-        def list_dataset
-          dataset
+        def list_dataset(params={})
+          dataset.filter(params)
         end
         def list(params={})
-          list_dataset.filter(params).all
+          list_dataset(params).all
+        end
+        def reggae_instance_list(params={})
+          items=list(params)
+          if items.length==0
+            Marley::ReggaeMessage.new(:title => 'Nothing Found')
+          else
+            cols=items[0].rest_cols
+            Marley::ReggaeInstanceList.new(
+              :name => resource_name,
+              :schema => items[0].reggae_schema(true),
+              :items => items.map{|i| cols.map{|c|i.send(c)}}
+            )
+          end
         end
         def sti
           plugin :single_table_inheritance, :"#{self.to_s.sub(/.*::/,'').underscore}_type", :model_map => lambda{|v| MR.const_get(v.to_sym)}, :key_map => lambda{|klass|klass.name.sub(/.*::/,'')}
@@ -50,17 +64,23 @@ module Marley
 
         def rest_associations;[];end
 
-        def reggae_schema
+        def reggae_schema(list_schema=false)
           Marley::ReggaeSchema.new(
             rest_cols.map do |col_name|
               db_spec=db_schema.to_hash[col_name]
               col_type=db_spec ? db_spec[:db_type].downcase : "text"
               col_type=:password if col_name.to_s.match(/password/)
-              restrictions=0
-              restrictions|=RESTRICT_HIDE if hidden_cols.include?(col_name)
-              restrictions|=RESTRICT_RO unless write_cols.include?(col_name)
-              restrictions|=RESTRICT_REQ if required_cols.include?(col_name) || (db_spec && !db_spec[:allow_null])
-              [col_type, col_name, restrictions,send(col_name)]
+              if list_schema
+                restrictions=RESTRICT_RO
+                restrictions|=RESTRICT_HIDE if hidden_cols.include?(col_name)
+                [col_type, col_name, restrictions]
+              else
+                restrictions=0
+                restrictions|=RESTRICT_HIDE if hidden_cols.include?(col_name)
+                restrictions|=RESTRICT_RO unless write_cols.include?(col_name)
+                restrictions|=RESTRICT_REQ if required_cols.include?(col_name) || (db_spec && !db_spec[:allow_null])
+                [col_type, col_name, restrictions,send(col_name)]
+              end
             end 
           )
         end

data/lib/marley/reggae.rb

@@ -107,8 +107,7 @@ module Marley
     end
   end
   class ReggaeInstanceList < ReggaeResource
-    properties :name,:description,:actions,:items
-    #not implemented yet
+    properties :name,:description,:actions,:group_actions,:items
   end
   class ReggaeMsg < ReggaeResource
     properties :title,:description

data/lib/marley/utils.rb

@@ -56,10 +56,10 @@ module Marley
     def self.sti(klass)
       klass.plugin :single_table_inheritance, :"#{klass.to_s.sub(/.*::/,'').underscore}_type", :model_map => lambda{|v| MR.const_get(v.to_sym)}, :key_map => lambda{|clss|clss.name.sub(/.*::/,'')}
     end
-    def self.many_to_many_join(lclass, rclass)
+    def self.many_to_many_join(lclass, rclass,lopts={},ropts={})
       join_table=[lclass.table_name.to_s,rclass.table_name.to_s ].sort.join('_').to_sym
-      lclass.many_to_many(rclass.resource_name.pluralize.to_sym,:join_table => join_table,:class =>rclass, :left_key => lclass.foreign_key_name, :right_key => rclass.foreign_key_name)
-      rclass.many_to_many(lclass.resource_name.pluralize.to_sym,:join_table => join_table, :class =>lclass,:left_key => rclass.foreign_key_name, :right_key => lclass.foreign_key_name)
+      lclass.many_to_many(rclass.resource_name.pluralize.to_sym,{:join_table => join_table,:class =>rclass, :left_key => lclass.foreign_key_name, :right_key => rclass.foreign_key_name}).update(lopts)
+      rclass.many_to_many(lclass.resource_name.pluralize.to_sym,{:join_table => join_table, :class =>lclass,:left_key => rclass.foreign_key_name, :right_key => lclass.foreign_key_name}.update(ropts))
     end
     def self.hash_keys_to_syms(hsh)
       hsh.inject({}) {|h,(k,v)| h[k.to_sym]= v.class==Hash ? hash_keys_to_syms(v) : v;h }

data/rdoc/forum_joint.rb

@@ -14,7 +14,7 @@ end
 DB.create_table :messages do
   primary_key :id
   integer :topic_id, :index => true
-  integer :parent_id, :index => true
+  text :path, :index => true
   integer :user_id, :index => true
   datetime :date_created, :index => true
   text :message_type, :index => true
@@ -31,6 +31,7 @@ end
 DB.create_table :tags do
   primary_key :id
   integer :user_id,:index => true
+  text :tag_type, :index => true
   text :tag,:index => true
 end
 DB.create_table :messages_tags do

data/rdoc/forum_load.rb

@@ -27,7 +27,7 @@ FactoryGirl.define do
     _public_tags ''
     _private_tags ''
   end
-  factory :private_message,:class => MR::PublicMessage do |n|
+  factory :private_message,:class => MR::PrivateMessage do |n|
     user
     recipients ''
     title
@@ -46,8 +46,15 @@ USERS.times do
   FactoryGirl.create(:user) do |u|
     $request={:user => u}
     TOPICS.times do 
-      FactoryGirl.create(:post,:user_id => u[:id])
+      FactoryGirl.create(:post,:user_id => u[:id],:_public_tags => (1 .. TAGS).to_a.map{|i| "tag#{i}"}.join(','))
     end
   end
 end
+REPLIES.each do |r|
+  MR::PublicMessage.all.each do |m|
+    rep=m.reply
+    rep.user_id=m[:id].modulo USERS 
+    rep.save
+  end
+end
 

data/rdoc/orm_materialized_path_plugin.rb

@@ -0,0 +1,21 @@
+
+require 'marley'
+require 'marley/test_helpers'
+
+DB=Sequel.sqlite('')
+DB.create_table :trees do
+  primary_key :id
+  text :name, :index => true
+  text :path, :index => true
+end
+
+Marley.plugin('orm_rest_convenience').apply(Sequel::Model)
+Marley.config {}
+module Marley
+  module Resources
+    class Tree < Sequel::Model
+      Marley.plugin('orm_materialized_path').apply(self)
+    end
+  end
+end
+

data/rdoc/orm_materialized_path_plugin.rdoc

@@ -0,0 +1,48 @@
+
+
+examples:
+
+>> MR::Tree.new(:name => 'asdf').save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 1], [:text, :name, 0, "asdf"], [:text, :path, 0, nil]], :url=>"/tree/1", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[1].new_child.reggae_instance
+=> [:instance, {:schema=>[[:text, :name, 0, nil], [:text, :path, 0, "1-"]], :url=>"/tree/", :new_rec=>true, :name=>"tree", :actions=>nil}, nil]
+>> MR::Tree[1].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 2], [:text, :name, 0, nil], [:text, :path, 0, "1-"]], :url=>"/tree/2", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[1].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 3], [:text, :name, 0, nil], [:text, :path, 0, "1-"]], :url=>"/tree/3", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[1].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 4], [:text, :name, 0, nil], [:text, :path, 0, "1-"]], :url=>"/tree/4", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[2].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 5], [:text, :name, 0, nil], [:text, :path, 0, "1-2-"]], :url=>"/tree/5", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[5].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 6], [:text, :name, 0, nil], [:text, :path, 0, "1-2-5-"]], :url=>"/tree/6", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[3].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 7], [:text, :name, 0, nil], [:text, :path, 0, "1-3-"]], :url=>"/tree/7", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+
+>> MR::Tree[3].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 8], [:text, :name, 0, nil], [:text, :path, 0, "1-3-"]], :url=>"/tree/8", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[3].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 9], [:text, :name, 0, nil], [:text, :path, 0, "1-3-"]], :url=>"/tree/9", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[3].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 10], [:text, :name, 0, nil], [:text, :path, 0, "1-3-"]], :url=>"/tree/10", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+
+>> MR::Tree[1].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 11], [:text, :name, 0, nil], [:text, :path, 0, "1-"]], :url=>"/tree/11", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[1].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 12], [:text, :name, 0, nil], [:text, :path, 0, "1-"]], :url=>"/tree/12", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[2].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 13], [:text, :name, 0, nil], [:text, :path, 0, "1-2-"]], :url=>"/tree/13", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[5].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 14], [:text, :name, 0, nil], [:text, :path, 0, "1-2-5-"]], :url=>"/tree/14", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[3].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 15], [:text, :name, 0, nil], [:text, :path, 0, "1-3-"]], :url=>"/tree/15", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+
+>> MR::Tree[7].new_child.save.reggae_instance 
+=> [:instance, {:schema=> [[:integer, :id, 2, 16], [:text, :name, 0, nil], [:text, :path, 0, "1-3-7-"]], :url=>"/tree/16", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+>> MR::Tree[13].new_child.save.reggae_instance
+=> [:instance, {:schema=> [[:integer, :id, 2, 17], [:text, :name, 0, nil], [:text, :path, 0, "1-2-13-"]], :url=>"/tree/17", :new_rec=>false, :name=>"tree", :actions=>nil}, []]
+
+>> MR::Tree[1].values_tree
+=> [1, "asdf", nil, [[2, nil, "1-", [], [5, nil, "1-2-", [], [6, nil, "1-2-5-", []], [14, nil, "1-2-5-", []]], [13, nil, "1-2-", [], [17, nil, "1-2-13-", []]]], [3, nil, "1-", [], [7, nil, "1-3-", [], [16, nil, "1-3-7-", []]], [8, nil, "1-3-", []], [9, nil, "1-3-", []], [10, nil, "1-3-", []], [15, nil, "1-3-", []]], [4, nil, "1-", []], [11, nil, "1-", []], [12, nil, "1-", []]]]
+
+

data/rdoc/plugins.rdoc

@@ -29,7 +29,9 @@ example: without the plugin, then with the plugin
 
 == Included Plugins
 
-Marley comes with 1 external plugin (there are others in the included Joints, described later):
+Marley comes with 2 plugins (there are others in the included Joints, described later):
 
 :include: rdoc/orm_rest_convenience_plugin.rdoc
 
+:include: rdoc/orm_materialized_path_plugin.rdoc
+

data/rdoc/tags_joint/announcements.rdoc

@@ -31,7 +31,6 @@ examples: announcements with private and public tags
 => [[:instance, {:url=>"/announcement/1", :new_rec=>false, :actions=>{:delete=>"/announcement/1"}, :schema=>[[:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :name, 4, "user1 ann1"], [:text, :message, 0, "user1ann1 msg"], [:text, :_private_tags, 0, "aaa, bbb"], [:text, :_public_tags, 0, "ppp"]], :name=>"announcement"}, []], [:instance, {:url=>"/announcement/2", :new_rec=>false, :actions=>nil, :schema=>[[:integer, :id, 2, 2], [:integer, :user_id, 3, 2], [:text, :name, 6, "user2 ann1"], [:text, :message, 2, "user2ann1 msg"], [:text, :_private_tags, 0, ""], [:text, :_public_tags, 0, "yyy, zzz"]], :name=>"announcement"}, []]]
 >> @client2.read
 => [[:instance, {:url=>"/announcement/1", :new_rec=>false, :actions=>nil, :schema=>[[:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :name, 6, "user1 ann1"], [:text, :message, 2, "user1ann1 msg"], [:text, :_private_tags, 0, ""], [:text, :_public_tags, 0, "ppp"]], :name=>"announcement"}, []], [:instance, {:url=>"/announcement/2", :new_rec=>false, :actions=>{:delete=>"/announcement/2"}, :schema=>[[:integer, :id, 2, 2], [:integer, :user_id, 3, 2], [:text, :name, 4, "user2 ann1"], [:text, :message, 0, "user2ann1 msg"], [:text, :_private_tags, 0, "xxx"], [:text, :_public_tags, 0, "yyy, zzz"]], :name=>"announcement"}, []]]
-
 >> @ann1client1=@client1.read({},:instance_id => 1)
 => [:instance, {:url=>"/announcement/1", :new_rec=>false, :actions=>{:delete=>"/announcement/1"}, :schema=>[[:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :name, 4, "user1 ann1"], [:text, :message, 0, "user1ann1 msg"], [:text, :_private_tags, 0, "aaa, bbb"], [:text, :_public_tags, 0, "ppp"]], :name=>"announcement"}, []]
  :_public_tags, 0, "ppp"]], :name=>"announcement"}, []]

data/rdoc/tags_joint/secrets.rdoc

@@ -30,9 +30,9 @@ examples:
 => [:instance, {:schema=>[[:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :name, 4, "user1 secret1"], [:text, :message, 0, nil], [:text, :_private_tags, 0, "foo"]], :url=>"/secret/1", :new_rec=>false, :actions=>nil, :name=>"secret"}, []]
 
 >> DB[:tags].all
-=> [{:tag=>"xxxxxx", :id=>1, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"sss", :id=>2, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"sss", :id=>3, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"zzz", :id=>4, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"aaa", :id=>5, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"foo", :id=>6, :tag_type=>"PrivateTag", :user_id=>1}]
+=> [{:tag=>"xxxxxx", :id=>1, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"sss", :id=>2, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"zzz", :id=>3, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"aaa", :id=>4, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"foo", :id=>5, :tag_type=>"PrivateTag", :user_id=>1}]
 >> DB[:messages_tags].all
-=> [{:tag_id=>6, :message_id=>1, :id=>7}]
+=> [{:tag_id=>5, :message_id=>1, :id=>7}]
 
 
 
@@ -58,8 +58,8 @@ examples:
 => [:instance, {:schema=>[[:integer, :id, 2, 2], [:integer, :user_id, 3, 2], [:text, :name, 4, "user2 secret"], [:text, :message, 0, nil], [:text, :_private_tags, 0, "boo"]], :url=>"/secret/2", :new_rec=>false, :actions=>nil, :name=>"secret"}, []]
 
 >> DB[:tags].all
-=> [{:tag=>"xxxxxx", :id=>1, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"sss", :id=>2, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"sss", :id=>3, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"zzz", :id=>4, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"aaa", :id=>5, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"foo", :id=>6,  :tag_type=>"PrivateTag",:user_id=>1}, {:tag=>"foo", :id=>7, :tag_type=>"PrivateTag", :user_id=>2}, {:tag=>"bar", :id=>8, :tag_type=>"PrivateTag", :user_id=>2}, {:tag=>"bar", :id=>9, :tag_type=>"PrivateTag", :user_id=>2}, {:tag=>"baz", :id=>10, :tag_type=>"PrivateTag", :user_id=>2}, {:tag=>"bat", :id=>11, :tag_type=>"PrivateTag", :user_id=>2}, {:tag=>"boo", :id=>12, :tag_type=>"PrivateTag", :user_id=>2}]
+=> [{:tag=>"xxxxxx", :id=>1, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"sss", :id=>2, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"zzz", :id=>3, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"aaa", :id=>4, :tag_type=>"PrivateTag", :user_id=>1}, {:tag=>"foo", :id=>5,  :tag_type=>"PrivateTag",:user_id=>1}, {:tag=>"foo", :id=>6, :tag_type=>"PrivateTag", :user_id=>2}, {:tag=>"bar", :id=>7, :tag_type=>"PrivateTag", :user_id=>2}, {:tag=>"baz", :id=>8, :tag_type=>"PrivateTag", :user_id=>2}, {:tag=>"bat", :id=>9, :tag_type=>"PrivateTag", :user_id=>2}, {:tag=>"boo", :id=>10, :tag_type=>"PrivateTag", :user_id=>2}]
 >> DB[:messages_tags].all
-=> [{:tag_id=>6, :message_id=>1, :id=>7}, {:tag_id=>12, :message_id=>2, :id=>14}]
+=> [{:tag_id=>5, :message_id=>1, :id=>7}, {:tag_id=>10, :message_id=>2, :id=>14}]
 
 

data/rdoc/user_joint.rb

@@ -40,7 +40,7 @@ module Marley
     end
     class Secret < Message
       User.join_to(self)
-      def self.list_dataset
+      def self.list_dataset(params={})
         current_user_ds
       end
     end

data/rdoc/user_joint/exiting_users.rdoc

@@ -63,8 +63,9 @@ example:  user1 reading/writing secrets
   => [[:instance, {:new_rec=>false, :actions=>nil, :schema=>[[:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :name, 4, "this is my secret"], [:text, :message, 0, nil]], :name=>"secret", :url=>"/secret/1"}, []]]
   >> @client.read({},:auth => @user2_auth)
   => []
-  >> @client.read({},:auth => @user2_auth,:instance_id => 1, :code => 403)
-  => [:error, {:error_type=>"authorization", :error_details=>nil, :description=>"You are not authorized for this operation"}]
+  >> @client.read({},:auth => @user2_auth,:instance_id => 1, :code => 404)
+  => [:error, {:error_type=>"routing", :description=>"Not Found", :error_details=>nil}]
+
 
 example: user2 reading/writing secrets
   >> @client.auth=@user2_auth
@@ -80,8 +81,8 @@ example: user2 reading/writing secrets
 
   >> @client.read({}, :auth => @user1_auth)
   => []
-  >> @client.read({}, :auth => @user1_auth, :instance_id => 1,:code => 403)
-  => [:error, {:error_type=>"authorization", :error_details=>nil, :description=>"You are not authorized for this operation"}]
+  >> @client.read({}, :auth => @user1_auth, :instance_id => 1,:code => 404)
+  => [:error, {:error_type=>"routing", :description=>"Not Found", :error_details=>nil}]
 
 examples:  announcements
   >> @client.auth=@user1_auth

data/reggae.ebnf

@@ -17,7 +17,7 @@ link_property ::= 'title' | 'description' | 'url'
 
 instance_property ::= 'name' | 'url' | 'new_rec' | 'search' | 'schema' | 'actions' 
 
-instance_list_property ::='title' | 'description' | 'schema' | 'actions' | 'items'
+instance_list_property ::='title' | 'description' | 'schema' | 'actions' | 'group_actions' | 'items'
 
 msg_property ::= 'title' | 'description'
 
@@ -41,6 +41,8 @@ items_value ::= '[' '[' col_value (',' col_value)* ']' (',' '[' col_value (',' c
 
 actions_value ::= '{' '"' ('get' | 'post' | 'put' | 'delete') '"' ':' methods (',' '"' ('get' | 'post' | 'put' | 'delete') '"' ':' methods )* '}'
 
+group_actions_value ::= actions_value
+
 methods::= '[' ( get_method (',' get_method)* | post_method (',' post_method)* | put_method (',' put_method)* | delete_method (',' delete_method)* ) ']'
 
 get_action ::= string_literal

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marley
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors: 
 - Herb Daily
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-24 00:00:00 -03:00
+date: 2012-03-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ files:
 - lib/marley/joint.rb
 - lib/marley/plugins/orm_rest_convenience.rb
 - lib/marley/plugins/rest_convenience.rb
+- lib/marley/plugins/orm_materialized_path.rb
 - lib/marley/controllers.rb
 - lib/marley/errors.rb
 - lib/marley/reggae.rb
@@ -109,6 +110,7 @@ files:
 - rdoc/user_joint/no_auth_provided.rdoc
 - rdoc/user_joint/exiting_users.rdoc
 - rdoc/messages_joint.rb
+- rdoc/orm_materialized_path_plugin.rb
 - rdoc/messages_joint.rdoc
 - rdoc/hello.rb
 - rdoc/section_joint.rdoc
@@ -122,6 +124,7 @@ files:
 - rdoc/orm_rest_convenience_plugin.rdoc
 - rdoc/reggae/generate.rdoc
 - rdoc/reggae/parse.rdoc
+- rdoc/orm_materialized_path_plugin.rdoc
 - rdoc/user_joint.rb
 - rdoc/joints.rdoc
 - rdoc/hello.rdoc