entasis 0.5.0.rc1 → 0.5.0.rc2

data/README.md

@@ -2,6 +2,7 @@ entasis
 =======
 
 [![Build Status](https://secure.travis-ci.org/ingemar/entasis.png)](http://travis-ci.org/ingemar/entasis)
+[![Code Climate](https://codeclimate.com/github/ingemar/entasis.png)](https://codeclimate.com/github/ingemar/entasis)
 
 Entasis provides a few neat methods for building a basic class. Handy for models without a database.
 
@@ -11,6 +12,8 @@ Example:
 class Person
   include Entasis::Model
 
+  has_many :friends
+
   attributes :name, :age, :city
 
   def age=(years)
@@ -18,9 +21,22 @@ class Person
   end
 end
 
-hilda = Person.new(name: 'Hilda', age: '23', city: 'Stockholm')
-hilda.attribute_names # => ["name", "age", "city"]
-hilda.attributes      # => {"name"=>"Hilda", "age"=>23, "city"=>"Stockholm"}
+class Friend
+  include Entasis::Model
+
+  belongs_to :best_friend, class: 'Person'
+
+  attributes :name
+end
+
+
+hilda = Person.new(name: 'Hilda', age: '23', city: 'Stockholm', friends: [{ name: 'Emma' }, { name: 'Johan' }])
+
+hilda.attribute_names                  # => ["name", "age", "city"]
+hilda.attributes                       # => {"name"=>"Hilda", "age"=>23, "city"=>"Stockholm"}
+
+hilda.friends                          # => [#<Friend:0x0 @name="Emma">, #<Friend:0x1 @name="Johan">]
+hilda.friends[0].best_friend == hilda  # => true
 
 anon = Person.new
 anon.valid?           # => false
@@ -44,7 +60,8 @@ Contributors
 ------------
 
   - Ingemar Edsborn (ingemar)
-  - Joshua Davey (jgdavey)
-  - Johnny Winn (nurugger07)
+  - Gabriel Reis (greis)
   - Jack Christensen (jackc)
+  - Johnny Winn (nurugger07)
+  - Joshua Davey (jgdavey)
 

data/lib/entasis/model.rb

@@ -7,6 +7,7 @@ module Entasis
       include ActiveModel::Validations
       class_attribute :attribute_names, :attributes_config, :belongings, instance_writer: false
 
+      self.belongings ||= {}
       self.attribute_names ||= []
       self.class_eval 'class UnknownAttributeError < StandardError; end'
     end

data/lib/entasis/relations.rb

@@ -25,7 +25,7 @@ module Entasis
         options = relations.last.is_a?(Hash) ? relations.pop : {}
 
         relations.each do |relation|
-          relation_model = (options[:class] || relation).to_s.singularize.camelize.constantize
+          relation_model = options[:class] || relation.to_s.singularize.camelize
 
           self.class_eval <<-RUBY
             def #{relation}=(resources)
@@ -36,8 +36,8 @@ module Entasis
                   resource = #{relation_model}.new resource
                 end
 
-                if resource.belongs_to? self.class
-                  resource.send "\#{self.class.name.underscore}=", self
+                if inverse_relation = resource.belongings[self.class.to_s]
+                  resource.send "\#{inverse_relation}=", self
                 end
 
                 @#{relation} << resource
@@ -55,18 +55,21 @@ module Entasis
       # To complete the inverse relationship and tie two models togeter
       # specify the +belongs_to+ relationship.
       #
+      # Last argument can be an options hash:
+      #
+      #   class: provide a custom class name
+      #
       def belongs_to(*relations)
         options = relations.last.is_a?(Hash) ? relations.pop : {}
 
-        self.belongings ||= []
-        self.belongings += relations.map(&:to_s).sort
+        relations.each do |relation|
+          relation_model = options[:class] || relation.to_s.singularize.camelize
+
+          self.belongings[relation_model] = relation
+        end
 
         attr_accessor *relations
       end
     end
-
-    def belongs_to?(model)
-      self.belongings.include? model.to_s.underscore
-    end
   end
 end

data/lib/entasis/version.rb

@@ -1,3 +1,3 @@
 module Entasis
-  VERSION = "0.5.0.rc1"
+  VERSION = "0.5.0.rc2"
 end

data/spec/relations_spec.rb

@@ -5,12 +5,14 @@ describe Entasis::Relations do
     {
       name: 'Volvo',
       people: [{ name: 'Aslog' }],
-      passengers: [{ name: 'Gunnar' }]
+      passengers: [{ name: 'Gunnar' }],
+      destinations: [{ name: 'Stockholm' }]
     }
   end
   let(:car) { Car.new }
   let(:person) { car.people.first }
   let(:passenger) { car.passengers.first }
+  let(:destination) { car.destinations.first }
 
   describe '#attributes=' do
     before { car.attributes = attributes }
@@ -31,5 +33,18 @@ describe Entasis::Relations do
         expect(passenger.car).to eq(car)
       end
     end
+
+    context 'subclasses' do
+      it 'creates a new instance of the relation' do
+        expect(destination).to be_a(Car::Destination)
+        expect(destination.name).to eq('Stockholm')
+      end
+    end
+
+    context 'when belongs_to was given a custom class name' do
+      it 'sets the correct relation' do
+        expect(destination.transportation).to eq(car)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entasis
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc1
+  version: 0.5.0.rc2
   prerelease: 6
 platform: ruby
 authors: