trax_model 0.0.97 → 0.0.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe39dac9ff74e51159a879a215dc98ccc0bd78c4
-  data.tar.gz: 373428f4903798d45be49fa6d9b539a68c5ed890
+  metadata.gz: a56cf1df33c14218b82e1c7b26c649c52adb18df
+  data.tar.gz: e12109ca5ea6fb9abccb869c7c67d87431614f9c
 SHA512:
-  metadata.gz: ddd740eab7478af4d5b6b3c02556d281191899d8f5ad6ae1882d937e38120f0c759a2970d32dd58fed65d806928e3fc53a02ccf89efff3f4d1afc8a93fb6dba8
-  data.tar.gz: e71ce067fa72afa23bf4149849fd29d37a4e6eb823e2033d0a96835fbc1592ec3e537cf2f99fca3ba1ddd249ab3a8a9dc6675fe33fd64eb2e7e7252c4561e1c6
+  metadata.gz: dc8eb0602e23a03e13a87daf5420f3ea51f1dab49708cee5128c242e175609f795a852185f60c2b26f8a250d42c7a2873a75a8b9c1d8007111cd5afcb6fe338a
+  data.tar.gz: ced26e12c60dcff2b03ccb64bfb1c0bae10e526eb9cb2e9748be3a528e67db668634f47d1ac5f6f4e5b6feca75cf39e1390677c415ba7f8b3365ff3c13fe0708

data/Guardfile

@@ -17,7 +17,7 @@ end
 #  * 'just' rspec: 'rspec'
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 
   # Rails example

data/lib/trax/model.rb

@@ -5,7 +5,6 @@ require 'hashie/mash'
 require 'hashie/trash'
 require 'hashie/extensions/dash/indifferent_access'
 require 'simple_enum'
-require_relative './string'
 require_relative './validators/boolean_validator'
 require_relative './validators/email_validator'
 require_relative './validators/frozen_validator'
@@ -39,6 +38,7 @@ module Trax
     autoload :Restorable
     autoload :Railtie
     autoload :STI
+    autoload :StringExtensions
     autoload :Struct
     autoload :StructExtensions
     autoload :Validators
@@ -85,6 +85,7 @@ module Trax
       ::Trax::Model::Mixins::FieldScopes
       ::Trax::Model::Mixins::IdScopes
       ::Trax::Model::Mixins::SortByScopes
+      ::Trax::Model::Mixins::StiEnum
     end
 
     eager_autoload_mixins!
@@ -156,6 +157,8 @@ module Trax
       end
     end
 
+    ::String.include(::Trax::Model::StringExtensions)
+
     ::ActiveSupport.run_load_hooks(:trax_model, self)
   end
 end

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

@@ -10,7 +10,7 @@ module Trax
             klass_name = "#{klass.fields_module.name.underscore}/#{attribute_name}".camelize
 
             attribute_klass = if options.key?(:extend)
-              _klass_prototype = options[:extend].constantize
+              _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

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

@@ -8,7 +8,7 @@ module Trax
           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].constantize
+              _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

data/lib/trax/model/mixins.rb

@@ -6,6 +6,7 @@ module Trax
       autoload :FieldScopes
       autoload :IdScopes
       autoload :SortByScopes
+      autoload :StiEnum
     end
   end
 end

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

@@ -14,13 +14,11 @@ module Trax
             case field_scope_options[:type]
             when :where
               define_where_scope_for_field(field_scope_name, **field_scope_options)
-            when :match
+            when :where_lower
+              define_where_lower_scope_for_field(field_scope_name, **field_scope_options)
+            when :match, :matching
               define_matching_scope_for_field(field_scope_name, **field_scope_options)
-            when :matching
-              define_matching_scope_for_field(field_scope_name, **field_scope_options)
-            when :not
-              define_where_not_scope_for_field(field_scope_name, **field_scope_options)
-            when :where_not
+            when :where_not, :not
               define_where_not_scope_for_field(field_scope_name, **field_scope_options)
             else
               define_where_scope_for_field(field_scope_name, **field_scope_options)
