active_dynamic 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e3a6c7d16108bd7a5689a0d8d125b01bc5cdce0
-  data.tar.gz: a3db6ea5125ece2d63e5189f13246653e011d824
+  metadata.gz: 06893fd851d9cb515ef8301c30c90225e095d4b9
+  data.tar.gz: 176497655badfaac02c1fef76928d670f1709431
 SHA512:
-  metadata.gz: d02e4a617c3bd878080bd2bd8a16d76c1a72b8ed3ad29c246878beeaf98a92fe9f7f9438b9d4f39276ebaf5b7af64e8c86391a52268083a43a83390f9130f122
-  data.tar.gz: cb529e4b253ae05eb99811f75bb8ff99e3da13d10b126110be088aca6513fe7b138d1dfa5d3068cba3a7baaf72d6c9de48a9aafbcb2fcf975ec5c477f1b11ebf
+  metadata.gz: f15edb3f106ced0263bed6ca0d02c547a58d4e63f07fb5abdcf03913f0744e87f335fec9544055834f91e03fb3064a78409f63404ff28a61cc74f88d63985a05
+  data.tar.gz: 5fd59c3c82d8585dc7a1c176e3524f8379d83e1475129710a434e18bf2921dce2a97a4f8d72dc375c18ae9494bdd292a4a70c8fca85e6337cb25ba843a4bce8e

data/README.md

@@ -30,7 +30,7 @@ attributses. For example, if you have `Profile` model:
  
 ```ruby
 class Profile < ActiveRecord::Base
-  include DynamicAttributes::HasDynamicAttributes
+  include ActiveDynamic::HasDynamicAttributes
   
   # ...
 end  
@@ -57,8 +57,8 @@ class ProfileAttributeProvider
   def call
     [
       # attribute definition has to specify attribute name, datatype, and optionally default value
-      ActiveDynamic::AttributeDefinition.new('age', ActiveDynamic::DataType::Integer, 18),
-      ActiveDynamic::AttributeDefinition.new('biography', ActiveDynamic::DataType::Text)
+      ActiveDynamic::AttributeDefinition.new('age', datatype: ActiveDynamic::DataType::Integer, default_value: 18),
+      ActiveDynamic::AttributeDefinition.new('biography', datatype: ActiveDynamic::DataType::Text)
     ]
   end
   

data/lib/active_dynamic/attribute.rb

@@ -4,6 +4,5 @@ module ActiveDynamic
 
     self.table_name = 'active_dynamic_attributes'
     validates :name, presence: true
-    validates :datatype, presence: true, inclusion: DataType::All
   end
 end

data/lib/active_dynamic/attribute_definition.rb

@@ -1,4 +1,14 @@
 module ActiveDynamic
-  class AttributeDefinition < Struct.new(:name, :datatype, :value)
+  class AttributeDefinition
+
+    attr_reader :display_name, :name, :datatype, :value
+
+    def initialize(display_name, options = {})
+      @display_name = display_name
+      @name = options[:system_name] || display_name.gsub(/[^a-zA-Z\s]/, ''.freeze).gsub(/\s+/, '_'.freeze)
+      @datatype = options[:datatype]
+      @value = options[:default_value]
+    end
+
   end
 end

data/lib/active_dynamic/data_type.rb

@@ -6,7 +6,5 @@ module ActiveDynamic
     Decimal = 3
     Date = 4
     DateTime = 5
-
-    All = [String, Text, Integer, Decimal]
   end
 end

data/lib/active_dynamic/has_dynamic_attributes.rb

@@ -13,7 +13,7 @@ module ActiveDynamic
       if persisted?
         active_dynamic_attributes.order(:created_at)
       else
-        ActiveDynamic.configuration.provider_class.new(self).call
+        ActiveDynamic.configuration.provider_class.new(self.class).call
       end
     end
 
@@ -54,7 +54,9 @@ module ActiveDynamic
 
     def save_dynamic_attributes
       dynamic_attributes.each do |field|
-        attr = self.active_dynamic_attributes.find_or_initialize_by(name: field.name, datatype: field.datatype)
+        props = { name: field.name, display_name: field.display_name,
+                  datatype: field.datatype, value: field.value }
+        attr = self.active_dynamic_attributes.find_or_initialize_by(props)
         if _custom_fields[field.name]
           if self.persisted?
             attr.update(value: _custom_fields[field.name])

data/lib/active_dynamic/migration.rb

@@ -5,6 +5,7 @@ class CreateActiveDynamicAttributesTable < ActiveRecord::Migration[4.2]
       t.integer :customizable_id, null: false
       t.string :customizable_type, limit: 50
 
+      t.string :display_name, null: false
       t.string :name, null: false
       t.text :value
       t.integer :datatype, null: false

data/lib/active_dynamic/version.rb

@@ -1,3 +1,3 @@
 module ActiveDynamic
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_dynamic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Constantine Lebedev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord