trax_model 0.0.92 → 0.0.93

data/lib/trax/model/unique_id.rb

@@ -8,17 +8,10 @@ module Trax
         option :uuid_map, :default => {}
       end
 
-      included do
+      after_included do |options|
         define_configuration_options!(:unique_id) do
+
           option :uuid_prefix,
-                 :setter => lambda{ |prefix|
-                   if(::Trax::Model::UniqueId.config.uuid_map.values.include?(prefix) && ::Trax::Model::UniqueId.config.uuid_map[self.source.name] != prefix)
-                     raise ::Trax::Model::Errors::DuplicatePrefixRegistered.new(:prefix => prefix, :model => self.source.name)
-                   end
-
-                   ::Trax::Model::UniqueId.config.uuid_map[self.source.name] = prefix
-                   ::Trax::Model::UUIDPrefix.new(prefix)
-                 },
                  :validates => {
                    :exclusion => {
                      :in => ::Trax::Model::Registry.uuid_map.values
@@ -31,15 +24,25 @@ module Trax
                  }
 
           option :uuid_column, :default => ::Trax::Model::UniqueId.config.uuid_column
+
+          klass do
+            def uuid_prefix=(prefix)
+              if(::Trax::Model::UniqueId.config.uuid_map.values.include?(prefix) && ::Trax::Model::UniqueId.config.uuid_map[self.source.name] != prefix)
+                raise ::Trax::Model::Errors::DuplicatePrefixRegistered.new(:prefix => prefix, :model => self.source.name)
+              end
+
+              ::Trax::Model::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
-      end
 
-      after_included do |options|
         self.unique_id_config.merge!(options)
 
         if(self.unique_id_config.uuid_prefix)
@@ -76,16 +79,6 @@ module Trax
           self.unique_id_config.uuid_prefix
         end
       end
-
-      # def self.apply_mixin(target, options)
-      #   target.unique_id_config.merge!(options)
-      #
-      #   if(target.unique_id_config.uuid_prefix)
-      #     target.default_value_for(:"#{target.unique_id_config.uuid_column}") {
-      #       ::Trax::Model::UUID.generate(target.unique_id_config.uuid_prefix)
-      #     }
-      #   end
-      # end
     end
   end
 end

data/lib/trax/model/uuid.rb

@@ -28,7 +28,7 @@ module Trax
       end
 
       def record
-        @record ||= record_type ? record_type.find_by(:"#{record_type.uuid_column}" => self) : nil
+        @record ||= record_type ? record_type.find_by(:"#{record_type.unique_id_config.uuid_column}" => self) : nil
       end
 
       def record_type

data/lib/trax/validators/enum_attribute_validator.rb

@@ -0,0 +1,9 @@
+class EnumAttributeValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+    enum_attribute = object.class.fields_module[attribute]
+
+    unless value.is_a?(enum_attribute) && enum_attribute === value
+      object.errors[attribute] = "#{value} is not an allowed value"
+    end
+  end
+end

data/lib/trax/validators/future_validator.rb

@@ -1,5 +1,5 @@
 class FutureValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    object.errors[attribute] << 'Must be in future' if value < ::DateTime.now
+    object.errors[attribute] << 'Must be in future' if value && (value < ::DateTime.now)
   end
 end

data/lib/trax/validators/json_attribute_validator.rb

@@ -3,13 +3,13 @@
 # that a hash is not provided
 class JsonAttributeValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
-    json_attribute = object.class.trax_attribute_fields[:json][attribute]
+    json_attribute = object.class.fields_module[attribute]
 
     unless value.is_a?(json_attribute) && value.valid?
       if value.is_a?(json_attribute)
         value.errors.messages.each_pair do |k,v|
-          v = v.join(", ") if v.is_a?(Array)
-          object.errors.add(:"#{attribute}.#{k}", v)
+          v.flatten.join(", ") if v.is_a?(Array)
+          object.errors.add("#{attribute}.#{k}", v)
         end
       else
         object.errors[attribute] << "can not be blank"

data/lib/trax/validators/string_attribute_validator.rb

@@ -0,0 +1,17 @@
+# validates each json property and bubbles up any errors
+# also throws a generic can not be blank error, in the event
+# that a hash is not provided
+class StringAttributeValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+    string_attribute = value.class
+
+    unless value.valid?
+      if value.is_a?(string_attribute)
+        value.errors.messages.each_pair do |k,v|
+          v.flatten.join(", ") if v.is_a?(Array)
+          object.errors.add("#{attribute}.#{k}", v)
+        end
+      end
+    end
+  end
+end

data/lib/trax_model/version.rb

@@ -1,3 +1,3 @@
 module TraxModel
-  VERSION = '0.0.92'
+  VERSION = '0.0.93'
 end

data/spec/db/database.yml

@@ -0,0 +1,16 @@
+default: &default
+  adapter: sqlite3
+  database: spec/test.db
+
+sqllite:
+  <<: *default
+
+postgres:
+  <<: *default
+  adapter: postgresql
+  encoding: unicode
+  database: trax_model_tests
+  pool: 5
+  host: localhost
+  username: postgres
+  password:

data/spec/db/schema/default_tables.rb

@@ -0,0 +1,68 @@
+DEFAULT_TABLES = Proc.new do
+  create_table "products", :force => true do |t|
+    t.string   "name"
+    t.integer  "category_id"
+    t.integer  "user_id"
+    t.decimal  "price"
+    t.integer  "in_stock_quantity"
+    t.integer  "on_order_quantity"
+    t.boolean  "active"
+    t.string   "uuid"
+    t.integer  "status"
+    t.integer  "size"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "messages", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.integer  "status"
+    t.string   "uuid"
+    t.boolean  "deleted"
+    t.datetime "deleted_at"
+    t.datetime "deliver_at"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "widgets", :force => true do |t|
+    t.string "uuid"
+    t.string  "email_address"
+    t.string  "subdomain"
+    t.string  "website"
+    t.integer  "status"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "things", :force => true do |t|
+    t.string "name"
+    t.string "uuid"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+
+  create_table "people", :force => true do |t|
+    t.string "name"
+    t.string "uuid"
+    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

@@ -0,0 +1,27 @@
+PG_TABLES = Proc.new do
+  execute %q{CREATE EXTENSION IF NOT EXISTS "uuid-ossp";}
+  execute %q{CREATE EXTENSION IF NOT EXISTS "pg_trgm";}
+
+  create_table "ecommerce_products", :id => :uuid, :force => true do |t|
+    t.string   "name"
+    t.string   "type"
+    t.uuid     "category_id"
+    t.uuid     "user_id"
+    t.decimal  "price"
+    t.boolean  "active"
+    t.integer  "status"
+    t.jsonb    "custom_fields"
+    t.jsonb    "stock"
+    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"
+    t.string   "type"
+    t.jsonb    "specifics"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
+end

data/spec/spec_helper.rb

@@ -1,18 +1,35 @@
 require 'rubygems'
 require 'bundler'
 require 'simplecov'
-require 'pry'
+# require 'pry'
 require 'trax_model'
+require 'active_record'
 
 SimpleCov.start do
   add_filter '/spec/'
 end
 
+ENV["DB"] ||= "sqllite"
+ENV["DB"] = "postgres" if ENV["DB"] == "pg" || ENV["pg"] == "true"
+
 RSpec.configure do |config|
+  config.filter_run_excluding :postgres => true unless ENV["DB"] == "postgres"
+
   config.before(:suite) do
+    db_config = ::YAML::load(::File.open("#{File.dirname(__FILE__)}/db/database.yml"))
+
+    ::ActiveRecord::Base.establish_connection(db_config[ENV["DB"]])
+
+    ::ActiveRecord::Base.connection.tables.each do |table|
+      ::ActiveRecord::Base.connection.drop_table(table)
+    end
+
+    ::Trax::Model.configure do |config|
+      config.auto_include = false
+    end
+
+    ::Dir["#{::File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
   end
 end
 
 Bundler.require(:default, :development, :test)
-
-::Dir["#{::File.dirname(__FILE__)}/support/*.rb"].each {|f| require f }

data/spec/support/models.rb

@@ -0,0 +1,123 @@
+require 'active_record'
+
+::ActiveRecord::Schema.define(:version => 1) do
+  require_relative '../db/schema/default_tables'
+  instance_eval(&DEFAULT_TABLES)
+
+  if ENV["DB"] == "postgres"
+    require_relative '../db/schema/pg_tables'
+    instance_eval(&PG_TABLES)
+  end
+end
+
+if ENV["DB"] == "postgres"
+  require_relative 'pg/models'
+end
+
+class Product < ::ActiveRecord::Base
+  include ::Trax::Model
+  include ::Trax::Model::Attributes::Mixin
+
+  mixins :unique_id => {
+    :uuid_column => "uuid",
+    :uuid_prefix => "1a"
+  }
+
+  define_attributes do
+    enum :status, :default => :in_stock do
+      define :in_stock,     1
+      define :out_of_stock, 2
+      define :backordered,  3
+    end
+
+    boolean :active, :default => false
+  end
+end
+
+module Products
+  class Shoes < Product
+    include ::Trax::Model
+    include ::Trax::Model::Attributes::Mixin
+  end
+
+  class MensShoes < Shoes
+    include ::Trax::Model
+    include ::Trax::Model::Attributes::Mixin
+
+    define_attributes do
+      enum :size, :default => :mens_9 do
+        define :mens_6,  1
+        define :mens_7,  2
+        define :mens_8,  3
+        define :mens_9,  4
+        define :mens_10, 5
+        define :mens_11, 6
+        define :mens_12, 7
+      end
+    end
+  end
+end
+
+class Widget < ::ActiveRecord::Base
+  include ::Trax::Model
+
+  mixins :unique_id => {
+    :uuid_column => "uuid",
+    :uuid_prefix => "2a"
+  }
+
+  validates :subdomain, :subdomain => true, :allow_nil => true
+  validates :email_address, :email => true, :allow_nil => true
+  validates :website, :url => true, :allow_nil => true
+end
+
+class Message < ::ActiveRecord::Base
+  include ::Trax::Model
+
+  mixins :unique_id => { :uuid_column => "uuid", :uuid_prefix => "3a" },
+         :freezable => true,
+         :restorable => { :field => :deleted }
+
+  enum :status => [ :queued, :scheduled, :delivered, :failed_delivery ]
+
+  default_value_for :status do
+    self.statuses[:queued]
+  end
+
+  validates :deliver_at, :future => true, :allow_nil => true
+
+  freezable_by_enum :status => [ :delivered, :failed_delivery ]
+end
+
+class Thing < ::ActiveRecord::Base
+  include ::Trax::Model
+
+  mixins :unique_id => { :uuid_column => "uuid", :uuid_prefix => "4a" }
+end
+
+class Person < ::ActiveRecord::Base
+  include ::Trax::Model
+
+  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
+
+require 'trax/model/struct'
+
+class StoreCategory < ::Trax::Model::Struct
+  string :name
+  struct :meta_attributes do
+    string :description
+    string :keywords
+  end
+end

data/spec/support/pg/models.rb

@@ -0,0 +1,103 @@
+module Ecommerce
+  class ProductAttributeSet < ::ActiveRecord::Base
+    self.table_name = "ecommerce_product_attribute_sets"
+
+    include ::Trax::Model
+    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
+    include ::Trax::Model
+    include ::Trax::Model::Attributes::Mixin
+
+    define_attributes do
+      struct :specifics, :validate => true do
+        string :cost, :default => 0
+
+        validates(:cost, :length => {:minimum => 10})
+
+        enum :service do
+          define :usps,  1
+          define :fedex, 2
+        end
+
+        struct :dimensions, :validate => true do
+          string :length
+          string :width
+          string :height
+
+          validates(:length, :length => {:maximum => 10})
+        end
+      end
+    end
+  end
+
+  class Product < ::ActiveRecord::Base
+    self.table_name = "ecommerce_products"
+
+    include ::Trax::Model
+    include ::Trax::Model::Attributes::Mixin
+
+    mixins :unique_id => { :uuid_prefix => "9a" }
+
+    belongs_to :store, :class_name => "Ecommerce::Store"
+
+    define_attributes do
+      string :name, :default => "Whatever" do
+        validates(self, :length => { :minimum => 20 })
+      end
+      boolean :active, :default => true
+
+      enum :status, :default => :in_stock do
+        define :in_stock,     1
+        define :out_of_stock, 2
+        define :backordered,  3
+      end
+    end
+  end
+
+  module Products
+    class Shoes < ::Ecommerce::Product
+      include ::Trax::Model
+      include ::Trax::Model::Attributes::Mixin
+    end
+
+    class MensShoes < ::Ecommerce::Products::Shoes
+      include ::Trax::Model
+      include ::Trax::Model::Attributes::Mixin
+
+      define_attributes do
+        string :name, :default => "Some Shoe Name", :define_scopes => true
+        boolean :active, :default => true, :define_scopes => true
+
+        struct :custom_fields do
+          string :primary_utility, :default => "Skateboarding", :define_scopes => true
+          string :sole_material
+          boolean :has_shoelaces, :define_scopes => true
+
+          enum :color, :default => :blue, :define_scopes => false do
+            define :red,   1
+            define :blue,  2
+            define :green, 3
+            define :black, 4
+          end
+
+          enum :size, :default => :mens_9, :define_scopes => true do
+            define :mens_6,  1
+            define :mens_7,  2
+            define :mens_8,  3
+            define :mens_9,  4
+            define :mens_10, 5
+            define :mens_11, 6
+            define :mens_12, 7
+          end
+        end
+      end
+    end
+  end
+end