@@ -32,8 +30,32 @@ module Trax
           private
           def define_where_scope_for_field(field_scope_name, **options)
             scope field_scope_name, lambda{ |*_values|
-              _values.flat_compact_uniq!
-              where(options[:field] => _values)
+              _relation = if _values.first.is_a?(::ActiveRecord::Relation)
+                where(options[:field] => _values.first)
+              else
+                _values.flat_compact_uniq!
+                where(options[:field] => _values)
+              end
+
+              _relation
+            }
+
+            # Alias scope names with pluralized versions, i.e. by_id also => by_ids
+            singleton_class.__send__(:alias_method, :"#{field_scope_name.to_s.pluralize}", field_scope_name)
+          end
+
+          def define_where_lower_scope_for_field(field_scope_name, **options)
+            scope field_scope_name, lambda{ |*_values|
+              _query = "lower(#{options[:field]}) in (?)"
+
+              _relation = if _values.first.is_a?(::ActiveRecord::Relation)
+                where(_query, _values.first)
+              else
+                _values.map!(&:downcase)
+                where(_query, _values)
+              end
+
+              _relation
             }
 
             # Alias scope names with pluralized versions, i.e. by_id also => by_ids
@@ -42,15 +64,27 @@ module Trax
 
           def define_where_not_scope_for_field(field_scope_name, **options)
             scope field_scope_name, lambda{ |*_values|
-              _values.flat_compact_uniq!
-              where.not(options[:field] => _values)
+              _relation = if _values.first.is_a?(::ActiveRecord::Relation)
+                where.not(options[:field] => _values.first)
+              else
+                _values.flat_compact_uniq!
+                where.not(options[:field] => _values)
+              end
+
+              _relation
             }
           end
 
           def define_matching_scope_for_field(field_scope_name, **options)
             scope field_scope_name, lambda{ |*_values|
-              _values.flat_compact_uniq!
-              matching(options[:field] => _values)
+              _relation = if _values.first.is_a?(::ActiveRecord::Relation)
+                matching(options[:field] => _values.first)
+              else
+                _values.flat_compact_uniq!
+                matching(options[:field] => _values)
+              end
+
+              _relation
             }
           end
         end

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

@@ -0,0 +1,51 @@
+
+module Trax
+  module Model
+    module Mixins
+      module StiEnum
+        extend ::Trax::Model::Mixin
+
+        mixed_in do |**options|
+          default_options = { :type_column => :type, :enum_column => :kind }
+
+          options = default_options.merge!(options)
+        end
+
+        included do
+          after_initialize :set_type_from_kind, :unless => :type?, :if => :kind?
+          after_initialize :set_kind_from_type, :unless => :kind?, :if => :type?
+        end
+
+        def set_type_from_kind
+          self[:type] = self.class.kind_to_type_mapping[self[:kind]] if !self[:type]
+        end
+
+        def set_kind_from_type
+          self[:kind] = self.class.type_to_kind_mapping[self[:type]] if !self[:kind]
+        end
+
+        module ClassMethods
+          def subclass_from_attributes?(attrs)
+            _attrs = attrs.with_indifferent_access if attrs
+            attrs[:type] = kind_to_type_mapping[_attrs["kind"]] if attrs && !_attrs.key?("type") && _attrs.key?("kind")
+            super(attrs)
+          end
+
+          def type_to_kind_mapping
+            @type_to_kind_mapping ||= fields[:kind].choices.each_with_object({}) do |choice, result|
+              result[choice.attributes[:type]] = choice.to_s
+              result
+            end.with_indifferent_access
+          end
+
+          def kind_to_type_mapping
+            @kind_to_type_mapping ||= fields[:kind].choices.each_with_object({}) do |choice, result|
+              result[choice.to_s] = choice.attributes[:type]
+              result
+            end.with_indifferent_access
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trax/model/string_extensions.rb

@@ -0,0 +1,11 @@
+module Trax
+  module Model
+    module StringExtensions
+      extend ::ActiveSupport::Concern
+
+      def uuid
+        ::Trax::Model::UUID === self ? ::Trax::Model::UUID.new(self) : nil
+      end
+    end
+  end
+end

data/lib/trax/model/struct_extensions.rb

@@ -40,11 +40,70 @@ module Trax
             define_where_scopes_for_boolean_property(attribute_name, attribute_klass, **options)
           when :enum
             define_scopes_for_enum(attribute_name, attribute_klass, **options)
+          when :array
+            define_scopes_for_array(attribute_name, attribute_klass, **options)
+          when :integer
+            define_scopes_for_numeric(attribute_name, attribute_klass, **options)
+          when :time
+            define_scopes_for_time(attribute_name, attribute_klass, **options)
           else
             define_where_scopes_for_property(attribute_name, attribute_klass, **options)
           end
         end
 
+        def define_scopes_for_array(attribute_name, property_klass, as:nil)
+          return unless has_active_record_ancestry?(property_klass)
+
+          model_class = model_class_for_property(property_klass)
+          field_name = property_klass.parent_definition.name.demodulize.underscore
+          attribute_name = property_klass.name.demodulize.underscore
+          scope_name = as || :"by_#{field_name}_#{attribute_name}"
+          
+          model_class.scope(scope_name, lambda{ |*_scope_values|
+            _scope_values.flat_compact_uniq!
+            model_class.where("#{field_name} -> '#{attribute_name}' ?| array[:values]", :values => _scope_values)
+          })
+        end
+
+        def define_scopes_for_numeric(attribute_name, property_klass, as:nil)
+          return unless has_active_record_ancestry?(property_klass)
+
+          model_class = model_class_for_property(property_klass)
+          field_name = property_klass.parent_definition.name.demodulize.underscore
+          attribute_name = property_klass.name.demodulize.underscore
+          cast_type = property_klass.type
+
+          { :gt => '>', :gte => '>=', :lt => '<', :lte => '<=', :eq => '='}.each_pair do |k, operator|
+            scope_name = as ? :"#{as}_#{k}" : :"by_#{field_name}_#{attribute_name}_#{k}"
+
+            model_class.scope(scope_name, lambda{ |*_scope_values|
+              _scope_values.flat_compact_uniq!
+              model_class.where("(#{field_name} ->> '#{attribute_name}')::#{cast_type} #{operator} ?", _scope_values)
+            })
+          end
+        end
+
+        def define_scopes_for_time(attribute_name, property_klass, as:nil)
+          return unless has_active_record_ancestry?(property_klass)
+
+          model_class = model_class_for_property(property_klass)
+          field_name = property_klass.parent_definition.name.demodulize.underscore
+          attribute_name = property_klass.name.demodulize.underscore
+          cast_type = 'timestamp'
+
+          { :gt => '>', :lt => '<'}.each_pair do |k, operator|
+            scope_prefix = as ? as : :"by_#{field_name}_#{attribute_name}"
+            scope_name = "#{scope_prefix}_#{k}"
+            scope_alias = "#{scope_prefix}_#{{:gt => 'after', :lt => 'before' }[k]}"
+
+            model_class.scope(scope_name, lambda{ |*_scope_values|
+              _scope_values.flat_compact_uniq!
+              model_class.where("(#{field_name} ->> '#{attribute_name}')::#{cast_type} #{operator} ?", _scope_values)
+            })
+            model_class.singleton_class.__send__("alias_method", scope_alias.to_sym, scope_name)
+          end
+        end
+
         #this only supports properties 1 level deep, but works beautifully
         #I.E. for this structure
         # define_attributes do

data/lib/trax/model/uuid.rb

@@ -2,16 +2,27 @@ module Trax
   module Model
     class UUID < String
       class_attribute :prefix_map
-
       self.prefix_map = ::Hashie::Mash.new
 
+      def self.===(val)
+        return false unless (val.is_a?(::Trax::Model::UUID) || val.is_a?(::String)) && val.length == 36
+        return true if val.is_a?(::Trax::Model::UUID)
+
+        #i.e. if we have 2 and 3 digit lengths, for value 'ABCDE' return ['AB', 'ABC']
+        value_samples = prefix_lengths.map do |limit|
+          val[0..(limit-1)]
+        end
+
+        return value_samples.any?{|sample| prefixes.include?(sample) }
+      end
+
       def self.klass_prefix_map
         prefix_map.invert
       end
 
       def self.generate(prefix = nil)
         uuid = ::SecureRandom.uuid
-        uuid[0..1] = prefix if prefix
+        uuid[0..(prefix.length-1)] = prefix if prefix
         uuid
       end
 
@@ -23,6 +34,14 @@ module Trax
         prefix_map[:"#{prefix_value}"] = klass
       end
 
