soulless 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3da6f6da8006ae59da0d6b1266c2d2882042d15
-  data.tar.gz: 59054e7d56f394f0f81bad19f22fd1029efa7198
+  metadata.gz: 9c1f160a2c6aaa4efd1cd39b4c5b73683137fce6
+  data.tar.gz: beb42ee6b2e877e084709d20a51ffb20b13616ee
 SHA512:
-  metadata.gz: b36b03a5ccd3f4e6700caa0b072a8ccf819d4d42c5d4076ef6641ef7a99a35ed335e24dc6a53e115f53abde94e872b1d569919e29d19cc2131ae9b20306ddb46
-  data.tar.gz: 9ff554ead5d5fe0eaed31d8841e5dbaccc0bdae59dc4afa2f9bcd9b9a25be1c146e7a0436bbc8a7829e96e1a1cd085bb019e7638cd9510f91d4a13b00f7f6b99
+  metadata.gz: dd8f3ae03fe3d0a168e1c9b62b4bfb1659fb35898f3c0e960db0ec79be30dfb40f003d9ec8d7db942362b4eb58b9f94bdf337a04e035734c002ac5e1456e5560
+  data.tar.gz: 556ccdfa0bdceaad7062ca2b83191cc6c8b57452f61f2c0288b892e73380fccfda272d8dd4b0dafb278fd66768782b4784ee16cc8c47910d840caf35d2d5ada6

data/README.md

@@ -183,6 +183,22 @@ class Person
 end
 ```
 
+Your association has access to it's ```parent``` object as well.
+
+```ruby
+class Person
+  include Soulless.model
+  
+  attribute :name, String
+  
+  validates :name, presence: true
+  
+  has_one :children do
+    attribute :name, String, default: lambda { "#{parent.name} Jr." }
+  end
+end
+```
+
 When you need to make sure an association is valid before processing the object use ```validates_associated```.
 
 ```ruby
@@ -196,6 +212,8 @@ class Person
     validates :name, presence: true
   end
   
+  validates_associated :spouse
+  
   ...
   
 end

data/lib/soulless/accessors.rb

@@ -0,0 +1,51 @@
+module Soulless
+  module Accessors
+    private
+    def init_accessors(attributes)
+      setup_attribute_methods(attributes)
+      define_attribute_accessors(attributes)
+    end
+    
+    def setup_attribute_methods(attributes)
+      self.class.define_attribute_methods(attributes)
+    end
+    
+    def define_attribute_accessors(attributes)
+      attributes.each do |attribute|
+        define_reader(attribute)
+        define_writer(attribute)
+      end
+    end
+    
+    def define_reader(attribute)
+      self.class.send(:define_method, "#{attribute}".to_sym) do
+        instance_variable_get("@#{attribute}")
+      end
+    end
+    
+    def define_writer(attribute)
+      self.class.send(:define_method, "#{attribute}=".to_sym) do |value|
+        define_dirty_writer(attribute, value)
+        super(value)
+        define_association_writer(attribute)
+      end
+    end
+    
+    def define_dirty_writer(attribute, value)
+      send("#{attribute}_will_change!") unless instance_variable_get("@#{attribute}") == value
+    end
+    
+    def define_association_writer(attribute)
+      association_attributes = self.class.association_attributes
+      if association_attributes && association_attributes.include?(attribute)
+        association = send(attribute)
+        return if association.nil?
+        if association.kind_of?(Array)
+          association.each { |child| child.parent = self }
+        else
+          association.parent = self
+        end
+      end
+    end
+  end
+end

data/lib/soulless/associations.rb

@@ -1,7 +1,13 @@
 module Soulless
   module Associations
     def self.included(base)
-      base.instance_eval do |object|
+      base.instance_eval do
+        @association_attributes = []
+        
+        class << self
+          attr_reader :association_attributes
+        end
+        
         def has_one(name, superclass = Object, &block)
           klass = define_virtus_class(name, superclass, &block)
           send(:attribute, name, klass)
@@ -14,9 +20,11 @@ module Soulless
         
         private
         def define_virtus_class(name, superclass, &block)
+          @association_attributes << name
           klass_name = name.to_s.singularize.classify + '_' + SecureRandom.hex
           klass = const_set(klass_name, Class.new(superclass))
           klass.send(:include, Soulless.model) unless klass.included_modules.include?(Model)
+          klass.send(:attr_accessor, :parent)
           klass.instance_eval(&block) if block_given?
           klass.model_name.instance_variable_set(:@i18n_key, klass.model_name.i18n_key.to_s.gsub(/_[^_]+$/, '').underscore.to_sym)
           klass

data/lib/soulless/dirty.rb

@@ -1,48 +1,13 @@
 module Soulless
   module Dirty
-    def self.included(base)
-      base.class_eval do
-        def initialize(params = {})
-          super
-          init_dirty(attribute_set.map { |a| a.name })
-        end
-        
-        private
-        def init_dirty(attributes)
-          define_dirty_attributes(attributes)
-          define_dirty_methods(attributes)
-          @changed_attributes = {}
-        end
-        
-        def changes_applied
-          @previously_changed = changed
-          @changed_attributes = {}
-        end
-        
-        def define_dirty_attributes(attributes)
-          self.class.define_attribute_methods(attributes)
-        end
-        
-        def define_dirty_methods(attributes)
-          attributes.each do |attribute|
-            define_dirty_reader(attribute)
-            define_dirty_writer(attribute)
-          end
-        end
-        
-        def define_dirty_reader(name)
-          self.class.send(:define_method, "#{name}".to_sym) do
-            instance_variable_get("@#{name}")
-          end
-        end
-        
-        def define_dirty_writer(name)
-          self.class.send(:define_method, "#{name}=".to_sym) do |value|
-            send("#{name}_will_change!") unless instance_variable_get("@#{name}") == value
-            super(value)
-          end
-        end
-      end
+    private
+    def init_dirty
+      @changed_attributes = {}
+    end
+      
+    def changes_applied
+      @previously_changed = changed
+      @changed_attributes = {}
     end
   end
 end

data/lib/soulless/model.rb

@@ -14,6 +14,12 @@ module Soulless
           end
         end
         
+        def initialize(params = {})
+          super
+          init_dirty
+          init_accessors(attribute_set.map { |a| a.name })
+        end
+        
         def persisted?
           false
         end

data/lib/soulless/version.rb

@@ -1,3 +1,3 @@
 module Soulless
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/soulless.rb

@@ -3,6 +3,7 @@ require 'securerandom'
 require 'active_support'
 require 'active_model'
 
+require 'soulless/accessors'
 require 'soulless/associations'
 require 'soulless/dirty'
 require 'soulless/model'
@@ -20,6 +21,7 @@ module Soulless
       object.send(:include, Associations)
       object.send(:include, Validations)
       object.send(:include, Dirty)
+      object.send(:include, Accessors)
     end
     mod
   end

data/spec/associations_spec.rb

@@ -29,6 +29,16 @@ describe Soulless::Associations do
       @dummy_class.dummy_clone.save
       @dummy_class.dummy_clone.errors[:name][0].should == 'this is a test'
     end
+    
+    it 'should have a parent assigned during initialization' do
+      @dummy_class = DummyAssociation.new(spouse: { name: 'Megan' })
+      @dummy_class.spouse.parent.should == @dummy_class
+    end
+    
+    it 'should have a parent assigned when set after initialization' do
+      @dummy_class.spouse = { name: 'Megan' }
+      @dummy_class.spouse.parent.should == @dummy_class
+    end
   end
   
   describe 'has_many' do
@@ -41,5 +51,15 @@ describe Soulless::Associations do
       @dummy_class.dummy_clones = [{ name: 'Biff' }]
       @dummy_class.dummy_clones[0].class.name.should match(/\ADummyAssociation::DummyClone/)
     end
+    
+    it 'should have a parent assigned during initialization' do
+      @dummy_class = DummyAssociation.new(friends: [{ name: 'Yaw' }])
+      @dummy_class.friends[0].parent.should == @dummy_class
+    end
+    
+    it 'should have a parent assigned when set after initialization' do
+      @dummy_class.friends = [{ name: 'Yaw' }]
+      @dummy_class.friends[0].parent.should == @dummy_class
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soulless
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Anthony Smith
@@ -122,6 +122,7 @@ files:
 - README.md
 - Rakefile
 - lib/soulless.rb
+- lib/soulless/accessors.rb
 - lib/soulless/associations.rb
 - lib/soulless/dirty.rb
 - lib/soulless/locale/en.yml