jsonapi-resources 0.2.0 → 0.3.0.pre1

data/test/integration/routes/routes_test.rb

@@ -7,8 +7,8 @@ class RoutesTest < ActionDispatch::IntegrationTest
                    {controller: 'posts', action: 'create'})
   end
 
-  def test_routing_put
-    assert_routing({path: '/posts/1', method: :put},
+  def test_routing_patch
+    assert_routing({path: '/posts/1', method: :patch},
                    {controller: 'posts', action: 'update', id: '1'})
   end
 
@@ -28,7 +28,7 @@ class RoutesTest < ActionDispatch::IntegrationTest
   end
 
   def test_routing_posts_links_author_update
-    assert_routing({path: '/posts/1/links/author', method: :put},
+    assert_routing({path: '/posts/1/links/author', method: :patch},
                    {controller: 'posts', action: 'update_association', post_id: '1', association: 'author'})
   end
 
@@ -48,26 +48,10 @@ class RoutesTest < ActionDispatch::IntegrationTest
   end
 
   def test_routing_posts_links_tags_update_acts_as_set
-    assert_routing({path: '/posts/1/links/tags', method: :put},
+    assert_routing({path: '/posts/1/links/tags', method: :patch},
                    {controller: 'posts', action: 'update_association', post_id: '1', association: 'tags'})
   end
 
-  def test_routing_authors_show
-    assert_routing({path: '/authors/1', method: :get},
-                   {action: 'show', controller: 'authors', id: '1'})
-  end
-
-  def test_routing_author_links_posts_create_not_acts_as_set
-    assert_routing({path: '/authors/1/links/posts', method: :post},
-                   {controller: 'authors', action: 'create_association', author_id: '1', association: 'posts'})
-  end
-
-  # ToDo: Test that non acts as set has_many association update route is not created
-  # def test_routing_author_links_posts_update_not_acts_as_set
-  #   refute_routing({ path: '/authors/1/links/posts', method: :put },
-  #                  { controller: 'authors', action: 'update_association', author_id: '1', association: 'posts' })
-  # end
-
   # V1
   def test_routing_v1_posts_show
     assert_routing({path: '/api/v1/posts/1', method: :get},
@@ -85,11 +69,6 @@ class RoutesTest < ActionDispatch::IntegrationTest
   end
 
   # V2
-  def test_routing_v2_posts_show
-    assert_routing({path: '/api/v2/authors/1', method: :get},
-                   {action: 'show', controller: 'api/v2/authors', id: '1'})
-  end
-
   def test_routing_v2_posts_links_author_show
     assert_routing({path: '/api/v2/posts/1/links/author', method: :get},
                    {controller: 'api/v2/posts', action: 'show_association', post_id: '1', association: 'author'})
@@ -144,6 +123,16 @@ class RoutesTest < ActionDispatch::IntegrationTest
                    {controller: 'api/v5/expense_entries', action: 'show_association', expense_entry_id: '1', association: 'iso_currency'})
   end
 
+  def test_routing_authors_show
+    assert_routing({path: '/api/v5/authors/1', method: :get},
+                   {action: 'show', controller: 'api/v5/authors', id: '1'})
+  end
+
+  def test_routing_author_links_posts_create_not_acts_as_set
+    assert_routing({path: '/api/v5/authors/1/links/posts', method: :post},
+                   {controller: 'api/v5/authors', action: 'create_association', author_id: '1', association: 'posts'})
+  end
+
   #primary_key
   def test_routing_primary_key_jsonapi_resources
     assert_routing({path: '/iso_currencies/USD', method: :get},

data/test/test_helper.rb

@@ -1,20 +1,18 @@
 require 'simplecov'
 
-# To run tests with coverage
+# To run tests with coverage:
 # COVERAGE=true rake test
+# To Switch rails versions and run a particular test order:
+# export RAILS_VERSION=4.2; bundle update rails; bundle exec rake TESTOPTS="--seed=39333" test
+
 if ENV['COVERAGE']
   SimpleCov.start do
   end
 end
 
-require 'minitest/autorun'
-require 'minitest/spec'
 require 'rails/all'
-
-require 'jsonapi/routing_ext'
-require 'jsonapi/configuration'
-require 'jsonapi/formatter'
-require 'jsonapi/mime_types'
+require 'rails/test_help'
+require 'jsonapi-resources'
 
 require File.expand_path('../helpers/value_matchers', __FILE__)
 require File.expand_path('../helpers/hash_helpers', __FILE__)
@@ -26,26 +24,45 @@ JSONAPI.configure do |config|
   config.json_key_format = :camelized_key
 end
 
+puts "Testing With RAILS VERSION #{Rails.version}"
+
 class TestApp < Rails::Application
   config.eager_load = false
   config.root = File.dirname(__FILE__)
   config.session_store :cookie_store, key: 'session'
   config.secret_key_base = 'secret'
 
-  ActiveSupport::JSON::Encoding.encode_big_decimal_as_string = false
-
   #Raise errors on unsupported parameters
   config.action_controller.action_on_unpermitted_parameters = :raise
 
   config.active_record.schema_format = :none
+  config.active_support.test_order = :random
+
+  # Turn off millisecond precision to maintain Rails 4.0 and 4.1 compatibility in test results
+  ActiveSupport::JSON::Encoding.time_precision = 0 if Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1
+end
+
+# Patch RAILS 4.0 to not use millisecond precision
+if Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR < 1
+  module ActiveSupport
+    class TimeWithZone
+      def as_json(options = nil)
+        if ActiveSupport::JSON::Encoding.use_standard_json_time_format
+          xmlschema
+        else
+          %(#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
+        end
+      end
+    end
+  end
 end
 
 TestApp.initialize!
 
 require File.expand_path('../fixtures/active_record', __FILE__)
+
 JSONAPI.configuration.route_format = :underscored_route
 TestApp.routes.draw do
-  jsonapi_resources :authors
   jsonapi_resources :people
   jsonapi_resources :comments
   jsonapi_resources :tags
@@ -62,7 +79,6 @@ TestApp.routes.draw do
 
   namespace :api do
     namespace :v1 do
-      jsonapi_resources :authors
       jsonapi_resources :people
       jsonapi_resources :comments
       jsonapi_resources :tags
@@ -80,9 +96,6 @@ TestApp.routes.draw do
 
     JSONAPI.configuration.route_format = :underscored_route
     namespace :v2 do
-      jsonapi_resources :authors do
-      end
-
       jsonapi_resources :posts do
         jsonapi_link :author, except: [:destroy]
       end
@@ -123,6 +136,7 @@ TestApp.routes.draw do
       jsonapi_resources :posts do
       end
 
+      jsonapi_resources :authors
       jsonapi_resources :expense_entries
       jsonapi_resources :iso_currencies
 
@@ -133,18 +147,28 @@ TestApp.routes.draw do
   end
 end
 
-class MiniTest::Unit::TestCase
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+class Minitest::Test
   include Helpers::HashHelpers
   include Helpers::ValueMatchers
   include Helpers::FunctionalHelpers
 end
 
 class ActiveSupport::TestCase
+  self.fixture_path = "#{Rails.root}/fixtures"
+  fixtures :all
   setup do
     @routes = TestApp.routes
   end
 end
 
+class ActionDispatch::IntegrationTest
+  self.fixture_path = "#{Rails.root}/fixtures"
+  fixtures :all
+end
+
 class UpperCamelizedKeyFormatter < JSONAPI::KeyFormatter
   class << self
     def format(key)
@@ -152,7 +176,7 @@ class UpperCamelizedKeyFormatter < JSONAPI::KeyFormatter
     end
 
     def unformat(formatted_key)
-      formatted_key.to_s.underscore.to_sym
+      formatted_key.to_s.underscore
     end
   end
 end

data/test/unit/jsonapi_request/jsonapi_request_test.rb

@@ -0,0 +1,152 @@
+require File.expand_path('../../../test_helper', __FILE__)
+
+class JSONAPIRequestTest < ActiveSupport::TestCase
+  def test_parse_includes_underscored
+    params = ActionController::Parameters.new(
+      {
+        controller: 'expense_entries',
+        action: 'index',
+        include: 'iso_currency'
+      }
+    )
+
+    request = JSONAPI::Request.new(
+      params,
+      {
+        context: nil,
+        key_formatter: JSONAPI::Formatter.formatter_for(:underscored_key)
+      }
+    )
+
+    assert request.errors.empty?
+  end
+
+  def test_parse_dasherized_with_dasherized_include
+    params = ActionController::Parameters.new(
+      {
+        controller: 'expense_entries',
+        action: 'index',
+        include: 'iso-currency'
+      }
+    )
+
+    request = JSONAPI::Request.new(
+      params,
+      {
+        context: nil,
+        key_formatter: JSONAPI::Formatter.formatter_for(:dasherized_key)
+      }
+    )
+
+    assert request.errors.empty?
+  end
+
+  def test_parse_dasherized_with_underscored_include
+    params = ActionController::Parameters.new(
+      {
+        controller: 'expense_entries',
+        action: 'index',
+        include: 'iso_currency'
+      }
+    )
+
+    request = JSONAPI::Request.new(
+      params,
+      {
+        context: nil,
+        key_formatter: JSONAPI::Formatter.formatter_for(:dasherized_key)
+      }
+    )
+
+    refute request.errors.empty?
+    assert_equal 'iso_currency is not a valid association of expense-entries', request.errors[0].detail
+  end
+
+  def test_parse_fields_underscored
+    params = ActionController::Parameters.new(
+      {
+        controller: 'expense_entries',
+        action: 'index',
+        fields: {expense_entries: 'iso_currency'}
+      }
+    )
+
+    request = JSONAPI::Request.new(
+      params,
+      {
+        context: nil,
+        key_formatter: JSONAPI::Formatter.formatter_for(:underscored_key)
+      }
+    )
+
+    assert request.errors.empty?
+  end
+
+  def test_parse_dasherized_with_dasherized_fields
+    params = ActionController::Parameters.new(
+      {
+        controller: 'expense_entries',
+        action: 'index',
+        fields: {
+          'expense-entries' => 'iso-currency'
+        }
+      }
+    )
+
+    request = JSONAPI::Request.new(
+      params,
+      {
+        context: nil,
+        key_formatter: JSONAPI::Formatter.formatter_for(:dasherized_key)
+      }
+    )
+
+    assert request.errors.empty?
+  end
+
+  def test_parse_dasherized_with_underscored_fields
+    params = ActionController::Parameters.new(
+      {
+        controller: 'expense_entries',
+        action: 'index',
+        fields: {
+          'expense-entries' => 'iso_currency'
+        }
+      }
+    )
+
+    request = JSONAPI::Request.new(
+      params,
+      {
+        context: nil,
+        key_formatter: JSONAPI::Formatter.formatter_for(:dasherized_key)
+      }
+    )
+
+    refute request.errors.empty?
+    assert_equal 'iso_currency is not a valid field for expense-entries.', request.errors[0].detail
+  end
+
+  def test_parse_dasherized_with_underscored_resource
+    params = ActionController::Parameters.new(
+      {
+        controller: 'expense_entries',
+        action: 'index',
+        fields: {
+          'expense_entries' => 'iso-currency'
+        }
+      }
+    )
+
+    request = JSONAPI::Request.new(
+      params,
+      {
+        context: nil,
+        key_formatter: JSONAPI::Formatter.formatter_for(:dasherized_key)
+      }
+    )
+
+    refute request.errors.empty?
+    assert_equal 'expense_entries is not a valid resource.', request.errors[0].detail
+  end
+end

data/test/unit/operation/operations_processor_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../../../test_helper', __FILE__)
-require File.expand_path('../../../fixtures/active_record', __FILE__)
 
 require 'jsonapi/operation'
 require 'jsonapi/operation_result'
@@ -55,7 +54,7 @@ class TestOperationsProcessor < JSONAPI::OperationsProcessor
   end
 end
 
-class OperationsProcessorTest < MiniTest::Unit::TestCase
+class OperationsProcessorTest < Minitest::Test
   def setup
     betax = Planet.find(5)
     betay = Planet.find(6)
@@ -129,6 +128,18 @@ class OperationsProcessorTest < MiniTest::Unit::TestCase
     saturn.reload
     assert_equal(saturn.planet_type_id, gas_giant.id)
 
+    # Remove link
+    operations = [
+      JSONAPI::ReplaceHasOneAssociationOperation.new(PlanetResource, saturn.id, :planet_type, nil)
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    results = op.process(request)
+    saturn.reload
+    assert_equal(saturn.planet_type_id, nil)
+
     # Reset
     operations = [
       JSONAPI::ReplaceHasOneAssociationOperation.new(PlanetResource, saturn.id, :planet_type, 5)

data/test/unit/resource/resource_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../../../test_helper', __FILE__)
-require File.expand_path('../../../fixtures/active_record', __FILE__)
 
 class ArticleResource < JSONAPI::Resource
   model_name 'Post'
@@ -18,7 +17,29 @@ class CatResource < JSONAPI::Resource
   has_one :father, class_name: 'Cat'
 end
 
-class ResourceTest < MiniTest::Unit::TestCase
+class PersonWithCustomRecordsForResource < PersonResource
+  def records_for(association_name, context)
+    :records_for
+  end
+end
+
+class PersonWithCustomRecordsForRelationshipsResource < PersonResource
+  def records_for_posts(options = {})
+    :records_for_posts
+  end
+  def record_for_preferences(options = {})
+    :record_for_preferences
+  end
+end
+
+class PersonWithCustomRecordsForErrorResource < PersonResource
+  class AuthorizationError < StandardError; end
+  def records_for(association_name, context)
+    raise AuthorizationError
+  end
+end
+
+class ResourceTest < ActiveSupport::TestCase
   def setup
     @post = Post.first
   end
@@ -41,7 +62,7 @@ class ResourceTest < MiniTest::Unit::TestCase
     assert_equal(attrs.keys.size, 3)
   end
 
-  def test_class_assosications
+  def test_class_associations
     associations = CatResource._associations
     assert_kind_of(Hash, associations)
     assert_equal(associations.size, 2)
@@ -55,25 +76,59 @@ class ResourceTest < MiniTest::Unit::TestCase
     refute(posts.include?(Post.find(3)))
   end
 
-  def test_find_by_key_with_customized_base_records
+  def test_records_for
     author = Person.find(1)
+    preferences = Preferences.first
+    refute(preferences == nil)
+    author.update! preferences: preferences
+    author_resource = PersonResource.new(author)
+    assert_equal(author_resource.preferences.model, preferences)
+
+    author_resource = PersonWithCustomRecordsForResource.new(author)
+    assert_equal(author_resource.preferences.model, :records_for)
+
+    author_resource = PersonWithCustomRecordsForErrorResource.new(author)
+    assert_raises PersonWithCustomRecordsForErrorResource::AuthorizationError do
+      author_resource.posts
+    end
+  end
 
-    post = ArticleResource.find_by_key(1, context: author).model
-    assert_equal(post, Post.find(1))
+  def test_records_for_meta_method_for_has_one
+    author = Person.find(1)
+    author.update! preferences: Preferences.first
+    author_resource = PersonWithCustomRecordsForRelationshipsResource.new(author)
+    assert_equal(author_resource.record_for_preferences, :record_for_preferences)
+  end
 
-    assert_raises JSONAPI::Exceptions::RecordNotFound do
-      ArticleResource.find_by_key(3, context: author).model
-    end
+  def test_records_for_meta_method_for_has_one_calling_records_for
+    author = Person.find(1)
+    author.update! preferences: Preferences.first
+    author_resource = PersonWithCustomRecordsForResource.new(author)
+    assert_equal(author_resource.record_for_preferences, :records_for)
   end
 
-  def test_find_by_keys_with_customized_base_records
+  def test_associated_records_meta_method_for_has_many
     author = Person.find(1)
+    author.posts << Post.find(1)
+    author_resource = PersonWithCustomRecordsForRelationshipsResource.new(author)
+    assert_equal(author_resource.records_for_posts, :records_for_posts)
+  end
 
-    posts = ArticleResource.find_by_keys([1, 2], context: author)
-    assert_equal(posts.length, 2)
+  def test_associated_records_meta_method_for_has_many_calling_records_for
+    author = Person.find(1)
+    author.posts << Post.find(1)
+    author_resource = PersonWithCustomRecordsForResource.new(author)
+    assert_equal(author_resource.records_for_posts, :records_for)
+  end
+
+  def test_find_by_key_with_customized_base_records
+    author = Person.find(1)
+
+    post = ArticleResource.find_by_key(1, context: author).model
+    assert_equal(post, Post.find(1))
 
     assert_raises JSONAPI::Exceptions::RecordNotFound do
-      ArticleResource.find_by_keys([1, 3], context: author).model
+      ArticleResource.find_by_key(3, context: author).model
     end
   end