+      def self.prefixes
+        @prefixes ||= ::Trax::Model::Registry.uuid_map.keys
+      end
+
+      def self.prefix_lengths
+        @prefix_lengths ||= prefixes.map(&:length).uniq
+      end
+
       def self.register(&block)
         instance_exec(&block)
       end

data/lib/trax_model/version.rb

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

data/spec/db/schema/default_tables.rb

@@ -1,4 +1,13 @@
 DEFAULT_TABLES = Proc.new do
+  create_table "vehicles", :force => true do |t|
+    t.string   "type"
+    t.integer  "kind"
+    t.integer  "make"
+    t.integer  "model"
+    t.string   "uuid"    
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
   create_table "products", :force => true do |t|
     t.string   "name"
     t.integer  "category_id"

data/spec/spec_helper.rb

@@ -14,7 +14,9 @@ ENV["DB"] ||= "sqllite"
 ENV["DB"] = "postgres" if ENV["DB"] == "pg" || ENV["pg"] == "true"
 
 RSpec.configure do |config|
+  config.filter_run :focus
   config.filter_run_excluding :postgres => true unless ENV["DB"] == "postgres"
+  config.run_all_when_everything_filtered = true
 
   config.before(:suite) do
     db_config = ::YAML::load(::File.open("#{File.dirname(__FILE__)}/db/database.yml"))

data/spec/support/models.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'trax_core'
 
 ::ActiveRecord::Schema.define(:version => 1) do
   require_relative '../db/schema/default_tables'
@@ -13,6 +14,15 @@ end
 if ENV["DB"] == "postgres"
   require_relative 'pg/models'
 end
+#
+# class Blueprint < ::Trax::Core::Blueprint
+#   class Vehicle < ::Trax::Core::Blueprint
+#     enum :kind do
+#       define :car, 1, :type => "Vehicle::Car"
+#       define :truck, 2, :type => "Vehicle::Truck"
+#     end
+#   end
+# end
 
 class Product < ::ActiveRecord::Base
   include ::Trax::Model
@@ -60,6 +70,27 @@ module Products
   end
 end
 
+class Vehicle < ::ActiveRecord::Base
+  include ::Trax::Model
+  include ::Trax::Model::Attributes::Mixin
+
+  mixins :unique_id => { :uuid_column => "uuid", :uuid_prefix => "9c" },
+         :sti_enum  => true
+
+  define_attributes do
+    enum :kind do
+      define :car, 1, :type => "Vehicle::Car"
+      define :truck, 2, :type => "Vehicle::Truck"
+    end
+  end
+
+  class Car < ::Vehicle
+  end
+
+  class Truck < ::Vehicle
+  end
+end
+
 class Widget < ::ActiveRecord::Base
   include ::Trax::Model
 
@@ -78,7 +109,11 @@ class Message < ::ActiveRecord::Base
 
   mixins :unique_id => { :uuid_column => "uuid", :uuid_prefix => "3a" },
          :freezable => true,
-         :restorable => { :field => :deleted }
+         :restorable => { :field => :deleted },
+         :field_scopes => {
+           :by_title => true,
+           :by_title_case_insensitive => { :field => :title, :type => :where_lower}
+         }
 
   enum :status => [ :queued, :scheduled, :delivered, :failed_delivery ]
 
@@ -114,8 +149,6 @@ end
 class SwinglineStaplerAttributeSet < ::ActiveRecord::Base
 end
 
-
-
 class StoreCategory < ::Trax::Core::Types::Struct
   include ::Trax::Model::StructExtensions
 

data/spec/support/pg/models.rb

@@ -6,9 +6,6 @@ module Ecommerce
     include ::Trax::Model::Attributes::Mixin
 
     mixins :unique_id => { :uuid_prefix => "c2" }
-
-    # belongs_to :user, :class_name => "Ecommerce::User"
-    # belongs_to :product, :class_name => "Ecommerce::Product"
   end
 
   class ShippingAttributes < ::Ecommerce::ProductAttributeSet
@@ -39,6 +36,8 @@ module Ecommerce
 
           validates(:length, :numericality => {:greater_than => 0})
         end
+
+        define_model_scope_for :cost, :as => :by_cost
       end
     end
   end
