RubyGems - marley - Versions diffs - 0.7.0 → 0.7.1 - Mend

marley 0.7.0 → 0.7.1

Files changed (13) hide show

data/lib/client/marley/client/_prevel-full.js +2117 -0
data/lib/client/marley/client/jamaica.css +159 -0
data/lib/client/marley/client/jamaica.js +87 -0
data/lib/client/marley/client/prevel-ext.js +47 -0
data/lib/client/marley/client/reggae.js +187 -0
data/lib/client/marley/jamaica.rb +38 -0
data/lib/marley/controllers.rb +1 -1
data/lib/marley/plugin.rb +3 -0
data/lib/marley/reggae.rb +3 -2
data/rdoc/forum_load.rb +53 -0
data/rdoc/messages_joint/private_messages.rdoc +10 -10
data/rdoc/messages_joint/public_messages.rdoc +9 -9
metadata +104 -39

data/lib/client/marley/jamaica.rb ADDED Viewed

@@ -0,0 +1,38 @@
+module Marley
+  class Client
+    # Here we define the Jamaica client class for Marley.  This client
+    # is a simple HTML page that is intended to be run in a browser.
+    # It will have its actual UI metadata in the global variable '_jamaica_json'
+    # and onDocumentReady, this will be turned into the client UI.
+    def initialize(opts={})
+      @opts={:app_name => 'Application',:css => '', :js => ''}.merge(opts)
+      @client_dir="#{File.dirname(__FILE__)}/client/"
+      @libs = Dir.glob("#{@client_dir}*.js").sort
+      @styles = [ 'jamaica.css' ]
+    end
+    def joint(joint_d,joint_name)
+      [:css,:js].each do |ext|
+        fn="#{joint_d}#{joint_name}.#{ext.to_s}"
+        File.exists?(fn) && send(ext,File.new(fn,"r").read)
+      end
+    end
+    def css(add_css=nil)
+      @opts[:css]+=add_css if add_css
+      @opts[:css]
+    end
+    def js(add_js=nil)
+      @opts[:js]+=add_js if add_js
+      @opts[:js]
+    end
+    def to_s(json='')
+      <<-EOHTML
+      <head>
+        <title>#{@opts[:app_name]}</title>
+        <script type='text/javascript'>var _jamaica_json=#{json}; #{ @libs.map{ |l| File.new(l).read }.push(@opts[:js]).join("\n") }</script>
+        <style>#{ @styles.map{ |s| File.new("#{@client_dir}#{s}").read }.push(@opts[:css]).join("\n") }
+      </head>
+      <body></body>
+      EOHTML
+    end
+  end
+end

data/lib/marley/controllers.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module Marley
           @method=@instance.method(@method_name)
         end
       else #class method -- should yield 0 or more instances of model in an array
-        @method_name=$request[:path][1]
+        @method_name=$request[:path][1].sub(/[\?\&\+]$/,'') rescue nil #ditch trailing characters, if any
         @method_name='list' if @method_name.nil? && $request[:verb]=='rest_get'
         if @method_name
           raise RoutingError unless @model.respond_to?(@method_name)

data/lib/marley/plugin.rb CHANGED Viewed

@@ -17,8 +17,11 @@ module Marley
           @opts[:required_plugins].to_a.each do |p|
             Marley.plugin(p).apply(klass)
           end
+          #below 4 lines vs 2 is for 1.8-1.9 and is fucking awful!
           plugin.constants.include?('ClassMethods') && resource.extend(plugin.const_get('ClassMethods'))
+          plugin.constants.include?(:ClassMethods) && resource.extend(plugin.const_get(:ClassMethods))
           plugin.constants.include?('InstanceMethods') && resource.send(:include, plugin.const_get('InstanceMethods'))
+          plugin.constants.include?(:InstanceMethods) && resource.send(:include, plugin.const_get(:InstanceMethods))
           if @opts[:lazy_class_attrs] || @opts[:class_attrs]
             resource.extend Marley::Utils::ClassAttrs
           end

data/lib/marley/reggae.rb CHANGED Viewed

@@ -40,7 +40,8 @@ module Marley
       end
     end
     def is_resource?
-      [String, Symbol].include?(self[0].class) && Marley.constants.include?("reggae_#{self[0]}".camelcase)
+      #below is for 1.8-1.9 and is fucking awful!
+      [String, Symbol].include?(self[0].class) && (Marley.constants.include?("reggae_#{self[0]}".camelcase) || Marley.constants.include?("reggae_#{self[0]}".camelcase.to_sym))
     end
     def contents=(*args)
       self[2]=*args
@@ -117,7 +118,7 @@ module Marley
   end
   class ReggaeSchema < Array
     def initialize(*args)
-      super
+      super
       replace(map{|spec| ReggaeColSpec.new(spec)})
     end
     def [](i)

