has_json_attributes_on 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3e46066738b802560e2c7aa03e2528d94c41e2
-  data.tar.gz: f6cac4d1a5f0520c2135c4d35b467cfcd4d073fd
+  metadata.gz: ba81d9925b53112ad1428e426467520d2c6ae6d1
+  data.tar.gz: 7755762a4ed521c56fe6f30d7c204652aea9a788
 SHA512:
-  metadata.gz: 1d08cc5459cf92c64e304eedacb47fd24be44ce75d5de1087f0299776600ea386f85d583dbc41ed2711268a1428e23fd3e49a73d0286d3382aaecfc4fa4b5783
-  data.tar.gz: 9f76ec22f60c8fd9b8d9819cf37bbed259e1a4abce8a7d8ab1b6356f6423825d793aaab08353c7b98359e5d4b39f51b29753b42dd73c9c821f2ce90aa2900bdd
+  metadata.gz: b536608bf77cbedbdeb1080af3ffa17851d6e8af93a2fdee7b95cb649110c69809cb844fd329d43fec687a0e5d3990ce095fdf0ddf730cc2e66f33e8d1f2ede8
+  data.tar.gz: 438acfb2649fb64aaa71445c264c90d0f6c9ad183fd1b3fce971f002592ce0a368fc59f834ed9e0354de587747e25a65f8f8096c1ef7b813e66911d841621a5d

data/lib/has_json_attributes_on/type/json_type.rb

@@ -43,11 +43,28 @@ module HasJsonAttributesOn
 
           klazz = Class.new do
             include Virtus.model
+            cattr_accessor :type_name, :klazz_name
 
             attrs.each do |attr_name, attr_type_key|
               attribute attr_name.to_sym, AXIOMS[attr_type_key]
             end
 
+            def  self.type_name
+              @type_name
+            end
+
+            def  self.type_name=(v)
+              @type_name = v
+            end
+
+            def  self.type_name
+              @klazz_name
+            end
+
+            def  self.type_name=(v)
+              @klazz_name = v
+            end
+
             def self.inspect
               _attrs = attribute_set.instance_variable_get("@attributes").map{|x| [x.name, x.type.inspect].join(":")}.join(", ")
               "<#{name}  type => #{type_name}  attribute_set => [#{_attrs}]>"
@@ -57,27 +74,96 @@ module HasJsonAttributesOn
               self.inspect
             end
           end
+          klazz.klazz_name = klazz_name
+          klazz.type_name = type_name
           return model.send(:const_set, klazz_name, klazz)
         end
-      end
 
-      def initialize(model, data_column, attrs = {})
-        @virtus_model = self.class.build_virtus_model(model, data_column, attrs)
-      end
+        def build_serializer(model, data_column, attrs = {})
+          type_name = self.name
+          validate_virtus_model_attr_options!(model, attrs)
+          klazz_name = data_column.to_s.camelize + "DynamicTypeSerializer"
+          virtus_model = build_virtus_model(model, data_column, attrs)
 
-      def type_cast_from_user(value)
-        @virtus_model.new(value)
-      end
+          klazz = Class.new() do
+            cattr_accessor :klazz_name, :virtus_model, :model, :data_column, :attrs
 
-      def type_cast_from_database(value)
-        @virtus_model.new(super(value))
-      end
+            def self.is_my_type?(v)
+              v.is_a?(virtus_model)
+            end
+
+            def  self.attrs
+              @attrs
+            end
+
+            def  self.attrs=(v)
+              @attrs = v
+            end
+
+            def  self.data_column
+              @data_column
+            end
+
+            def  self.data_column=(v)
+              @data_column = v
+            end
+
+            def  self.model
+              @model
+            end
 
-      def type_cast_for_database(value)
-        if value.is_a?(@virtus_model)
-          ::ActiveSupport::JSON.encode(value)
-        else
-          super
+            def  self.model=(v)
+              @model = v
+            end
+
+            def  self.klazz_name
+              @klazz_name
+            end
+
+            def  self.klazz_name=(v)
+              @klazz_name = v
+            end
+
+            def self.virtus_model=(v)
+              @virtus_model = v
+            end
+
+            def self.virtus_model
+              @virtus_model
+            end
+
+            def self.load(value)
+              begin
+                if (value.is_a?(String))
+                  value = JSON.load(value)
+                end
+                return @virtus_model.new(value)
+              rescue Exception => e
+                Rails.logger.warn("#{name} for model #{model.name} threw an exception within self.load, #{e.class} => #{e.message}")
+                return @virtus_model.new
+              end
+            end
+
+            def self.dump(value)
+              ActiveSupport::JSON.encode(value)
+            end
+
+            def self.inspect
+              "<#{name} \n virtus_model => #{self.virtus_model.inspect} \n model => #{self.model.inspect} \n data_column => #{self.data_column} \n attrs => #{self.attrs.inspect} >"
+            end
+
+            def self.to_s
+              self.inspect
+            end
+          end
+
+          klazz.virtus_model = virtus_model
+          klazz.klazz_name = klazz_name
+          klazz.model = model
+          klazz.data_column = data_column
+          klazz.attrs = attrs
+
+          return model.send(:const_set, klazz_name, klazz)
         end
       end
     end