@@ -64,6 +63,17 @@ module Ecommerce
         define :out_of_stock, 2
         define :backordered,  3
       end
+
+      struct :custom_fields do
+        integer :cost
+        integer :price
+        integer :in_stock_quantity, :default => 0
+        integer :number_of_sales, :default => 0
+        time :last_received_at
+
+        define_model_scope_for :in_stock_quantity, :as => :by_quantity_in_stock
+        define_model_scope_for :last_received_at, :as => :by_last_received_at
+      end
     end
   end
 
@@ -71,6 +81,9 @@ module Ecommerce
     class Shoes < ::Ecommerce::Product
       include ::Trax::Model
       include ::Trax::Model::Attributes::Mixin
+
+      define_attributes do
+      end
     end
 
     class MensShoes < ::Ecommerce::Products::Shoes
@@ -81,14 +94,12 @@ module Ecommerce
         string :name, :default => "Some Shoe Name"
         boolean :active, :default => true
 
-        struct :custom_fields do
+        struct :custom_fields, :extend => ::Ecommerce::Product::Fields::CustomFields do
           string :primary_utility, :default => "Skateboarding"
           string :sole_material
           boolean :has_shoelaces
-          integer :in_stock_quantity, :default => 0
-          integer :number_of_sales, :default => 0
-          integer :cost
-          integer :price
+
+          array :tags
 
           enum :color, :default => :blue do
             define :red,   1
@@ -112,6 +123,7 @@ module Ecommerce
           end
 
           define_model_scopes_for(:primary_utility, :has_shoelaces, :size)
+          define_model_scope_for :tags, :as => :by_tags
         end
       end
     end

data/spec/trax/model/attributes/types/struct_spec.rb

@@ -4,7 +4,7 @@ describe ::Trax::Model::Attributes::Types::Struct, :postgres => true do
   subject{ ::Ecommerce::Products::MensShoes::Fields::CustomFields }
 
   it { expect(subject.new.primary_utility).to eq "Skateboarding" }
-  it { expect(subject.new.sole_material).to eq nil }
+  it { expect(subject.new.sole_material).to eq "" }
 
   context "attribute definition" do
     subject { ::Ecommerce::ShippingAttributes.new }
@@ -69,6 +69,86 @@ describe ::Trax::Model::Attributes::Types::Struct, :postgres => true do
         it { expect(subject.by_custom_fields_size(:mens_6, :mens_7)).to include(mens_6, mens_7) }
         it { expect(subject.by_custom_fields_size(:mens_6, :mens_7)).to_not include(mens_10) }
       end