data/rdoc/forum_load.rb ADDED Viewed

@@ -0,0 +1,53 @@
+#require 'rubygems'
+require 'rdoc/forum_joint.rb'
+require 'factory_girl'
+#this kinda sucks...
+Sequel::Model.send(:alias_method, :save!, :save)
+USERS=5
+TOPICS=5
+TAGS=3
+REPLIES=[4,2]
+FactoryGirl.define do
+  [:name,:title,:tag,:content].each do |seq|
+    sequence seq do |n|
+      "#{seq.to_s}#{n}"
+    end
+  end
+  factory :user,:class => MR::User,:aliases => [:author,:recipient] do |n|
+    name
+    password 'asdfasdf'
+    confirm_password 'asdfasdf'
+  end
+  factory :post,:class => MR::PublicMessage do |n|
+    user
+    title
+    content
+    _public_tags ''
+    _private_tags ''
+  end
+  factory :private_message,:class => MR::PublicMessage do |n|
+    user
+    recipients ''
+    title
+    content
+    _private_tags ''
+  end
+  factory :public_tag,:class => MR::PublicTag do |n|
+    tag
+  end
+  factory :private_tag,:class => MR::PrivateTag do |n|
+    user
+    tag
+  end
+end
+USERS.times do
+  FactoryGirl.create(:user) do |u|
+    $request={:user => u}
+    TOPICS.times do
+      FactoryGirl.create(:post,:user_id => u[:id])
+    end
+  end
+end

data/rdoc/messages_joint/private_messages.rdoc CHANGED Viewed

@@ -15,29 +15,29 @@ example: user1 sends message to user2
 >> @client1.create(@msg.set_values(:title => 'asdf',:recipients => 'xxx'),:code => 400)
 => [:error, {:error_type=>"validation", :error_details=>{:recipients=>["xxx is not a valid message recipient"]}, :description=>nil}]
 >> @client1.create(@msg.set_values(:title => 'asdf',:recipients => 'user2'))
-=> [:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 6, "asdf"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>"reply"}}, []]
+=> [:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 6, "asdf"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>:reply}}, []]
 >> @client1.read
 => []
 >> @client3.read
 => []
 >> @client2.read
-=> [[:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 6, "asdf"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>"reply"}}, []]]
+=> [[:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 6, "asdf"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>:reply}}, []]]
 example: user2 sends message to user3 and user4, each of which replies
 >> @msg=@client2.read({},:method => 'new')
 => [:instance, {:url=>"/private_message/", :schema=>[[:text, :recipients, 0, ""], [:integer, :user_id, 3, 2], [:text, :title, 4, nil], [:text, :content, 0, nil]], :name=>"private_message", :new_rec=>true, :actions=>nil}, nil]
 >> @client2.create(@msg.set_values(:title => 'message1',:recipients => 'user3,user4'))
-=> [:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user3,user4"], [:text, :author, 2, "user2"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 2], [:text, :title, 6, "message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => ["reply", "reply_all"]}}, []]
+=> [:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user3,user4"], [:text, :author, 2, "user2"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 2], [:text, :title, 6, "message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => [:reply, :reply_all]}}, []]
 >> @client1.read
 => []
 >> @client2.read
 => []
 >> @client3.read
-=> [[:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user3,user4"], [:text, :author, 2, "user2"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 2], [:text, :title, 6, "message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => ["reply", "reply_all"]}}, []]]
+=> [[:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user3,user4"], [:text, :author, 2, "user2"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 2], [:text, :title, 6, "message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => [:reply, :reply_all]}}, []]]
 >> @orig=@client4.read
-=> [[:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user3,user4"], [:text, :author, 2, "user2"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 2], [:text, :title, 6, "message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => ["reply", "reply_all"]}}, []]]
+=> [[:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user3,user4"], [:text, :author, 2, "user2"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 2], [:text, :title, 6, "message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => [:reply, :reply_all]}}, []]]
 >> @u3r=@client3.read({},:url => @orig[0].url+'/reply')
 => [:instance, {:url=>"/private_message/", :schema=>[[:text, :recipients, 0, "user2"], [:integer, :user_id, 3, 3], [:text, :title, 4, "re: message1"], [:text, :content, 0, nil]], :name=>"private_message", :new_rec=>true, :actions=>nil}, nil]
@@ -45,15 +45,15 @@ example: user2 sends message to user3 and user4, each of which replies
 => [:instance, {:url=>"/private_message/", :schema=>[[:text, :recipients, 0, "user2,user4"], [:integer, :user_id, 3, 3], [:text, :title, 4, "re: message1"], [:text, :content, 0, nil]], :name=>"private_message", :new_rec=>true, :actions=>nil}, nil]
 >> @client3.create(@u3r)
