yodatra 0.3.4 → 0.3.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c28dec8ba275bce4a44a79d41f2c3aac9a265e5e
+  data.tar.gz: f516d481e2e6ad9ce2c49ab3805584f1e0bfa270
+SHA512:
+  metadata.gz: bb2fb3841624fb4f869286779ed5c7a1b28e84165b8dca7f09cb3a577c7f01acb1f0fc851ceb143bef3d3ede66eff5b8a6a55d72aef1a07f8d4964b00e9f5a31
+  data.tar.gz: a97295b4414f0939ec2d9ad263ecfadd6b807a80130cfc5642f781a955fadc88e32867e4ef5da82418719b633f59aaefb4d5fae5124401bf37450e528f98ed71

data/lib/yodatra/models_controller.rb

@@ -184,7 +184,14 @@ module Yodatra
 
       unless parent_model.nil?
         parent = parent_model.find params[:captures].second
-        resources = parent.send(involved.to_sym) unless parent.reflections[involved.to_sym].nil?
+        if parent.respond_to? :reflections
+          # This is AR 4.0.x compatibility
+          has_association = !parent.reflections[involved.to_sym].nil?
+        else
+          # This is AR 4.1.x compatibility
+          has_association = !parent._reflections[involved.to_sym].nil?
+        end
+        resources = parent.send(involved.to_sym) if has_association
       end
       resources
     rescue ActiveRecord::RecordNotFound

data/lib/yodatra/version.rb

@@ -1,3 +1,3 @@
 module Yodatra
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/spec_helper.rb

@@ -1,12 +1,15 @@
 ENV['RACK_ENV'] ||= 'test'
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_filter 'spec/'
+end
 require 'coveralls'
 Coveralls.wear!
 require 'rack/test'
 require 'rspec'
 
 require File.expand_path '../../lib/yodatra.rb', __FILE__
+require File.expand_path '../../lib/yodatra/api_formatter.rb', __FILE__
 require File.expand_path '../../lib/yodatra/models_controller.rb', __FILE__
 require File.expand_path '../data/ar_models_controller.rb', __FILE__
 
@@ -15,6 +18,7 @@ module RSpecMixin
   def app
     Sinatra.new {
       use Yodatra::Base
+      use Yodatra::ApiFormatter
       use Yodatra::ModelsController
       use ArModelsController
     }

data/spec/unit/api_formatter_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path '../../spec_helper.rb', __FILE__
+
+describe Yodatra::ApiFormatter do
+  let(:app) { proc{[200,{},['Hello, world.']]} }
+
+  before do
+    @stack = Yodatra::ApiFormatter.new(app, &bloc)
+    @request = Rack::MockRequest.new(@stack)
+  end
+
+  context 'with a unity bloc' do
+    let(:bloc) { proc{ |s,h,r| [s,h,r] } }
+
+    it 'transforms the response with the given block' do
+      response = @request.get('/')
+      expect(response.body).to eq 'Hello, world.'
+    end
+  end
+
+  context 'with an object wrapper bloc' do
+    let(:bloc) do
+      proc do |s,h,r|
+        transformed = r.map{ |rr| {data: rr}.to_json }
+        [s,h,transformed]
+      end
+    end
+
+    it 'transforms the response with the given block' do
+      response = @request.get('/')
+      expect(JSON.parse(response.body)['data']).to eq 'Hello, world.'
+    end
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: yodatra
 version: !ruby/object:Gem::Version
-  version: 0.3.4
-  prerelease: 
+  version: 0.3.5
 platform: ruby
 authors:
 - Paul Bonaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,83 +27,74 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.4
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.4
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: sinatra-activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: sinatra-logger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.2
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.2
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,7 +102,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -147,12 +134,14 @@ files:
 - spec/data/ar_models_controller.rb
 - spec/data/model.rb
 - spec/spec_helper.rb
+- spec/unit/api_formatter_spec.rb
 - spec/unit/models_controller_spec.rb
 - spec/unit/throttling_spec.rb
 - yodatra.gemspec
 homepage: http://squareteam.github.io/yodatra
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -165,24 +154,22 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Classy backend development with the speed of Sinatra and the power of ActiveRecord
 test_files:
+- spec/unit/api_formatter_spec.rb
 - spec/unit/models_controller_spec.rb
 - spec/unit/throttling_spec.rb
-has_rdoc: