Merge branch 'master' into RomanKapitonov-master

Author: bf4

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,29 @@
+#### Expected behavior vs actual behavior
+
+
+
+#### Steps to reproduce
+*(e.g., detailed walkthrough, runnable script, example application)*
+
+
+
+#### Environment
+
+ActiveModelSerializers Version *(commit ref if not on tag)*: 
+
+Output of `ruby -e "puts RUBY_DESCRIPTION"`: 
+
+OS Type & Version: 
+
+Integrated application and version *(e.g., Rails, Grape, etc)*: 
+
+
+#### Backtrace
+*(e.g., provide any applicable backtraces from your application)*
+
+
+
+#### Additonal helpful information
+*(e.g., Gemfile.lock, configurations, PR containing a failing test, git bisect results)*
+
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+#### Purpose
+
+
+#### Changes
+
+
+#### Caveats
+
+
+#### Related GitHub issues
+
+
+#### Additional helpful information
+
+

.rubocop.yml

@@ -1,18 +1,24 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 2.2
   Exclude:
     - config/initializers/forbidden_yaml.rb
     - !ruby/regexp /(vendor|bundle|bin|db|tmp)\/.*/
-  RunRailsCops: true
   DisplayCopNames: true
   DisplayStyleGuide: true
 
+Rails:
+  Enabled: true
+
 Lint/NestedMethodDefinition:
   Enabled: false
   Exclude:
     - test/action_controller/serialization_test.rb
 
+Style/Alias:
+  EnforcedStyle: prefer_alias
+
 Style/StringLiterals:
   EnforcedStyle: single_quotes
 
@@ -59,6 +65,18 @@ Style/BlockDelimiters:
   Enabled: true
   EnforcedStyle: line_count_based
 
+Style/SignalException:
+  EnforcedStyle: semantic
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: no_comma
+
+Style/ConditionalAssignment:
+  Enabled: false
+
+Style/DotPosition:
+  EnforcedStyle: leading
+
 ########## test_helper.rb sanity
 Style/EndBlock:
   Exclude:

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-09-20 17:56:22 -0500 using RuboCop version 0.34.0.
+# on 2016-03-08 22:29:52 +0100 using RuboCop version 0.37.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,49 +13,31 @@ Lint/HandleExceptions:
 
 # Offense count: 2
 # Cop supports --auto-correct.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'lib/active_model/serializer/adapter/json_api/fragment_cache.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
 Lint/UnusedMethodArgument:
   Exclude:
-    - 'lib/active_model/serializer/adapter/null.rb'
-    - 'lib/active_model/serializer/pass_through_serializer.rb'
-    - 'test/fixtures/poro.rb'
     - 'test/lint_test.rb'
 
-# Offense count: 2
-Lint/UselessAssignment:
-  Exclude:
-    - 'bench/perf.rb'
-    - 'lib/active_model/serializer/adapter/json_api/fragment_cache.rb'
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Rails/Date:
-  Exclude:
-    - 'test/fixtures/poro.rb'
-
 # Offense count: 4
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
 Rails/TimeZone:
   Exclude:
     - 'test/action_controller/serialization_test.rb'
-    - 'test/fixtures/poro.rb'
     - 'test/serializers/cache_test.rb'
 
 # Offense count: 16
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
 Style/AlignHash:
   Exclude:
     - 'test/action_controller/json_api/pagination_test.rb'
 
-# Offense count: 25
+# Offense count: 27
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: braces, no_braces, context_dependent
 Style/BracesAroundHashParameters:
   Exclude:
     - 'test/action_controller/adapter_selector_test.rb'
@@ -67,17 +49,16 @@ Style/BracesAroundHashParameters:
     - 'test/collection_serializer_test.rb'
     - 'test/serializable_resource_test.rb'
     - 'test/serializers/associations_test.rb'
-    - 'test/serializers/attribute_test.rb'
     - 'test/serializers/attributes_test.rb'
-    - 'test/serializers/fieldset_test.rb'
     - 'test/serializers/root_test.rb'
 
-# Offense count: 174
+# Offense count: 271
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 6
 # Cop supports --auto-correct.
 Style/CommentIndentation:
   Exclude:
@@ -89,34 +70,29 @@ Style/DoubleNegation:
     - 'lib/active_model/serializable_resource.rb'
 
 # Offense count: 1
-Style/EachWithObject:
-  Exclude:
-    - 'lib/active_model/serializer/fieldset.rb'
-
-# Offense count: 2
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
     - 'lib/active_model/serializer.rb'
 
-# Offense count: 12
+# Offense count: 58
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
 Style/HashSyntax:
   Enabled: false
 
-# Offense count: 9
+# Offense count: 4
 # Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
 Style/IndentArray:
