trax_model 0.0.98 → 0.0.99

data/lib/trax/model/extensions_for/struct_fields/time.rb

@@ -0,0 +1,54 @@
+module Trax
+  module Model
+    module ExtensionsFor
+      module StructFields
+        module Time
+          extend ::ActiveSupport::Concern
+          include ::Trax::Model::ExtensionsFor::Base
+
+          module ClassMethods
+            def after(value)
+              cast_type = 'timestamp'
+              operator = '>'
+              model_class.where("(#{parent_definition.field_name} ->> '#{field_name}')::#{cast_type} #{operator} ?", value)
+            end
+
+            def before(value)
+              cast_type = 'timestamp'
+              operator = '<'
+              model_class.where("(#{parent_definition.field_name} ->> '#{field_name}')::#{cast_type} #{operator} ?", value)
+            end
+
+            def between(first_time, second_time)
+              after(first_time).merge(before(second_time))
+            end
+
+            def gt(value)
+              after(value)
+            end
+
+            def gte(value)
+              cast_type = 'timestamp'
+              operator = '>='
+              model_class.where("(#{parent_definition.field_name} ->> '#{field_name}')::#{cast_type} #{operator} ?", value)
+            end
+
+            def in_range(first_time, second_time)
+              gte(first_time).merge(lte(second_time))
+            end
+
+            def lt(value)
+              before(value)
+            end
+
+            def lte(value)
+              cast_type = 'timestamp'
+              operator = '<='
+              model_class.where("(#{parent_definition.field_name} ->> '#{field_name}')::#{cast_type} #{operator} ?", value)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trax/model/matchable.rb

@@ -3,23 +3,16 @@ module Trax
     module Matchable
       extend ::ActiveSupport::Concern
 
-      included do
-        ::String.class_eval do
-          def to_matchable
-            "%#{self.strip}%"
-          end
-        end
-      end
-
       module ClassMethods
         def matching(args = {})
           matches = args.inject(self.all) do |scope, (key, value)|
             node = key.is_a?(Symbol) ? self.arel_table[key] : key
 
             values = [value]
+            values.flat_compact_uniq!
+            values.map!(&:to_matchable)
 
-            match_values = values.flatten.compact.uniq.map!(&:to_matchable)
-            scope = scope.where(node.matches_any(match_values))
+            scope = scope.where(node.matches_any(values))
             scope
           end
 

data/lib/trax/model/mixins.rb

@@ -4,9 +4,12 @@ module Trax
       extend ::ActiveSupport::Autoload
 
       autoload :FieldScopes
+      autoload :Freezable
       autoload :IdScopes
+      autoload :Restorable
       autoload :SortByScopes
       autoload :StiEnum
+      autoload :UniqueId
     end
   end
 end

data/lib/trax/model/mixins/freezable.rb

@@ -0,0 +1,31 @@
+module Trax
+  module Model
+    module Mixins
+      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
+end

data/lib/trax/model/mixins/restorable.rb

@@ -0,0 +1,63 @@
+module Trax
+  module Model
+    module Mixins
+      module Restorable
+        extend ::Trax::Model::Mixin
+
+        define_configuration_options! do
+          option :field, :default => :is_deleted
+          option :timestamp_field, :default => :deleted_at
+          option :hide_deleted, :default => true
+          option :alias_destroy, :default => true
+        end
+
+        included do
+          define_configuration_options!(:restorable) do
+            option :field, :default => ::Trax::Model::Mixins::Restorable.config.field
+            option :timestamp_field, :default => ::Trax::Model::Mixins::Restorable.config.timestamp_field
+            option :hide_deleted, :default => ::Trax::Model::Mixins::Restorable.config.hide_deleted
+            option :alias_destroy, :default => ::Trax::Model::Mixins::Restorable.config.alias_destroy
+          end
+        end
+
+        module ClassMethods
+          def setup_restorable!
+            self.class_eval do
+              if(self.restorable_config.hide_deleted)
+                default_scope { by_not_deleted }
+              end
+
+              if(self.restorable_config.alias_destroy)
+                alias_method :destroy!, :destroy
+              end
+
+              ### Clear default deleted scope ###
+              scope :by_is_deleted, lambda { |*|
+                unscope(:where => self.restorable_config.field).where(self.restorable_config.field => true)
+              }
+              scope :by_not_deleted, lambda { |*|
+                where(self.restorable_config.field => false)
+              }
+
+              default_value_for(self.restorable_config.field) { false }
+            end
+          end
+        end
+
+        def destroy
+          self.update_attributes(self.class.restorable_config.field => true, self.class.restorable_config.timestamp_field => ::DateTime.now)
+        end
+
+        def restore
+          self.update_attributes(self.class.restorable_config.field => false, self.class.restorable_config.timestamp_field => ::DateTime.now)
+        end
+
+        def self.apply_mixin(target, options)
+          target.restorable_config.merge!(options)
+
+          target.setup_restorable!
+        end
+      end
+    end
+  end
+end

