Merge pull request #328 from cerebris/init_from_model

Init from model

Author: dgeb

README.md

@@ -262,7 +262,7 @@ end
 
 The relationship methods (`relationship`, `has_one`, and `has_many`) support the following options:
 
- * `class_name` - a string specifying the underlying class for the related resource
+ * `class_name` - a string specifying the underlying class for the related resource. Defaults to the `class_name` property on the underlying model.
  * `foreign_key` - the method on the resource used to fetch the related resource. Defaults to `<resource_name>_id` for has_one and `<resource_name>_ids` for has_many relationships.
  * `acts_as_set` - allows the entire set of related records to be replaced in one operation. Defaults to false if not set.
  * `polymorphic` - set to true to identify relationships that are polymorphic.

lib/jsonapi/resource.rb

@@ -673,6 +673,15 @@ def _add_relationship(klass, *attrs)
 
         attrs.each do |attr|
           check_reserved_relationship_name(attr)
+
+          # Initialize from an ActiveRecord model's properties
+          if _model_class < ActiveRecord::Base
+            model_association = _model_class.reflect_on_association(attr)
+            if model_association
+              options[:class_name] ||= model_association.class_name
+            end
+          end
+
           @_relationships[attr] = relationship = klass.new(attr, options)
 
           associated_records_method_name = case relationship

test/fixtures/active_record.rb

@@ -254,6 +254,21 @@ class Tag < ActiveRecord::Base
 class Section < ActiveRecord::Base
 end
 
+class HairCut < ActiveRecord::Base
+end
+
+class Property < ActiveRecord::Base
+end
+
+class Customer < ActiveRecord::Base
+end
+
+class BadlyNamedAttributes < ActiveRecord::Base
+end
+
+class Cat < ActiveRecord::Base
+end
+
 class IsoCurrency < ActiveRecord::Base
   self.primary_key = :code
   # has_many :expense_entries, foreign_key: 'currency_code'
@@ -422,13 +437,6 @@ class Product < ActiveRecord::Base
   has_one :picture, as: :imageable
 end
 
-### PORO Data - don't do this in a production app
-$breed_data = BreedData.new
-$breed_data.add(Breed.new(0, 'persian'))
-$breed_data.add(Breed.new(1, 'siamese'))
-$breed_data.add(Breed.new(2, 'sphinx'))
-$breed_data.add(Breed.new(3, 'to_delete'))
-
 ### OperationsProcessor
 class CountingActiveRecordOperationsProcessor < ActiveRecordOperationsProcessor
   after_find_operation do
@@ -896,8 +904,8 @@ def self.verify_key(key, context = nil)
 class PreferencesResource < JSONAPI::Resource
   attribute :advanced_mode
 
-  has_one :author, foreign_key: :person_id, class_name: 'Person'
-  has_many :friends, class_name: 'Person'
+  has_one :author, foreign_key: :person_id
+  has_many :friends
 
   def self.find_by_key(key, options = {})
     new(Preferences.first)
@@ -961,7 +969,7 @@ class PostResource < JSONAPI::Resource
       attribute :body
       attribute :subject
 
-      has_one :writer, foreign_key: 'author_id'
+      has_one :writer, foreign_key: 'author_id', class_name: 'Writer'
       has_one :section
       has_many :comments, acts_as_set: false
 
@@ -1246,30 +1254,9 @@ class BadlyNamedAttributesResource < JSONAPI::Resource
 end
 warn 'end testing Name Collisions'
 
