Merge pull request #45 from fs/load-tasters-from-lib

Introduce ApiTaster.route_path configuration option
fredwu · Jul 19, 2013 · 8ac3021 · 8ac3021
2 parents 83864a7 + c3ee730
commit 8ac3021
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 5 deletions.
diff --git a/lib/api_taster.rb b/lib/api_taster.rb
@@ -12,6 +12,9 @@ module ApiTaster
   mattr_accessor :global_params
   self.global_params = {}
 
+  mattr_accessor :route_path
+  self.route_path = "#{Rails.root}/lib/api_tasters"
+
   def self.routes(&block)
     ApiTaster::RouteCollector.routes << block
   end

diff --git a/lib/api_taster/route.rb b/lib/api_taster/route.rb
@@ -9,7 +9,7 @@ class Route
     cattr_accessor :metadata
 
     class << self
-      def map_routes(path = "#{Rails.root}/app/api_tasters")
+      def map_routes(path = ApiTaster.route_path)
         self.route_set            = Rails.application.routes
         self.supplied_params      = {}
         self.obsolete_definitions = []

diff --git a/...mmy/app/api_tasters/global_params/test.rb → ...mmy/lib/api_tasters/global_params/test.rb b/...mmy/app/api_tasters/global_params/test.rb → ...mmy/lib/api_tasters/global_params/test.rb
diff --git a/spec/dummy/app/api_tasters/mapper/test1.rb → spec/dummy/lib/api_tasters/mapper/test1.rb b/spec/dummy/app/api_tasters/mapper/test1.rb → spec/dummy/lib/api_tasters/mapper/test1.rb
diff --git a/.../app/api_tasters/route_collector/test1.rb → .../lib/api_tasters/route_collector/test1.rb b/.../app/api_tasters/route_collector/test1.rb → .../lib/api_tasters/route_collector/test1.rb
diff --git a/.../app/api_tasters/route_collector/test2.rb → .../lib/api_tasters/route_collector/test2.rb b/.../app/api_tasters/route_collector/test2.rb → .../lib/api_tasters/route_collector/test2.rb
diff --git a/spec/mapper_spec.rb b/spec/mapper_spec.rb
@@ -6,7 +6,7 @@ module ApiTaster
       before(:all) do
         ApiTaster.global_params = { :foo => 'bar' }
 
-        Route.map_routes "#{Rails.root}/app/api_tasters/global_params"
+        Route.map_routes "#{Rails.root}/lib/api_tasters/global_params"
       end
 
       it "merges params" do
@@ -25,7 +25,7 @@ module ApiTaster
         end
 
         Route.route_set = routes
-        Route.map_routes "#{Rails.root}/app/api_tasters/mapper"
+        Route.map_routes "#{Rails.root}/lib/api_tasters/mapper"
       end
 
       it "records obsolete definitions" do
@@ -40,7 +40,7 @@ module ApiTaster
         end
       end
 
-      Route.map_routes "#{Rails.root}/app/api_tasters/mapper"
+      Route.map_routes "#{Rails.root}/lib/api_tasters/mapper"
     end
 
     it "gets users" do

diff --git a/spec/route_collector_spec.rb b/spec/route_collector_spec.rb
@@ -6,7 +6,7 @@ module ApiTaster
       Rails.application.routes.draw do
         resources :dummy_users
       end
-      Route.map_routes "#{Rails.root}/app/api_tasters/route_collector"
+      Route.map_routes "#{Rails.root}/lib/api_tasters/route_collector"
     end
 
     it "gets users" do