trax_model 0.0.98 → 0.0.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a56cf1df33c14218b82e1c7b26c649c52adb18df
-  data.tar.gz: e12109ca5ea6fb9abccb869c7c67d87431614f9c
+  metadata.gz: aff3b6b4389df830349e17d6b8ed2a378effd6af
+  data.tar.gz: c2e220e45e53c87812eabf18c772db0067bd9f90
 SHA512:
-  metadata.gz: dc8eb0602e23a03e13a87daf5420f3ea51f1dab49708cee5128c242e175609f795a852185f60c2b26f8a250d42c7a2873a75a8b9c1d8007111cd5afcb6fe338a
-  data.tar.gz: ced26e12c60dcff2b03ccb64bfb1c0bae10e526eb9cb2e9748be3a528e67db668634f47d1ac5f6f4e5b6feca75cf39e1390677c415ba7f8b3365ff3c13fe0708
+  metadata.gz: 6c808f53684e7ed77a9509597cd2d8c4b11d52313f6e7246de544aa54db24d83695a7780331afa6626c32f8552e6c8a786132e0e7226347b56c43247d70c5341
+  data.tar.gz: 91bcf1d6bf4f70155ac262f58f82b38fc15aff0dca066cccc901d93028c1b24cb739c0f582e6575354e264d21afecb10c92eb4368ae90c9382d0cf70a7b47fb8

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'hashie', :github => "jasonayre/hashie"
+# gem 'trax_core', :github => "jasonayre/trax_core"
+# gem 'trax_core', :path => "~/gems/trax_core"
+
 gemspec

data/lib/trax/model.rb

@@ -4,7 +4,6 @@ require 'hashie/dash'
 require 'hashie/mash'
 require 'hashie/trash'
 require 'hashie/extensions/dash/indifferent_access'
-require 'simple_enum'
 require_relative './validators/boolean_validator'
 require_relative './validators/email_validator'
 require_relative './validators/frozen_validator'
@@ -24,23 +23,16 @@ module Trax
 
     autoload :Attributes
     autoload :Config
-    autoload :Enum
+    autoload :CoreExtensions
+    autoload :ExtensionsFor
     autoload :Errors
-    autoload :Freezable
     autoload :Registry
     autoload :UUID
     autoload :UUIDPrefix
-    autoload :UniqueId
     autoload :Matchable
     autoload :Mixin
     autoload :Mixins
-    autoload :MTI
-    autoload :Restorable
     autoload :Railtie
-    autoload :STI
-    autoload :StringExtensions
-    autoload :Struct
-    autoload :StructExtensions
     autoload :Validators
 
     include ::Trax::Model::Matchable
@@ -77,15 +69,13 @@ module Trax
     end
 
     def self.eager_autoload_mixins!
-      ::Trax::Model::Attributes::Mixin
-      ::Trax::Model::Enum
-      ::Trax::Model::Freezable
-      ::Trax::Model::Restorable
-      ::Trax::Model::UniqueId
       ::Trax::Model::Mixins::FieldScopes
+      ::Trax::Model::Mixins::Freezable
       ::Trax::Model::Mixins::IdScopes
+      ::Trax::Model::Mixins::Restorable
       ::Trax::Model::Mixins::SortByScopes
       ::Trax::Model::Mixins::StiEnum
+      ::Trax::Model::Mixins::UniqueId
     end
 
     eager_autoload_mixins!
@@ -157,7 +147,7 @@ module Trax
       end
     end
 
-    ::String.include(::Trax::Model::StringExtensions)
+    ::String.include(::Trax::Model::CoreExtensions::String)
 
     ::ActiveSupport.run_load_hooks(:trax_model, self)
   end

data/lib/trax/model/attributes.rb

@@ -6,8 +6,8 @@ module Trax
       extend ::ActiveSupport::Autoload
 
       autoload :Attribute
-      autoload :Mixin
       autoload :Definitions
+      autoload :Dsl
       autoload :Errors
       autoload :Fields
       autoload :Types

data/lib/trax/model/attributes/definitions.rb

@@ -26,6 +26,10 @@ module Trax
           attribute(*args, type: :integer, **options, &block)
         end
 
+        def set(*args, **options, &block)
+          attribute(*args, :type => :set, **options, &block)
+        end
+
         def string(*args, **options, &block)
           attribute(*args, :type => :string, **options, &block)
         end

data/lib/trax/model/attributes/{mixin.rb → dsl.rb}

@@ -1,15 +1,9 @@
 module Trax
   module Model
     module Attributes
-      module Mixin
+      module Dsl
         extend ::Trax::Core::Concern
 
-        included do
-          ::Trax::Model::Attributes.config.attribute_types.each_pair do |key, mod|
-            include mod::Mixin if mod.const_defined?("Mixin")
-          end
-        end
-
         after_included do
           evaluate_attribute_definitions_blocks
         end
