Merge branch 'api' into stable

Conflicts: Gemfile

Merge branch 'api' into stable
Conflicts: Gemfile
Victor Costa
2 parents 68a0e942 cf2b8ce4
Showing 11 changed files with 31 additions and 15 deletions Show diff stats
Gemfile
lib/api/api.rb
lib/api/helpers.rb
lib/api/v1/articles.rb
lib/api/v1/categories.rb
lib/api/v1/comments.rb
lib/api/v1/communities.rb
lib/api/v1/enterprises.rb
lib/api/v1/people.rb
lib/api/v1/users.rb
lib/noosfero/plugin.rb
@@ -24,10 +24,6 @@ gem &#39;locale&#39;,                   &#39;~&gt; 2.0.5&#39;
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
-group :development do
-  gem 'bullet'
-end
-
 group :production do
   gem 'dalli', '~> 2.7.0'
 end
@@ -3,6 +3,11 @@ Dir[&quot;#{Rails.root}/lib/api/*.rb&quot;].each {|file| require file}
 module API
   class API < Grape::API
+    before { start_log }
+    before { setup_multitenancy }
+    before { detect_stuff_by_domain }
+    after { end_log }
+
     version 'v1'
     prefix "api"
     format :json
@@ -19,5 +24,15 @@ module API
     mount V1::Categories
     mount Session
+    # hook point which allow plugins to add Grape::API extensions to API::API
+    #finds for plugins which has api mount points classes defined (the class should extends Grape::API)
+    @plugins = Noosfero::Plugin.all.map { |p| p.constantize }
+    @plugins.each do |klass|
+      if klass.public_methods.include? 'api_mount_points'
+        klass.api_mount_points.each do |mount_class|
+            mount mount_class if mount_class && ( mount_class < Grape::API )
+        end
+      end
+    end
   end
 end
@@ -3,7 +3,7 @@ module API
     PRIVATE_TOKEN_PARAM = :private_token
     def logger
-      API.logger
+      @logger ||= Logger.new(File.join(Rails.root, 'log', "#{ENV['RAILS_ENV']}_api.log"))
     end
     def current_user
@@ -166,6 +166,17 @@ module API
     end
     protected
+    def start_log
+      logger.info "Started #{request.path}"
+    end
+    def end_log
+      logger.info "Completed #{request.path}"
+    end
+
+    def setup_multitenancy
+      Noosfero::MultiTenancy.setup!(request.host)
+    end
+
     def detect_stuff_by_domain
       @domain = Domain.find_by_name(request.host)
       if @domain.nil?
 module API
   module V1
     class Articles < Grape::API
-      before { detect_stuff_by_domain }
       before { authenticate! }
       resource :articles do
@@ -19,7 +18,6 @@ module API
 #      :params => API::Entities::Article.documentation
 #    }
         get do
-  
           articles = select_filtered_collection_of(environment, 'articles', params)
           present articles, :with => Entities::Article 
         end
 module API
   module V1
     class Categories < Grape::API
-      before { detect_stuff_by_domain }
       before { authenticate! }
       resource :categories do
 module API
   module V1
     class Comments < Grape::API
-
-      before { detect_stuff_by_domain }
       before { authenticate! }
       resource :articles do
 module API
   module V1
     class Communities < Grape::API
-      before { detect_stuff_by_domain }
       before { authenticate! }
       resource :communities do
 module API
   module V1
     class Enterprises < Grape::API
-      before { detect_stuff_by_domain }
       before { authenticate! }
       resource :enterprises do
 module API
   module V1
     class People < Grape::API
-      before { detect_stuff_by_domain }
       before { authenticate! }
       resource :people do
 module API
   module V1
     class Users < Grape::API
-   
-      before { detect_stuff_by_domain }
       before { authenticate! }
       resource :users do
@@ -161,6 +161,10 @@ class Noosfero::Plugin
     def has_admin_url?
       File.exists?(File.join(root_path, 'controllers', "#{name.underscore}_admin_controller.rb"))
     end
+
+    # -> define grape class used to map resource api provided by the plugin
+    def api_mount_points
+    end
   end
   def expanded_template(file_path, locals = {})
	@@ -3,6 +3,11 @@ Dir["#{Rails.root}/lib/api/*.rb"].each {\|file\| require file}		@@ -3,6 +3,11 @@ Dir["#{Rails.root}/lib/api/*.rb"].each {\|file\| require file}
3		3
4	module API	4	module API
5	class API < Grape::API	5	class API < Grape::API
		6	+ before { start_log }
		7	+ before { setup_multitenancy }
		8	+ before { detect_stuff_by_domain }
		9	+ after { end_log }
		10	+
6	version 'v1'	11	version 'v1'
7	prefix "api"	12	prefix "api"
8	format :json	13	format :json
	@@ -19,5 +24,15 @@ module API		@@ -19,5 +24,15 @@ module API
19	mount V1::Categories	24	mount V1::Categories
20	mount Session	25	mount Session
21		26
		27	+ # hook point which allow plugins to add Grape::API extensions to API::API
		28	+ #finds for plugins which has api mount points classes defined (the class should extends Grape::API)
		29	+ @plugins = Noosfero::Plugin.all.map { \|p\| p.constantize }
		30	+ @plugins.each do \|klass\|
		31	+ if klass.public_methods.include? 'api_mount_points'
		32	+ klass.api_mount_points.each do \|mount_class\|
		33	+ mount mount_class if mount_class && ( mount_class < Grape::API )
		34	+ end
		35	+ end
		36	+ end
22	end	37	end
23	end	38	end
1	module API	1	module API
2	module V1	2	module V1
3	class Categories < Grape::API	3	class Categories < Grape::API
4	- before { detect_stuff_by_domain }
5	before { authenticate! }	4	before { authenticate! }
6		5
7	resource :categories do	6	resource :categories do