api_taster 0.4.2 → 0.4.3

data/.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 ._*
+.tags
 .bundle/
 coverage/
 log/*.log

data/app/controllers/api_taster/routes_controller.rb

@@ -1,5 +1,7 @@
 module ApiTaster
   class RoutesController < ApplicationController
+    before_filter :map_routes
+
     def index
       @routes = Route.grouped_routes
       @has_missing_definitions  = Route.missing_definitions.present?
@@ -18,5 +20,11 @@ module ApiTaster
     def obsolete_definitions
       @obsolete_definitions = Route.obsolete_definitions
     end
+
+    private
+
+    def map_routes
+      Route.map_routes
+    end
   end
 end

data/lib/api_taster.rb

@@ -6,11 +6,7 @@ require 'api_taster/form_builder'
 
 module ApiTaster
   def self.routes(&block)
-    Route.route_set            = Rails.application.routes
-    Route.inputs               = {}
-    Route.obsolete_definitions = []
-
-    Mapper.instance_eval(&block)
+    Route.mappings = Proc.new { block }
   end
 
   class Exception < ::Exception; end

data/lib/api_taster/route.rb

@@ -1,13 +1,24 @@
 module ApiTaster
   class Route
     cattr_accessor :route_set
+    cattr_accessor :routes
+    cattr_accessor :mappings
     cattr_accessor :inputs
-    cattr_accessor :missing_definitions
     cattr_accessor :obsolete_definitions
 
     class << self
-      def routes
-        _routes = []
+      def map_routes
+        self.route_set            = Rails.application.routes
+        self.inputs               = {}
+        self.obsolete_definitions = []
+
+        normalise_routes!
+
+        Mapper.instance_eval(&self.mappings.call)
+      end
+
+      def normalise_routes!
+        self.routes = []
         i = -1
 
         unless route_set.respond_to?(:routes)
@@ -20,16 +31,14 @@ module ApiTaster
 
           if (rack_app = discover_rack_app(route.app)) && rack_app.respond_to?(:routes)
             rack_app.routes.routes.each do |rack_route|
-              _routes << normalise_route(rack_route, i+=1)
+              self.routes << normalise_route(rack_route, i+=1)
             end
           end
 
           next if route.verb.source.empty?
 
-          _routes << normalise_route(route, i+=1)
+          self.routes << normalise_route(route, i+=1)
         end
-
-        _routes
       end
 
       def grouped_routes

data/lib/api_taster/version.rb

@@ -1,3 +1,3 @@
 module ApiTaster
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/mapper_spec.rb

@@ -14,6 +14,7 @@ module ApiTaster
         end
 
         Route.route_set = routes
+        Route.map_routes
       end
 
       it "records obsolete definitions" do
@@ -31,6 +32,8 @@ module ApiTaster
         put '/dummy_users/:id', :id => 2
         delete '/dummy_users/:id', :id => 3
       end
+
+      Route.map_routes
     end
 
     it "gets users" do

data/spec/route_spec.rb

@@ -26,7 +26,8 @@ module ApiTaster
         mount proc {} => '/rack_app'
       end
 
-      Route.route_set = routes
+      Rails.application.stub(:routes).and_return(routes)
+      Route.map_routes
     end
 
     it "#routes" do
@@ -36,7 +37,7 @@ module ApiTaster
     context "undefined ApiTaster.routes" do
       it "errors out" do
         Route.route_set = nil
-        expect { Route.routes }.to raise_exception(ApiTaster::Exception)
+        expect { Route.normalise_routes! }.to raise_exception(ApiTaster::Exception)
       end
     end
 
@@ -88,6 +89,7 @@ module ApiTaster
       ApiTaster.routes do
         # nothing
       end
+      Route.map_routes
 
       Route.missing_definitions.first[:path].should == '/awesome_route'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_taster
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -354,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2192023684559152796
+      hash: 261485977407243398
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -363,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2192023684559152796
+      hash: 261485977407243398
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24