data/lib/trax/model/mixins/sti_enum.rb

@@ -1,4 +1,3 @@
-
 module Trax
   module Model
     module Mixins
@@ -12,16 +11,16 @@ module Trax
         end
 
         included do
-          after_initialize :set_type_from_kind, :unless => :type?, :if => :kind?
-          after_initialize :set_kind_from_type, :unless => :kind?, :if => :type?
+          after_initialize :set_kind_from_type
+          after_initialize :set_type_from_kind
         end
 
         def set_type_from_kind
-          self[:type] = self.class.kind_to_type_mapping[self[:kind]] if !self[:type]
+          self[:type] = self.class.kind_to_type_mapping[self[:kind]] if self.has_attribute?(:kind) && self.has_attribute?(:type) && !self[:type]
         end
 
         def set_kind_from_type
-          self[:kind] = self.class.type_to_kind_mapping[self[:type]] if !self[:kind]
+          self[:kind] = self.class.type_to_kind_mapping[self[:type]] if self.has_attribute?(:kind) && self.has_attribute?(:type) && self.has_attribute?(:type) && !self[:kind]
         end
 
         module ClassMethods

data/lib/trax/model/mixins/unique_id.rb

@@ -0,0 +1,85 @@
+module Trax
+  module Model
+    module Mixins
+      module UniqueId
+        extend ::Trax::Model::Mixin
+
+        define_configuration_options! do
+          option :uuid_column, :default => :id
+          option :uuid_map, :default => {}
+        end
+
+        after_included do |options|
+          define_configuration_options!(:unique_id) do
+            option :uuid_prefix,
+                   :validates => {
+                     :exclusion => {
+                       :in => ::Trax::Model::Registry.uuid_map.values
+                     },
+                     :inclusion => {
+                       :in => ::Trax::Model::UUIDPrefix.all,
+                       :message => "%{value} not a valid uuid prefix!\nRun Trax::Model::UUIDPrefix.all for valid prefix list"
+                     },
+                     :allow_nil => true
+                   }
+
+            option :uuid_column, :default => ::Trax::Model::Mixins::UniqueId.config.uuid_column
+
+            klass do
+              def uuid_prefix=(prefix)
+                if(::Trax::Model::Mixins::UniqueId.config.uuid_map.values.include?(prefix) && ::Trax::Model::Mixins::UniqueId.config.uuid_map[self.source.name] != prefix)
+                  raise ::Trax::Model::Errors::DuplicatePrefixRegistered.new(:prefix => prefix, :model => self.source.name)
+                end
+
+                ::Trax::Model::Mixins::UniqueId.config.uuid_map[self.source.name] = prefix
+                super(::Trax::Model::UUIDPrefix.new(prefix))
+              end
+            end
+
+          end
+
+          #grab prefix from uuid registry if uuids are defined in an initializer
+          if ::Trax::Model.mixin_registry.key?(:unique_id) && ::Trax::Model::UUID.klass_prefix_map.key?(self.name)
+            self.unique_id_config.uuid_prefix = ::Trax::Model::UUID.klass_prefix_map[self.name]
+          end
+
+          self.unique_id_config.merge!(options)
+
+          if(self.unique_id_config.uuid_prefix)
+            default_value_for(:"#{self.unique_id_config.uuid_column}") {
+              ::Trax::Model::UUID.generate(self.unique_id_config.uuid_prefix)
+            }
+          end
+        end
+
+        def uuid
+          uuid_column = self.class.unique_id_config.uuid_column
+          uuid_value = (uuid_column == "uuid") ? super : __send__(uuid_column)
+
+          ::Trax::Model::UUID.new(uuid_value)
+        end
+
+        #i.e. Blog::Post
+        def uuid_type
+          uuid.record_type
+        end
+
+        #i.e. 'Blog::Post'
+        def uuid_type_name
+          uuid.record_type.name
+        end
+
+        #i.e, Blog::Post will = post
+        def uuid_type_slug
+          uuid.record_type.name.demodulize.underscore
+        end
+
+        module ClassMethods
+          def uuid_prefix
+            self.unique_id_config.uuid_prefix
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trax/model/railtie.rb

@@ -3,8 +3,10 @@ module Trax
     class Railtie < ::Rails::Railtie
       ::ActiveSupport.on_load(:active_record) do
         def self.inherited(subklass)