+
+      context "array property" do
+        before(:all) do
+          @item_1 = ::Ecommerce::Products::MensShoes.create(:custom_fields => { :tags => ['skateboarding'] })
+          @item_2 = ::Ecommerce::Products::MensShoes.create(:custom_fields => { :tags => ['skateboarding', 'walking']})
+          @item_3 = ::Ecommerce::Products::MensShoes.create(:custom_fields => { :tags => ['running']})
+        end
+
+        subject { ::Ecommerce::Products::MensShoes.all }
+
+        it { expect(subject.by_tags('skateboarding')).to include(@item_1, @item_2) }
+        it { expect(subject.by_tags('skateboarding')).to_not include(@item_3) }
+        it { expect(subject.by_tags('running')).to include(@item_3) }
+        it { expect(subject.by_tags('running')).to_not include(@item_1, @item_2) }
+      end
+
+      context "time property" do
+        before(:all) do
+          @timestamp_1 = "2013-01-01 07:00:00"
+          @timestamp_2 = "2014-01-01 07:00:00"
+          @timestamp_3 = "2015-01-01 07:00:00"
+          @item_1 =  ::Ecommerce::Products::MensShoes.create(:custom_fields => { :last_received_at => @timestamp_1 })
+          @item_2 =  ::Ecommerce::Products::MensShoes.create(:custom_fields => { :last_received_at => @timestamp_2 })
+          @item_3 =  ::Ecommerce::Products::MensShoes.create(:custom_fields => { :last_received_at => @timestamp_3 })
+        end
+
+        subject { ::Ecommerce::Products::MensShoes.all }
+
+        context "greater than" do
+          it { expect(subject.by_last_received_at_gt(@timestamp_2)).to include(@item_3) }
+          it { expect(subject.by_last_received_at_gt(@timestamp_2)).to_not include(@item_2, @item1) }
+        end
+
+        context "less than" do
+          it { expect(subject.by_last_received_at_lt(@timestamp_2)).to include(@item_1) }
+          it { expect(subject.by_last_received_at_lt(@timestamp_2)).to_not include(@item_3, @item_2) }
+        end
+      end
+
+      context "numeric property" do
+        before(:all) do
+          @item_1 =  ::Ecommerce::Products::MensShoes.create(:custom_fields => { :in_stock_quantity => 1 })
+          @item_2 =  ::Ecommerce::Products::MensShoes.create(:custom_fields => { :in_stock_quantity => 2 })
+          @item_3 =  ::Ecommerce::Products::MensShoes.create(:custom_fields => { :in_stock_quantity => 3 })
+        end
+
+        subject { ::Ecommerce::Products::MensShoes.all }
+
+
+        context "less than" do
+          it { expect(subject.by_quantity_in_stock_lt(2)).to include(@item_1) }
+          it { expect(subject.by_quantity_in_stock_lt(2)).to_not include(@item_2, @item_3) }
+
+          context "or equal" do
+            it { expect(subject.by_quantity_in_stock_lte(2)).to include(@item_1, @item_2) }
+            it { expect(subject.by_quantity_in_stock_lt(2)).to_not include(@item_3) }
+          end
+        end
+
+        context "greater than" do
+          it { expect(subject.by_quantity_in_stock_gt(2)).to include(@item_3) }
+          it { expect(subject.by_quantity_in_stock_gt(2)).to_not include(@item_2, @item_1) }
+
+          context "or equal" do
+            it { expect(subject.by_quantity_in_stock_gte(2)).to include(@item_3, @item_2) }
+            it { expect(subject.by_quantity_in_stock_gte(2)).to_not include(@item_1) }
+          end
+        end
+
+        context "equal" do
+          it {
+            values = subject.by_quantity_in_stock_eq(2).map(&:custom_fields).map(&:in_stock_quantity)
+            expect(values).to include(2)
+          }
+          it {
+            values = subject.by_quantity_in_stock_eq(2).map(&:custom_fields).map(&:in_stock_quantity)
+            expect(values).to_not include(1, 3)
+          }
+        end
+      end
     end
 
     context "dirty attributes" do

data/spec/trax/model/mixins/field_scopes_spec.rb

@@ -1,7 +1,47 @@
 require 'spec_helper'
 
 describe ::Trax::Model::Mixins::FieldScopes do
-  subject{ ::Message.create(:title => "Whatever") }
+  let(:known_title) { "Whatever's Clever: The Questioning" }
+  let(:other_known_title) { "Whatever's Clever: The Reckoning" }
+  let(:unknown_title) { "Most Known Unkown" }
+  let(:known_titles) { [known_title, other_known_title] }
+  let!(:known_message) { ::Message.create(:title => known_title) }
+  let!(:other_known_message) { ::Message.create(:title => other_known_title) }
+  let!(:known_titles_relation) { ::Message.where(id: known_message.id).select(:title) }
+  let!(:known_titles_downcased_relation) { ::Message.where(id: known_message.id).select('lower(title)') }
+  let!(:known_titles_upcased_relation) { ::Message.where(id: known_message.id).select('upper(title)') }
 
