has_json_attributes_on 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d72de8b5fe0ad71e4e6ccc7ba63a7a708916516
-  data.tar.gz: e4ffdff6fc8e9886df9a8e80b7b9c00bc43994a7
+  metadata.gz: b12c1abafaaf601c42dc878d0a7b941b60a26f1f
+  data.tar.gz: 02e1613de3fb1cf3b03c9a3ebabe49aae5aed317
 SHA512:
-  metadata.gz: f9052ae90b3e913af9aafa1689c28fe7dc1af741228e48310c6b87f6f35f73784011d0e61c36aa7dd1bd6e8d3f4788030a993c596926f1c30cffcbf7902279bf
-  data.tar.gz: 3e148c926b5c3f564229e5bf6f6990271ac62cda03648617789056a89376f74a34393deff32395cad9d28efe1f64e81b9ac2b014dd24921869e836e23e1e5e32
+  metadata.gz: b8b6a277b613a0e935abe8478c27260a2d57476a8864ef6662e45308e996f3ab6ff061b6b9ba6dd28b6d87386fbf4023c95940c8890d7922b7f2c318b32eb17d
+  data.tar.gz: 93aad3d412cdc226064e95a201a405485914a074dbb5b077c1a0d5dc9c5fc56d835fe0ed78bb41c9322c09d33e616a7650a48b72563178c310540d17a85b0e9c

data/lib/has_json_attributes_on/type/json.rb

@@ -0,0 +1,9 @@
+require 'active_record/connection_adapters/postgresql/oid/json'
+require_relative 'json_type'
+module HasJsonAttributesOn
+  module Type
+    class Json < ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Json
+      include JsonType
+    end
+  end
+end

data/lib/has_json_attributes_on/type/json_type.rb

@@ -0,0 +1,85 @@
+require  'virtus'
+require  'default_value_for'
+module HasJsonAttributesOn
+  extend ActiveSupport::Concern
+
+  AXIOMS = {
+    'Boolean' => Axiom::Types::Boolean,
+    'String'  => Axiom::Types::String,
+    'Decimal' => Axiom::Types::Decimal,
+    'Date'    => Axiom::Types::Date,
+    'DateTime'=> Axiom::Types::DateTime,
+    'Time'    => Axiom::Types::Time,
+    'Float'   => Axiom::Types::Float,
+    'Integer' => Axiom::Types::Integer,
+    'Object'  => Axiom::Types::Object,
+    'Array'   => Axiom::Types::Array,
+    'Set'     => Axiom::Types::Set,
+    'Hash'    => Axiom::Types::Hash
+  }
+
+  module Type
+    module JsonType
+      extend ActiveSupport::Concern
+
+      included do
+        attr_accessor :virtus_model
+      end
+
+      class_methods do
+
+        def validate_virtus_model_attr_options!(model, attrs)
+          raise "Model: #{model}, attributes must be a Hash of key:attribute_name and value:attribute_type" unless attrs.is_a?(Hash)
+          attrs.each do |k,v|
+            raise "Model: #{model}, key:#{k} should be a valid hash key" if k.to_s.include?(" ");
+            raise "Model: #{model}, value for key:#{k} should be one of: #{AXIOMS.keys}" unless v.in?(AXIOMS.keys)
+          end
+        end
+
+        def build_virtus_model(model, data_column,  attrs = {})
+          type_name = self.name
+          validate_virtus_model_attr_options!(model, attrs)
+          klazz_name = data_column.to_s.camelize + "DynamicType"
+
+          klazz = Class.new do
+            include Virtus.model
+
+            attrs.each do |attr_name, attr_type_key|
+              attribute attr_name.to_sym, AXIOMS[attr_type_key]
+            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}]>"
+            end
+
+            def self.to_s
+              self.inspect
+            end
+          end
+          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 type_cast_from_user(value)
+        @virtus_model.new(value)
+      end
+
+      def type_cast_from_database(value)
+        @virtus_model.new(super(value))
+      end
+
+      def type_cast_for_database(value)
+        if value.is_a?(@virtus_model)
+          ::ActiveSupport::JSON.encode(value)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/has_json_attributes_on/type/jsonb.rb

@@ -0,0 +1,9 @@
+require 'active_record/connection_adapters/postgresql/oid/jsonb'
+require_relative 'json_type'
+module HasJsonAttributesOn
+  module Type
+    class Jsonb < ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb
+      include JsonType
+    end
+  end
+end

data/lib/has_json_attributes_on/version.rb

@@ -1,3 +1,3 @@
 module HasJsonAttributesOn
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/has_json_attributes_on.rb

@@ -1,104 +1,15 @@
 require 'rails'
-require 'active_record/connection_adapters/postgresql/oid/json'
-require 'active_record/connection_adapters/postgresql/oid/jsonb'
-require  'virtus'
-require  'default_value_for'
+require_relative 'has_json_attributes_on/type/json'
+require_relative 'has_json_attributes_on/type/jsonb'
 
 module HasJsonAttributesOn
   extend ActiveSupport::Concern
 