@@ -45,11 +39,7 @@ module Trax
           def trax_attribute(name, type:, **options, &block)
             raise ::Trax::Model::Attributes::Errors::UnknownAttributeType.new(type: type) unless ::Trax::Model::Attributes.key?(type)
 
-            if ::Trax::Model::Attributes[type].const_defined?("Mixin")
-              attribute_type_definition_method = ::Trax::Model::Attributes[type]::Mixin::ClassMethods.instance_methods.first
-              self.send(attribute_type_definition_method, name, **options, &block)
-              self.validates(name, options[:validates]) if options.key?(:validates)
-            elsif ::Trax::Model::Attributes[type].respond_to?(:define_attribute)
+            if ::Trax::Model::Attributes[type].respond_to?(:define_attribute)
               ::Trax::Model::Attributes[type].define_attribute(self, name, **options, &block)
               self.validates(name, options[:validates]) if options.key?(:validates)
             else

data/lib/trax/model/attributes/types/boolean.rb

@@ -1,5 +1,3 @@
-require 'hashie/extensions/ignore_undeclared'
-
 module Trax
   module Model
     module Attributes
@@ -20,6 +18,7 @@ module Trax
           end
 
           class Attribute < ::Trax::Model::Attributes::Attribute
+            include ::Trax::Model::ExtensionsFor::Boolean
             self.type = :boolean
 
             def self.to_schema

data/lib/trax/model/attributes/types/enum.rb

@@ -1,5 +1,3 @@
-require 'hashie/extensions/ignore_undeclared'
-
 module Trax
   module Model
     module Attributes

data/lib/trax/model/attributes/types/integer.rb

@@ -1,5 +1,3 @@
-require 'hashie/extensions/ignore_undeclared'
-
 module Trax
   module Model
     module Attributes
@@ -18,6 +16,8 @@ module Trax
           end
 
           class Value < ::Trax::Model::Attributes::Value
+            include ::Trax::Model::ExtensionsFor::Integer
+
             def self.type; :integer end;
           end
 

data/lib/trax/model/attributes/types/set.rb

@@ -0,0 +1,67 @@
+module Trax
+  module Model
+    module Attributes
+      module Types
+        class Set < ::Trax::Model::Attributes::Type
+          def self.define_attribute(klass, attribute_name, **options, &block)
+            klass_name = "#{klass.fields_module.name.underscore}/#{attribute_name}".camelize
+            attribute_klass = if options.key?(:extend)
+              _klass_prototype = options[:extend].is_a?(::String) ? options[:extend].safe_constantize : options[:extend]
+              _klass = ::Trax::Core::NamedClass.new(klass_name, _klass_prototype, :parent_definition => klass, &block)
+              _klass
+            else
+              ::Trax::Core::NamedClass.new(klass_name, Value, :parent_definition => klass, &block)
+            end
+
+            klass.attribute(attribute_name, typecaster_klass.new(target_klass: attribute_klass))
+            klass.default_value_for(attribute_name) { attribute_klass.new }
+          end
+
+          class Value < ::Trax::Model::Attributes::Value
+            include ::Trax::Model::ExtensionsFor::Set
+
+            def initialize(*args)
+              @value = ::Set.new(*args)
+            end
+          end
+
+          class TypeCaster < ActiveRecord::Type::Value
+            include ::ActiveRecord::Type::Mutable
+
+            def initialize(*args, target_klass:)
+              super(*args)
+
+              @target_klass = target_klass
+            end
+
+            def type
+              :set
+            end
+
+            def type_cast_from_user(value)
+              case value.class.name
+              when "Array", "Set"
+                @target_klass.new(value)
+              when @target_klass.name
+                @target_klass
+              else
+                @target_klass.new
+              end
+            end
+
+            def type_cast_from_database(value)
+              value.present? ? @target_klass.new(::JSON.parse(value)) : value
+            end
+
+            def type_cast_for_database(value)
+              value.try(:to_json)
+            end
+          end
+
+          self.value_klass = ::Trax::Model::Attributes::Types::Set::Value
+          self.typecaster_klass = ::Trax::Model::Attributes::Types::Set::TypeCaster
+        end
+      end
+    end
+  end
+end

data/lib/trax/model/attributes/types/string.rb

@@ -1,5 +1,3 @@
-require 'hashie/extensions/ignore_undeclared'
-
 module Trax
   module Model
     module Attributes
@@ -18,6 +16,8 @@ module Trax
           end
 
           class Value < ::Trax::Model::Attributes::Value
+            include ::Trax::Model::ExtensionsFor::String
+            
             def self.type; :string end;
           end
 
@@ -29,7 +29,7 @@ module Trax
             end
 
             def type_cast_from_user(value)
-              value.is_a?(@target_klass) ? @target_klass : @target_klass.new(value || {})
+              value.is_a?(@target_klass) ? @target_klass : @target_klass.new(value)
             end
 
             def type_cast_from_database(value)

data/lib/trax/model/attributes/types/struct.rb