-  its(:status) { should eq "queued" }
+  subject { ::Message }
+
+  context "type 'where'" do
+    it { expect(subject.by_title(known_title)).to be_present }
+    it { expect(subject.by_title(known_title.downcase)).to be_empty }
+    it { expect(subject.by_title(known_title.upcase)).to be_empty }
+
+    it { expect(subject.by_title(*known_titles)).to be_present }
+    it { expect(subject.by_title(*known_titles.map(&:downcase))).to be_empty }
+    it { expect(subject.by_title(*known_titles.map(&:upcase))).to be_empty }
+
+    it { expect(subject.by_title(known_titles_relation)).to be_present }
+    it { expect(subject.by_title(known_titles_downcased_relation)).to be_empty }
+    it { expect(subject.by_title(known_titles_upcased_relation)).to be_empty }
+
+    it { expect(subject.by_title(unknown_title)).to be_empty }
+  end
+
+  context "type 'where_lower'" do
+    it { expect(subject.by_title_case_insensitive(known_title)).to be_present }
+    it { expect(subject.by_title_case_insensitive(known_title.downcase)).to be_present }
+    it { expect(subject.by_title_case_insensitive(known_title.upcase)).to be_present }
+
+    it { expect(subject.by_title_case_insensitive(*known_titles)).to be_present }
+    it { expect(subject.by_title_case_insensitive(*known_titles.map(&:downcase))).to be_present }
+    it { expect(subject.by_title_case_insensitive(*known_titles.map(&:upcase))).to be_present }
+
+    it { expect(subject.by_title_case_insensitive(known_titles_relation)).to be_empty }
+    it { expect(subject.by_title_case_insensitive(known_titles_downcased_relation)).to be_present }
+    it { expect(subject.by_title_case_insensitive(known_titles_upcased_relation)).to be_empty }
+
+    it { expect(subject.by_title_case_insensitive(unknown_title)).to be_empty }
+  end
 end

data/spec/trax/model/mixins/sti_enum_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+describe ::Trax::Model::Mixins::StiEnum do
+  subject{ ::Vehicle }
+
+  it { expect(::Vehicle.new(:kind => :car).type).to eq "Vehicle::Car"}
+  it { expect(::Vehicle.new(:kind => :truck).type).to eq "Vehicle::Truck"}
+end

data/spec/trax/string_spec.rb

@@ -3,10 +3,12 @@ describe ::String do
   let(:product) { ::Product.create(:name => "iMac") }
   subject{ "#{product.uuid}" }
 
+  it{ expect(subject.uuid).to be_instance_of(::Trax::Model::UUID) }
+
   its(:uuid) { should be_instance_of(::Trax::Model::UUID) }
 
   context "when not a uuid length" do
     let(:truncated_uuid) { subject[0..8] }
-    it { truncated_uuid.uuid.should be_nil }
+    it { expect(truncated_uuid.uuid).to be_nil }
   end
 end

data/trax_model.gemspec

@@ -18,7 +18,7 @@ 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.80"
+  spec.add_dependency "trax_core", "~> 0.0.83"
   spec.add_dependency "default_value_for", "~> 3.0.0"
   spec.add_dependency "simple_enum"
   spec.add_development_dependency "hashie", ">= 3.4.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trax_model
 version: !ruby/object:Gem::Version
-  version: 0.0.97
+  version: 0.0.98
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-12-17 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.80
+        version: 0.0.83
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.80
+        version: 0.0.83
 - !ruby/object:Gem::Dependency
   name: default_value_for
   requirement: !ruby/object:Gem::Requirement
@@ -347,6 +347,7 @@ files:
 - lib/trax/model/mixins/field_scopes.rb
 - lib/trax/model/mixins/id_scopes.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
@@ -357,12 +358,12 @@ files:
 - 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
-- lib/trax/string.rb
 - lib/trax/validators/boolean_validator.rb
 - lib/trax/validators/email_validator.rb
 - lib/trax/validators/enum_attribute_validator.rb
@@ -389,6 +390,7 @@ files:
 - spec/trax/model/freezable_spec.rb
 - spec/trax/model/matchable_spec.rb
 - spec/trax/model/mixins/field_scopes_spec.rb
+- spec/trax/model/mixins/sti_enum_spec.rb
 - spec/trax/model/registry_spec.rb
 - spec/trax/model/restorable_spec.rb
 - spec/trax/model/sti/attributes_spec.rb
@@ -443,6 +445,7 @@ test_files:
 - spec/trax/model/freezable_spec.rb
 - spec/trax/model/matchable_spec.rb
 - spec/trax/model/mixins/field_scopes_spec.rb
+- spec/trax/model/mixins/sti_enum_spec.rb
 - spec/trax/model/registry_spec.rb
 - spec/trax/model/restorable_spec.rb
 - spec/trax/model/sti/attributes_spec.rb

data/lib/trax/string.rb

@@ -1,5 +0,0 @@
-::String.class_eval do
-  def uuid
-    self.length == 36 ? ::Trax::Model::UUID.new(self) : nil
-  end
-end