yodatra 0.1.7 → 0.1.8

data/lib/yodatra/api_formatter.rb

@@ -15,7 +15,7 @@ module Yodatra
 
       status, headers, response = @block.yield(status, headers, response) unless @block.nil?
 
-      headers['Content-Length'] = response.first.length.to_s unless response.nil? || response.first.nil?
+      headers['Content-Length'] = response.first.length.to_s unless response.nil? || !response.respond_to?(:first) || response.first.nil?
 
       [status, headers, response]
     end

data/lib/yodatra/models_controller.rb

@@ -6,13 +6,15 @@ module Yodatra
     end
 
     READ_ALL = :read_all
-    get "/*s" do
+    get "/*" do
+      pass unless involved?
       no_route if disabled? READ_ALL
       model_name.constantize.all.as_json(read_scope).to_json
     end
 
     READ_ONE = :read
-    get "/*s/:id" do
+    get "/*/:id" do
+      pass unless involved?
       no_route if disabled? READ_ONE
 
       @one = model_name.constantize.find params[:id]
@@ -20,10 +22,12 @@ module Yodatra
     end
 
     CREATE_ONE = :create
-    post "/*s" do
+    post "/*" do
+      pass unless involved?
       no_route if disabled? CREATE_ONE
 
-      @one = model_name.constantize.new self.send("#{model_name.underscore}_params".to_sym)
+      hash = self.send("#{model_name.underscore}_params".to_sym)
+      @one = model_name.constantize.new hash
 
       if @one.save
         @one.as_json(read_scope).to_json
@@ -34,7 +38,8 @@ module Yodatra
     end
 
     UPDATE_ONE = :update
-    put "/*s/:id" do
+    put "/*/:id" do
+      pass unless involved?
       no_route if disabled? UPDATE_ONE
 
       @one = model_name.constantize.find params[:id]
@@ -52,7 +57,8 @@ module Yodatra
     end
 
     DELETE_ONE = :delete
-    delete "/*s/:id" do
+    delete "/*/:id" do
+      pass unless involved?
       no_route if disabled? DELETE_ONE
 
       @one = model_name.constantize.find params[:id]
@@ -77,14 +83,20 @@ module Yodatra
 
     private
 
+    def involved?
+      params[:splat].first == model_name.downcase
+    end
+
     # read_scope defaults to all attrs of the model
     def read_scope
       {}
     end
 
     # create/update scope defaults to all data given in the POST/PUT
-    define_method "#{model_name.underscore}_params".to_sym do
-      params
+    def method_missing(name, *args)
+      if name.to_s == "#{model_name.underscore}_params"
+        return params.reject{|k,v| %w(splat captures).include? k}
+      end
     end
 
     def model_name

data/lib/yodatra/throttling.rb

@@ -0,0 +1,26 @@
+begin
+  require 'redis'
+
+  module Yodatra
+    class Throttle
+      def initialize(app, opts)
+        @app = app
+        @redis = Redis.new opts[:redis_conf]
+        @rpm = opts[:rpm] || 100
+      end
+
+      def call(env)
+        req = Rack::Request.new(env)
+        key = "throttle:#{req.ip}"
+        @redis.incr(key) == 1 && @redis.expire(key, 60)
+        if @redis.get(key).to_i > @rpm
+          Rack::Response.new('Too many API calls', 403)
+        else
+          @app.call(env)
+        end
+      end
+    end
+  end
+rescue LoadError
+  raise "Error: in order to use Yodatra's throttling middleware you will need Redis. Add 'redis' to your Gemfile or simply gem install 'redis'"
+end

data/lib/yodatra/version.rb

@@ -1,3 +1,3 @@
 module Yodatra
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/unit/models_controller_spec.rb

@@ -37,7 +37,7 @@ describe 'Model controller' do
   describe 'Getting a collection of the Model' do
     context 'default' do
       it 'should have a GET all route' do
-        get '/models'
+        get '/model'
 
         last_response.should be_ok
         expect(last_response.body).to eq(Model::ALL.map{|e| {:data => e} }.to_json)
@@ -50,7 +50,7 @@ describe 'Model controller' do
         end
       end
       it 'should fail with no route available' do
-        get '/models'
+        get '/model'
 
         last_response.should_not be_ok
       end
@@ -58,7 +58,7 @@ describe 'Model controller' do
   end
   describe 'getting an specific Model instance' do
     it 'should have a GET one route' do
-      get '/models/2'
+      get '/model/2'
 
       last_response.should be_ok
       expect(last_response.body).to eq({ :data => 'c'}.to_json)
@@ -70,7 +70,7 @@ describe 'Model controller' do
         end
       end
       it 'should fail with no route available' do
-        get '/models/1'
+        get '/model/1'
 
         last_response.should_not be_ok
       end
@@ -80,7 +80,7 @@ describe 'Model controller' do
     context 'with correct model params' do
       it 'adds creates an instance, saves it and succeed' do
         expect{
-          post '/models', {:data => 'd'}
+          post '/model', {:data => 'd'}
         }.to change(Model::ALL, :length).by(1)
 
         last_response.should be_ok
@@ -89,7 +89,7 @@ describe 'Model controller' do
     context 'with incorrect params' do
       it 'doesn t create an instance and fails' do
         expect{
-          post '/models', {}
+          post '/model', {}
         }.to change(Model::ALL, :length).by(0)
 
         last_response.should_not be_ok
@@ -103,7 +103,7 @@ describe 'Model controller' do
         end
       end
       it 'should fail with no route available' do
-        post '/models', {:data => 'd'}
+        post '/model', {:data => 'd'}
 
         last_response.should_not be_ok
       end
@@ -113,7 +113,7 @@ describe 'Model controller' do
     context 'targeting an existing instance' do
       it 'deletes the instance and succeed' do
         expect{
-          delete '/models/1'
+          delete '/model/1'
         }.to change(Model::ALL, :length).by(-1)
 
         last_response.should be_ok
@@ -122,7 +122,7 @@ describe 'Model controller' do
     context 'targeting a not existing instance' do
       it 'does not delete any instance and fails' do
         expect{
-          delete '/models/6'
+          delete '/model/6'
         }.to change(Model::ALL, :length).by(0)
 
         last_response.should_not be_ok
@@ -135,7 +135,7 @@ describe 'Model controller' do
         end
       end
       it 'should fail with no route available' do
-        delete '/models/2'
+        delete '/model/2'
 
         last_response.should_not be_ok
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yodatra
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -139,6 +139,7 @@ files:
 - lib/yodatra/initializers.rb
 - lib/yodatra/logger.rb
 - lib/yodatra/models_controller.rb
+- lib/yodatra/throttling.rb
 - lib/yodatra/utils.rb
 - lib/yodatra/version.rb
 - spec/spec_helper.rb