api_taster 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2f3a1189530fd63c3d2e25cbbee312fe3a8e29c5
+  data.tar.gz: 468045d8574f04e57dcd2ede43ab1618f714a1a8
+SHA512:
+  metadata.gz: 9ea4a76b1b9072f6bf3873cd598022b2122a5c6d0a9cae3103ede407e414a07caeb585a32d0d3933cbae9c2d35d2e30fbd56011399235b0f1f26380c2e233aa1
+  data.tar.gz: f5a28623c9bf2180cbd52ecfb11efe250b78922dbca8a4690e83dcc0d7c77db542b85470a608327f6b656a7aebc71a05f7151e65de202f43137d37499ed6e9c2

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
+  - 2.0.0

data/api_taster.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.files      = `git ls-files`.split($\)
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency 'rails', '>= 3.1.0'
+  s.add_dependency 'rails', '~> 3.2.0'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'sass-rails'
   s.add_dependency 'bootstrap-sass', '~> 2.1'
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec-rails', '~> 2.13.2'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'thin'
 end

data/app/assets/javascripts/api_taster/app.js

@@ -119,8 +119,7 @@ jQuery(function($) {
     window.ajax = $.ajax({
       url: ApiTaster.getSubmitUrl($form),
       type: $form.attr('method'),
-      data: $form.serialize(),
-      dataType: 'xml'
+      data: $form.serialize()
     }).complete(onComplete);
 
     ApiTaster.lastRequest = {};

data/lib/api_taster.rb

@@ -6,13 +6,17 @@ require 'api_taster/engine'
 require 'api_taster/route'
 require 'api_taster/mapper'
 require 'api_taster/form_builder'
+require 'api_taster/route_collector'
 
 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)
-    Route.mappings = Proc.new { block }
+    ApiTaster::RouteCollector.routes << block
   end
 
   class Exception < ::Exception; end

data/lib/api_taster/form_builder.rb

@@ -26,15 +26,15 @@ module ApiTaster
 
         new_parent_labels = parent_labels.clone << label
 
-        if value.is_a?(Hash)
+        case value
+        when Hash
           add_legend_to_buffer(parent_labels, label)
-
           add_to_buffer(value, new_parent_labels)
-        elsif value.is_a?(Array)
+        when Array
           value.each do |v|
-            if v.is_a?(Hash)
+            case v
+            when Hash
               add_legend_to_buffer(parent_labels, label)
-
               add_to_buffer(v, parent_labels.clone << "#{label}[]")
             else
               add_element_to_buffer(parent_labels, "#{label}[]", v)

data/lib/api_taster/route.rb

@@ -9,8 +9,7 @@ module ApiTaster
     cattr_accessor :metadata
 
     class << self
-
-      def map_routes
+      def map_routes(path = ApiTaster.route_path)
         self.route_set            = Rails.application.routes
         self.supplied_params      = {}
         self.obsolete_definitions = []
@@ -20,7 +19,8 @@ module ApiTaster
         normalise_routes!
 
         begin
-          Mapper.instance_eval(&self.mappings.call)
+          ApiTaster::RouteCollector.collect(path)
+          Mapper.instance_eval(&self.mappings)
         rescue
           Route.mappings = {}
         end
@@ -35,11 +35,12 @@ module ApiTaster
         end
 
         route_set.routes.each do |route|
-          next if route.app.is_a?(ActionDispatch::Routing::Mapper::Constraints)
           next if route.app.is_a?(Sprockets::Environment)
           next if route.app == ApiTaster::Engine
 
-          if (rack_app = discover_rack_app(route.app)) && rack_app.respond_to?(:routes)
+          rack_app = discover_rack_app(route.app)
+
+          if rack_app && rack_app.respond_to?(:routes) && rack_app.routes.respond_to?(:routes)
             rack_app.routes.routes.each do |rack_route|
               self.routes << normalise_route(rack_route, route.path.spec)
             end

data/lib/api_taster/route_collector.rb

@@ -0,0 +1,15 @@
+module ApiTaster
+  class RouteCollector
+    cattr_accessor :routes
+    self.routes = []
+
+    def self.collect(path)
+      self.routes = []
+      Dir["#{path}/**/*.rb"].each { |file| load(file) }
+
+      Route.mappings = Proc.new do
+        RouteCollector.routes.each { |route| instance_eval(&route) }
+      end
+    end
+  end
+end

data/lib/api_taster/version.rb

@@ -1,3 +1,3 @@
 module ApiTaster
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/dummy/api_tasters/test1.rb

@@ -0,0 +1,4 @@
+ApiTaster.routes do
+  post '/dummy_users'
+  post '/dummy_users', { :hello => 'world' }, { :meta => 'data' }
+end

data/spec/dummy/api_tasters/test2.rb

@@ -0,0 +1,3 @@
+ApiTaster.routes do
+  get '/dummy_users/:id', :id => 1
+end

data/spec/dummy/lib/api_tasters/global_params/test.rb

@@ -0,0 +1,3 @@
+ApiTaster.routes do
+  get '/dummy_users/:id', :id => 1
+end

data/spec/dummy/lib/api_tasters/mapper/test1.rb

@@ -0,0 +1,10 @@
+ApiTaster.routes do
+  get '/dummy_route'
+  desc "Dummy user ID"
+  get '/dummy_users/:id', :id => 1
+  post '/dummy_users'
+  post '/dummy_users', { :hello => 'world' }, { :meta => 'data' }
+  put '/dummy_users/:id', :id => 2
+  delete '/dummy_users/:id', :id => 3
+  patch '/dummy_users/:id', :id => 4
+end

data/spec/dummy/lib/api_tasters/route_collector/test1.rb

@@ -0,0 +1,4 @@
+ApiTaster.routes do
+  post '/dummy_users'
+  post '/dummy_users', { :hello => 'world' }, { :meta => 'data' }
+end

data/spec/dummy/lib/api_tasters/route_collector/test2.rb

@@ -0,0 +1,3 @@
+ApiTaster.routes do
+  get '/dummy_users/:id', :id => 42
+end

data/spec/mapper_spec.rb

@@ -2,19 +2,30 @@ require 'spec_helper'
 
 module ApiTaster
   describe Mapper do
+    context "#global_params" do
+      before(:all) do
+        ApiTaster.global_params = { :foo => 'bar' }
+
+        Route.map_routes "#{Rails.root}/lib/api_tasters/global_params"
+      end
+
+      it "merges params" do
+        route = Route.find_by_verb_and_path(:get, '/dummy_users/:id')
+
+        Route.supplied_params[route[:id]].should == [{ :foo => 'bar', :id => 1 }]
+      end
+    end
+
     context "non-existing routes" do
       before(:all) do
+        ApiTaster.global_params = {}
         routes = ActionDispatch::Routing::RouteSet.new
         routes.draw do
           get '/awesome_route' => 'awesome#route'
         end
 
-        ApiTaster.routes do
-          get '/dummy_route'
-        end
-
         Route.route_set = routes
-        Route.map_routes
+        Route.map_routes "#{Rails.root}/lib/api_tasters/mapper"
       end
 
       it "records obsolete definitions" do
@@ -28,38 +39,8 @@ module ApiTaster
           member { map_method :patch, :update }
         end
       end
-    end
-
-    context "#global_params" do
-      before(:all) do
-        ApiTaster.global_params = { :foo => 'bar' }
-
-        ApiTaster.routes do
-          get '/dummy_users/:id', :id => 1
-        end
-
-        Route.map_routes
-      end
-
-      it "merges params" do
-        route = Route.find_by_verb_and_path(:get, '/dummy_users/:id')
-
-        Route.supplied_params[route[:id]].should == [{ :foo => 'bar', :id => 1 }]
-      end
-    end
-
-    before(:all) do
-      ApiTaster.routes do
-        desc "Dummy user ID"
-        get '/dummy_users/:id', :id => 1
-        post '/dummy_users'
-        post '/dummy_users', { :hello => 'world' }, { :meta => 'data' }
-        put '/dummy_users/:id', :id => 2
-        delete '/dummy_users/:id', :id => 3
-        patch '/dummy_users/:id', :id => 4
-      end
 
-      Route.map_routes
+      Route.map_routes "#{Rails.root}/lib/api_tasters/mapper"
     end
 
     it "gets users" do

data/spec/route_collector_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module ApiTaster
+  describe RouteCollector do
+    before(:all) do
+      Rails.application.routes.draw do
+        resources :dummy_users
+      end
+      Route.map_routes "#{Rails.root}/lib/api_tasters/route_collector"
+    end
+
+    it "gets users" do
+      route = Route.find_by_verb_and_path(:get, '/dummy_users/:id')
+      Route.supplied_params[route[:id]].should == [{ :id => 42 }]
+    end
+
+    it "posts a new user" do
+      route = Route.find_by_verb_and_path(:post, '/dummy_users')
+      Route.supplied_params[route[:id]].should == [{}, { :hello => 'world' }]
+    end
+  end
+end

metadata

@@ -1,192 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: api_taster
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Fred Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-    none: false
-  prerelease: false
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    none: false
+        version: 3.2.0
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
-    none: false
-  prerelease: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: '2.1'
+- !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
-  prerelease: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: remotipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 2.13.2
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: 2.13.2
+- !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A quick and easy way to visually test out your application's API.
 email:
 - ifredwu@gmail.com
@@ -229,11 +206,14 @@ files:
 - lib/api_taster/form_builder.rb
 - lib/api_taster/mapper.rb
 - lib/api_taster/route.rb
+- lib/api_taster/route_collector.rb
 - lib/api_taster/version.rb
 - lib/tasks/api_taster_tasks.rake
 - script/rails
 - spec/controllers/api_taster/routes_controller_spec.rb
 - spec/dummy/Rakefile
+- spec/dummy/api_tasters/test1.rb
+- spec/dummy/api_tasters/test2.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -257,12 +237,17 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/lib/api_tasters/global_params/test.rb
+- spec/dummy/lib/api_tasters/mapper/test1.rb
+- spec/dummy/lib/api_tasters/route_collector/test1.rb
+- spec/dummy/lib/api_tasters/route_collector/test2.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/script/rails
 - spec/form_builder_spec.rb
 - spec/helpers/api_taster/application_helper_spec.rb
 - spec/mapper_spec.rb
+- spec/route_collector_spec.rb
 - spec/route_spec.rb
 - spec/spec_helper.rb
 - spec/dummy/log/development.log
@@ -485,39 +470,33 @@ files:
 - spec/dummy/tmp/cache/sass/c4c1688f5dbdaaa3941b73da0a6005bdab08bb92/_variables.scssc
 - spec/dummy/tmp/cache/sass/c4c1688f5dbdaaa3941b73da0a6005bdab08bb92/_wells.scssc
 - spec/dummy/tmp/cache/sass/d27ff1c5f2e254072ed81f036be53e0b7a828e6c/bootstrap.scssc
-- spec/dummy/tmp/pids/server.pid
 homepage: https://github.com/fredwu/api_taster
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2826962051612884184
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2826962051612884184
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A quick and easy way to visually test out your application's API.
 test_files:
 - spec/controllers/api_taster/routes_controller_spec.rb
+- spec/dummy/api_tasters/test1.rb
+- spec/dummy/api_tasters/test2.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -539,6 +518,10 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/lib/api_tasters/global_params/test.rb
+- spec/dummy/lib/api_tasters/mapper/test1.rb
+- spec/dummy/lib/api_tasters/route_collector/test1.rb
+- spec/dummy/lib/api_tasters/route_collector/test2.rb
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/Rakefile
@@ -761,9 +744,9 @@ test_files:
 - spec/dummy/tmp/cache/sass/c4c1688f5dbdaaa3941b73da0a6005bdab08bb92/_variables.scssc
 - spec/dummy/tmp/cache/sass/c4c1688f5dbdaaa3941b73da0a6005bdab08bb92/_wells.scssc
 - spec/dummy/tmp/cache/sass/d27ff1c5f2e254072ed81f036be53e0b7a828e6c/bootstrap.scssc
-- spec/dummy/tmp/pids/server.pid
 - spec/form_builder_spec.rb
 - spec/helpers/api_taster/application_helper_spec.rb
 - spec/mapper_spec.rb
+- spec/route_collector_spec.rb
 - spec/route_spec.rb
 - spec/spec_helper.rb