yodatra 0.1.5 → 0.1.6

data/Gemfile

@@ -5,7 +5,6 @@ group :test do
   gem 'rspec', :require => false
   gem 'simplecov', :require => false
   gem 'coveralls', :require => false
-  gem 'mocha', :require => false
 end
 
 gemspec

data/lib/yodatra/api_formatter.rb

@@ -15,6 +15,8 @@ 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?
+
       [status, headers, response]
     end
 

data/lib/yodatra/base.rb

@@ -3,6 +3,7 @@ require 'sinatra/reloader'
 
 require File.expand_path  '../boot', __FILE__
 require File.expand_path  '../initializers', __FILE__
+require File.expand_path  '../utils', __FILE__
 
 
 module Yodatra

data/lib/yodatra/{model_controller.rb → models_controller.rb}

@@ -1,5 +1,5 @@
 module Yodatra
-  class ModelController < Sinatra::Base
+  class ModelsController < Sinatra::Base
 
     before do
       content_type 'application/json'
@@ -8,7 +8,7 @@ module Yodatra
     READ_ALL = :read_all
     get "/*s" do
       no_route if disabled? READ_ALL
-      model_name.constantize.all.to_json
+      model_name.constantize.all.as_json(read_scope).to_json
     end
 
     READ_ONE = :read
@@ -16,17 +16,17 @@ module Yodatra
       no_route if disabled? READ_ONE
 
       @one = model_name.constantize.find params[:id]
-      @one.to_json
+      @one.as_json(read_scope).to_json
     end
 
     CREATE_ONE = :create
     post "/*s" do
       no_route if disabled? CREATE_ONE
 
-      @one = model_name.constantize.new params
+      @one = model_name.constantize.new self.send("#{model_name.underscore}_params".to_sym)
 
       if @one.save
-        @one.to_json
+        @one.as_json(read_scope).to_json
       else
         status 400
         @one.errors.full_messages.to_json
@@ -40,7 +40,7 @@ module Yodatra
       @one = model_name.constantize.find params[:id]
 
       if !@one.nil? && @one.update_attributes(params)
-        @one.to_json
+        @one.as_json(read_scope).to_json
       else
         status 400
         if !@one.nil?
@@ -58,25 +58,41 @@ module Yodatra
       @one = model_name.constantize.find params[:id]
 
       if @one.destroy
-        @one.to_json
+        @one.as_json(read_scope).to_json
       else
         status 400
         @one.errors.full_messages.to_json
       end
     end
 
+    class << self
+      def model_name
+        self.name.split('::').last.gsub(/sController/, '')
+      end
+
+      def route_name
+        self.model_name.underscore
+      end
+    end
+
     private
 
-    def model_params
+    # 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
     end
 
     def model_name
-      self.class.name.split('::').last.gsub(/sController/, '')
+      self.class.model_name
     end
 
     def route_name
-      self.send(:model_name).underscore
+      self.class.route_name
     end
 
     def disabled? key

data/lib/yodatra/utils.rb

@@ -0,0 +1,16 @@
+module Yodatra
+  class Utils
+  end
+end
+
+class String
+  def underscore
+    word = self.dup
+    word.gsub!(/::/, '/')
+    word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+end

data/lib/yodatra/version.rb

@@ -1,3 +1,3 @@
 module Yodatra
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/spec/spec_helper.rb

@@ -7,14 +7,14 @@ require 'rack/test'
 require 'rspec'
 
 require File.expand_path '../../lib/yodatra.rb', __FILE__
-require File.expand_path '../../lib/yodatra/model_controller.rb', __FILE__
+require File.expand_path '../../lib/yodatra/models_controller.rb', __FILE__
 
 module RSpecMixin
   include Rack::Test::Methods
   def app
     Sinatra.new {
       use Yodatra::Base
-      use Yodatra::ModelController
+      use Yodatra::ModelsController
     }
   end
 end

data/spec/unit/{model_controller_spec.rb → models_controller_spec.rb}

@@ -1,13 +1,11 @@
 require File.expand_path '../../spec_helper.rb', __FILE__
-require 'mocha/setup'
-require 'mocha/api'
 
 # Mock model constructed for the tests
-class TestModel
+class Model
   ALL = %w(a b c)
   class << self
-    def all; ALL.map{ |e| TestModel.new({:data=> e }) }; end
-    def find(id); TestModel.new({:data => ALL[id.to_i]}); end
+    def all; ALL.map{ |e| Model.new({:data=> e }) }; end
+    def find(id); Model.new({:data => ALL[id.to_i]}); end
   end
   def initialize(param); @data = param[:data]; end
   def save
@@ -30,30 +28,29 @@ class TestModel
 end
 
 describe 'Model controller' do
+
   before do
-    @any_model = 'TestModel'
     @errors = ['error']
-    Yodatra::ModelController.any_instance.stubs(:model_name).returns(@any_model)
-    Array.any_instance.stubs(:full_messages).returns(@errors)
+    allow_any_instance_of(Array).to receive(:full_messages).and_return(@errors)
   end
 
   describe 'Getting a collection of the Model' do
     context 'default' do
       it 'should have a GET all route' do
-        get '/test_models'
+        get '/models'
 
         last_response.should be_ok
-        expect(last_response.body).to eq(TestModel::ALL.map{|e| {:data => e} }.to_json)
+        expect(last_response.body).to eq(Model::ALL.map{|e| {:data => e} }.to_json)
       end
     end
     context 'forced GET all route disabled' do
       before do
-        class Yodatra::ModelController
+        class Yodatra::ModelsController
           disable :read_all
         end
       end
       it 'should fail with no route available' do
-        get '/test_models'
+        get '/models'
 
         last_response.should_not be_ok
       end
@@ -61,19 +58,19 @@ describe 'Model controller' do
   end
   describe 'getting an specific Model instance' do
     it 'should have a GET one route' do
-      get '/test_models/2'
+      get '/models/2'
 
       last_response.should be_ok
       expect(last_response.body).to eq({ :data => 'c'}.to_json)
     end
     context 'forced GET one route disabled' do
       before do
-        class Yodatra::ModelController
+        class Yodatra::ModelsController
           disable :read
         end
       end
       it 'should fail with no route available' do
-        get '/test_models/1'
+        get '/models/1'
 
         last_response.should_not be_ok
       end
@@ -83,8 +80,8 @@ describe 'Model controller' do
     context 'with correct model params' do
       it 'adds creates an instance, saves it and succeed' do
         expect{
-          post '/test_models', {:data => 'd'}
-        }.to change(TestModel::ALL, :length).by(1)
+          post '/models', {:data => 'd'}
+        }.to change(Model::ALL, :length).by(1)
 
         last_response.should be_ok
       end
@@ -92,8 +89,8 @@ describe 'Model controller' do
     context 'with incorrect params' do
       it 'doesn t create an instance and fails' do
         expect{
-          post '/test_models', {}
-        }.to change(TestModel::ALL, :length).by(0)
+          post '/models', {}
+        }.to change(Model::ALL, :length).by(0)
 
         last_response.should_not be_ok
         expect(last_response.body).to eq(@errors.to_json)
@@ -101,12 +98,12 @@ describe 'Model controller' do
     end
     context 'when the creation route is disabled' do
       before do
-        class Yodatra::ModelController
+        class Yodatra::ModelsController
           disable :create
         end
       end
       it 'should fail with no route available' do
-        post '/test_models', {:data => 'd'}
+        post '/models', {:data => 'd'}
 
         last_response.should_not be_ok
       end
@@ -116,8 +113,8 @@ describe 'Model controller' do
     context 'targeting an existing instance' do
       it 'deletes the instance and succeed' do
         expect{
-          delete '/test_models/1'
-        }.to change(TestModel::ALL, :length).by(-1)
+          delete '/models/1'
+        }.to change(Model::ALL, :length).by(-1)
 
         last_response.should be_ok
       end
@@ -125,20 +122,20 @@ describe 'Model controller' do
     context 'targeting a not existing instance' do
       it 'does not delete any instance and fails' do
         expect{
-          delete '/test_models/6'
-        }.to change(TestModel::ALL, :length).by(0)
+          delete '/models/6'
+        }.to change(Model::ALL, :length).by(0)
 
         last_response.should_not be_ok
       end
     end
     context 'when the deletion route is disabled' do
       before do
-        class Yodatra::ModelController
+        class Yodatra::ModelsController
           disable :delete
         end
       end
       it 'should fail with no route available' do
-        delete '/test_models/2'
+        delete '/models/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.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -138,10 +138,11 @@ files:
 - lib/yodatra/crypto.rb
 - lib/yodatra/initializers.rb
 - lib/yodatra/logger.rb
-- lib/yodatra/model_controller.rb
+- lib/yodatra/models_controller.rb
+- lib/yodatra/utils.rb
 - lib/yodatra/version.rb
 - spec/spec_helper.rb
-- spec/unit/model_controller_spec.rb
+- spec/unit/models_controller_spec.rb
 - yodatra.gemspec
 homepage: http://squareteam.github.io/yodatra
 licenses:
@@ -176,4 +177,4 @@ signing_key:
 specification_version: 3
 summary: Classy backend development with the speed of Sinatra and the power of ActiveRecord
 test_files:
-- spec/unit/model_controller_spec.rb
+- spec/unit/models_controller_spec.rb