rails3: fix grape initialization

Victor Costa · Rodrigo Souto
1 parent 800be114
Showing 3 changed files with 8 additions and 6 deletions Show diff stats
Gemfile
app/models/comment.rb
config.ru
@@ -19,6 +19,10 @@ gem &#39;gettext&#39;,                  &#39;~&gt; 2.2.1&#39;, :require =&gt; false
 gem 'locale',                   '~> 2.0.5'
 gem 'whenever', :require => false
 gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
+gem 'grape', '0.2.1'
+
+# FIXME list here all actual dependencies (i.e. the ones in debian/control),
+# with their GEM names (not the Debian package names)
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -21,12 +21,12 @@ class Comment &lt; ActiveRecord::Base
   scope :without_reply, :conditions => ['reply_of_id IS NULL']
   #FIXME make this test
-  named_scope :newer_than, lambda { |reference_id|
+  scope :newer_than, lambda { |reference_id|
     {:conditions => ["comments.id > #{reference_id}"]}
   }
   #FIXME make this test
-  named_scope :older_than, lambda { |reference_id|
+  scope :older_than, lambda { |reference_id|
     {:conditions => ["comments.id < #{reference_id}"]}
   }
@@ -10,11 +10,9 @@ require &quot;config/environment&quot;
 #run ActionController::Dispatcher.new
 rails_app = Rack::Builder.new do
-  use Rails::Rack::LogTailer
-  use Rails::Rack::Static
-  run ActionController::Dispatcher.new
+  run Noosfero::Application
 end
- 
+
 run Rack::Cascade.new([
   API::API,
   rails_app
	@@ -21,12 +21,12 @@ class Comment < ActiveRecord::Base		@@ -21,12 +21,12 @@ class Comment < ActiveRecord::Base
21	scope :without_reply, :conditions => ['reply_of_id IS NULL']	21	scope :without_reply, :conditions => ['reply_of_id IS NULL']
22		22
23	#FIXME make this test	23	#FIXME make this test
24	- named_scope :newer_than, lambda { \|reference_id\|	24	+ scope :newer_than, lambda { \|reference_id\|
25	{:conditions => ["comments.id > #{reference_id}"]}	25	{:conditions => ["comments.id > #{reference_id}"]}
26	}	26	}
27		27
28	#FIXME make this test	28	#FIXME make this test
29	- named_scope :older_than, lambda { \|reference_id\|	29	+ scope :older_than, lambda { \|reference_id\|
30	{:conditions => ["comments.id < #{reference_id}"]}	30	{:conditions => ["comments.id < #{reference_id}"]}
31	}	31	}
32		32