trax_model 0.0.98 → 0.0.99

data/spec/trax/model/{freezable_spec.rb → mixins/freezable_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ::Trax::Model::Freezable do
+describe ::Trax::Model::Mixins::Freezable do
   subject{ ::Message.create(:title => "Whatever") }
 
   its(:status) { should eq "queued" }

data/spec/trax/model/{restorable_spec.rb → mixins/restorable_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ::Trax::Model::Restorable do
+describe ::Trax::Model::Mixins::Restorable do
   subject{ ::Message.create(:title => "Whatever") }
 
   its(:deleted) { should be false }

data/spec/trax/model/{unique_id_spec.rb → mixins/unique_id_spec.rb}

@@ -1,5 +1,5 @@
 require 'spec_helper'
-describe ::Trax::Model::UniqueId do
+describe ::Trax::Model::Mixins::UniqueId do
   subject{ ::Product }
 
   its(:uuid_prefix) { should be_instance_of(::Trax::Model::UUIDPrefix) }

data/trax_model.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = TraxModel::VERSION
   spec.authors       = ["Jason Ayre"]
   spec.email         = ["jasonayre@gmail.com"]
-  spec.summary       = %q{Higher level ActiveRecord models for rails}
-  spec.description   = %q{Supports uuid defaults and mapping, default attributes, and various other utilities via composition}
+  spec.summary       = %q{Better ActiveRecord attributes, conventions, utilities}
+  spec.description   = %q{ActiveRecord attributes DDL, struct/array attribute types, an enum implementation that doesn't suck, etc..}
   spec.homepage      = "http://github.com/jasonayre/trax_model"
   spec.license       = "MIT"
 
@@ -18,10 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trax_core", "~> 0.0.83"
+  spec.add_dependency "trax_core", "~> 0.0.84"
   spec.add_dependency "default_value_for", "~> 3.0.0"
-  spec.add_dependency "simple_enum"
-  spec.add_development_dependency "hashie", ">= 3.4.2"
+  # spec.add_development_dependency "hashie", ">= 3.4.4"
   spec.add_development_dependency "rails", "~> 4.2.0"
   spec.add_development_dependency "activerecord", "~> 4.2.0"
   spec.add_development_dependency "bundler", "~> 1.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trax_model
 version: !ruby/object:Gem::Version
-  version: 0.0.98
+  version: 0.0.99
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trax_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.83
+        version: 0.0.84
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.83
+        version: 0.0.84
 - !ruby/object:Gem::Dependency
   name: default_value_for
   requirement: !ruby/object:Gem::Requirement
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: simple_enum
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -304,8 +276,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Supports uuid defaults and mapping, default attributes, and various other
-  utilities via composition
+description: ActiveRecord attributes DDL, struct/array attribute types, an enum implementation
+  that doesn't suck, etc..
 email:
 - jasonayre@gmail.com
 executables: []
@@ -325,42 +297,52 @@ files:
 - lib/trax/model/attributes.rb
 - lib/trax/model/attributes/attribute.rb
 - lib/trax/model/attributes/definitions.rb
+- lib/trax/model/attributes/dsl.rb
 - lib/trax/model/attributes/errors.rb
 - lib/trax/model/attributes/fields.rb
-- lib/trax/model/attributes/mixin.rb
 - lib/trax/model/attributes/type.rb
 - lib/trax/model/attributes/types.rb
 - lib/trax/model/attributes/types/array.rb
 - lib/trax/model/attributes/types/boolean.rb
 - lib/trax/model/attributes/types/enum.rb
 - lib/trax/model/attributes/types/integer.rb
+- lib/trax/model/attributes/types/set.rb
 - lib/trax/model/attributes/types/string.rb
 - lib/trax/model/attributes/types/struct.rb
 - lib/trax/model/attributes/types/uuid_array.rb
 - lib/trax/model/attributes/value.rb
-- lib/trax/model/enum.rb
+- lib/trax/model/core_extensions.rb
+- lib/trax/model/core_extensions/string.rb
 - lib/trax/model/errors.rb
-- lib/trax/model/freezable.rb
+- lib/trax/model/extensions_for.rb
+- lib/trax/model/extensions_for/base.rb
+- lib/trax/model/extensions_for/boolean.rb
+- lib/trax/model/extensions_for/enumerable.rb
+- lib/trax/model/extensions_for/integer.rb
+- lib/trax/model/extensions_for/numeric.rb
+- lib/trax/model/extensions_for/set.rb
+- lib/trax/model/extensions_for/string.rb
+- lib/trax/model/extensions_for/struct.rb
+- lib/trax/model/extensions_for/struct_fields.rb
+- lib/trax/model/extensions_for/struct_fields/boolean.rb
+- lib/trax/model/extensions_for/struct_fields/enum.rb
+- lib/trax/model/extensions_for/struct_fields/float.rb
+- lib/trax/model/extensions_for/struct_fields/integer.rb
+- lib/trax/model/extensions_for/struct_fields/numeric.rb
+- lib/trax/model/extensions_for/struct_fields/string.rb
+- lib/trax/model/extensions_for/struct_fields/time.rb
 - lib/trax/model/matchable.rb
 - lib/trax/model/mixin.rb
 - lib/trax/model/mixins.rb
 - lib/trax/model/mixins/field_scopes.rb
+- lib/trax/model/mixins/freezable.rb
 - lib/trax/model/mixins/id_scopes.rb
+- lib/trax/model/mixins/restorable.rb
 - lib/trax/model/mixins/sort_by_scopes.rb
 - lib/trax/model/mixins/sti_enum.rb
-- lib/trax/model/mti.rb
-- lib/trax/model/mti/abstract.rb
-- lib/trax/model/mti/entity.rb
-- lib/trax/model/mti/namespace.rb
+- lib/trax/model/mixins/unique_id.rb
 - lib/trax/model/railtie.rb
 - lib/trax/model/registry.rb
-- lib/trax/model/restorable.rb
-- lib/trax/model/scopes.rb
-- lib/trax/model/sti.rb
-- lib/trax/model/sti/attributes.rb
-- lib/trax/model/string_extensions.rb
-- lib/trax/model/struct_extensions.rb
-- lib/trax/model/unique_id.rb
 - lib/trax/model/uuid.rb
 - lib/trax/model/uuid_array.rb
 - lib/trax/model/uuid_prefix.rb
@@ -384,18 +366,22 @@ files:
 - spec/trax/model/attributes/fields_spec.rb
 - spec/trax/model/attributes/types/enum_spec.rb
 - spec/trax/model/attributes/types/integer_spec.rb
+- spec/trax/model/attributes/types/set_spec.rb
 - spec/trax/model/attributes/types/struct_spec.rb
 - spec/trax/model/attributes_spec.rb
 - spec/trax/model/errors_spec.rb
-- spec/trax/model/freezable_spec.rb
+- spec/trax/model/extensions_for/boolean_spec.rb
+- spec/trax/model/extensions_for/numeric_spec.rb
+- spec/trax/model/extensions_for/string_spec.rb
+- spec/trax/model/extensions_for/struct_spec.rb
+- spec/trax/model/extensions_for_spec.rb
 - spec/trax/model/matchable_spec.rb
 - spec/trax/model/mixins/field_scopes_spec.rb
+- spec/trax/model/mixins/freezable_spec.rb
+- spec/trax/model/mixins/restorable_spec.rb
 - spec/trax/model/mixins/sti_enum_spec.rb
+- spec/trax/model/mixins/unique_id_spec.rb
 - spec/trax/model/registry_spec.rb
-- spec/trax/model/restorable_spec.rb
-- spec/trax/model/sti/attributes_spec.rb
-- spec/trax/model/struct_extensions_spec.rb
-- spec/trax/model/unique_id_spec.rb
 - spec/trax/model/uuid_prefix_spec.rb
 - spec/trax/model/uuid_spec.rb
 - spec/trax/model_spec.rb
@@ -428,7 +414,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Higher level ActiveRecord models for rails
+summary: Better ActiveRecord attributes, conventions, utilities
 test_files:
 - spec/db/database.yml
 - spec/db/schema/default_tables.rb
@@ -439,18 +425,22 @@ test_files:
 - spec/trax/model/attributes/fields_spec.rb
 - spec/trax/model/attributes/types/enum_spec.rb
 - spec/trax/model/attributes/types/integer_spec.rb
+- spec/trax/model/attributes/types/set_spec.rb
 - spec/trax/model/attributes/types/struct_spec.rb
 - spec/trax/model/attributes_spec.rb
 - spec/trax/model/errors_spec.rb
-- spec/trax/model/freezable_spec.rb
+- spec/trax/model/extensions_for/boolean_spec.rb
+- spec/trax/model/extensions_for/numeric_spec.rb
+- spec/trax/model/extensions_for/string_spec.rb
+- spec/trax/model/extensions_for/struct_spec.rb
+- spec/trax/model/extensions_for_spec.rb
 - spec/trax/model/matchable_spec.rb
 - spec/trax/model/mixins/field_scopes_spec.rb
+- spec/trax/model/mixins/freezable_spec.rb
+- spec/trax/model/mixins/restorable_spec.rb
 - spec/trax/model/mixins/sti_enum_spec.rb
+- spec/trax/model/mixins/unique_id_spec.rb
 - spec/trax/model/registry_spec.rb
-- spec/trax/model/restorable_spec.rb
-- spec/trax/model/sti/attributes_spec.rb
-- spec/trax/model/struct_extensions_spec.rb
-- spec/trax/model/unique_id_spec.rb
 - spec/trax/model/uuid_prefix_spec.rb
 - spec/trax/model/uuid_spec.rb
 - spec/trax/model_spec.rb

data/lib/trax/model/enum.rb

@@ -1,64 +0,0 @@
-# An opinionated enum preconfiguration:
-# Uses simple_enum instead of active record built in enum, due to the complete
-# and utter polution it causes to your classes. in addition, AR does not prefix
-# enums with anything, i.e.
-# class User
-# enum :gender => [:unknown, :male, :female]
-# enum :locale => [:unknown, :en, :ca]
-# will break because :unknown cant be used twice, since it defines an User.unknown
-# method, the value which does not even make sense in alot of situations, out of context
-#
-# So, we use simple_enum instead, which will allow us to do that
-# in addition, I dont like that simple_enum does not allow you to raise errrors at the activerecord
-# level using validations, therefore you cant reuse the same interface for displaying errors
-# to the user if an invalid value is picked
-# so validation is added when an enum is defined
-# also defines just 2 generic scopes, by_enum_name, and by_enum_name_not, which accept multiple args
-# i.e. by_gender(:male), by_gender_not(:female, :unknown)
-# in interest of not polluting the class with scopes for each individual enum value
-
-module Trax
-  module Model
-    module Enum
-      extend ::Trax::Model::Mixin
-
-      module ClassMethods
-        def define_scopes_for_trax_enum(enum_name)
-          scope_method_name = :"by_#{enum_name}"
-          scope_not_method_name = :"by_#{enum_name}_not"
-
-          self.scope scope_method_name, lambda { |*values|
-            enum_hash = self.__send__("#{enum_name}".pluralize).hash
-            where(enum_name => enum_hash.with_indifferent_access.slice(*values.flatten.compact.uniq).values)
-          }
-          self.scope scope_not_method_name, lambda { |*values|
-            enum_hash = self.__send__("#{enum_name}".pluralize).hash
-            where.not(enum_name => enum_hash.with_indifferent_access.slice(*values.flatten.compact.uniq).values)
-          }
-        end
-
-        #todo: ew need to clean this up
-        def as_enum(enum_name, enum_mapping, options = {})
-          enum_values = enum_mapping.is_a?(Hash) ? enum_mapping.keys : enum_mapping
-          options.assert_valid_keys(:prefix, :source, :message, :default, :validate)
-
-          options[:message] ||= "Invalid value selected for #{enum_name}"
-          options[:prefix] ||= true
-          options[:source] ||= enum_name
-          default_value = options.extract!(:default)[:default] if options.key?(:default)
-
-          validation_options = { :in => enum_values, :message => options.extract!(:message)[:message] }
-
-          self.validates_inclusion_of(enum_name, validation_options) unless options.key?(:validate) && !options[:validate]
-          
-          options.delete(:validate) if options.key?(:validate)
-
-          define_scopes_for_trax_enum(enum_name)
-
-          super(enum_name, enum_mapping, options)
-          self.default_value_for(enum_name) { default_value } if default_value
-        end
-      end
-    end
-  end
-end

data/lib/trax/model/freezable.rb

@@ -1,29 +0,0 @@
-module Trax
-  module Model
-    module Freezable
-      extend ::Trax::Model::Mixin
-
-      included do
-        class_attribute :freezable_fields
-        self.freezable_fields = ::ActiveSupport::OrderedOptions.new
-      end
-
-      module ClassMethods
-        def freezable_by_enum(options = {})
-          freezable_fields.merge!(options)
-          define_frozen_validators_for_enum(options)
-        end
-
-        def define_frozen_validators_for_enum(options)
-          self.class_eval do
-            options.each_pair do |enum_method, frozen_states|
-              validates_with ::FrozenValidator, :if => lambda { |record|
-                frozen_states.any?{ |state| state == :"#{record.send(enum_method)}" } && !record.changed.include?("#{enum_method}")
-              }
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/trax/model/mti.rb

@@ -1,11 +0,0 @@
-module Trax
-  module Model
-    module MTI
-      extend ::ActiveSupport::Autoload
-
-      autoload :Abstract
-      autoload :Entity
-      autoload :Namespace
-    end
-  end
-end

data/lib/trax/model/mti/abstract.rb

@@ -1,65 +0,0 @@
-module Trax
-  module Model
-    module MTI
-      module Abstract
-        extend ::ActiveSupport::Concern
-
-        included do
-          class_attribute :mti_config
-
-          self.abstract_class = true
-          self.mti_config = ::ActiveSupport::HashWithIndifferentAccess.new({
-            :foreign_key => :id
-          })
-
-          scope :records, lambda{
-            map(&:entity)
-          }
-        end
-
-        module ClassMethods
-          def inherited(subklass)
-            super(subklass)
-
-            subklass.after_create do |record|
-              entity_model = mti_config[:class_name].constantize.new
-
-              record.attributes.each_pair do |k,v|
-                entity_model.__send__("#{k}=", v) if entity_model.respond_to?(k)
-              end
-
-              entity_model.save
-            end
-
-            subklass.after_update do |record|
-              entity_model = record.entity
-
-              if record.changed.any?
-                record.changes.each_pair do |k,v|
-                  entity_model.__send__("#{k}=", v[1]) if entity.respond_to?(:"#{k}")
-                end
-              end
-
-              entity_model.save if entity_model.changed.any?
-            end
-
-            subklass.after_destroy do |record|
-              entity_model = record.entity
-
-              entity_model.destroy
-            end
-          end
-
-          def entity_model(options)
-            valid_options = options.assert_valid_keys(:class_name, :foreign_key)
-
-            mti_config.merge!(valid_options)
-
-            self.has_one(:entity, mti_config.symbolize_keys)
-            self.accepts_nested_attributes_for(:entity)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/trax/model/mti/entity.rb

@@ -1,62 +0,0 @@
-module Trax
-  module Model
-    module MTI
-      module Entity
-        extend ::ActiveSupport::Concern
-
-        included do
-          class_attribute :_mti_namespace
-
-          scope :records, lambda{
-            map(&:entity)
-          }
-
-          scope :fully_loaded, lambda{
-            relation = current_scope.dup
-            entity_ids = relation.pluck(:id)
-            entity_types = entity_ids.map { |id| ::Trax::Model::UUID.new(id[0..1]) }
-                                     .map(&:record_type)
-                                     .flatten
-                                     .compact
-                                     .uniq
-
-            relation_names = entity_types.map{ |type| :"#{type.name.demodulize.underscore}_entity" }
-
-            current_scope.includes(relation_names).references(relation_names)
-          }
-        end
-
-        def model_type
-          @model_type ||= uuid.record_type
-        end
-
-        def model_type_key
-          :"#{model_type.name.demodulize.underscore}_entity"
-        end
-
-        def model
-          @model ||= __send__(model_type_key)
-        end
-
-        def uuid
-          @uuid ||= self[:id].uuid
-        end
-
-        module ClassMethods
-          def mti_namespace(namespace)
-            _mti_namespace = (namespace.is_a?(String)) ? namespace.constantize : namespace
-
-            _mti_namespace.all.reject{|model| model.abstract_class }.each do |subclass|
-              key = :"#{subclass.name.demodulize.underscore}_entity"
-              has_one key, :class_name => subclass.name, :foreign_key => :id
-            end
-          end
-
-          def multiple_table_inheritance_namespace(namespace)
-            mti_namespace(namespace)
-          end
-        end
-      end
-    end
-  end
-end