diff -Nru ruby-acts-as-api-0.4.2/acts_as_api.gemspec ruby-acts-as-api-0.4.3/acts_as_api.gemspec --- ruby-acts-as-api-0.4.2/acts_as_api.gemspec 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/acts_as_api.gemspec 2016-09-07 05:08:17.000000000 +0000 @@ -16,7 +16,7 @@ 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'] Binary files /tmp/tmpQa0U_I/7CnQL5IvlO/ruby-acts-as-api-0.4.2/checksums.yaml.gz and /tmp/tmpQa0U_I/aolASSBs5V/ruby-acts-as-api-0.4.3/checksums.yaml.gz differ diff -Nru ruby-acts-as-api-0.4.2/debian/changelog ruby-acts-as-api-0.4.3/debian/changelog --- ruby-acts-as-api-0.4.2/debian/changelog 2014-04-24 10:49:52.000000000 +0000 +++ ruby-acts-as-api-0.4.3/debian/changelog 2016-09-07 05:21:09.000000000 +0000 @@ -1,3 +1,10 @@ +ruby-acts-as-api (0.4.3-1) unstable; urgency=medium + + * Team upload. + * New upstream release + + -- Sruthi Chandran Wed, 07 Sep 2016 10:50:56 +0530 + ruby-acts-as-api (0.4.2-1) unstable; urgency=low * Initial release (Closes: #744909) diff -Nru ruby-acts-as-api-0.4.2/debian/control ruby-acts-as-api-0.4.3/debian/control --- ruby-acts-as-api-0.4.2/debian/control 2014-04-24 10:48:56.000000000 +0000 +++ ruby-acts-as-api-0.4.3/debian/control 2016-09-07 05:21:09.000000000 +0000 @@ -4,9 +4,9 @@ Maintainer: Debian Ruby Extras Maintainers Uploaders: Pirate Praveen Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.7.5~) -Standards-Version: 3.9.5 -Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-acts-as-api.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-acts-as-api.git;a=summary +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-acts-as-api.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-acts-as-api.git Homepage: https://github.com/fabrik42/acts_as_api XS-Ruby-Versions: all diff -Nru ruby-acts-as-api-0.4.2/Gemfile ruby-acts-as-api-0.4.3/Gemfile --- ruby-acts-as-api-0.4.2/Gemfile 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/Gemfile 2016-09-07 05:08:17.000000000 +0000 @@ -4,9 +4,13 @@ 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' diff -Nru ruby-acts-as-api-0.4.2/.gitignore ruby-acts-as-api-0.4.3/.gitignore --- ruby-acts-as-api-0.4.2/.gitignore 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/.gitignore 2016-09-07 05:08:17.000000000 +0000 @@ -10,5 +10,6 @@ spec/mongoid_dummy/tmp/**/* spec/mongoid_dummy/log/*.log .rspec +.ruby-version .rvmrc -*.sqlite3-journal \ No newline at end of file +*.sqlite3-journal diff -Nru ruby-acts-as-api-0.4.2/lib/acts_as_api/rails_renderer.rb ruby-acts-as-api-0.4.3/lib/acts_as_api/rails_renderer.rb --- ruby-acts-as-api-0.4.2/lib/acts_as_api/rails_renderer.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/lib/acts_as_api/rails_renderer.rb 2016-09-07 05:08:17.000000000 +0000 @@ -8,7 +8,7 @@ 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 diff -Nru ruby-acts-as-api-0.4.2/lib/acts_as_api/responder.rb ruby-acts-as-api-0.4.3/lib/acts_as_api/responder.rb --- ruby-acts-as-api-0.4.2/lib/acts_as_api/responder.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/lib/acts_as_api/responder.rb 2016-09-07 05:08:17.000000000 +0000 @@ -20,26 +20,20 @@ # 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 diff -Nru ruby-acts-as-api-0.4.2/lib/acts_as_api/version.rb ruby-acts-as-api-0.4.3/lib/acts_as_api/version.rb --- ruby-acts-as-api-0.4.2/lib/acts_as_api/version.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/lib/acts_as_api/version.rb 2016-09-07 05:08:17.000000000 +0000 @@ -1,3 +1,3 @@ module ActsAsApi - VERSION = "0.4.2" + VERSION = "0.4.3" end diff -Nru ruby-acts-as-api-0.4.2/lib/acts_as_api.rb ruby-acts-as-api-0.4.3/lib/acts_as_api.rb --- ruby-acts-as-api-0.4.2/lib/acts_as_api.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/lib/acts_as_api.rb 2016-09-07 05:08:17.000000000 +0000 @@ -30,6 +30,11 @@ 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 diff -Nru ruby-acts-as-api-0.4.2/metadata.yml ruby-acts-as-api-0.4.3/metadata.yml --- ruby-acts-as-api-0.4.2/metadata.yml 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/metadata.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,500 +0,0 @@ ---- !ruby/object:Gem::Specification -name: acts_as_api -version: !ruby/object:Gem::Version - version: 0.4.2 -platform: ruby -authors: -- Christian Bäuerlein -autorequire: -bindir: bin -cert_chain: [] -date: 2013-12-28 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 - type: :development - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ! '>=' - - !ruby/object:Gem::Version - version: 3.2.16 -- !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 - way so you can easily determine how your XML/JSON API responses should look like. -email: -- christian@ffwdme.com -executables: [] -extensions: [] -extra_rdoc_files: [] -files: -- .gitignore -- .travis.yml -- Gemfile -- History.txt -- README.md -- Rakefile -- acts_as_api.gemspec -- examples/introduction/docco.css -- examples/introduction/index.html -- examples/introduction/index.rb -- examples/introduction/layout.mustache -- lib/acts_as_api.rb -- lib/acts_as_api/adapters.rb -- lib/acts_as_api/adapters/mongoid.rb -- lib/acts_as_api/api_template.rb -- lib/acts_as_api/array.rb -- lib/acts_as_api/base.rb -- lib/acts_as_api/config.rb -- lib/acts_as_api/exceptions.rb -- lib/acts_as_api/rails_renderer.rb -- lib/acts_as_api/rendering.rb -- lib/acts_as_api/responder.rb -- lib/acts_as_api/version.rb -- spec/README.md -- spec/active_record_dummy/.gitignore -- spec/active_record_dummy/Gemfile -- spec/active_record_dummy/README.rdoc -- spec/active_record_dummy/Rakefile -- spec/active_record_dummy/app/assets/images/rails.png -- spec/active_record_dummy/app/assets/javascripts/application.js -- spec/active_record_dummy/app/assets/stylesheets/application.css -- spec/active_record_dummy/app/controllers/application_controller.rb -- spec/active_record_dummy/app/helpers/application_helper.rb -- spec/active_record_dummy/app/mailers/.gitkeep -- spec/active_record_dummy/app/models/.gitkeep -- spec/active_record_dummy/app/models/profile.rb -- spec/active_record_dummy/app/models/task.rb -- spec/active_record_dummy/app/models/untouched.rb -- spec/active_record_dummy/app/models/user.rb -- spec/active_record_dummy/app/views/layouts/application.html.erb -- spec/active_record_dummy/config.ru -- spec/active_record_dummy/config/application.rb -- spec/active_record_dummy/config/boot.rb -- spec/active_record_dummy/config/database.yml -- spec/active_record_dummy/config/environment.rb -- spec/active_record_dummy/config/environments/development.rb -- spec/active_record_dummy/config/environments/production.rb -- spec/active_record_dummy/config/environments/test.rb -- spec/active_record_dummy/config/initializers/backtrace_silencers.rb -- spec/active_record_dummy/config/initializers/generators.rb -- spec/active_record_dummy/config/initializers/inflections.rb -- spec/active_record_dummy/config/initializers/mime_types.rb -- spec/active_record_dummy/config/initializers/secret_token.rb -- spec/active_record_dummy/config/initializers/session_store.rb -- spec/active_record_dummy/config/initializers/wrap_parameters.rb -- spec/active_record_dummy/config/locales/en.yml -- spec/active_record_dummy/config/routes.rb -- spec/active_record_dummy/db/migrate/20110214201640_create_tables.rb -- spec/active_record_dummy/db/schema.rb -- spec/active_record_dummy/db/seeds.rb -- spec/active_record_dummy/doc/README_FOR_APP -- spec/active_record_dummy/lib/assets/.gitkeep -- spec/active_record_dummy/lib/tasks/.gitkeep -- spec/active_record_dummy/log/.gitkeep -- spec/active_record_dummy/public/404.html -- spec/active_record_dummy/public/422.html -- spec/active_record_dummy/public/500.html -- spec/active_record_dummy/public/favicon.ico -- spec/active_record_dummy/public/index.html -- spec/active_record_dummy/public/robots.txt -- spec/active_record_dummy/script/rails -- spec/active_record_dummy/vendor/assets/javascripts/.gitkeep -- spec/active_record_dummy/vendor/assets/stylesheets/.gitkeep -- spec/active_record_dummy/vendor/plugins/.gitkeep -- spec/controllers/plain_objects_controller_spec.rb -- spec/controllers/respond_with_users_controller_spec.rb -- spec/controllers/users_controller_spec.rb -- spec/models/model_spec.rb -- spec/mongoid_dummy/.gitignore -- spec/mongoid_dummy/Gemfile -- spec/mongoid_dummy/README.rdoc -- spec/mongoid_dummy/Rakefile -- spec/mongoid_dummy/app/assets/images/rails.png -- spec/mongoid_dummy/app/assets/javascripts/application.js -- spec/mongoid_dummy/app/assets/stylesheets/application.css -- spec/mongoid_dummy/app/controllers/application_controller.rb -- spec/mongoid_dummy/app/helpers/application_helper.rb -- spec/mongoid_dummy/app/mailers/.gitkeep -- spec/mongoid_dummy/app/models/.gitkeep -- spec/mongoid_dummy/app/models/profile.rb -- spec/mongoid_dummy/app/models/task.rb -- spec/mongoid_dummy/app/models/untouched.rb -- spec/mongoid_dummy/app/models/user.rb -- spec/mongoid_dummy/app/views/layouts/application.html.erb -- spec/mongoid_dummy/config.ru -- spec/mongoid_dummy/config/application.rb -- spec/mongoid_dummy/config/boot.rb -- spec/mongoid_dummy/config/environment.rb -- spec/mongoid_dummy/config/environments/development.rb -- spec/mongoid_dummy/config/environments/production.rb -- spec/mongoid_dummy/config/environments/test.rb -- spec/mongoid_dummy/config/initializers/backtrace_silencers.rb -- spec/mongoid_dummy/config/initializers/generators.rb -- spec/mongoid_dummy/config/initializers/include_acts_as_api.rb -- spec/mongoid_dummy/config/initializers/inflections.rb -- spec/mongoid_dummy/config/initializers/mime_types.rb -- spec/mongoid_dummy/config/initializers/secret_token.rb -- spec/mongoid_dummy/config/initializers/session_store.rb -- spec/mongoid_dummy/config/initializers/wrap_parameters.rb -- spec/mongoid_dummy/config/locales/en.yml -- spec/mongoid_dummy/config/mongoid.yml -- spec/mongoid_dummy/config/routes.rb -- spec/mongoid_dummy/db/seeds.rb -- spec/mongoid_dummy/doc/README_FOR_APP -- spec/mongoid_dummy/lib/assets/.gitkeep -- spec/mongoid_dummy/lib/tasks/.gitkeep -- spec/mongoid_dummy/log/.gitkeep -- spec/mongoid_dummy/public/404.html -- spec/mongoid_dummy/public/422.html -- spec/mongoid_dummy/public/500.html -- spec/mongoid_dummy/public/favicon.ico -- spec/mongoid_dummy/public/index.html -- spec/mongoid_dummy/public/robots.txt -- spec/mongoid_dummy/script/rails -- spec/mongoid_dummy/vendor/assets/javascripts/.gitkeep -- spec/mongoid_dummy/vendor/assets/stylesheets/.gitkeep -- spec/mongoid_dummy/vendor/plugins/.gitkeep -- spec/shared_engine/.gitignore -- spec/shared_engine/Gemfile -- spec/shared_engine/MIT-LICENSE -- spec/shared_engine/README.rdoc -- spec/shared_engine/Rakefile -- spec/shared_engine/app/assets/images/shared_engine/.gitkeep -- spec/shared_engine/app/assets/javascripts/shared_engine/application.js -- spec/shared_engine/app/assets/stylesheets/shared_engine/application.css -- spec/shared_engine/app/controllers/shared_engine/application_controller.rb -- spec/shared_engine/app/controllers/shared_engine/plain_objects_controller.rb -- spec/shared_engine/app/controllers/shared_engine/respond_with_users_controller.rb -- spec/shared_engine/app/controllers/shared_engine/users_controller.rb -- spec/shared_engine/app/helpers/shared_engine/application_helper.rb -- spec/shared_engine/app/models/plain_object.rb -- spec/shared_engine/app/models/user_template.rb -- spec/shared_engine/app/views/layouts/shared_engine/application.html.erb -- spec/shared_engine/config/routes.rb -- spec/shared_engine/dummy/README.rdoc -- spec/shared_engine/dummy/Rakefile -- spec/shared_engine/dummy/app/assets/javascripts/application.js -- spec/shared_engine/dummy/app/assets/stylesheets/application.css -- spec/shared_engine/dummy/app/controllers/application_controller.rb -- spec/shared_engine/dummy/app/helpers/application_helper.rb -- spec/shared_engine/dummy/app/mailers/.gitkeep -- spec/shared_engine/dummy/app/models/.gitkeep -- spec/shared_engine/dummy/app/views/layouts/application.html.erb -- spec/shared_engine/dummy/config.ru -- spec/shared_engine/dummy/config/application.rb -- spec/shared_engine/dummy/config/boot.rb -- spec/shared_engine/dummy/config/database.yml -- spec/shared_engine/dummy/config/environment.rb -- spec/shared_engine/dummy/config/environments/development.rb -- spec/shared_engine/dummy/config/environments/production.rb -- spec/shared_engine/dummy/config/environments/test.rb -- spec/shared_engine/dummy/config/initializers/backtrace_silencers.rb -- spec/shared_engine/dummy/config/initializers/inflections.rb -- spec/shared_engine/dummy/config/initializers/mime_types.rb -- spec/shared_engine/dummy/config/initializers/secret_token.rb -- spec/shared_engine/dummy/config/initializers/session_store.rb -- spec/shared_engine/dummy/config/initializers/wrap_parameters.rb -- spec/shared_engine/dummy/config/locales/en.yml -- spec/shared_engine/dummy/config/routes.rb -- spec/shared_engine/dummy/lib/assets/.gitkeep -- spec/shared_engine/dummy/log/.gitkeep -- spec/shared_engine/dummy/public/404.html -- spec/shared_engine/dummy/public/422.html -- spec/shared_engine/dummy/public/500.html -- spec/shared_engine/dummy/public/favicon.ico -- spec/shared_engine/dummy/script/rails -- spec/shared_engine/lib/magic/rails/engine.rb -- spec/shared_engine/lib/shared_engine.rb -- spec/shared_engine/lib/shared_engine/engine.rb -- spec/shared_engine/lib/shared_engine/version.rb -- spec/shared_engine/lib/tasks/shared_engine_tasks.rake -- spec/shared_engine/script/rails -- spec/shared_engine/shared_engine.gemspec -- spec/spec.opts -- spec/spec_helper.rb -- spec/support/api_test_helpers.rb -- spec/support/controller_examples.rb -- spec/support/it_supports.rb -- spec/support/model_examples/associations.rb -- spec/support/model_examples/callbacks.rb -- spec/support/model_examples/closures.rb -- spec/support/model_examples/conditional_if.rb -- spec/support/model_examples/conditional_unless.rb -- spec/support/model_examples/enabled.rb -- spec/support/model_examples/extending.rb -- spec/support/model_examples/methods.rb -- spec/support/model_examples/options.rb -- spec/support/model_examples/renaming.rb -- spec/support/model_examples/simple.rb -- spec/support/model_examples/sub_nodes.rb -- spec/support/model_examples/undefined.rb -- spec/support/model_examples/untouched.rb -- spec/support/routing.rb -- spec/support/simple_fixtures.rb -homepage: https://github.com/fabrik42/acts_as_api -licenses: [] -metadata: {} -post_install_message: -rdoc_options: -- --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 -signing_key: -specification_version: 4 -summary: Makes creating XML/JSON responses in Rails 3 easy and fun. -test_files: -- spec/README.md -- spec/active_record_dummy/.gitignore -- spec/active_record_dummy/Gemfile -- spec/active_record_dummy/README.rdoc -- spec/active_record_dummy/Rakefile -- spec/active_record_dummy/app/assets/images/rails.png -- spec/active_record_dummy/app/assets/javascripts/application.js -- spec/active_record_dummy/app/assets/stylesheets/application.css -- spec/active_record_dummy/app/controllers/application_controller.rb -- spec/active_record_dummy/app/helpers/application_helper.rb -- spec/active_record_dummy/app/mailers/.gitkeep -- spec/active_record_dummy/app/models/.gitkeep -- spec/active_record_dummy/app/models/profile.rb -- spec/active_record_dummy/app/models/task.rb -- spec/active_record_dummy/app/models/untouched.rb -- spec/active_record_dummy/app/models/user.rb -- spec/active_record_dummy/app/views/layouts/application.html.erb -- spec/active_record_dummy/config.ru -- spec/active_record_dummy/config/application.rb -- spec/active_record_dummy/config/boot.rb -- spec/active_record_dummy/config/database.yml -- spec/active_record_dummy/config/environment.rb -- spec/active_record_dummy/config/environments/development.rb -- spec/active_record_dummy/config/environments/production.rb -- spec/active_record_dummy/config/environments/test.rb -- spec/active_record_dummy/config/initializers/backtrace_silencers.rb -- spec/active_record_dummy/config/initializers/generators.rb -- spec/active_record_dummy/config/initializers/inflections.rb -- spec/active_record_dummy/config/initializers/mime_types.rb -- spec/active_record_dummy/config/initializers/secret_token.rb -- spec/active_record_dummy/config/initializers/session_store.rb -- spec/active_record_dummy/config/initializers/wrap_parameters.rb -- spec/active_record_dummy/config/locales/en.yml -- spec/active_record_dummy/config/routes.rb -- spec/active_record_dummy/db/migrate/20110214201640_create_tables.rb -- spec/active_record_dummy/db/schema.rb -- spec/active_record_dummy/db/seeds.rb -- spec/active_record_dummy/doc/README_FOR_APP -- spec/active_record_dummy/lib/assets/.gitkeep -- spec/active_record_dummy/lib/tasks/.gitkeep -- spec/active_record_dummy/log/.gitkeep -- spec/active_record_dummy/public/404.html -- spec/active_record_dummy/public/422.html -- spec/active_record_dummy/public/500.html -- spec/active_record_dummy/public/favicon.ico -- spec/active_record_dummy/public/index.html -- spec/active_record_dummy/public/robots.txt -- spec/active_record_dummy/script/rails -- spec/active_record_dummy/vendor/assets/javascripts/.gitkeep -- spec/active_record_dummy/vendor/assets/stylesheets/.gitkeep -- spec/active_record_dummy/vendor/plugins/.gitkeep -- spec/controllers/plain_objects_controller_spec.rb -- spec/controllers/respond_with_users_controller_spec.rb -- spec/controllers/users_controller_spec.rb -- spec/models/model_spec.rb -- spec/mongoid_dummy/.gitignore -- spec/mongoid_dummy/Gemfile -- spec/mongoid_dummy/README.rdoc -- spec/mongoid_dummy/Rakefile -- spec/mongoid_dummy/app/assets/images/rails.png -- spec/mongoid_dummy/app/assets/javascripts/application.js -- spec/mongoid_dummy/app/assets/stylesheets/application.css -- spec/mongoid_dummy/app/controllers/application_controller.rb -- spec/mongoid_dummy/app/helpers/application_helper.rb -- spec/mongoid_dummy/app/mailers/.gitkeep -- spec/mongoid_dummy/app/models/.gitkeep -- spec/mongoid_dummy/app/models/profile.rb -- spec/mongoid_dummy/app/models/task.rb -- spec/mongoid_dummy/app/models/untouched.rb -- spec/mongoid_dummy/app/models/user.rb -- spec/mongoid_dummy/app/views/layouts/application.html.erb -- spec/mongoid_dummy/config.ru -- spec/mongoid_dummy/config/application.rb -- spec/mongoid_dummy/config/boot.rb -- spec/mongoid_dummy/config/environment.rb -- spec/mongoid_dummy/config/environments/development.rb -- spec/mongoid_dummy/config/environments/production.rb -- spec/mongoid_dummy/config/environments/test.rb -- spec/mongoid_dummy/config/initializers/backtrace_silencers.rb -- spec/mongoid_dummy/config/initializers/generators.rb -- spec/mongoid_dummy/config/initializers/include_acts_as_api.rb -- spec/mongoid_dummy/config/initializers/inflections.rb -- spec/mongoid_dummy/config/initializers/mime_types.rb -- spec/mongoid_dummy/config/initializers/secret_token.rb -- spec/mongoid_dummy/config/initializers/session_store.rb -- spec/mongoid_dummy/config/initializers/wrap_parameters.rb -- spec/mongoid_dummy/config/locales/en.yml -- spec/mongoid_dummy/config/mongoid.yml -- spec/mongoid_dummy/config/routes.rb -- spec/mongoid_dummy/db/seeds.rb -- spec/mongoid_dummy/doc/README_FOR_APP -- spec/mongoid_dummy/lib/assets/.gitkeep -- spec/mongoid_dummy/lib/tasks/.gitkeep -- spec/mongoid_dummy/log/.gitkeep -- spec/mongoid_dummy/public/404.html -- spec/mongoid_dummy/public/422.html -- spec/mongoid_dummy/public/500.html -- spec/mongoid_dummy/public/favicon.ico -- spec/mongoid_dummy/public/index.html -- spec/mongoid_dummy/public/robots.txt -- spec/mongoid_dummy/script/rails -- spec/mongoid_dummy/vendor/assets/javascripts/.gitkeep -- spec/mongoid_dummy/vendor/assets/stylesheets/.gitkeep -- spec/mongoid_dummy/vendor/plugins/.gitkeep -- spec/shared_engine/.gitignore -- spec/shared_engine/Gemfile -- spec/shared_engine/MIT-LICENSE -- spec/shared_engine/README.rdoc -- spec/shared_engine/Rakefile -- spec/shared_engine/app/assets/images/shared_engine/.gitkeep -- spec/shared_engine/app/assets/javascripts/shared_engine/application.js -- spec/shared_engine/app/assets/stylesheets/shared_engine/application.css -- spec/shared_engine/app/controllers/shared_engine/application_controller.rb -- spec/shared_engine/app/controllers/shared_engine/plain_objects_controller.rb -- spec/shared_engine/app/controllers/shared_engine/respond_with_users_controller.rb -- spec/shared_engine/app/controllers/shared_engine/users_controller.rb -- spec/shared_engine/app/helpers/shared_engine/application_helper.rb -- spec/shared_engine/app/models/plain_object.rb -- spec/shared_engine/app/models/user_template.rb -- spec/shared_engine/app/views/layouts/shared_engine/application.html.erb -- spec/shared_engine/config/routes.rb -- spec/shared_engine/dummy/README.rdoc -- spec/shared_engine/dummy/Rakefile -- spec/shared_engine/dummy/app/assets/javascripts/application.js -- spec/shared_engine/dummy/app/assets/stylesheets/application.css -- spec/shared_engine/dummy/app/controllers/application_controller.rb -- spec/shared_engine/dummy/app/helpers/application_helper.rb -- spec/shared_engine/dummy/app/mailers/.gitkeep -- spec/shared_engine/dummy/app/models/.gitkeep -- spec/shared_engine/dummy/app/views/layouts/application.html.erb -- spec/shared_engine/dummy/config.ru -- spec/shared_engine/dummy/config/application.rb -- spec/shared_engine/dummy/config/boot.rb -- spec/shared_engine/dummy/config/database.yml -- spec/shared_engine/dummy/config/environment.rb -- spec/shared_engine/dummy/config/environments/development.rb -- spec/shared_engine/dummy/config/environments/production.rb -- spec/shared_engine/dummy/config/environments/test.rb -- spec/shared_engine/dummy/config/initializers/backtrace_silencers.rb -- spec/shared_engine/dummy/config/initializers/inflections.rb -- spec/shared_engine/dummy/config/initializers/mime_types.rb -- spec/shared_engine/dummy/config/initializers/secret_token.rb -- spec/shared_engine/dummy/config/initializers/session_store.rb -- spec/shared_engine/dummy/config/initializers/wrap_parameters.rb -- spec/shared_engine/dummy/config/locales/en.yml -- spec/shared_engine/dummy/config/routes.rb -- spec/shared_engine/dummy/lib/assets/.gitkeep -- spec/shared_engine/dummy/log/.gitkeep -- spec/shared_engine/dummy/public/404.html -- spec/shared_engine/dummy/public/422.html -- spec/shared_engine/dummy/public/500.html -- spec/shared_engine/dummy/public/favicon.ico -- spec/shared_engine/dummy/script/rails -- spec/shared_engine/lib/magic/rails/engine.rb -- spec/shared_engine/lib/shared_engine.rb -- spec/shared_engine/lib/shared_engine/engine.rb -- spec/shared_engine/lib/shared_engine/version.rb -- spec/shared_engine/lib/tasks/shared_engine_tasks.rake -- spec/shared_engine/script/rails -- spec/shared_engine/shared_engine.gemspec -- spec/spec.opts -- spec/spec_helper.rb -- spec/support/api_test_helpers.rb -- spec/support/controller_examples.rb -- spec/support/it_supports.rb -- spec/support/model_examples/associations.rb -- spec/support/model_examples/callbacks.rb -- spec/support/model_examples/closures.rb -- spec/support/model_examples/conditional_if.rb -- spec/support/model_examples/conditional_unless.rb -- spec/support/model_examples/enabled.rb -- spec/support/model_examples/extending.rb -- spec/support/model_examples/methods.rb -- spec/support/model_examples/options.rb -- spec/support/model_examples/renaming.rb -- spec/support/model_examples/simple.rb -- spec/support/model_examples/sub_nodes.rb -- spec/support/model_examples/undefined.rb -- spec/support/model_examples/untouched.rb -- spec/support/routing.rb -- spec/support/simple_fixtures.rb diff -Nru ruby-acts-as-api-0.4.2/README.md ruby-acts-as-api-0.4.3/README.md --- ruby-acts-as-api-0.4.2/README.md 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/README.md 2016-09-07 05:08:17.000000000 +0000 @@ -4,7 +4,7 @@ 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 @@ * 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 @@ 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. \ No newline at end of file +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff -Nru ruby-acts-as-api-0.4.2/spec/controllers/plain_objects_controller_spec.rb ruby-acts-as-api-0.4.3/spec/controllers/plain_objects_controller_spec.rb --- ruby-acts-as-api-0.4.2/spec/controllers/plain_objects_controller_spec.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/spec/controllers/plain_objects_controller_spec.rb 2016-09-07 05:08:17.000000000 +0000 @@ -1,6 +1,6 @@ require 'spec_helper' -describe SharedEngine::PlainObjectsController do +describe SharedEngine::PlainObjectsController, type: :controller do include ApiTestHelpers before(:each) do diff -Nru ruby-acts-as-api-0.4.2/spec/controllers/respond_with_users_controller_spec.rb ruby-acts-as-api-0.4.3/spec/controllers/respond_with_users_controller_spec.rb --- ruby-acts-as-api-0.4.2/spec/controllers/respond_with_users_controller_spec.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/spec/controllers/respond_with_users_controller_spec.rb 2016-09-07 05:08:17.000000000 +0000 @@ -4,7 +4,7 @@ # config.include SharedEngine::Engine.routes.url_helpers # end -describe SharedEngine::RespondWithUsersController do +describe SharedEngine::RespondWithUsersController, type: :controller do before(:each) do setup_models diff -Nru ruby-acts-as-api-0.4.2/spec/controllers/users_controller_spec.rb ruby-acts-as-api-0.4.3/spec/controllers/users_controller_spec.rb --- ruby-acts-as-api-0.4.2/spec/controllers/users_controller_spec.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/spec/controllers/users_controller_spec.rb 2016-09-07 05:08:17.000000000 +0000 @@ -1,7 +1,7 @@ require 'spec_helper' -describe SharedEngine::UsersController do - +describe SharedEngine::UsersController, type: :controller do + before(:each) do setup_models end diff -Nru ruby-acts-as-api-0.4.2/spec/mongoid_dummy/Gemfile ruby-acts-as-api-0.4.3/spec/mongoid_dummy/Gemfile --- ruby-acts-as-api-0.4.2/spec/mongoid_dummy/Gemfile 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/spec/mongoid_dummy/Gemfile 2016-09-07 05:08:17.000000000 +0000 @@ -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 @@ group :test do gem 'rspec-rails', '>= 2.5.0' - gem 'webrat' + gem 'webrat' end diff -Nru ruby-acts-as-api-0.4.2/spec/shared_engine/shared_engine.gemspec ruby-acts-as-api-0.4.3/spec/shared_engine/shared_engine.gemspec --- ruby-acts-as-api-0.4.2/spec/shared_engine/shared_engine.gemspec 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/spec/shared_engine/shared_engine.gemspec 2016-09-07 05:08:17.000000000 +0000 @@ -7,15 +7,14 @@ 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" diff -Nru ruby-acts-as-api-0.4.2/spec/support/api_test_helpers.rb ruby-acts-as-api-0.4.3/spec/support/api_test_helpers.rb --- ruby-acts-as-api-0.4.2/spec/support/api_test_helpers.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/spec/support/api_test_helpers.rb 2016-09-07 05:08:17.000000000 +0000 @@ -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 \ No newline at end of file +end diff -Nru ruby-acts-as-api-0.4.2/spec/support/controller_examples.rb ruby-acts-as-api-0.4.3/spec/support/controller_examples.rb --- ruby-acts-as-api-0.4.2/spec/support/controller_examples.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/spec/support/controller_examples.rb 2016-09-07 05:08:17.000000000 +0000 @@ -94,7 +94,7 @@ 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 @@ response_body_json["users"].first["last_name"].should eql("Solo") end - end + end describe 'get a single user' do @@ -300,6 +300,18 @@ end 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 diff -Nru ruby-acts-as-api-0.4.2/spec/support/model_examples/enabled.rb ruby-acts-as-api-0.4.3/spec/support/model_examples/enabled.rb --- ruby-acts-as-api-0.4.2/spec/support/model_examples/enabled.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/spec/support/model_examples/enabled.rb 2016-09-07 05:08:17.000000000 +0000 @@ -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 diff -Nru ruby-acts-as-api-0.4.2/spec/support/model_examples/untouched.rb ruby-acts-as-api-0.4.3/spec/support/model_examples/untouched.rb --- ruby-acts-as-api-0.4.2/spec/support/model_examples/untouched.rb 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/spec/support/model_examples/untouched.rb 2016-09-07 05:08:17.000000000 +0000 @@ -2,7 +2,7 @@ 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 @@ end end -end \ No newline at end of file +end diff -Nru ruby-acts-as-api-0.4.2/.travis.yml ruby-acts-as-api-0.4.3/.travis.yml --- ruby-acts-as-api-0.4.2/.travis.yml 2014-04-24 10:43:57.000000000 +0000 +++ ruby-acts-as-api-0.4.3/.travis.yml 2016-09-07 05:08:17.000000000 +0000 @@ -1,5 +1,7 @@ +language: ruby +sudo: false script: bundle exec rake spec:all services: - mongodb rvm: - - 1.9.3 + - 2.3.1