embedded 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dad0317dedc0a4f5a2bc155d667f6b4131ba67d3ed03c225f387deb68c3187c9
-  data.tar.gz: ea2b00691c5431639e3991afb3b0dc86bc87702f749f7fe695e55c6932ea6a1e
+  metadata.gz: f0cb08595d317787cfd5ca6b9de7fa50e6800eeeb3607466192816e65eb99099
+  data.tar.gz: 0e0daa41abd96d62c02316fa7a432b2af8764faf92fbf1d0b188ce480b005a7f
 SHA512:
-  metadata.gz: d1c1e2ff032c40c27938ae4af252ceb1d2b261f2b4d7ab01e6dd4d4421094e6fa09886a7b011a4dbe5f75898390eec0874646c0c3ba38604f54376f34944f3c7
-  data.tar.gz: 534cd2314130b599c428a6ef898b09624d8ca2728c10bf4d5d858b0938809eb00a9f0b9a2c11140c8cb3fd274d95ac3318b9e4af3d98b48cb011ac1d8a18cfd7
+  metadata.gz: a7da9b8d21c25d77f32a3055e3218b13a59b0ce677862cc10a922e0534e1ff6f22c06ce6c4f5a5df9f10a40551837d5d01e4b1c8ee55864eff0050d60f166196
+  data.tar.gz: f4f78dd54363b5a0fc9400e0708edc7381b74f9f6326ddaaa1b176c2b867e133eef3b36141c277b5d6e96266c2204993b2dc560cac48d6d1d5b744979658597e

data/README.md

@@ -164,8 +164,9 @@ Also you can persist the reservation, and when fetching it back from the db its
 
 ### Database Mapping
 
-Your table columns have to be named in a specific way so they are mapped correctly, for example:
+The default convention column mapping is the value object name as prefix and the value object attribute as suffix.
 
+Example:
 If Reservation attribute name is scheduled_time and its TimeInterval has start_time and end_time attributes, your column names should be defined as followed:
 
 ```ruby
@@ -196,6 +197,47 @@ class CreateShops < ActiveRecord::Migration
 end
 ```
 
+We can override this convetion if you pass attrs argument as hash where you define the mapping. 
+
+Example: 
+```ruby
+class PersonalDocument
+  attr_reader :number, :type
+
+  def initialize(values = {})
+    @number = values.fetch(:number)
+    @type = values.fetch(:type)
+  end
+
+  def ==(other)
+    return false if !other.is_a?(PersonalDocument)
+
+    @number == other.number && @type == other.type
+  end
+end
+
+class Person < ApplicationRecord
+  embeds :identification, attrs: { 
+    number: id_number, 
+    type: id_type
+  }, class_name: 'PersonalDocument'
+end
+
+class CreatePeople < ActiveRecord::Migration
+  def change
+    create_table :people do |t|
+      t.string :id_number
+      t.string :id_type
+
+      t.timestamps
+    end
+
+    add_index :people, :id_number
+    add_index :people, :id_type
+  end
+end
+```
+
 ### Querying
 
 For example you have now a model that has prices in different currencies. 

data/lib/embedded/model.rb

@@ -3,8 +3,14 @@ module Embedded
     ScopeMethod = ActiveRecord::VERSION::MAJOR >= 4 ? :all.freeze : :scoped.freeze
 
     def embedded_column_names(embeddable_attr, attributes)
-      attributes.inject({}) do |hash, a|
-        hash.merge(:"#{embeddable_attr}_#{a}" => a)
+      if attributes.is_a?(Array)
+        attributes.inject({}) do |hash, a|
+          hash.merge(:"#{embeddable_attr}_#{a}" => a)
+        end
+      elsif attributes.is_a?(Hash)
+        attributes.invert
+      else
+        raise ArgumentError.new('invalid attributes')
       end
     end
 

data/lib/embedded/scope.rb

@@ -6,8 +6,16 @@ module Embedded
     end
 
     def embedded_attributes_for(embeddable_attr, value = nil)
-      @attributes[embeddable_attr][:attrs].inject({}) do |a,attr|
-        a.merge(:"#{embeddable_attr}_#{attr}" => value ? value.send(attr) : nil)
+      attrs = @attributes[embeddable_attr][:attrs]
+
+      if attrs.is_a?(Array)
+        attrs.inject({}) do |a,attr|
+          a.merge(:"#{embeddable_attr}_#{attr}" => value ? value.send(attr) : nil)
+        end
+      elsif attrs.is_a?(Hash)
+        attrs.inject({}) do |a,(attr,column)| 
+          a.merge(column => value ? value.send(attr) : nil)
+        end
       end
     end
 

data/lib/embedded/version.rb

@@ -1,3 +1,3 @@
 module Embedded
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedded
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - jvillarejo