data/lib/has_json_attributes_on/version.rb

@@ -1,3 +1,3 @@
 module HasJsonAttributesOn
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/has_json_attributes_on.rb

@@ -11,7 +11,7 @@ module HasJsonAttributesOn
   }
 
   included do
-    extend Forwardable
+    # extend Forwardable
   end
 
   class_methods do
@@ -86,6 +86,7 @@ module HasJsonAttributesOn
 
     def build_json_attributes(data_column, data_column_sql_type, accessors)
 
+
       cattr_accessor :_json_attributes_on
       self._json_attributes_on ||= {}.symbolize_keys
       self._json_attributes_on[data_column] ||= {
@@ -93,10 +94,9 @@ module HasJsonAttributesOn
         types: {},
         default_values: {},
         validations: {},
-        delegators: [],
         data_column_sql_type: data_column_sql_type,
         value_type_class: VALUE_TYPE_CLASSES[data_column_sql_type.to_s],
-        value_type_instance: nil
+        serializer_klazz: nil
       }.symbolize_keys
 
       self._json_attributes_on[data_column][:accessors].merge!(accessors)
@@ -105,15 +105,44 @@ module HasJsonAttributesOn
         self._json_attributes_on[data_column][:validations][_accessor_attribute] = options[:validates] if options[:validates]
         self._json_attributes_on[data_column][:default_values][_accessor_attribute] = options[:default]
         self._json_attributes_on[data_column][:types][_accessor_attribute] = options[:type] || 'String'
-        self._json_attributes_on[data_column][:delegators] += [_accessor_attribute, "#{_accessor_attribute.to_s}=".to_sym]
       end
 
-      # set attribute for this class
-      self._json_attributes_on[data_column][:value_type_instance] = self._json_attributes_on[data_column][:value_type_class].new(self, data_column, self._json_attributes_on[data_column][:types])
-      attribute data_column, self._json_attributes_on[data_column][:value_type_instance]
+      self._json_attributes_on[data_column][:serializer_klazz]  =  self._json_attributes_on[data_column][:value_type_class].build_serializer(self, data_column, self._json_attributes_on[data_column][:types])
+
+      store data_column,
+      accessors:  accessors.keys,
+      coder: self._json_attributes_on[data_column][:serializer_klazz]
+
+
+      define_method data_column.to_sym do
+        column_value = self[data_column.to_sym]
+        unless self._json_attributes_on[data_column][:serializer_klazz].is_my_type?(column_value)
+          column_value = self._json_attributes_on[data_column][:serializer_klazz].virtus_model.new(column_value)
+        end
+        column_value
+      end
+
+      define_method "#{data_column.to_s}=" do |value|
+        unless self._json_attributes_on[data_column][:serializer_klazz].is_my_type?(value)
+          value = self._json_attributes_on[data_column][:serializer_klazz].virtus_model.new(value)
+        end
+        raw_write_attribute(data_column, value.to_hash)
+        send("#{data_column.to_s}_will_change!")
+      end
+
+      accessors.keys.each do |_accessor_attribute|
+        define_method _accessor_attribute.to_sym do
+          column_value = send(data_column)
+          column_value.send(_accessor_attribute)
+        end
 
-      # set the delegators
-      def_delegators data_column, *self._json_attributes_on[data_column][:delegators]
+        define_method "#{_accessor_attribute.to_s}=" do |value|
+          column_value = send(data_column)
+          column_value.send("#{_accessor_attribute.to_s}=", value)
+          send("#{data_column.to_s}=", column_value)
+          value
+        end
+      end
 
       # set default values
       self._json_attributes_on[data_column][:default_values].each do |_accessor_attribute, _default_value|
@@ -129,8 +158,19 @@ module HasJsonAttributesOn
       self._json_attributes_on[data_column][:validations].each do |_accessor_attribute, _attribute_validations|
         validates _accessor_attribute, _attribute_validations
       end
+
+      self.after_initialize :build_json_attributes
     end
   end
+
+  def build_json_attributes
+    # ensure that we can call the method
+    self._json_attributes_on.each_pair do |data_column, options|
+      send(data_column);
+    end
+    return true
+  end
+
 end
 
 ActiveRecord::Base.send(:include, HasJsonAttributesOn)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_json_attributes_on
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - wiseallie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails