marley 0.7.1 → 0.7.2

data/lib/marley/joints/forum.rb

@@ -11,7 +11,7 @@ module Marley
           filters.inject(self.dataset.filter(:parent_id => nil)) {|ds,f| ds.filter(f)}
         end
         def list(params=nil)
-          (params.is_a?(Sequel::Dataset) ?  params : topics(params)).map{|t| t.thread}
+          (params.is_a?(Sequel::Dataset) ?  params : topics(params)).eager(associations).all.map{|t| t.thread}
         end
       end
       module InstanceMethods
@@ -19,12 +19,12 @@ module Marley
           super.push(:topic_id, :parent_id)
         end
         def children
-          self.class.filter(:parent_id => id).all
+          self.class.filter(:parent_id => id).eager(associations)
         end
         def thread
-          return reggae_instance if children.length==0
+          return reggae_instance if children.all.length==0
           foo=reggae_instance
-          foo[2] = children.map{|m| m.thread} 
+          foo[2] = children.all.map{|m| m.thread} 
           foo
         end
         def before_save

data/lib/marley/joints/messages.rb

@@ -36,7 +36,7 @@ module Marley
           end
           Marley::Utils.many_to_many_join(self, MR::User)
           def self.list_dataset
-            filter(:id => DB[:messages_users].filter(:user_id => current_user[:id]).select(:message_id))
+            super.filter(:messages__id => DB[:messages_users].filter(:user_id => current_user[:id]).select(:message_id))
           end
           def current_user_role
             super || (self.users.include?(self.class.current_user) && 'recipient')

data/lib/marley/joints/tags.rb

@@ -1,30 +1,13 @@
 module Marley
   module Plugins
     class Tagging < Plugin
-      @default_opts={:join_type => 'many_to_many', :add_to_write_cols? => true}
+      @default_opts={:concat_tags => true}
       def apply(*klasses)
         klasses.each do |klass|
           klass=MR.const_get(klass) if klass.is_a?(String)
-          # not crazy about this nested if shit.  there may be a better way...
-          if val=klass.instance_variable_get('@derived_after_cols')
-            if val[:new?]
-              val[:new?][:all] << @tag_col_name.to_sym
-            else
-              val[:new?]={:all => [@tag_col_name.to_sym]}
-            end
-          else
-            klass.instance_variable_set('@derived_after_cols',{:new? => {:all => [@tag_col_name.to_sym]}})
-          end
+          klass.derived_after_cols![:new?][:all] << @tag_col_name.to_sym
           @instance_methods_mod.send(:append_features,klass)
-          tag_class=@tag_class
-          join_type=@opts[:"#{klass}_join_type"] || @opts[:join_type]
-          if join_type=='many_to_many'
-            Marley::Utils.many_to_many_join(klass, tag_class)
-          else
-            reciprocal_join=join_type.split('_').reverse.join('_')
-            tag_class.send(reciprocal_join.to_sym, klass.resource_name.pluralize.to_sym, {:class => klass})
-            klass.send(join_type.to_sym, tag_class.resource_name.pluralize.to_sym, {:class => tag_class})
-          end
+          Marley::Utils.many_to_many_join(klass, @tag_class)
         end
       end
       def initialize(opts={})
@@ -33,15 +16,14 @@ 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"
-        add_to_write_cols=@opts[:add_to_write_cols?]
         @instance_methods_mod=Module.new do |m|
           attr_accessor tag_col_name
-          if add_to_write_cols
-            define_method(:write_cols) {
-              super << tag_col_name.to_sym
-            }
-          end
+          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)})
           }
@@ -70,6 +52,10 @@ module Marley
     class Tags < Joint
       module Resources
         class Tag < Sequel::Model
+          sti
+          def self.list_dataset
+            dataset.order(:tag)
+          end
           def validate
             validates_presence :tag
             validates_unique [:tag,:user_id]
@@ -85,12 +71,11 @@ module Marley
         end
         class PublicTag < Tag
           @owner_col=nil
-          set_dataset DB[:tags].filter(:tags__user_id => nil).order(:tag)
         end
         class PrivateTag < Tag
           MR::User.join_to(self) if MR::User
           def self.list_dataset
-            current_user_dataset.order(:tag)
+            current_user_ds.order(:tag)
           end
         end
       end

data/lib/marley/joints/user.rb

@@ -48,16 +48,7 @@ module Marley
         def current_user_role
           if u=self.class.current_user
             return 'new' if u.new?
-            return "owner" if (@owners||=owners).include?(u) #avoid multiple calls to `owners`
-          end
-        end
-        def owners
-          if self.class.to_s.match(/User$/)||self.class.superclass.to_s.match(/User$/)
-            [self]
-          elsif self.class.owner_col
-            [MR::User[send(self.class.owner_col)]]
-          else
-            self.class.association_reflections.select {|k,v| v[:type]==:many_to_one}.map {|a| self.send(a[0]) && self.send(a[0]).owners}.flatten.compact
+            return "owner" if send_or_nil(self.class.owner_col)==u[:id]
           end
         end
       end
