schema_serializer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5404332ba242848977ad36f8fdb7a10aca0e9075976ccbe03c439de1fe919c5
-  data.tar.gz: c270f0b70fa19a3578cd5a7bf836d29fcbfa2085bad74eb7662a1209d39e3e8f
+  metadata.gz: 94f709a1c2d51ff0aa79c34c05738103e8b7bed11bff02b5d80bb26a3eb65aa9
+  data.tar.gz: bf489e3759d930ea6862ed46dfc534d4d30efd84a77000723e34b0d4c031afa1
 SHA512:
-  metadata.gz: ccba07d36a8e858ec0e175d5f7353cc632babe90211e7d50edb5d5a23b9d1e49c25a5c226b2b26b8cd678ec08e1fa80a8a53b3054991d1705af8a5e123657c62
-  data.tar.gz: b704f1f029e65c35769e7c8ab9732acf672514a63b4f123b77ae1abf2899e94861373cd48d259e2f8f3159e3f34cc8ca0de78462a73c695407778cf85ebaef2e
+  metadata.gz: 5de1089009d4f710cb750f7c3a09b68feeb1a25110698f6f40b4b673c3451df100354474aa666cb452361433313052ecdffc987f7fae72fe001f33dd0e76069f
+  data.tar.gz: fe3fc664a7d43f3c66b673922d777f4bdb5dc2cf38231d3c1ac5714031c9d129977301f37fa47a4bb2f8aacce0d67d505a17ecb05f11335e42a85136620889af

data/lib/schema_serializer/railtie.rb

@@ -2,7 +2,7 @@ class SchemaSerializer
   class Railtie < ::Rails::Railtie
     initializer "schema_serializer" do
       ActiveSupport.on_load(:active_record) do
-        ::ActiveRecord::Base.send(:extend, SchemaSerializer::Serializable)
+        ::ActiveRecord::Base.send(:include, SchemaSerializer::Serializable)
       end
     end
   end

data/lib/schema_serializer/schema.rb

@@ -35,9 +35,20 @@ class SchemaSerializer
         not_enough_columns = required - properties.keys
         raise RequiredNotDefined, not_enough_columns.join(", ") unless not_enough_columns.empty?
         properties.each_with_object({}) { |(column, schema), obj|
-          obj[column] = schema.serialize(object.public_send(column))
+          obj[column] = schema.serialize(get_value(object, column))
         }
       end
     end
+
+    private
+
+      def get_value(object, column)
+        return object[column] || object[column.to_sym] if object.is_a?(Hash)
+
+        value = object.public_send(column)
+        return value if !object.respond_to?(:defined_enums) || !object.defined_enums.has_key?(column)
+
+        object.defined_enums[column][value]
+      end
   end
 end

data/lib/schema_serializer/version.rb

@@ -1,3 +1,3 @@
 class SchemaSerializer
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_serializer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport