Commit Graph

493 Commits

Author SHA1 Message Date
Benjamin Fleischer
1a78cf20b6 Correct changelog link [ci skip] 2021-01-27 16:05:31 -06:00
Benjamin Fleischer
75ec9d5120
Merge pull request #2408 from rails-api/update_changelog
Update changelog
2021-01-26 16:30:39 -06:00
Benjamin Fleischer
93b0a0caf4 Update changelog 2021-01-26 16:29:20 -06:00
Benjamin Fleischer
866e123824
Merge pull request #2407 from rails-api/0-8-stable-github_ci
Try GitHub actions for CI
2021-01-26 16:28:51 -06:00
Benjamin Fleischer
f7b07b12f3 Try GitHub actions for CI 2021-01-26 16:21:41 -06:00
Benjamin Fleischer
0ef0f0c538
Merge pull request #2196 from rails-api/fix_ci
Fix CI for 0.8.x for Rails 5/master
2017-11-02 11:45:41 -05:00
Benjamin Fleischer
bba131759a Turn of JRuby CI on Rails 4.0
https://travis-ci.org/rails-api/active_model_serializers/jobs/296314721

```
Picked up _JAVA_OPTIONS: -Xmx2048m -Xms512m
jruby: warning: unknown property jruby.cext.enabled
2.7.0
32.06s$ bundle install --path=vendor/bundle --retry=3 --jobs=3
Picked up _JAVA_OPTIONS: -Xmx2048m -Xms512m
jruby: warning: unknown property jruby.cext.enabled
Fetching gem metadata from https://rubygems.org/..........
Fetching gem metadata from https://rubygems.org/.
Resolving dependencies.........................................................................................................................
Bundler could not find compatible versions for gem "actionpack":
  In Gemfile:
    actionpack (~> 4.0.0) java
    rails (~> 4.0.0) java was resolved to 4.0.0, which depends on
      actionpack (= 4.0.0) java
Bundler could not find compatible versions for gem "activemodel":
  In Gemfile:
    activemodel (~> 4.0.0) java
    active_model_serializers java was resolved to 0.8.4, which depends on
      activemodel (>= 3.0) java
    rails (~> 4.0.0) java was resolved to 4.0.0, which depends on
      activerecord (= 4.0.0) java was resolved to 4.0.0, which depends on
        activemodel (= 4.0.0) java
Bundler could not find compatible versions for gem "activerecord":
  In Gemfile:
    activerecord (~> 4.0.0) java
    rails (~> 4.0.0) java was resolved to 4.0.0, which depends on
      activerecord (= 4.0.0) java
Bundler could not find compatible versions for gem "activesupport":
  In Gemfile:
    activesupport (~> 4.0.0) java
    rails (~> 4.0.0) java was resolved to 4.0.0, which depends on
      activesupport (= 4.0.0) java
Bundler could not find compatible versions for gem "rails":
  In Gemfile:
    rails (~> 4.0.0) java
Could not find gem 'rails (~> 4.0.0)' in any of the sources.
Bundler could not find compatible versions for gem "railties":
  In Gemfile:
    railties (~> 4.0.0) java
    rails (~> 4.0.0) java was resolved to 4.0.0, which depends on
      railties (= 4.0.0) java
Bundler could not find compatible versions for gem "tzinfo":
  In Gemfile:
    rails (~> 4.0.0) java was resolved to 4.0.0, which depends on
      activesupport (= 4.0.0) java was resolved to 4.0.0, which depends on
        tzinfo (~> 0.3.37) java
    tzinfo-data java was resolved to 1.2017.3, which depends on
      tzinfo (>= 1.0.0) java
The command "bundle install --path=vendor/bundle --retry=3 --jobs=3" failed and exited with 6 during .
Your build has been stopped.
```
2017-11-02 11:25:07 -05:00
Benjamin Fleischer
c92a08a94a Re-enable Rails 4.0 non-windows 2017-11-02 10:09:09 -05:00
Benjamin Fleischer
b2b3112110 Advice from rails/rails 2017-11-02 09:32:37 -05:00
Benjamin Fleischer
2e2cdc91e0 Turn off Rails 4.0 temporarily 2017-11-02 09:26:25 -05:00
Benjamin Fleischer
f2c8741219 Specify rails gem for pre rails master
https://ci.appveyor.com/project/bf4/active-model-serializers/build/1144/job/rf3yi4b7vf8w4t6l

```
Build started
git clone -q --branch=fix_ci https://github.com/rails-api/active_model_serializers.git C:\projects\active-model-serializers
git checkout -qf 37d4bdc4d2
Running Install scripts
SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
ruby --version
ruby 2.0.0p648 (2015-12-16) [i386-mingw32]
gem --version
2.6.13
gem install bundler
Successfully installed bundler-1.16.0
Parsing documentation for bundler-1.16.0
Installing ri documentation for bundler-1.16.0
1 gem installed
bundler --version
Bundler version 1.16.0
bundle platform
Your platform is: i386-mingw32
Your app has gems that work on these platforms:
* x86-mingw32
Your Gemfile does not specify a Ruby version requirement.
bundle install --path=vendor/bundle --retry=3 --jobs=3
Fetching gem metadata from https://rubygems.org/..........
Fetching gem metadata from https://rubygems.org/.
Resolving dependencies...........................................
Bundler could not find compatible versions for gem "actionpack":
  In Gemfile:
    actionpack (~> 4.0.0) x86-mingw32
Could not find gem 'actionpack (~> 4.0.0)' in any of the sources.
Bundler could not find compatible versions for gem "activemodel":
  In Gemfile:
    activemodel (~> 4.0.0) x86-mingw32
    active_model_serializers x86-mingw32 was resolved to 0.8.4, which depends on
      activemodel (>= 3.0) x86-mingw32
    activerecord (~> 4.0.0) x86-mingw32 was resolved to 4.0.0, which depends on
      activemodel (= 4.0.0) x86-mingw32
Bundler could not find compatible versions for gem "activesupport":
  In Gemfile:
    activesupport (~> 4.0.0) x86-mingw32
    actionpack (~> 4.0.0) x86-mingw32 was resolved to 4.0.0, which depends on
      activesupport (= 4.0.0) x86-mingw32
Bundler could not find compatible versions for gem "ruby":
  In Gemfile:
    ruby x86-mingw32
    pry x86-mingw32 was resolved to 0.11.2, which depends on
      ruby (>= 1.9.3) x86-mingw32
    rails (>= 3.0) x86-mingw32 was resolved to 5.1.4, which depends on
      ruby (>= 2.2.2) x86-mingw32
Bundler could not find compatible versions for gem "tzinfo":
  In Gemfile:
    actionpack (~> 4.0.0) x86-mingw32 was resolved to 4.0.0, which depends on
activesupport (= 4.0.0) x86-mingw32 was resolved to 4.0.0, which depends
on
        tzinfo (~> 0.3.37) x86-mingw32
    tzinfo-data x86-mingw32 was resolved to 1.2017.3, which depends on
      tzinfo (>= 1.0.0) x86-mingw32
Command exited with code 6
```
2017-11-02 09:13:35 -05:00
Benjamin Fleischer
37d4bdc4d2 Address bundle not finding actionpack via dep require order 2017-11-02 08:54:18 -05:00
Benjamin Fleischer
aabc1cb07d Remove rubinius tests, too fragile 2017-11-02 08:54:18 -05:00
Benjamin Fleischer
ffe658f027 Shim rails5 http test methods 2017-11-02 08:53:46 -05:00
Benjamin Fleischer
322c8aa59c Rails5 requires x_action filters 2017-11-02 08:53:46 -05:00
Benjamin Fleischer
9c226c67f1 Rename deprecated empty ActiveModel::TestCase; removed in Rails master 2017-11-02 08:53:46 -05:00
Benjamin Fleischer
5f4252f11d Rails 5 requires explicit rails gem
```
Bundler could not find compatible versions for gem "activemodel":

In Gemfile:
  activerecord was resolved to 5.2.0.alpha, which depends on activemodel (= 5.2.0.alpha)

  rails (>= 3.0) was resolved to 4.2.9, which depends on activemodel (= 4.2.9)
```
2017-11-02 08:53:46 -05:00
Benjamin Fleischer
2cf5331ad2 Bump to 0.8.4 2017-09-19 08:49:27 -05:00
Benjamin Fleischer
db3453d4c1 Exclude Rails 5/master for now 2017-09-19 08:48:14 -05:00
Edgars Beigarts
3125069892 Prepare changelog for 0.8.4 release
Conflicts:
	CHANGELOG-0-08.md