-### PORO DATA
-gas_giant = PlanetType.create(name: 'Gas Giant')
-planetoid = PlanetType.create(name: 'Planetoid')
-terrestrial = PlanetType.create(name: 'Terrestrial')
-sulfuric = PlanetType.create(name: 'Sulfuric')
-unknown = PlanetType.create(name: 'unknown')
-
-saturn = Planet.create(name: 'Satern',
-                       description: 'Saturn is the sixth planet from the Sun and the second largest planet in the Solar System, after Jupiter.',
-                       planet_type_id: planetoid.id)
-titan = Moon.create(name:'Titan', description: 'Best known of the Saturn moons.', planet_id: saturn.id)
-crater1 = Crater.create(code:'S56D', description: 'Very large crater', moon_id: titan.id)
-crater2 = Crater.create(code:'A4D3', description: 'Small crater', moon_id: titan.id)
-makemake = Planet.create(name: 'Makemake', description: 'A small planetoid in the Kuiperbelt.', planet_type_id: planetoid.id)
-uranus = Planet.create(name: 'Uranus', description: 'Insert adolescent jokes here.', planet_type_id: gas_giant.id)
-jupiter = Planet.create(name: 'Jupiter', description: 'A gas giant.', planet_type_id: gas_giant.id)
-betax = Planet.create(name: 'Beta X', description: 'Newly discovered Planet X', planet_type_id: unknown.id)
-betay = Planet.create(name: 'Beta X', description: 'Newly discovered Planet Y', planet_type_id: unknown.id)
-betaz = Planet.create(name: 'Beta X', description: 'Newly discovered Planet Z', planet_type_id: unknown.id)
-betaw = Planet.create(name: 'Beta W', description: 'Newly discovered Planet W')
-Category.create(name: 'Category A', status: 'active')
-Category.create(name: 'Category B', status: 'active')
-Category.create(name: 'Category C', status: 'active')
-Category.create(name: 'Category D', status: 'inactive')
-Category.create(name: 'Category E', status: 'inactive')
-Category.create(name: 'Category F', status: 'inactive')
-Category.create(name: 'Category G', status: 'inactive')
+### PORO Data - don't do this in a production app
+$breed_data = BreedData.new
+$breed_data.add(Breed.new(0, 'persian'))
+$breed_data.add(Breed.new(1, 'siamese'))
+$breed_data.add(Breed.new(2, 'sphinx'))
+$breed_data.add(Breed.new(3, 'to_delete'))

test/fixtures/categories.yml

@@ -0,0 +1,35 @@
+category_a:
+  id: 1
+  name: Category A
+  status: active
+
+category_b:
+  id: 2
+  name: Category B
+  status: active
+
+category_c:
+  id: 3
+  name: Category C
+  status: active
+
+category_d:
+  id: 4
+  name: Category D
+  status: inactive
+
+category_e:
+  id: 5
+  name: Category E
+  status: inactive
+
+category_f:
+  id: 6
+  name: Category F
+  status: inactive
+
+category_g:
+  id: 7
+  name: Category G
+  status: inactive
+

test/fixtures/craters.yml

@@ -0,0 +1,9 @@
+crater1:
+  code: S56D
+  description: Very large crater
+  moon_id: 1
+
+crater2:
+  code: A4D3
+  description: Small crater
+  moon_id: 1

test/fixtures/moons.yml

@@ -0,0 +1,6 @@
+titan:
+  id: 1
+  name: Titan
+  description: Best known of the Saturn moons.
+  planet_id: 1
+

test/fixtures/planet_types.yml

@@ -0,0 +1,19 @@
+gas_giant:
+  id: 1
+  name: Gas Giant
+
+planetoid:
+  id: 2
+  name: Planetoid
+
+terrestrial:
+  id: 3
+  name: Terrestrial
+
+sulfuric:
+  id: 4
+  name: Sulfuric
+
+unknown:
+  id: 5
+  name: unknown

test/fixtures/planets.yml

@@ -0,0 +1,47 @@
+saturn:
+  id: 1
+  name: Satern
+  description: Saturn is the sixth planet from the Sun and the second largest planet in the Solar System, after Jupiter.
+  planet_type_id: 2
+
+makemake:
+  id: 2
+  name: Makemake
+  description: A small planetoid in the Kuiperbelt.
+  planet_type_id: 2
+
+uranus:
+  id: 3
+  name: Uranus
+  description: Insert adolescent jokes here.
+  planet_type_id: 1
+
+jupiter:
+  id: 4
+  name: Jupiter
+  description: A gas giant.
+  planet_type_id: 1
+
+betax:
+  id: 5
+  name: Beta X
+  description: Newly discovered Planet X
+  planet_type_id: 5
+
+betay:
+  id: 6
+  name: Beta X
+  description: Newly discovered Planet Y
+  planet_type_id: 5
+
+betaz:
+  id: 7
+  name: Beta X
+  description: Newly discovered Planet Z
+  planet_type_id: 5
+
+betaw:
+  id: 8
+  name: Beta W
+  description: Newly discovered Planet W
+  planet_type_id:

test/test_helper.rb

@@ -226,6 +226,14 @@ class Minitest::Test
   include Helpers::Assertions
   include Helpers::ValueMatchers
   include Helpers::FunctionalHelpers
+  include ActiveRecord::TestFixtures
+
+  def run_in_transaction?
+    true
+  end
+
+  self.fixture_path = "#{Rails.root}/fixtures"
+  fixtures :all
 end
 
 class ActiveSupport::TestCase