@@ -70,18 +61,19 @@ module Marley
           LOGIN_FORM= [:instance,{:name => 'login',:url => 'main_menu',:description => 'Existing users please log in here:',:new_rec => true,:schema => [[:text,'name',RESTRICT_REQ],[:password,'password',RESTRICT_REQ]]}]
           Marley.plugin('current_user_methods').apply(self)
           MU.sti(self)
-          @owner_col=nil 
+          @owner_col=:id
           required_cols![:new?][true]=['password','confirm_password']
           derived_after_cols![:new?]={true => [:password,:confirm_password]}
           derived_after_cols![:current_user_role]={'owner' => [:old_password,:password,:confirm_password]}
           reject_cols![:current_user_role]={:all => ['pw_hash']}
           ro_cols![:current_user_role]={'new' => ['id'],nil => [/.*/]} 
+          def after_initialize;end
           def self.join_to(klass, user_id_col_name=nil)
-            user_id_col_name||='user_id'
+            user_id_col_name||=:user_id
             klass=MR.const_get(klass) if klass.class==String
             Marley.plugin(:current_user_methods).apply(klass)
             klass.owner_col!=user_id_col_name
-            one_to_many klass.resource_name.to_sym, :class => klass, :key => user_id_col_name
+            one_to_many klass.resource_name.pluralize.to_sym, :class => klass, :key => user_id_col_name
             klass.send(:many_to_one, :user, :class => MR::User, :key => user_id_col_name)
           end
           attr_accessor :old_password,:password, :confirm_password

data/lib/marley/plugins/orm_rest_convenience.rb

@@ -25,12 +25,11 @@ module Marley
 
         def foreign_key_name; :"#{(respond_to?(:table_name) ? table_name : resource_name).to_s.singularize}_id"; end
 
+        def list_dataset
+          dataset
+        end
         def list(params={})
-          if respond_to?(:list_dataset)
-            list_dataset.filter(params).all
-          else
-            filter(params).all
-          end
+          list_dataset.filter(params).all
         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(/.*::/,'')}

data/lib/marley/utils.rb

@@ -57,7 +57,7 @@ module Marley
       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)
-      join_table=[lclass.table_name.to_s,rclass.table_name.to_s ].sort.join('_')
+      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)
     end

data/rdoc/tags_joint.rb

@@ -3,6 +3,7 @@ require 'user_joint.rb'
 DB.create_table :tags do
   primary_key :id
   integer :user_id
+  text :tag_type
   text :tag
 end
 DB.create_table :messages_tags do

data/rdoc/tags_joint/secrets.rdoc

@@ -30,7 +30,7 @@ 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, :user_id=>1}, {:tag=>"sss", :id=>2, :user_id=>1}, {:tag=>"sss", :id=>3, :user_id=>1}, {:tag=>"zzz", :id=>4, :user_id=>1}, {:tag=>"aaa", :id=>5, :user_id=>1}, {:tag=>"foo", :id=>6, :user_id=>1}]
+=> [{: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}]
 >> DB[:messages_tags].all
 => [{:tag_id=>6, :message_id=>1, :id=>7}]
 
@@ -58,7 +58,7 @@ 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, :user_id=>1}, {:tag=>"sss", :id=>2, :user_id=>1}, {:tag=>"sss", :id=>3, :user_id=>1}, {:tag=>"zzz", :id=>4, :user_id=>1}, {:tag=>"aaa", :id=>5, :user_id=>1}, {:tag=>"foo", :id=>6, :user_id=>1}, {:tag=>"foo", :id=>7, :user_id=>2}, {:tag=>"bar", :id=>8, :user_id=>2}, {:tag=>"bar", :id=>9, :user_id=>2}, {:tag=>"baz", :id=>10, :user_id=>2}, {:tag=>"bat", :id=>11, :user_id=>2}, {:tag=>"boo", :id=>12, :user_id=>2}]
+=> [{: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}]
 >> DB[:messages_tags].all
 => [{:tag_id=>6, :message_id=>1, :id=>7}, {:tag_id=>12, :message_id=>2, :id=>14}]
 

data/rdoc/user_joint/exiting_users.rdoc

@@ -37,7 +37,7 @@ example: user1 logged in
   >> @user1.set_values(:confirm_password => 'zxcvzxcv',:old_password => 'asdfasdf')
   => [:instance, {:new_rec=>false, :actions=>nil, :schema=>[[:integer, :id, 2, 1], [:text, :name, 0, "user1"], [:text, :email, 0, nil], [:date, :birthday, 0, nil], [:datetime, :date_created, 2, "date_created"], [:text, :description, 0, nil], [:password, :old_password, 0, "asdfasdf"], [:password, :password, 0, "zxcvzxcv"], [:password, :confirm_password, 0, "zxcvzxcv"]], :name=>"user", :url=>"/user/1"}, []]
   >> @client.update(@user1)