@@ -10,7 +10,7 @@ module Trax
             attribute_klass = if options.key?(:extend)
               _klass_prototype = options[:extend].is_a?(::String) ? options[:extend].safe_constantize : options[:extend]
               _klass = ::Trax::Core::NamedClass.new(klass_name, _klass_prototype, :parent_definition => klass, &block)
-              _klass.include(::Trax::Model::StructExtensions)
+              _klass.include(::Trax::Model::ExtensionsFor::Struct)
               _klass
             else
               ::Trax::Core::NamedClass.new(klass_name, Value, :parent_definition => klass, &block)
@@ -23,7 +23,7 @@ module Trax
           end
 
           class Value < ::Trax::Core::Types::Struct
-            include ::Trax::Model::StructExtensions
+            include ::Trax::Model::ExtensionsFor::Struct
           end
 
           class TypeCaster < ActiveRecord::Type::Value
@@ -48,7 +48,7 @@ module Trax
             end
 
             def type_cast_for_database(value)
-              value.present? ? value.to_serializable_hash.to_json : nil
+              value.present? ? value.to_serializable_hash.to_json : {}.to_json
             end
           end
 
@@ -82,6 +82,8 @@ module Trax
               end
 
               model.delegate(getter_method, :to => attribute_name)
+
+              model.attribute_names << _property.to_s unless model.attribute_names.include?(_property.to_s)
             end
           end
         end

data/lib/trax/model/attributes/types/uuid_array.rb

@@ -1,5 +1,3 @@
-require 'hashie/extensions/ignore_undeclared'
-
 module Trax
   module Model
     module Attributes

data/lib/trax/model/{sti.rb → core_extensions.rb}

@@ -1,9 +1,9 @@
 module Trax
   module Model
-    module STI
+    module CoreExtensions
       extend ::ActiveSupport::Autoload
 
-      autoload :Attributes
+      autoload :String
     end
   end
 end

data/lib/trax/model/core_extensions/string.rb

@@ -0,0 +1,17 @@
+module Trax
+  module Model
+    module CoreExtensions
+      module String
+        extend ::ActiveSupport::Concern
+
+        def to_matchable
+          "%#{self.strip}%"
+        end
+
+        def uuid
+          ::Trax::Model::UUID === self ? ::Trax::Model::UUID.new(self) : nil
+        end
+      end
+    end
+  end
+end

data/lib/trax/model/extensions_for.rb

@@ -0,0 +1,18 @@
+#trax model attribute dsl/trax core type extensions
+module Trax
+  module Model
+    module ExtensionsFor
+      extend ::ActiveSupport::Autoload
+
+      autoload :Base
+      autoload :Boolean
+      autoload :Enumerable
+      autoload :Integer
+      autoload :Numeric
+      autoload :Set
+      autoload :Struct
+      autoload :StructFields
+      autoload :String
+    end
+  end
+end

data/lib/trax/model/extensions_for/base.rb

@@ -0,0 +1,31 @@
+module Trax
+  module Model
+    module ExtensionsFor
+      module Base
+        extend ::ActiveSupport::Concern
+
+        module ClassMethods
+          def field_name
+            name.demodulize.underscore
+          end
+
+          def model_class
+            @model_class ||= begin
+              model_class_for_property(self)
+            end
+          end
+
+          def model_class_for_property(property_klass)
+            result = if property_klass.parent_definition.ancestors.include?(::ActiveRecord::Base)
+              property_klass.parent_definition
+            else
+              model_class_for_property(property_klass.parent_definition)
+            end
+
+            result
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trax/model/extensions_for/boolean.rb

@@ -0,0 +1,29 @@
+module Trax
+  module Model
+    module ExtensionsFor
+      module Boolean
+        extend ::ActiveSupport::Concern
+        include ::Trax::Model::ExtensionsFor::Base
+
+        module ClassMethods
+          def eq(*_scope_values)
+            _scope_values.flat_compact_uniq!
+            model_class.where({field_name => _scope_values})
+          end
+
+          def is_nil
+            eq(nil)
+          end
+
+          def is_false
+            eq(false)
+          end
+
+          def is_true
+            eq(true)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trax/model/extensions_for/enumerable.rb

@@ -0,0 +1,18 @@
+module Trax
+  module Model
+    module ExtensionsFor
+      module Enumerable
+        extend ::ActiveSupport::Concern
+
+        include ::Trax::Model::ExtensionsFor::Base
+
+        module ClassMethods
+          def contains(*_values)
+            _values.flat_compact_uniq!
+            model_class.where("#{field_name} ?| array[:values]", :values => _values)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trax/model/extensions_for/integer.rb

@@ -0,0 +1,10 @@
+module Trax
+  module Model
+    module ExtensionsFor
+      module Integer
+        extend ::ActiveSupport::Concern
+        include ::Trax::Model::ExtensionsFor::Numeric
+      end
+    end
+  end
+end