marley 0.6.0 → 0.6.1

data/lib/marley.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'marley/jamaica' #should prob be ditched
 require 'json/ext'
 require 'rack'
 require 'rack/builder'
@@ -13,8 +14,7 @@ require 'marley/resources'
 require 'marley/controllers'
 require 'marley/joint' 
 require 'marley/plugin' 
-require 'client/jamaica' #should prob be ditched
-Sequel.extension :inflector
+Sequel.extension :inflector #needs to be replaced, probably
 
 log_fn='log/marley.log'
 $log=Logger.new(File.exists?(log_fn) ? log_fn : $stdout) 

data/lib/marley/controllers.rb

@@ -6,7 +6,7 @@ module Marley
       if $request[:path][1].to_s.match(/^\d+$/) #references a specific instance by ID
         @instance=@model[$request[:path][1].to_i]
         raise RoutingError unless @instance
-        @method_name=$request[:path][2]  
+        @method_name=$request[:path][2].sub(/[\?\&\+]$/,'') rescue nil #ditch trailing characters, if any
         if @method_name
           raise RoutingError unless @instance.respond_to?(@method_name)
           @method=@instance.method(@method_name)

data/lib/marley/joints/forum.rb

@@ -31,6 +31,7 @@ module Marley
           super
           self.topic_id||=self.class.max(:topic_id).to_i+1
         end
+        #this needs to change
         def reply
           foo=reggae_instance.set_values(:parent_id => id,:title => "re: #{title}")
           foo.new_rec=true
@@ -46,12 +47,9 @@ module Marley
           [
             self.reggae_link(:new, 'New Post'),
             self.reggae_link(:list, 'All Posts'),
-            self.reggae_link(:recent_topics, 'Recent Topics')
-          ].push(
-            Marley::ReggaeMsg.new({
-              :title => 'Topics Tagged With:', 
-              :description => 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}")}})
-          )
+            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}")}})
+          ]
         end
         def section_contents
         end

data/lib/marley/joints/section.rb

@@ -28,7 +28,7 @@ module Marley
         Marley.plugin('rest_convenience').apply(self)
         Marley.plugin('section').apply(self)
         Marley.plugin('current_user_methods').apply(self) if MP.const_defined?(:CurrentUserMethods)
-        def self.rest_get
+        def self.rest_get(params=nil)
           section
         end
       end
@@ -41,11 +41,14 @@ module Marley
               false
             end
           end
+          def self.section_title
+            Marley.config[:app_name]
+          end
           def self.section_nav
             if respond_to?(:current_user) && (current_user.nil? || current_user.new?)
               [[:msg,{},'New users, please sign up below'],MR::User.new]
             else
-              MR.resources_responding_to(:section).sort {|l,r|l.resource_name <=> r.resource_name}.map{|r| r.section_link}.compact
+              MR.resources_responding_to(:section).sort {|l,r|l.resource_name <=> r.resource_name}.map{|r| next if r==self; r.section}.compact
             end
           end
           def self.section_desc

data/rdoc/forum_joint.rb

@@ -47,4 +47,5 @@ DB.create_table :topics_tags do
 end
  
 
+Marley.config(:app_name => 'Forum',:client => Marley::Client.new(:app_name => 'Forum'))
 Marley.joint('forum')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marley
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Herb Daily
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-22 00:00:00 -03:00
+date: 2012-02-27 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.13.4
+        version: 0.15.1
     version: 
 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