-          subklass.include(::Trax::Model) if ::Trax::Model.config.auto_include
-          subklass.include(::Trax::Model::Attributes::Mixin) if ::Trax::Model.config.auto_include
+          if ::Trax::Model.config.auto_include
+            subklass.include(::Trax::Model)
+            subklass.include(::Trax::Model::Attributes::Dsl)
+          end
 
           super(subklass)
 

data/lib/trax/validators/json_attribute_validator.rb

@@ -4,6 +4,7 @@
 class JsonAttributeValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
     json_attribute = object.class.fields_module[attribute]
+    value = json_attribute.new(value || {}) unless value.is_a?(json_attribute)
 
     value.instance_variable_set("@record", object)
 

data/lib/trax_model/version.rb

@@ -1,3 +1,3 @@
 module TraxModel
-  VERSION = '0.0.98'
+  VERSION = '0.0.99'
 end

data/spec/db/schema/default_tables.rb

@@ -4,7 +4,7 @@ DEFAULT_TABLES = Proc.new do
     t.integer  "kind"
     t.integer  "make"
     t.integer  "model"
-    t.string   "uuid"    
+    t.string   "uuid"
     t.datetime "created_at",        :null => false
     t.datetime "updated_at",        :null => false
   end
@@ -58,20 +58,4 @@ DEFAULT_TABLES = Proc.new do
     t.datetime "created_at",        :null => false
     t.datetime "updated_at",        :null => false
   end
-
-  create_table "staplers", :force => true do |t|
-    t.string "name"
-    t.string "type"
-    t.integer "attribute_set_id"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
-  end
-
-  create_table "swingline_stapler_attribute_sets", :force => true do |t|
-    t.float "speed"
-    t.string "owner"
-
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
-  end
 end

data/spec/db/schema/pg_tables.rb

@@ -16,6 +16,21 @@ PG_TABLES = Proc.new do
     t.datetime "updated_at",        :null => false
   end
 
+  create_table "ecommerce_votes", :id => :uuid, :force => true do |t|
+    t.uuid "voteable_id"
+    t.jsonb "upvoter_ids"
+    t.jsonb "downvoter_ids"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "ecommerce_users", :id => :uuid, :force => true do |t|
+    t.string "name"
+    t.text "watched_product_ids", :array => true
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
   create_table "ecommerce_product_attribute_sets", :id => :uuid, :force => true do |t|
     t.uuid     "user_id"
     t.uuid     "product_id"

data/spec/support/models.rb

@@ -26,7 +26,7 @@ end
 
 class Product < ::ActiveRecord::Base
   include ::Trax::Model
-  include ::Trax::Model::Attributes::Mixin
+  include ::Trax::Model::Attributes::Dsl
 
   mixins :unique_id => {
     :uuid_column => "uuid",
@@ -34,6 +34,12 @@ class Product < ::ActiveRecord::Base
   }
 
   define_attributes do
+    string :name
+    # float :price
+
+    integer :in_stock_quantity
+    integer :out_of_stock_quantity
+
     enum :status, :default => :in_stock do
       define :in_stock,     1
       define :out_of_stock, 2
@@ -47,12 +53,12 @@ end
 module Products
   class Shoes < Product
     include ::Trax::Model
-    include ::Trax::Model::Attributes::Mixin
+    include ::Trax::Model::Attributes::Dsl
   end
 
   class MensShoes < Shoes
     include ::Trax::Model
-    include ::Trax::Model::Attributes::Mixin
+    include ::Trax::Model::Attributes::Dsl
 
     define_attributes do
       enum :size, :default => :mens_9 do
@@ -72,7 +78,7 @@ end
 
 class Vehicle < ::ActiveRecord::Base
   include ::Trax::Model
-  include ::Trax::Model::Attributes::Mixin
+  include ::Trax::Model::Attributes::Dsl
 
   mixins :unique_id => { :uuid_column => "uuid", :uuid_prefix => "9c" },
          :sti_enum  => true
@@ -138,19 +144,8 @@ class Person < ::ActiveRecord::Base
   mixins :unique_id => { :uuid_column => "uuid", :uuid_prefix => "5a" }
 end
 
-class Stapler < ::ActiveRecord::Base
-  include ::Trax::Model
-end
-
-class SwinglineStapler < ::Stapler
-  include ::Trax::Model::STI::Attributes
-end
-
-class SwinglineStaplerAttributeSet < ::ActiveRecord::Base
-end
-
 class StoreCategory < ::Trax::Core::Types::Struct
-  include ::Trax::Model::StructExtensions
+  include ::Trax::Model::ExtensionsFor::Struct
 
   string :name
   struct :meta_attributes do