-  => [:instance, {:new_rec=>false, :actions=>nil, :schema=>[[:integer, :id, 2, 1], [:text, :name, 2, "user1"], [:text, :email, 2, nil], [:date, :birthday, 2, nil], [:datetime, :date_created, 2, "date_created"], [:text, :description, 2, nil]], :name=>"user", :url=>"/user/1"}, []]
+  => [:instance, {:new_rec=>false, :actions=>nil, :schema=>[[:integer, :id, 2, 1], [:text, :name, 0, "user1"], [:text, :email, 0, nil], [:date, :birthday, 0, nil], [:datetime, :date_created, 2, "date_created"], [:text, :description, 0, nil], [:password, :old_password, 0, "asdfasdf"], [:password, :password, 0, "zxcvzxcv"], [:password, :confirm_password, 0, "zxcvzxcv"]], :name=>"user", :url=>"/user/1"}, []]
   >> @client.read({},:code => 401)
   => [:error, {:error_type=>"authentication", :error_details=>nil, :description=>nil}]
   >> @client.read({},:auth => ['user1', 'zxcvzxcv'])

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marley
 version: !ruby/object:Gem::Version 
-  hash: 92329988
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Herb Daily
@@ -15,95 +9,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 Z
+date: 2012-03-24 00:00:00 -03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 869193570
-        segments: 
-        - 3
         version: "3"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 32663276
-        segments: 
-        - 2
         version: "2"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: json
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 349180216
-        segments: 
-        - 1
-        - 6
         version: "1.6"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 869193570
-        segments: 
-        - 3
         version: "3"
-  type: :development
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 881230260
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id005
+    version: 
 - !ruby/object:Gem::Dependency 
   name: tdoc
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3846723
-        segments: 
-        - 0
-        - 16
         version: "0.16"
-  type: :development
-  version_requirements: *id006
-description: "Marley is a framework for quickly building RESTful web services and applications.  Development is fast because Marley implements lots of sensible defaults, all of which can be overridden and most of which can be overridden easily. "
+    version: 
+description: "Marley is a framework for quickly building RESTful web services and applications.  Development is fast for two reasons: Marley implements lots of sensible defaults, all of which can be overridden and most of which can be overridden easily.  And Marley servers exchange only data and metadata with clients.  "
 email: herb.daily@safe-mail.net
 executables: []
 
@@ -120,29 +89,25 @@ files:
 - lib/marley/plugin.rb
 - lib/marley/resources.rb
 - lib/marley/router.rb
-- lib/marley/utils.rb
-- lib/marley/joint.rb
-- lib/marley/controllers.rb
-- lib/marley/errors.rb
-- lib/marley/reggae.rb
-- lib/client/marley/jamaica.rb
-- lib/client/marley/client/jamaica.css
-- lib/client/marley/client/_prevel-full.js
-- lib/client/marley/client/prevel-ext.js
-- lib/client/marley/client/jamaica.js
-- lib/client/marley/client/reggae.js
 - lib/marley/joints/forum.rb
 - lib/marley/joints/messages.rb
 - lib/marley/joints/section.rb
 - lib/marley/joints/user.rb
 - lib/marley/joints/tags.rb
+- lib/marley/utils.rb
+- lib/marley/joint.rb
 - lib/marley/plugins/orm_rest_convenience.rb
 - lib/marley/plugins/rest_convenience.rb
+- lib/marley/controllers.rb
+- lib/marley/errors.rb
+- lib/marley/reggae.rb
 - rdoc/orm_rest_convenience_plugin.rb
 - rdoc/section_joint.rb
 - rdoc/forum_load.rb
 - rdoc/forum_joint.rb
 - rdoc/tags_joint.rdoc
+- rdoc/user_joint/no_auth_provided.rdoc
+- rdoc/user_joint/exiting_users.rdoc
 - rdoc/messages_joint.rb
 - rdoc/messages_joint.rdoc
 - rdoc/hello.rb
@@ -151,22 +116,21 @@ files:
 - rdoc/example_plugin.rb
 - rdoc/plugins.rdoc
 - rdoc/example_joint.rb
+- rdoc/messages_joint/private_messages.rdoc
+- rdoc/messages_joint/public_messages.rdoc
 - rdoc/forum_joint.rdoc
 - rdoc/orm_rest_convenience_plugin.rdoc
+- rdoc/reggae/generate.rdoc
+- rdoc/reggae/parse.rdoc
 - rdoc/user_joint.rb
 - rdoc/joints.rdoc
 - rdoc/hello.rdoc
 - rdoc/tags_joint.rb
-- rdoc/reggae.rb
-- rdoc/reggae.rdoc
-- rdoc/user_joint/no_auth_provided.rdoc
-- rdoc/user_joint/exiting_users.rdoc
-- rdoc/messages_joint/private_messages.rdoc
-- rdoc/messages_joint/public_messages.rdoc
-- rdoc/reggae/generate.rdoc
-- rdoc/reggae/parse.rdoc
 - rdoc/tags_joint/announcements.rdoc
 - rdoc/tags_joint/secrets.rdoc
+- rdoc/reggae.rb
+- rdoc/reggae.rdoc
+has_rdoc: true
 homepage: http://github.com/herbdaily/marley
 licenses: []
 
@@ -176,29 +140,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 881230260
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 540260530
-      segments: 
-      - 1
-      - 0
-      - 0
       version: 1.0.0
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Irie default restful routes for models and other objects