trax_model 0.0.91 → 0.0.92

data/lib/trax/model/uuid_array.rb

@@ -0,0 +1,59 @@
+module Trax
+  module Model
+    class UUIDArray
+      include Enumerable
+
+      attr_reader :uuids
+
+      def initialize(*uuids)
+        @uuids = uuids.map{ |uuid_string| uuid_string.try(&:uuid) }.compact
+      end
+
+      def each(&block)
+        yield @uuids.each(&block)
+      end
+
+      def <<(val)
+        reset_instance_variables(:record_types, :records_grouped_by_count, :records_grouped_by_uuid)
+        @uuids.push(::Trax::Model::UUID.new(val))
+      end
+
+      def records
+        @records ||= group_by_record_type.to_a.map{|pair|
+          pair[0].by_id(*pair[1])
+        }.flatten.compact
+      end
+
+      def records_grouped_by_uuid
+        @records_grouped_by_uuid ||= records.group_by(&:id)
+      end
+
+      def records_grouped_by_count
+        @records_grouped_by_count ||= begin
+          {}.tap do |hash|
+            @uuids.group_by_count.each_pair do |uuid, count|
+              record = records_grouped_by_uuid[uuid].first
+              hash[record] = count
+            end
+
+            hash
+          end
+        end
+      end
+
+      private
+
+      def group_by_count
+        @uuids.group_by(&:count)
+      end
+
+      def group_by_record_type
+        @uuids.group_by{ |uuid| uuid.record_type }
+      end
+
+      def record_types
+        @record_types ||= @uuids.map(&:record_type).flatten.compact.uniq
+      end
+    end
+  end
+end

data/lib/trax/model/validators.rb

@@ -3,7 +3,9 @@ module Trax
     module Validators
       extend ::ActiveSupport::Autoload
 
+      autoload :BooleanValidator
       autoload :EmailValidator
+      autoload :EnumValidator
       autoload :Frozen
       autoload :FutureDate
       autoload :Subdomain

data/lib/trax/validators/boolean_validator.rb

@@ -0,0 +1,14 @@
+### Credit to Jason Staten, https://github.com/statianzo
+class BooleanValidator < ActiveModel::Validations::InclusionValidator
+  def initialize(options)
+    options[:in] = [true, false].to_set
+    options[:message] = "must be true or false"
+    super
+  end
+
+  module HelperMethods
+    def validates_booleans(*attr_names)
+      validates_with(::BooleanValidator, _merge_attributes(attr_names))
+    end
+  end
+end

data/lib/trax/validators/email_validator.rb

@@ -1,6 +1,10 @@
 class EmailValidator < ActiveModel::EachValidator
+  EMAIL_REGEX = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+
   def validate_each(record, attribute, value)
-    record.errors.add attribute, (options[:message] || "is not a valid email") unless
-      value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+    unless (value =~ EMAIL_REGEX).present?
+      record.errors[attribute] = (options[:message] || "is not a valid email")
+    end
+    record
   end
 end

data/lib/trax/validators/enum_validator.rb

@@ -0,0 +1,16 @@
+class EnumValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+    enum_attribute = object.class.trax_attribute_fields[:enum][attribute]
+
+    unless value.is_a?(enum_attribute) && value.valid?
+      if value.is_a?(enum_attribute)
+        value.errors.messages.each_pair do |k,v|
+          v = v.join(", ") if v.is_a?(Array)
+          object.errors["#{attribute}.#{k}"] = v
+        end
+      else
+        object.errors[attribute] = "#{v} is not an allowed value"
+      end
+    end
+  end
+end

data/lib/trax/validators/json_attribute_validator.rb

@@ -0,0 +1,19 @@
+# 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 JsonAttributeValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+    json_attribute = object.class.trax_attribute_fields[:json][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)
+        end
+      else
+        object.errors[attribute] << "can not be blank"
+      end
+    end
+  end
+end

data/lib/trax_model/version.rb

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

data/spec/support/schema.rb

@@ -36,7 +36,8 @@ ActiveRecord::Schema.define(:version => 1) do
   end
 
   create_table "widgets", :force => true do |t|
-    t.string   "email_address"
+    t.string "uuid"
+    t.string  "email_address"
     t.string  "subdomain"
     t.string  "website"
     t.integer  "status"
@@ -77,15 +78,20 @@ end
 
 class Product < ::ActiveRecord::Base
   include ::Trax::Model
-  include ::Trax::Model::UniqueId
 
-  defaults :uuid_prefix => "1a", :uuid_column => "uuid"
+  mixins :unique_id => {
+    :uuid_column => "uuid",
+    :uuid_prefix => "1a"
+  }
 end
 
 class Widget < ::ActiveRecord::Base
   include ::Trax::Model
 
-  defaults :uuid_prefix => "2a", :uuid_column => "uuid"
+  mixins :unique_id => {
+    :uuid_column => "uuid",
+    :uuid_prefix => "2a"
+  }
 
   validates :subdomain, :subdomain => true, :allow_nil => true
   validates :email_address, :email => true, :allow_nil => true