-=> [:instance, {:url=>"/private_message/2", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user3"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>"reply"}}, []]
+=> [:instance, {:url=>"/private_message/2", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user3"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>:reply}}, []]
 >> @client2.read
-=> [[:instance, {:url=>"/private_message/2", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user3"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>"reply"}}, []]]
+=> [[:instance, {:url=>"/private_message/2", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user3"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>:reply}}, []]]
 >> @client3.create(@u3ra)
-=> [:instance, {:url=>"/private_message/3", :schema=>[[:text, :recipients, 2, "user2,user4"], [:text, :author, 2, "user3"], [:integer, :id, 2, 3], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => ["reply", "reply_all"]}}, []]
+=> [:instance, {:url=>"/private_message/3", :schema=>[[:text, :recipients, 2, "user2,user4"], [:text, :author, 2, "user3"], [:integer, :id, 2, 3], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => [:reply, :reply_all]}}, []]
 >> @client2.read
-=> [[:instance, {:url=>"/private_message/2", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user3"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>"reply"}}, []], [:instance, {:url=>"/private_message/3", :schema=>[[:text, :recipients, 2, "user2,user4"], [:text, :author, 2, "user3"], [:integer, :id, 2, 3], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => ["reply", "reply_all"]}}, []]]
+=> [[:instance, {:url=>"/private_message/2", :schema=>[[:text, :recipients, 2, "user2"], [:text, :author, 2, "user3"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get=>:reply}}, []], [:instance, {:url=>"/private_message/3", :schema=>[[:text, :recipients, 2, "user2,user4"], [:text, :author, 2, "user3"], [:integer, :id, 2, 3], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => [:reply, :reply_all]}}, []]]
 >> @client4.read
-=> [[:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user3,user4"], [:text, :author, 2, "user2"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 2], [:text, :title, 6, "message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => ["reply", "reply_all"]}}, []], [:instance, {:url=>"/private_message/3", :schema=>[[:text, :recipients, 2, "user2,user4"], [:text, :author, 2, "user3"], [:integer, :id, 2, 3], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => ["reply", "reply_all"]}}, []]]
+=> [[:instance, {:url=>"/private_message/1", :schema=>[[:text, :recipients, 2, "user3,user4"], [:text, :author, 2, "user2"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 2], [:text, :title, 6, "message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => [:reply, :reply_all]}}, []], [:instance, {:url=>"/private_message/3", :schema=>[[:text, :recipients, 2, "user2,user4"], [:text, :author, 2, "user3"], [:integer, :id, 2, 3], [:integer, :user_id, 3, 3], [:text, :title, 6, "re: message1"], [:text, :content, 2, nil]], :name=>"private_message", :new_rec=>false, :actions=>{:get => [:reply, :reply_all]}}, []]]

data/rdoc/messages_joint/public_messages.rdoc CHANGED Viewed

@@ -19,13 +19,13 @@ example: user1 writes, edits, deletes post
 => [:error, {:error_type=>"validation", :description=>nil, :error_details=>{:title=>["is required"]}}]
 >> @msg=@client1.create(@msg.set_values(:title => 'test'))
-=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "test"], [:text, :content, 0, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply", :delete=>"/public_message/1"}}, []]
+=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "test"], [:text, :content, 0, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply, :delete=>"/public_message/1"}}, []]
 >> @client1.update(@msg.set_values(:content => 'asdf'),:url => @msg.url)
-=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "test"], [:text, :content, 0, "asdf"]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply", :delete=>"/public_message/1"}}, []]
+=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "test"], [:text, :content, 0, "asdf"]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply, :delete=>"/public_message/1"}}, []]
 >> @client1.del({},:url => @msg.url)
-=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "test"], [:text, :content, 0, "asdf"]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply", :delete=>"/public_message/1"}}, []]
+=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "test"], [:text, :content, 0, "asdf"]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply, :delete=>"/public_message/1"}}, []]
 example:  two users, several messages
@@ -35,28 +35,28 @@ example:  two users, several messages
 => [:instance, {:new_rec=>true, :actions=>nil, :url=>"/public_message/", :name=>"public_message", :schema=>[[:integer, :user_id, 3, 2], [:text, :title, 4, nil], [:text, :content, 0, nil]]}, nil]
 >> @u1m1=@client1.create(@u1msg.set_values(:title => 'usr1 msg1'))
-=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "usr1 msg1"], [:text, :content, 0, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply", :delete=>"/public_message/1"}}, []]
+=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "usr1 msg1"], [:text, :content, 0, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply, :delete=>"/public_message/1"}}, []]
 >> @client3.read
-=> [[:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 6, "usr1 msg1"], [:text, :content, 2, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply"}}, []]]
+=> [[:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 6, "usr1 msg1"], [:text, :content, 2, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply}}, []]]
 >> @u1m2=@client1.create(@u1msg.set_values(:title => 'usr1 msg2'))
-=> [:instance, {:url=>"/public_message/2", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 1], [:text, :title, 4, "usr1 msg2"], [:text, :content, 0, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply", :delete=>"/public_message/2"}}, []]
+=> [:instance, {:url=>"/public_message/2", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 1], [:text, :title, 4, "usr1 msg2"], [:text, :content, 0, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply, :delete=>"/public_message/2"}}, []]
 >> @client3.read
-=> [[:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 6, "usr1 msg1"], [:text, :content, 2, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply"}}, []], [:instance, {:url=>"/public_message/2", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 1], [:text, :title, 6, "usr1 msg2"], [:text, :content, 2, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply"}}, []]]
+=> [[:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 6, "usr1 msg1"], [:text, :content, 2, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply}}, []], [:instance, {:url=>"/public_message/2", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 2], [:integer, :user_id, 3, 1], [:text, :title, 6, "usr1 msg2"], [:text, :content, 2, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply}}, []]]
 >> @client3.update(@u1m1.set_values(:title => 'asdf'),:url => @u1m1.url,:code => 403)
 => [:error, {:error_type=>"authorization", :error_details=>nil, :description=>"You are not authorized for this operation"}]
 >> @client2.update(@u1m1.set_values(:title => 'asdf'),:url => @u1m1.url,:code => 403)
 => [:error, {:error_type=>"authorization", :error_details=>nil, :description=>"You are not authorized for this operation"}]
 >> @client1.update(@u1m1.set_values(:title => 'asdf'),:url => @u1m1.url)
