api_taster 0.4.4 → 0.4.5

data/.travis.yml

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

data/Gemfile

@@ -1,6 +1,3 @@
 source "http://rubygems.org"
 
 gemspec
-
-gem "jquery-rails"
-gem "bootstrap-sass"

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

@@ -36,22 +36,22 @@ $.fn.extend({
 	replaceUrlParams: function(params) {
 		var form = this;
 
+		ApiTaster.storeFormActionFor(form);
+
+		var formAction = form.attr("action");
+
 		$.each(params, function(i, param) {
 			var matches = param["name"].match(/\[api_taster_url_params\](.*)/)
 			if (matches) {
 				var paramKey   = matches[1];
 				var paramValue = param["value"];
+				var regex      = new RegExp(":" + paramKey);
 
-				ApiTaster.storeFormActionFor(form);
-
-				var regex = new RegExp(":" + paramKey);
-				var replacedAction = ApiTaster.formAction.replace(regex, paramValue);
-
-				form.attr("action", replacedAction);
-			} else {
-				ApiTaster.storeFormActionFor(form);
+				formAction = formAction.replace(regex, paramValue);
 			}
 		});
+
+		form.attr("action", formAction);
 	},
 
 	enableNavTabsFor: function(contentElement) {

data/app/controllers/api_taster/routes_controller.rb

@@ -1,5 +1,5 @@
 module ApiTaster
-  class RoutesController < ApplicationController
+  class RoutesController < ApiTaster::ApplicationController
     before_filter :map_routes
 
     def index
@@ -10,7 +10,7 @@ module ApiTaster
 
     def show
       @route  = Route.find(params[:id])
-      @inputs = Route.inputs_for(@route)
+      @inputs = Route.params_for(@route)
     end
 
     def missing_definitions

data/lib/api_taster/mapper.rb

@@ -29,8 +29,8 @@ module ApiTaster
             :params => params
           }
         else
-          Route.inputs[route[:id]] ||= []
-          Route.inputs[route[:id]] << params
+          Route.supplied_params[route[:id]] ||= []
+          Route.supplied_params[route[:id]] << params
         end
       end
     end

data/lib/api_taster/route.rb

@@ -3,13 +3,13 @@ module ApiTaster
     cattr_accessor :route_set
     cattr_accessor :routes
     cattr_accessor :mappings
-    cattr_accessor :inputs
+    cattr_accessor :supplied_params
     cattr_accessor :obsolete_definitions
 
     class << self
       def map_routes
         self.route_set            = Rails.application.routes
-        self.inputs               = {}
+        self.supplied_params      = {}
         self.obsolete_definitions = []
 
         normalise_routes!
@@ -56,12 +56,12 @@ module ApiTaster
         end[0]
       end
 
-      def inputs_for(route)
-        unless inputs.has_key?(route[:id])
+      def params_for(route)
+        unless supplied_params.has_key?(route[:id])
           return { :undefined => route }
         end
 
-        inputs[route[:id]].collect { |input| split_input(input, route) }
+        supplied_params[route[:id]].collect { |input| split_input(input, route) }
       end
 
       def missing_definitions
@@ -71,7 +71,7 @@ module ApiTaster
       private
 
       def undefined_route?(route)
-        r = inputs_for(route)
+        r = params_for(route)
         r.is_a?(Hash) && r.has_key?(:undefined)
       end
 
@@ -97,7 +97,7 @@ module ApiTaster
       def split_input(input, route)
         url_param_keys = route[:path].scan /:\w+/
 
-        url_params  = input.select { |k| ":#{k}".in?(url_param_keys) }
+        url_params  = input.reject { |k, v| ! ":#{k}".in?(url_param_keys) }
         post_params = input.diff(url_params)
 
         {

data/lib/api_taster/version.rb

@@ -1,3 +1,3 @@
 module ApiTaster
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/controllers/api_taster/routes_controller_spec.rb

@@ -10,7 +10,7 @@ module ApiTaster
 
     it "#show" do
       Route.stub(:find).and_return(Route.new)
-      Route.stub(:inputs_for).and_return([])
+      Route.stub(:params_for).and_return([])
 
       get :show, :id => 1, :use_route => :api_taster
 

data/spec/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters :format => [:json]
 end
 
 # Disable root element in JSON by default.

data/spec/mapper_spec.rb

@@ -39,25 +39,25 @@ module ApiTaster
     it "gets users" do
       route = Route.find_by_verb_and_path(:get, '/dummy_users/:id')
 
-      Route.inputs[route[:id]].should == [{ :id => 1 }]
+      Route.supplied_params[route[:id]].should == [{ :id => 1 }]
     end
 
     it "posts a new user" do
       route = Route.find_by_verb_and_path(:post, '/dummy_users')
 
-      Route.inputs[route[:id]].should == [{}, { :hello => 'world' }]
+      Route.supplied_params[route[:id]].should == [{}, { :hello => 'world' }]
     end
 
     it "edits a user" do
       route = Route.find_by_verb_and_path(:put, '/dummy_users/:id')
 
-      Route.inputs[route[:id]].should == [{ :id => 2 }]
+      Route.supplied_params[route[:id]].should == [{ :id => 2 }]
     end
 
     it "deletes a user" do
       route = Route.find_by_verb_and_path(:delete, '/dummy_users/:id')
 
-      Route.inputs[route[:id]].should == [{ :id => 3 }]
+      Route.supplied_params[route[:id]].should == [{ :id => 3 }]
     end
   end
 end

data/spec/route_spec.rb

@@ -59,7 +59,7 @@ module ApiTaster
       Route.find_by_verb_and_path(:delete, '/home').should == nil
     end
 
-    it "#inputs_for" do
+    it "#params_for" do
       Route.stub(:routes).and_return([{
         :id   => 0,
         :path => '/dummy/:dummy_id'
@@ -68,12 +68,12 @@ module ApiTaster
         :path => 'a_non_existing_dummy',
         :verb => 'get'
       }])
-      Route.inputs[0] = [{ :dummy_id => 1, :hello => 'world' }]
+      Route.supplied_params[0] = [{ :dummy_id => 1, :hello => 'world' }]
 
-      Route.inputs_for(Route.find(999)).should have_key(:undefined)
+      Route.params_for(Route.find(999)).should have_key(:undefined)
 
       2.times do
-        Route.inputs_for(Route.find(0)).should == [{
+        Route.params_for(Route.find(0)).should == [{
           :url_params  => { :dummy_id => 1 },
           :post_params => { :hello => 'world' }
         }]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_taster
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -354,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1654334421203811347
+      hash: 4235987413395832386
 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: -1654334421203811347
+      hash: 4235987413395832386
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24