acts_as_api 0.4.1 → 0.4.2

checksums.yaml

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

data/.travis.yml

@@ -1,8 +1,5 @@
 script: bundle exec rake spec:all
-
+services:
+  - mongodb
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - ruby-head
-  - ree  

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.2 2013-12-28
+
+* Fixed problem with rendering of POROs (see PR #88)
+
 === 0.4.1 2012-07-18
 
 * Added support for Mongoid 3

data/README.md

@@ -1,4 +1,4 @@
-# acts_as_api ![acts_as_api on travis ci](http://travis-ci.org/fabrik42/acts_as_api.png)
+# acts_as_api ![acts_as_api on travis ci](https://secure.travis-ci.org/fabrik42/acts_as_api.png?branch=master)
 
 acts_as_api makes creating XML/JSON responses in Rails 3 easy and fun.
 
@@ -80,12 +80,16 @@ 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](http://travis-ci.org/fabrik42/acts_as_api.png)
+### 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, 1.9.2, 1.8.7 and REE: http://travis-ci.org/#!/fabrik42/acts_as_api
+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

data/Rakefile

@@ -12,8 +12,7 @@ namespace :spec do
 
   supported_orms.each do |orm|
     desc "Run #{orm} specs only"
-    RSpec::Core::RakeTask.new do |t|
-      t.name = orm
+    RSpec::Core::RakeTask.new(orm) do |t|
       t.rspec_opts = ["--color"]
     end
 

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.3'])
+  s.add_development_dependency('rails', ['>= 3.2.16'])
   s.add_development_dependency('mongoid', ['>= 3.0.1'])
 
   s.rdoc_options  = ['--charset=UTF-8']

data/lib/acts_as_api/base.rb

@@ -34,7 +34,7 @@ module ActsAsApi
       # be contained in the api responses.
       def api_accessible(api_template, options = {}, &block)
 
-        attributes = api_accessible_attributes(api_template) || ApiTemplate.new(api_template)
+        attributes = api_accessible_attributes(api_template).try(:dup) || ApiTemplate.new(api_template)
 
         attributes.merge!(api_accessible_attributes(options[:extend])) if options[:extend]
 

data/lib/acts_as_api/rendering.rb

@@ -47,12 +47,13 @@ module ActsAsApi
         api_root_name = api_model.collection_name
       elsif api_model.is_a?(Array) && !api_model.empty? && api_model.first.class.respond_to?(:model_name)
         api_root_name = api_model.first.class.model_name
+      elsif api_model.is_a?(Array) && !api_model.empty? && api_model.first.respond_to?(:model_name)
+        api_root_name = api_model.first.model_name
       elsif api_model.respond_to?(:model_name)
         api_root_name = api_model.model_name        
       else
         api_root_name = ActsAsApi::Config.default_root.to_s
       end
-
       api_root_name = api_root_name.to_s.underscore.tr('/', '_')
 
       if api_model.is_a?(Array) || (defined?(ActiveRecord) && api_model.is_a?(ActiveRecord::Relation))

data/lib/acts_as_api/version.rb

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

data/spec/README.md

@@ -38,7 +38,7 @@ They contain **no controllers** to be tested, just models that match the tested
 
 * Create to Models used in the spec (`User, Profile, Untouched, Task`).
 
-* Include `SharedEngine::UserTemplate` in your `User` model.
+* Include `UserTemplate` in your `User` model.
 
 * Add `mount SharedEngine::Engine => "/shared", :as => "shared"` to your `routes.rb`
 

data/spec/controllers/plain_objects_controller_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe SharedEngine::PlainObjectsController do
+  include ApiTestHelpers
+
+  before(:each) do
+    class SharedEngine::PlainObjectsController
+      include SimpleFixtures
+    end
+  end
+
+  describe 'get all users as a an array of plain objects, autodetecting the root node name' do
+
+    before(:each) do
+      get :index, :format => 'json', :api_template => :name_only
+    end
+
+    it "should have a root node named users" do
+      response_body_json.should have_key("plain_objects")
+    end
+
+    it "should contain all users" do
+      response_body_json["plain_objects"].should be_a(Array)
+    end
+
+    it "should contain the specified attributes" do
+      response_body_json["plain_objects"].first.should have_key("first_name")
+      response_body_json["plain_objects"].first.should have_key("last_name")
+    end
+
+    it "should contain the specified values" do
+      response_body_json["plain_objects"].first["first_name"].should eql("Han")
+      response_body_json["plain_objects"].first["last_name"].should eql("Solo")
+    end
+  end
+end

data/spec/mongoid_dummy/app/models/user.rb

@@ -16,7 +16,7 @@ class User
 
   acts_as_api
 
-  include SharedEngine::UserTemplate
+  include UserTemplate
 
   def over_thirty?
     age > 30

data/spec/shared_engine/app/controllers/shared_engine/plain_objects_controller.rb

@@ -0,0 +1,14 @@
+module SharedEngine
+  class PlainObjectsController < SharedEngine::ApplicationController
+    before_filter :setup_objects
+
+    def index
+      @users = [@han, @luke, @leia]
+
+      respond_to do |format|
+        format.xml  { render_for_api params[:api_template].to_sym, :xml => @users }
+        format.json { render_for_api params[:api_template].to_sym, :json => @users }
+      end
+    end
+  end
+end

data/spec/shared_engine/app/models/plain_object.rb

@@ -0,0 +1,17 @@
+class PlainObject < Struct.new(:first_name, :last_name, :age, :active)
+  extend ActsAsApi::Base
+
+  def initialize(opts)
+    opts.each do |k, v|
+      send("#{k}=", v)
+    end
+  end
+
+  def model_name
+    'plain_object'
+  end
+
+  acts_as_api
+
+  include SharedEngine::UserTemplate
+end

data/spec/shared_engine/config/routes.rb

@@ -23,4 +23,6 @@ SharedEngine::Engine.routes.draw do
       get 'show_prefix_postfix'
     end
   end
+
+  resources :plain_objects
 end

data/spec/shared_engine/shared_engine.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 
-  s.add_dependency "rails", "~> 3.2.3"
+  s.add_dependency "rails", "~> 3.2.16"
   # s.add_dependency "jquery-rails"
 
   s.add_development_dependency "sqlite3"

data/spec/support/simple_fixtures.rb

@@ -21,6 +21,12 @@ module SimpleFixtures
     User.delete_all
   end
 
+  def setup_objects
+    @luke = PlainObject.new({ :first_name => 'Luke',      :last_name => 'Skywalker', :age => 25, :active => true  })
+    @han  = PlainObject.new({ :first_name => 'Han',       :last_name => 'Solo',      :age => 35, :active => true  })
+    @leia = PlainObject.new({ :first_name => 'Princess',  :last_name => 'Leia',      :age => 25, :active => false })
+  end
+
   # def setup_roflscale_models
   #   @orm_for_testing  = :vanilla
   #   @user_model       = VanillaUser

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_api
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Christian Bäuerlein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70279657916060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70279657916060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70279657914840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70279657914840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70279657914060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70279657914060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70279657913480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.16
   type: :development
   prerelease: false
-  version_requirements: *70279657913480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70279657912660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70279657912660
+  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:
@@ -148,6 +162,7 @@ files:
 - 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
@@ -209,9 +224,11 @@ files:
 - 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
@@ -277,28 +294,27 @@ files:
 - 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
-  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.17
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Makes creating XML/JSON responses in Rails 3 easy and fun.
 test_files:
 - spec/README.md
@@ -352,6 +368,7 @@ test_files:
 - 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
@@ -413,9 +430,11 @@ test_files:
 - 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