-  Exclude:
-    - 'test/adapter/json/has_many_test.rb'
-    - 'test/adapter/json_api/json_api_test.rb'
-    - 'test/adapter/json_api/pagination_links_test.rb'
-    - 'test/adapter/json_test.rb'
+  Enabled: false
 
-# Offense count: 8
+# Offense count: 10
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
 Style/IndentHash:
   Enabled: false
 
@@ -129,12 +105,14 @@ Style/Lambda:
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
 Style/MethodDefParentheses:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented
 Style/MultilineOperationIndentation:
   Enabled: false
 
@@ -146,95 +124,44 @@ Style/NegatedIf:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Style/NumericLiterals:
-  MinDigits: 7
-
-# Offense count: 2
-# Cop supports --auto-correct.
 Style/PerlBackrefs:
   Exclude:
     - 'test/fixtures/poro.rb'
-    - 'test/serializers/associations_test.rb'
 
 # Offense count: 3
-# Configuration parameters: NamePrefix, NamePrefixBlacklist.
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
 Style/PredicateName:
   Exclude:
     - 'lib/active_model/serializer/associations.rb'
     - 'test/action_controller/json_api/linked_test.rb'
 
-# Offense count: 5
+# Offense count: 1
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Exclude:
-    - 'lib/active_model/serializer/associations.rb'
     - 'test/fixtures/poro.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowAsExpressionSeparator.
-Style/Semicolon:
-  Exclude:
-    - 'lib/active_model/serializer/fieldset.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
-  Exclude:
-    - 'lib/active_model/serializer/fieldset.rb'
-    - 'lib/active_model/serializer/pass_through_serializer.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowIfMethodIsEmpty.
 Style/SingleLineMethods:
   Exclude:
     - 'test/serializers/serializer_for_test.rb'
 
-# Offense count: 2
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
   Enabled: false
 
-# Offense count: 1
-Style/StructInheritance:
-  Exclude:
-    - 'bench/perf.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-Style/SymbolProc:
-  Exclude:
-    - 'lib/generators/serializer/serializer_generator.rb'
-
-# Offense count: 8
-# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: final_newline, final_blank_line
 Style/TrailingBlankLines:
   Exclude:
-    - 'lib/active_model/serializer/pass_through_serializer.rb'
-    - 'lib/generators/serializer/serializer_generator.rb'
-    - 'test/adapter/fragment_cache_test.rb'
-    - 'test/adapter/json_api/json_api_test.rb'
     - 'test/adapter/null_test.rb'
-    - 'test/serializers/cache_test.rb'
-    - 'test/serializers/fieldset_test.rb'
-    - 'test/support/stream_capture.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
-  Exclude:
-    - 'test/action_controller/adapter_selector_test.rb'
-    - 'test/action_controller/serialization_test.rb'
-    - 'test/adapter/json_api/belongs_to_test.rb'
-    - 'test/adapter/json_api/linked_test.rb'
-
-# Offense count: 1
-Style/UnlessElse:
-  Exclude:
-    - 'lib/active_model/serializer.rb'

.travis.yml

@@ -8,7 +8,11 @@ rvm:
   - 2.2.3
   - 2.3.0
   - ruby-head
-  - rbx-2
+  - jruby-9.0.4.0
+  - jruby-head
+
+jdk:
+  - oraclejdk8
 
 install: bundle install --path=vendor/bundle --retry=3 --jobs=3
 cache:
@@ -19,21 +23,29 @@ script:
   - bundle exec rake ci
 
 env:
-  - "RAILS_VERSION=4.0"
-  - "RAILS_VERSION=4.1"
-  - "RAILS_VERSION=4.2"
-  - "RAILS_VERSION=master"
+  global:
+    - "JRUBY_OPTS='--dev -J-Xmx1024M --debug'"
+  matrix:
+    - "RAILS_VERSION=4.0"
+    - "RAILS_VERSION=4.1"
+    - "RAILS_VERSION=4.2"
+    - "RAILS_VERSION=master"
 
 matrix:
   exclude:
   - rvm: 2.0.0
     env: RAILS_VERSION=master
   - rvm: 2.1
     env: RAILS_VERSION=master
-  include:
   - rvm: jruby-9.0.4.0
-    env: JRUBY_OPTS='-Xcompat.version=2.0 --server -Xcompile.invokedynamic=false -Xcli.debug=true --debug'
+    env: RAILS_VERSION=master
+  - rvm: jruby-9.0.4.0
+    env: RAILS_VERSION=4.0
+  - rvm: jruby-head
+    env: RAILS_VERSION=master
+  - rvm: jruby-head
+    env: RAILS_VERSION=4.0
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx-2
+    - rvm: jruby-head
   fast_finish: true