-=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "asdf"], [:text, :content, 0, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply", :delete=>"/public_message/1"}}, []]
+=> [:instance, {:url=>"/public_message/1", :schema=>[[:text, :author, 2, "user1"], [:integer, :id, 2, 1], [:integer, :user_id, 3, 1], [:text, :title, 4, "asdf"], [:text, :content, 0, nil]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply, :delete=>"/public_message/1"}}, []]
 >> @u2r1=@client2.read({},:url => @u1m1.url+'/reply')
 => [:instance, {:url=>"/public_message/", :schema=>[[:integer, :user_id, 3, 2], [:text, :title, 4, "re: asdf"], [:text, :content, 0, nil]], :name=>"public_message", :new_rec=>true, :actions=>nil}, nil]
 >> @client2.create(@u2r1.set_values(:content => 'xxxxxx'))
-=> [:instance, {:url=>"/public_message/3", :schema=>[[:text, :author, 2, "user2"], [:integer, :id, 2, 3], [:integer, :user_id, 3, 2], [:text, :title, 4, "re: asdf"], [:text, :content, 0, "xxxxxx"]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>"reply", :delete=>"/public_message/3"}}, []]
+=> [:instance, {:url=>"/public_message/3", :schema=>[[:text, :author, 2, "user2"], [:integer, :id, 2, 3], [:integer, :user_id, 3, 2], [:text, :title, 4, "re: asdf"], [:text, :content, 0, "xxxxxx"]], :name=>"public_message", :new_rec=>false, :actions=>{:get=>:reply, :delete=>"/public_message/3"}}, []]

metadata CHANGED Viewed

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: marley
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  hash: 92329988
+  prerelease:
+  segments:
+  - 0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors:
 - Herb Daily
@@ -9,49 +15,94 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00 -03:00
-default_executable:
+date: 2012-03-21 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  type: :runtime
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: "3.27"
-    version:
+        hash: 869193570
+        segments:
+        - 3
+        version: "3"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency
   name: rack
-  type: :runtime
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
-    version:
+        hash: 32663276
+        segments:
+        - 2
+        version: "2"
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency
   name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        hash: 349180216
+        segments:
+        - 1
+        - 6
+        version: "1.6"
   type: :runtime
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.7
-    version:
+        hash: 869193570
+        segments:
+        - 3
+        version: "3"
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency
-  name: tdoc
+  name: rack-test
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        hash: 881230260
+        segments:
+        - 0
+        version: "0"
   type: :development
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency
+  name: tdoc
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
-    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. "
 email: herb.daily@safe-mail.net
 executables: []
@@ -69,24 +120,29 @@ 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
@@ -95,21 +151,22 @@ 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/tags_joint/announcements.rdoc
-- rdoc/tags_joint/secrets.rdoc
 - rdoc/reggae.rb
 - rdoc/reggae.rdoc
-has_rdoc: true
+- 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
 homepage: http://github.com/herbdaily/marley
 licenses: []
@@ -119,21 +176,29 @@ 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.3.5
+rubygems_version: 1.8.12
 signing_key:
 specification_version: 3
 summary: Irie default restful routes for models and other objects