@@ -95,12 +101,11 @@ end
 class Message < ::ActiveRecord::Base
   include ::Trax::Model
 
-  defaults :uuid_prefix => "3a", :uuid_column => "uuid"
-
-  mixins :freezable => true,
+  mixins :unique_id => { :uuid_column => "uuid", :uuid_prefix => "3a" },
+         :freezable => true,
          :restorable => { :field => :deleted }
 
-  enum :status => [:queued, :scheduled, :delivered, :failed_delivery]
+  enum :status => [ :queued, :scheduled, :delivered, :failed_delivery ]
 
   default_value_for :status do
     self.statuses[:queued]
@@ -114,13 +119,13 @@ end
 class Thing < ::ActiveRecord::Base
   include ::Trax::Model
 
-  defaults :uuid_prefix => "4a", :uuid_column => "uuid"
+  mixins :unique_id => { :uuid_column => "uuid", :uuid_prefix => "4a" }
 end
 
 class Person < ::ActiveRecord::Base
   include ::Trax::Model
 
-  defaults :uuid_column => "uuid"
+  mixins :unique_id => { :uuid_column => "uuid", :uuid_prefix => "5a" }
 end
 
 class Stapler < ::ActiveRecord::Base
@@ -133,3 +138,14 @@ end
 
 class SwinglineStaplerAttributeSet < ::ActiveRecord::Base
 end
+
+require 'trax/model/struct'
+
+class StoreCategory < ::Trax::Model::Struct
+  property :name
+
+  struct_property :meta_attributes do
+    property :description
+    property :keywords
+  end
+end

data/spec/trax/model/struct_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+describe ::Trax::Model::Struct do
+  subject {
+    ::StoreCategory.new(
+      "name" => "watches",
+      "meta_attributes" => {
+        "description" => "Watches and stuff",
+        "keywords" => [ 'nixon', 'vestal' ]
+      }
+    )
+  }
+
+  its("name") {  should eq "watches" }
+  its("meta_attributes.description") { should eq "Watches and stuff" }
+  its("meta_attributes.class") { should eq StoreCategory::MetaAttributesStruct }
+end

data/spec/trax/model_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe ::Trax::Model do
-  subject do
-    ::Product
-  end
+  subject { ::Product }
 
   its(:trax_registry_key) { should eq "product" }
-  its(:trax_defaults) { should be_a(::Trax::Model::Config) }
+  it { subject.unique_id_config.uuid_prefix }
 end

data/trax_model.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "trax_core", "~> 0.0.3"
   spec.add_dependency "default_value_for", "~> 3.0.0"
   spec.add_dependency "simple_enum"
+  spec.add_development_dependency "hashie", "~> 3.4.1"
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trax_model
 version: !ruby/object:Gem::Version
-  version: 0.0.91
+  version: 0.0.92
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trax_core
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !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.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +293,17 @@ files:
 - Rakefile
 - lib/trax.rb
 - lib/trax/model.rb
+- lib/trax/model/attributes.rb
+- lib/trax/model/attributes/definitions.rb
+- lib/trax/model/attributes/errors.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/enum.rb
+- lib/trax/model/attributes/types/json.rb
+- lib/trax/model/attributes/types/uuid_array.rb
+- lib/trax/model/attributes/value.rb
 - lib/trax/model/config.rb
 - lib/trax/model/enum.rb
 - lib/trax/model/errors.rb
@@ -289,18 +314,24 @@ files:
 - lib/trax/model/mti/abstract.rb
 - lib/trax/model/mti/entity.rb
 - lib/trax/model/mti/namespace.rb
+- lib/trax/model/railtie.rb
 - lib/trax/model/registry.rb
 - lib/trax/model/restorable.rb
 - lib/trax/model/sti.rb
 - lib/trax/model/sti/attributes.rb
+- lib/trax/model/struct.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/model/validators.rb
 - lib/trax/string.rb
+- lib/trax/validators/boolean_validator.rb
 - lib/trax/validators/email_validator.rb
+- lib/trax/validators/enum_validator.rb
 - lib/trax/validators/frozen_validator.rb
 - lib/trax/validators/future_validator.rb
+- lib/trax/validators/json_attribute_validator.rb
 - lib/trax/validators/subdomain_validator.rb
 - lib/trax/validators/url_validator.rb
 - lib/trax_model.rb
@@ -314,6 +345,7 @@ files:
 - spec/trax/model/registry_spec.rb
 - spec/trax/model/restorable_spec.rb
 - spec/trax/model/sti/attributes_spec.rb
+- spec/trax/model/struct_spec.rb
 - spec/trax/model/unique_id_spec.rb
 - spec/trax/model/uuid_prefix_spec.rb
 - spec/trax/model/uuid_spec.rb
@@ -358,6 +390,7 @@ test_files:
 - spec/trax/model/registry_spec.rb
 - spec/trax/model/restorable_spec.rb
 - spec/trax/model/sti/attributes_spec.rb
+- spec/trax/model/struct_spec.rb
 - spec/trax/model/unique_id_spec.rb
 - spec/trax/model/uuid_prefix_spec.rb
 - spec/trax/model/uuid_spec.rb