2017-09-19 08:24:03 -05:00
Dries Harnie
07addbf8c7 AMS 0.8: Fix memory leak with :scope_name (#1675)
Fix memory leak with :scope_name

Supplying :scope_name causes `ActiveModel::Serializer#initialize` to
define a method on the class, which retains a reference to the
serializer instance.

* Lock version of mime-types to < 3 for older JRubies
2016-04-12 23:54:33 -05:00
Benjamin Fleischer
e54d129091 Merge pull request #1276 from kieran/0-8-stable
[FIX] serializers were never including associations on cache hits
2016-04-01 03:40:37 -05:00
Kieran Huggins
82a870d9dc add guard against including associations for nil objects 2016-03-16 14:39:30 -04:00
Kieran Huggins
b2dc2598fb add specs for cached attributes 2016-03-16 14:39:30 -04:00
Kieran Huggins
ab502f0c52 move @node assignment and the include_associations! call outside the cached response, since including associations produces the side-effect *actually* including the associations.
Previously, subsequent renders of a cached serializer would never include associations.
2016-03-16 14:39:30 -04:00
Benjamin Fleischer
1a684927c4 Merge pull request #1503 from feministy/0-8-stable-poro-documentation
[0.8-stable] additional documentation for POROs
2016-02-12 09:02:38 -06:00
Liz Abinante
5596eab65f add unreleased documentation updates 2016-02-12 05:24:15 -08:00
Liz Abinante
5c2e61bcfb [0.8.x] add example for POROs, clear up explanation 2016-02-09 04:12:46 -08:00
Benjamin Fleischer
7e2051a369 Merge pull request #1376 from bf4/fix_ci
Fix CI
2015-12-15 10:16:38 -06:00
Benjamin Fleischer
75252a2ef9 Run CI against Rails >= 4.0, Ruby >= 1.9.3 2015-12-14 21:59:08 -06:00
Benjamin Fleischer
d03b8179f5 Adjust test for Rails versions that address CVE-2014-4671
Compare
https://github.com/rails/rails/blob/3-2-stable/actionpack/lib/action_controller/metal/renderers.rb#L94
to
https://github.com/rails/rails/blob/4-0-stable/actionpack/lib/action_controller/metal/renderers.rb#L97
2015-12-14 21:51:31 -06:00
mhuggins
b05d9dbd36 Add appveyor.yml 2015-12-14 21:48:27 -06:00
mhuggins
66caef5a0c Remove Ruby 1.8 and 1.9.2 support 2015-12-14 21:48:27 -06:00
mhuggins
e1ae39122c Fix failing tests 2015-12-14 21:48:27 -06:00
Steve Klabnik
8d31f7ee8c Bump to 0.8.3 2014-12-10 09:45:29 -05:00
Steve Klabnik
b6b01d0b73 Merge pull request #663 from wouterw/ww-fix-super-in-define-method
Fix use of `super` in `define_method`
2014-09-23 09:16:58 -04:00
Wouter Willaert
d5226e5978 Fix use of super in define_method 2014-09-21 23:34:44 +02:00
Steve Klabnik
d996d136e4 Merge pull request #644 from tricknotes/fix-0.8-tests
Fix to run 0.8-stable's tests
2014-09-20 17:46:30 -04:00
Steve Klabnik
a65e86bb52 Merge pull request #655 from wouterw/ww-rails-4.2.0
Fix Rails Master
2014-09-19 12:37:50 -04:00
Wouter Willaert
9ebd317898 Remove usage of %i 2014-09-19 17:13:25 +02:00
Wouter Willaert
18667712ea Support both the _render_option_json and the newer _render_with_renderer_json methods 2014-09-19 10:30:59 +02:00
Ryunosuke SATO
f77362e9d6 Disabled protect_from_forgery
Because of the following error:
```
ActionController::InvalidCrossOriginRequest: Security warning: an
embedded <script> tag on another site requested protected JavaScript. If
you know what you're doing, go ahead and disable forgery protection on
this action to permit cross-origin JavaScript embedding.
```
2014-09-08 19:09:07 +09:00
Ryunosuke SATO
bb8bedad63 Fix to run tests 2014-09-08 19:04:29 +09:00
Steve Klabnik
66d39b6c0a bump version 2014-09-01 17:00:39 -04:00
Steve Klabnik
1db474963b Remove coveralls.
It's fine, but it's causing issues.
2014-07-04 23:01:26 -04:00
Steve Klabnik
c7d8145773 Fix rbx in .travis.yml 2014-07-04 22:59:42 -04:00
Steve Klabnik
d8f59f2e94 Merge pull request #538 from mayhewluke/fix-array-output
Fix ArraySerializer's output when falling back on DefaultSerializer
2014-07-04 19:09:18 -07:00
Luke Mayhew
cfcd712123 Fix ArraySerializer's output when falling back on DefaultSerializer
Change ArraySerializer's initialization of DefaultSerializer to pass
:root => false in order to avoid adding root keys to each of the
items in the array. This ensures consistent results between serializing
arrays of objects with serializers and arrays of objects without
serializers. Fixes #495.
2014-04-01 22:38:58 -06:00
Rafael Mendonça França
76fe4e754c Merge pull request #536 from icem/patch-1
Fix type in Readme
2014-03-31 13:14:16 -05:00
Yury Otcheski
acfa17ecc7 Fix type in Readme
proof https://github.com/rails-api/active_model_serializers/blob/0-8-stable/test/serializer_support_test.rb
2014-03-31 21:10:32 +03:00