-  AXIOMS = {
-    'Boolean' => Axiom::Types::Boolean,
-    'String'  => Axiom::Types::String,
-    'Decimal' => Axiom::Types::Decimal,
-    'Date'    => Axiom::Types::Date,
-    'DateTime'=> Axiom::Types::DateTime,
-    'Time'    => Axiom::Types::Time,
-    'Float'   => Axiom::Types::Float,
-    'Integer' => Axiom::Types::Integer,
-    'Object'  => Axiom::Types::Object,
-    'Array'   => Axiom::Types::Array,
-    'Set'     => Axiom::Types::Set,
-    'Hash'    => Axiom::Types::Hash
-  }
-
-  SUPPORTED_DB_SQL_TYPES = %w(json jsonb)
   VALUE_TYPE_CLASSES = {
-    'json' => 'HasJsonAttributesOn::Type::Json',
-    'jsonb' => 'HasJsonAttributesOn::Type::Jsonb'
+    'json' => HasJsonAttributesOn::Type::Json,
+    'jsonb' => HasJsonAttributesOn::Type::Jsonb
   }
 
-  module Type
-    module JsonType
-      extend ActiveSupport::Concern
-
-      included do
-        attr_accessor :virtus_model
-      end
-
-      class_methods do
-
-        def validate_virtus_model_attr_options!(model, attrs)
-          raise "Model: #{model}, attributes must be a Hash of key:attribute_name and value:attribute_type" unless attrs.is_a?(Hash)
-          attrs.each do |k,v|
-            raise "Model: #{model}, key:#{k} should be a valid hash key" if k.to_s.include?(" ");
-            raise "Model: #{model}, value for key:#{k} should be one of: #{AXIOMS.keys}" unless v.in?(AXIOMS.keys)
-          end
-        end
-
-        def build_virtus_model(model, data_column, attrs = {})
-          validate_virtus_model_attr_options!(model, attrs)
-          klazz_name = data_column.to_s.camelize + "DynamicType"
-
-          klazz = Class.new do
-            include Virtus.model
-
-            attrs.each do |attr_name, attr_type_key|
-              attribute attr_name.to_sym, AXIOMS[attr_type_key]
-            end
-
-            def self.inspect
-              _attrs = attribute_set.instance_variable_get("@attributes").map{|x| [x.name, x.type.inspect].join(":")}.join(", ")
-              "<#{name}  type =>HasJsonAttributesOn::Type::JsonType  attribute_set => [#{_attrs}]>"
-            end
-
-            def self.to_s
-              self.inspect
-            end
-          end
-
-          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 type_cast_from_user(value)
-        @virtus_model.new(value)
-      end
-
-      def type_cast_from_database(value)
-        @virtus_model.new(super(value))
-      end
-
-      def type_cast_for_database(value)
-        if value.is_a?(@virtus_model)
-          ::ActiveSupport::JSON.encode(value)
-        else
-          super
-        end
-      end
-    end
-    class Jsonb < ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb
-      include JsonType
-    end
-    class Json < ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Json
-      include JsonType
-    end
-  end
-
   included do
     extend Forwardable
   end
@@ -128,9 +39,9 @@ module HasJsonAttributesOn
         raise ArgumentError,  "Model: #{name}#has_json_attributes_on, data_column: #{data_column} does not exist as a column in database"
       end
 
-      data_column_sql_type = columns.detect{|x| x.name.to_s == data_column.to_s}.sql_type
-      unless data_column_sql_type.in?(SUPPORTED_DB_SQL_TYPES)
-        raise ArgumentError,  "Model: #{name}#has_json_attributes_on, data_column: #{data_column} is of sql type: #{data_column_sql_type}, supported types are:#{SUPPORTED_DB_SQL_TYPES}"
+      data_column_sql_type = columns.detect{|x| x.name.to_s == data_column.to_s}.sql_type.to_s
+      unless data_column_sql_type.in?(VALUE_TYPE_CLASSES.keys)
+        raise ArgumentError,  "Model: #{name}#has_json_attributes_on, data_column: #{data_column} is of sql type: #{data_column_sql_type}, supported types are:#{VALUE_TYPE_CLASSES.keys}"
       end
       return [data_column, data_column_sql_type]
     end
@@ -163,7 +74,7 @@ module HasJsonAttributesOn
         validations: {},
         delegators: [],
         data_column_sql_type: data_column_sql_type,
-        value_type_class: VALUE_TYPE_CLASSES[data_column_sql_type].constantize,
+        value_type_class: VALUE_TYPE_CLASSES[data_column_sql_type.to_s].constantize,
         value_type_instance: nil
       }.symbolize_keys
 
@@ -186,7 +97,8 @@ module HasJsonAttributesOn
       # set default values
       self._json_attributes_on[data_column][:default_values].each do |_accessor_attribute, _default_value|
         if _default_value.is_a?(Proc)
-          default_value_for(_accessor_attribute, &_default_value)
+          # pass the context to self in the proc
+          default_value_for(_accessor_attribute,  &_default_value)
         else
           default_value_for _accessor_attribute, _default_value
         end
@@ -196,7 +108,6 @@ module HasJsonAttributesOn
       self._json_attributes_on[data_column][:validations].each do |_accessor_attribute, _attribute_validations|
         validates _accessor_attribute, _attribute_validations
       end
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_json_attributes_on
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - wiseallie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,6 +76,9 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/has_json_attributes_on.rb
+- lib/has_json_attributes_on/type/json.rb
+- lib/has_json_attributes_on/type/json_type.rb
+- lib/has_json_attributes_on/type/jsonb.rb
 - lib/has_json_attributes_on/version.rb
 - lib/tasks/has_json_attributes_on_tasks.rake
 homepage: https://github.com/wiseallie/has_json_attributes_on