acts_as_api 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDkxOTQ3MWZmMjk3YWJiZGRhYjk3OGE5NWU2ZWJmMzRhYmRlNzkwMg==
-  data.tar.gz: !binary |-
-    M2VlNDBlNzUyMzJmNzM2MjdjNTA5ODQzYzBlNTJiM2ZjYzliOGQ4Yw==
+SHA1:
+  metadata.gz: 750c497db915d3d79eb40810cdaf5913c9444fa9
+  data.tar.gz: e30520e560f3381f58f683784cf906f910a1bdcc
 SHA512:
-  metadata.gz: !binary |-
-    MzYyNGY5MjY2NTk0ZjViNGI5NjMwZTU4YjBkNjYzZGI3ZDcwZmE3ZmU3MDhl
-    NDMwYTUzZmQyZmNmZjY1NzlkYzRiMjc4MjlhZTFhNWJkNjkxNzE2YTM4ZDcy
-    YzIyYzg5ZTYyYTY1N2FmYmVlNzZhZmMwNzBjYmI3ODMxM2ZhYTA=
-  data.tar.gz: !binary |-
-    NjEwMmZiMjFmMTFlNDIzMmViMzdmMDk1OGEwM2UwMmExZDZhNWJhNmY1Mzhj
-    NTRlYTVlMWQwNzg3MzI3MTBiZjJiOTkzMDBmZWRmOWE1MzUzMzM2NDU2ZWNj
-    NGQzYzBlM2RmZTE2OTM2ODM2MDA5NjFkZjhmNDQwN2U4NTg1MDk=
+  metadata.gz: 0ef61479b5003497864d5849ac686e07afea4a4cbf40d321beb40e9ef5446cc79945f46578a0c4b7938b3f3987d4ff68499700f935a18d9b3c0e2b2515875a72
+  data.tar.gz: ad9dbf1e35bac88887795d19f414fd7eef6d7a5113e0e00fb04ecdf95158a15f74e3cbc0ec788e3b263a77c941dd452e3a6e1c9cddbb081b89c5bb08a5a52fc8

data/.gitignore

@@ -10,5 +10,6 @@ spec/active_record_dummy/log/*.log
 spec/mongoid_dummy/tmp/**/*
 spec/mongoid_dummy/log/*.log
 .rspec
+.ruby-version
 .rvmrc
-*.sqlite3-journal
+*.sqlite3-journal

data/.travis.yml

@@ -1,5 +1,7 @@
+language: ruby
+sudo: false
 script: bundle exec rake spec:all
 services:
   - mongodb
 rvm:
-  - 1.9.3
+  - 2.3.1

data/Gemfile

@@ -4,9 +4,13 @@ source "http://rubygems.org"
 gemspec
 
 group :test do
+  gem 'test-unit', '~> 3.0'
   gem 'sqlite3-ruby'
   gem 'mongoid', '>= 3.0.1'
   gem 'rspec', '>= 2.9.0'
+  gem 'rspec-its'
+  gem 'rspec-collection_matchers'
+  gem 'capybara'
   gem 'rspec-rails', '>= 2.5.0'
   gem 'webrat'
   gem 'shared_engine', :path => './spec/shared_engine'

data/README.md

@@ -4,7 +4,7 @@ acts_as_api makes creating XML/JSON responses in Rails 3 easy and fun.
 
 It provides a simple interface to determine the representation of your model data, that should be rendered in your API responses.
 
-In addition to Rails it theoretically can be used with any ruby app and any database (__ActiveRecord__ and __Mongoid__ are supported out of the box) as it only has few dependencies.
+In addition to Rails it theoretically can be used with any ruby app and any database (__ActiveRecord__, __Mongoid__ and __ActiveResource__ are supported out of the box) as it only has few dependencies.
 
 The lib is _very_ fast in generating your responses and battle tested in production with platforms like [Diaspora](https://joindiaspora.com) or [flinc](https://flinc.org).
 
@@ -80,21 +80,6 @@ There are a lot of how-tos like:
 
 * Want to contribute - the spec suite is explained here: https://github.com/fabrik42/acts_as_api/tree/master/spec
 
-### Travis CI build status ![acts_as_api on travis ci](https://secure.travis-ci.org/fabrik42/acts_as_api.png?branch=master)
-
-Specs run with 1.9.3: http://travis-ci.org/#!/fabrik42/acts_as_api
-
-### Tested with:
-
-It has been used in production with the following ruby versions.
-
-They are not integrated in Travis, because optional dependencies (like Mongoid 3) don't support these Ruby versions.
-
-* MRI 1.9.3-p125
-* MRI 1.9.2-p290
-* MRI 1.8.7-p358
-* But it just should work fine with other versions too... :)
-
 ### Downwards Compatibility
 
 Note that upgrading to 0.3.0 will break code that worked with previous versions due to a complete overhaul of the lib.
@@ -123,4 +108,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/acts_as_api.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activesupport','>= 3.0.0')
   s.add_dependency('rack','>= 1.1.0')
 
-  s.add_development_dependency('rails', ['>= 3.2.16'])
+  s.add_development_dependency('rails', ['>= 3.2.22.2'])
   s.add_development_dependency('mongoid', ['>= 3.0.1'])
 
   s.rdoc_options  = ['--charset=UTF-8']

data/lib/acts_as_api.rb

@@ -30,6 +30,11 @@ if defined?(ActiveRecord::Base)
   ActiveRecord::Base.extend ActsAsApi::Base
 end
 
+# Attach ourselves to ActiveResource
+if defined?(ActiveResource::Base)
+  ActiveResource::Base.extend ActsAsApi::Base
+end
+
 # Attach ourselves to Mongoid
 if defined?(Mongoid::Document)
   Mongoid::Document.send :include, ActsAsApi::Adapters::Mongoid

data/lib/acts_as_api/rails_renderer.rb

@@ -8,7 +8,7 @@ module ActsAsApi
       ActionController.add_renderer :acts_as_api_jsonp do |json, options|
         json = ActiveSupport::JSON.encode(json) unless json.respond_to?(:to_str)
         json = "#{options[:callback]}(#{json}, #{response.status})" unless options[:callback].blank?
-        self.content_type ||= Mime::JSON
+        self.content_type ||= options[:callback].blank ? Mime::JSON : Mime::JS
         self.response_body = json
       end
     end

data/lib/acts_as_api/responder.rb

@@ -20,26 +20,20 @@ module ActsAsApi
   # The `:api_template` parameter is required so the responder knows which api template it should render.
 
   class Responder < ActionController::Responder
+    module Module
+      # Overrides the base implementation of display, replacing it with
+      # the render_for_api method whenever api_template is specified.
+      def display(resource, given_options={})
+        api_template = options[:api_template]
 
-    # Should be specified as an option to the `respond_with` call
-    attr_reader :api_template
-
-    # Grabs the required :api_template parameter, then hands control back to
-    # the base ActionController::Responder initializer.
-    def initialize(controller, resources, options={})
-      @api_template = options.delete(:api_template)
-      super(controller, resources, options)
-    end
-
-    # Overrides the base implementation of display, replacing it with
-    # the render_for_api method whenever api_template is specified.
-    def display(resource, given_options={})
-      if api_template.nil? || !resource.respond_to?(:as_api_response)
-        controller.render given_options.merge!(options).merge!(format => resource)
-      else
-        controller.render_for_api api_template, given_options.merge!(options).merge!(format => resource)
+        if api_template.nil? || !resource.respond_to?(:as_api_response)
+          controller.render given_options.merge!(options).merge!(format => resource)
+        else
+          controller.render_for_api api_template, given_options.merge!(options).merge!(format => resource)
+        end
       end
     end
 
+    include Module
   end
 end

data/lib/acts_as_api/version.rb

@@ -1,3 +1,3 @@
 module ActsAsApi
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/controllers/plain_objects_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SharedEngine::PlainObjectsController do
+describe SharedEngine::PlainObjectsController, type: :controller do
   include ApiTestHelpers
 
   before(:each) do

data/spec/controllers/respond_with_users_controller_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 #   config.include SharedEngine::Engine.routes.url_helpers
 # end
 
-describe SharedEngine::RespondWithUsersController do
+describe SharedEngine::RespondWithUsersController, type: :controller do
 
   before(:each) do
     setup_models

data/spec/controllers/users_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe SharedEngine::UsersController do
-  
+describe SharedEngine::UsersController, type: :controller do
+
   before(:each) do
     setup_models
   end

data/spec/mongoid_dummy/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.3'
+gem 'rails', '3.2.22.2'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -14,5 +14,5 @@ gem 'acts_as_api', :path => '../../'
 
 group :test do
   gem 'rspec-rails', '>= 2.5.0'
-  gem 'webrat'  
+  gem 'webrat'
 end

data/spec/shared_engine/shared_engine.gemspec

@@ -7,15 +7,14 @@ require "shared_engine/version"
 Gem::Specification.new do |s|
   s.name        = "shared_engine"
   s.version     = SharedEngine::VERSION
-  s.authors     = ["TODO: Your name"]
-  s.email       = ["TODO: Your email"]
-  s.homepage    = "TODO"
-  s.summary     = "TODO: Summary of SharedEngine."
-  s.description = "TODO: Description of SharedEngine."
+  s.authors     = ["Your name"]
+  s.email       = ["Your email"]
+  s.summary     = "Summary of SharedEngine."
+  s.description = "Description of SharedEngine."
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 
-  s.add_dependency "rails", "~> 3.2.16"
+  s.add_dependency "rails", "~> 3.2.22.2"
   # s.add_dependency "jquery-rails"
 
   s.add_development_dependency "sqlite3"

data/spec/support/api_test_helpers.rb

@@ -1,23 +1,23 @@
 module ApiTestHelpers
-  
+
   def response_body
     response.body.strip
   end
-  
+
   def response_body_json
     ActiveSupport::JSON.decode(response_body)
   end
-  
+
   def response_body_jsonp(callback)
     jsonp_callback(callback).match(response_body)
   end
-  
+
   def jsonp_callback(callback)
     /\A#{callback}\((.*),\s+\d{3}\)\z/
   end
-  
+
 end
 
 RSpec.configure do |c|
   c.include ApiTestHelpers
-end
+end

data/spec/support/controller_examples.rb

@@ -94,7 +94,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
       end
 
     end
-    
+
     describe 'get all users as a ActiveRecord::Relation (or similar chained) object, autodetecting the root node name' do
 
       before(:each) do
@@ -119,7 +119,7 @@ shared_examples_for "a controller with ActsAsApi responses" do
         response_body_json["users"].first["last_name"].should eql("Solo")
       end
 
-    end    
+    end
 
     describe 'get a single user' do
 
@@ -301,6 +301,18 @@ shared_examples_for "a controller with ActsAsApi responses" do
 
       end
 
+      describe 'Requesting the JSONP content as JavaScript' do
+
+        before(:each) do
+          get :index, :format => :js, :api_template => :name_only, :callback => @callback
+        end
+
+        it "should set the content type to JavaScript" do
+          response.content_type.should == Mime::JS
+        end
+
+      end
+
     end
   end
 

data/spec/support/model_examples/enabled.rb

@@ -1,7 +1,7 @@
 shared_examples_for "acts_as_api is enabled" do
 
   it "indicates that acts_as_api is enabled" do
-    User.acts_as_api?.should be_true
+    User.acts_as_api?.should == true
   end
 
   it "does respond to api_accessible" do

data/spec/support/model_examples/untouched.rb

@@ -2,7 +2,7 @@ shared_examples_for "untouched models" do
 
   describe "has disabled acts_as_api by default" do
     it "indicates that acts_as_api is disabled" do
-      Untouched.acts_as_api?.should be_false
+      Untouched.acts_as_api?.should == false
     end
 
     it "does not respond to api_accessible" do
@@ -10,4 +10,4 @@ shared_examples_for "untouched models" do
     end
   end
 
-end
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_api
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Christian Bäuerlein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2016-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.22.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.22.2
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
 description: acts_as_api enriches the models and controllers of your app in a rails-like
@@ -88,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - History.txt
 - README.md
@@ -297,22 +297,22 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Makes creating XML/JSON responses in Rails 3 easy and fun.