trax_model 0.0.93 → 0.0.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f90a589c224b12e3d814f1d0000f97ae92abf3a0
-  data.tar.gz: 3805c04cfb881d04c38bbeddc52ff028250cd7b1
+  metadata.gz: 2e9c4e45cdc76295880d1e087727ec1414889bdc
+  data.tar.gz: eb26cfa1732eaa1e2ba69b3b5448e71e8c229837
 SHA512:
-  metadata.gz: df15b25f69f3dd4ab7a5bf1ae9b67ff16a9868a64812e6ccfad1190758a0af053aa77ce5e0edf9c226fb5246315b675242202714ca08138a38a27863e2808972
-  data.tar.gz: 483dace95c58f209f3474258263b4b18d5f6f4cf8ad11c00ca4290a061f0217856aeab45c992ca819447136bd8aa558e302229bc3aa127b755efb8c14a79e575
+  metadata.gz: fc5388aaf9d9a351bc4412357e4d7d2b01ccac35934ac02d9b193aa8eb24814f852e482efa6ee455318c8fe4129c65fda97e2d2e11b19fd8a4a943372eec0dab
+  data.tar.gz: 0847884f74518a4fe603b92d2e2366b08218ccf7a56a07d4ae057f5ebc783d952fefcfe532de86117fd7e02656e9b682bab9ee463aa94b5f40e8e30c15ecb696

data/lib/trax/model/attributes/definitions.rb

@@ -22,6 +22,10 @@ module Trax
           attribute(*args, type: :enum, **options, &block)
         end
 
+        def integer(*args, **options, &block)
+          attribute(*args, type: :integer, **options, &block)
+        end
+
         def string(*args, **options, &block)
           attribute(*args, :type => :string, **options, &block)
         end

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

@@ -0,0 +1,33 @@
+require 'hashie/extensions/ignore_undeclared'
+
+module Trax
+  module Model
+    module Attributes
+      module Types
+        class Integer < ::Trax::Model::Attributes::Type
+          def self.define_attribute(klass, attribute_name, **options, &block)
+            klass_name = "#{klass.fields_module.name.underscore}/#{attribute_name}".camelize
+            attribute_klass = if options.key?(:class_name)
+              options[:class_name].constantize
+            else
+              ::Trax::Core::NamedClass.new(klass_name, Value, :parent_definition => klass, &block)
+            end
+
+            klass.attribute(attribute_name, typecaster_klass.new)
+            klass.default_value_for(attribute_name) { options[:default] } if options.key?(:default)
+          end
+
+          class Value < ::Trax::Model::Attributes::Value
+            def self.type; :integer end;
+          end
+
+          class TypeCaster < ::ActiveRecord::Type::Integer
+          end
+
+          self.value_klass = ::Trax::Model::Attributes::Types::Integer::Value
+          self.typecaster_klass = ::Trax::Model::Attributes::Types::Integer::TypeCaster
+        end
+      end
+    end
+  end
+end

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

@@ -38,6 +38,7 @@ module Trax
             klass.attribute(attribute_name, typecaster_klass.new(target_klass: attribute_klass))
             klass.validates(attribute_name, :json_attribute => true) unless options.key?(:validate) && !options[:validate]
             klass.default_value_for(attribute_name) { {} }
+            define_model_accessors(klass, attribute_name, attribute_klass, options[:model_accessors]) if options.key?(:model_accessors) && options[:model_accessors]
           end
 
           class Value < ::Trax::Model::Struct
@@ -72,6 +73,36 @@ module Trax
 
           self.value_klass = ::Trax::Model::Attributes::Types::Json::Value
           self.typecaster_klass = ::Trax::Model::Attributes::Types::Json::TypeCaster
+
+          private
+
+          def self.define_model_accessors(model, attribute_name, struct_attribute, option_value)
+            properties_to_define = if [ true ].include?(option_value)
+                                     struct_attribute.properties.to_a
+                                   elsif option_value.is_a(Hash) && option_value.has_key?(:only)
+                                     struct_attribute.properties.to_a.only(*option_value[:only])
+                                   elsif option_value.is_a(Hash) && option_value.has_key?(:except)
+                                     struct_attribute.properties.to_a.except(*option_value[:except])
+                                   elsif option_value.is_a(Array)
+                                     struct_attribute.properties.to_a.only(*option_value[:only])
+                                   else
+                                     raise Trax::Model::Errors::InvalidOption.new(
+                                       :option => :model_accessors,
+                                       :valid_choices => ["true", "array of properties", "hash with :only or :except keys"]
+                                     )
+                                   end
+
+            properties_to_define.each do |_property|
+              getter_method, setter_method = _property.to_sym, :"#{_property}="
+
+              model.__send__(:define_method, setter_method) do |val|
+                self[attribute_name] = {} unless self[attribute_name]
+                self.__send__(attribute_name).__send__(setter_method, val)
+              end
+
+              model.delegate(getter_method, :to => attribute_name)
+            end
+          end
         end
       end
     end

data/lib/trax/model/errors.rb

@@ -3,6 +3,15 @@ require 'trax/core/errors'
 module Trax
   module Model
     module Errors
+      class InvalidOption < ::Trax::Core::Errors::Base
+        argument :option
+        argument :valid_options
+
+        message {
+          "Invalid option #{option}: must instead be one of #{valid_options.join(", ")}"
+        }
+      end
+
       class MixinNotRegistered < ::Trax::Core::Errors::Base
         argument :mixin
         argument :model

data/lib/trax/model/struct.rb

@@ -11,6 +11,8 @@ module Trax
       include ::Hashie::Extensions::Dash::PropertyTranslation
       include ::ActiveModel::Validations
 
+      attr_reader :record
+
       # note that we must explicitly set default or blank values for all properties.
       # It defeats the whole purpose of being a 'struct'
       # if we fail to do so, and it makes our data far more error prone
@@ -19,6 +21,7 @@ module Trax
         :string_property  => "",
         :struct_property  => {},
         :enum_property    => nil,
+        :integer_property => nil
       }.with_indifferent_access.freeze
 
       def self.fields_module
@@ -72,6 +75,16 @@ module Trax
         coerce_key(name.to_sym, enum_klass)
       end
 
+      def self.integer_property(name, *args, **options, &block)
+        name = name.is_a?(Symbol) ? name.to_s : name
+        klass_name = "#{fields_module.name.underscore}/#{name}".camelize
+        integer_klass = ::Trax::Core::NamedClass.new(klass_name, ::Trax::Model::Attributes::Types::Integer::Value, :parent_definition => self, &block)
+        options[:default] = options.key?(:default) ? options[:default] : DEFAULT_VALUES_FOR_PROPERTY_TYPES[__method__]
+        define_where_scopes_for_property(name, integer_klass) if options.key?(:define_scopes) && options[:define_scopes]
+        property(name.to_sym, *args, **options)
+        coerce_key(name.to_sym, Integer)
+      end
+
       def self.to_schema
         ::Trax::Core::Definition.new(
           :source => self.name,
@@ -98,6 +111,7 @@ module Trax
         alias :enum :enum_property
         alias :struct :struct_property
         alias :string :string_property
+        alias :integer :integer_property
       end
 
       def value

data/lib/trax/validators/json_attribute_validator.rb

@@ -5,6 +5,8 @@ class JsonAttributeValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
     json_attribute = object.class.fields_module[attribute]
 
+    value.instance_variable_set("@record", object)
+
     unless value.is_a?(json_attribute) && value.valid?
       if value.is_a?(json_attribute)
         value.errors.messages.each_pair do |k,v|

data/lib/trax_model/version.rb

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

data/spec/support/models.rb

@@ -54,6 +54,8 @@ module Products
         define :mens_11, 6
         define :mens_12, 7
       end
+
+      integer :in_stock_quantity, :default => 0
     end
   end
 end

data/spec/support/pg/models.rb

@@ -7,8 +7,8 @@ module Ecommerce
 
     mixins :unique_id => { :uuid_prefix => "c2" }
 
-    belongs_to :user, :class_name => "Ecommerce::User"
-    belongs_to :product, :class_name => "Ecommerce::Product"
+    # belongs_to :user, :class_name => "Ecommerce::User"
+    # belongs_to :product, :class_name => "Ecommerce::Product"
   end
 
   class ShippingAttributes < ::Ecommerce::ProductAttributeSet
@@ -16,10 +16,11 @@ module Ecommerce
     include ::Trax::Model::Attributes::Mixin
 
     define_attributes do
-      struct :specifics, :validate => true do
-        string :cost, :default => 0
-
-        validates(:cost, :length => {:minimum => 10})
+      struct :specifics, :model_accessors => true, :validate => true do
+        integer :cost, :default => 0
+        validates(:cost, :numericality => {:greater_than => 0})
+        integer :tax
+        string :delivery_time
 
         enum :service do
           define :usps,  1
@@ -27,11 +28,12 @@ module Ecommerce
         end
 
         struct :dimensions, :validate => true do
-          string :length
-          string :width
-          string :height
+          integer :length
+          integer :width
+          integer :height
+          string :packaging_box
 
-          validates(:length, :length => {:maximum => 10})
+          validates(:length, :numericality => {:greater_than => 0})
         end
       end
     end
@@ -79,6 +81,10 @@ module Ecommerce
           string :primary_utility, :default => "Skateboarding", :define_scopes => true
           string :sole_material
           boolean :has_shoelaces, :define_scopes => true
+          integer :in_stock_quantity, :default => 0
+          integer :number_of_sales, :default => 0
+          integer :cost
+          integer :price
 
           enum :color, :default => :blue, :define_scopes => false do
             define :red,   1
@@ -96,6 +102,10 @@ module Ecommerce
             define :mens_11, 6
             define :mens_12, 7
           end
+
+          def total_profit
+            number_of_sales * (price - cost)
+          end
         end
       end
     end

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

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe ::Trax::Model::Attributes::Types::Integer do
+  subject{ ::Products::MensShoes::Fields::Quantity }
+
+  context "model" do
+    subject { ::Products::MensShoes.new(:in_stock_quantity => 1) }
+
+    it { expect(subject.in_stock_quantity).to eq 1 }
+
+    context "non integer value" do
+      let(:test_subject) { ::Products::MensShoes.new(:in_stock_quantity => "blah") }
+      it { expect(test_subject.in_stock_quantity).to eq 0 }
+    end
+  end
+
+  context "struct attribute", :postgres => true do
+    subject { ::Ecommerce::Products::MensShoes.new(:in_stock_quantity => 1) }
+  end
+end

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

@@ -6,6 +6,30 @@ describe ::Trax::Model::Attributes::Types::Json, :postgres => true do
   it { expect(subject.new.primary_utility).to eq "Skateboarding" }
   it { expect(subject.new.sole_material).to eq "" }
 
+  context "attribute definition" do
+    subject { ::Ecommerce::ShippingAttributes.new }
+
+    context "model_accessors (delegators)" do
+      it {
+        ::Ecommerce::ShippingAttributes.fields[:specifics].properties.each do |_property|
+          expect(subject.__send__(_property)).to eq subject.specifics.__send__(_property)
+        end
+      }
+
+      context "initializing model and setting delegated attributes directly", :delegated_attributes =>  { :cost => 5, :tax => 5, :delivery_time => "5 days" } do
+        self::DELEGATED_ATTRIBUTES = { :cost => 5, :tax => 5, :delivery_time => "5 days" }
+
+        subject{ |example| ::Ecommerce::ShippingAttributes.new(example.example_group::DELEGATED_ATTRIBUTES) }
+
+        self::DELEGATED_ATTRIBUTES.each_pair do |k,v|
+          it "#{k} should be set" do
+            expect(subject.specifics.__send__(k)).to eq v
+          end
+        end
+      end
+    end
+  end
+
   context "model" do
     subject { ::Ecommerce::Products::MensShoes.new }
 
@@ -13,6 +37,13 @@ describe ::Trax::Model::Attributes::Types::Json, :postgres => true do
       it { subject.custom_fields.size.should eq :mens_9 }
     end
 
+    context "instance method defined within struct" do
+      subject { ::Ecommerce::Products::MensShoes.new(:custom_fields => {:cost => 10, :price => 20, :number_of_sales => 5}) }
+      it {
+        expect(subject.custom_fields.total_profit).to eq 50
+      }
+    end
+
     context "search scopes" do
       context "enum property" do
         [ :mens_6, :mens_7, :mens_10 ].each_with_index do |enum_name|
@@ -68,7 +99,7 @@ describe ::Trax::Model::Attributes::Types::Json, :postgres => true do
       end
 
       context "valid struct attribute" do
-        let(:subject_attributes) { { :specifics => { :cost => "asdasdasdasdasd", :dimensions => {}}} }
+        let(:subject_attributes) { { :specifics => { :cost => 1, :dimensions => { :length => 10 }}} }
 
         it { expect(subject.valid?).to eq true }
       end

data/spec/trax/model/attributes_spec.rb

@@ -4,7 +4,7 @@ describe ::Trax::Model::Attributes do
   subject{ described_class }
 
   describe ".register_attribute_type" do
-    [:array, :boolean, :enum, :json, :string, :uuid_array].each do |type|
+    [:array, :boolean, :enum, :integer, :json, :string, :uuid_array].each do |type|
       it "registers attribute type #{type}" do
         expect(subject.config.attribute_types).to have_key(type)
       end

data/spec/trax/model/errors_spec.rb

@@ -4,6 +4,6 @@ describe ::Trax::Model::Errors do
   subject{ Trax::Model::Errors::InvalidPrefix }
 
   it do
-    expect{subject.new(:blah => "blah")}.to raise_error
+    expect{subject.new(:blah => "blah")}.to raise_error(NoMethodError)
   end
 end

data/spec/trax/model/freezable_spec.rb

@@ -12,7 +12,7 @@ describe ::Trax::Model::Freezable do
       subject.title = "somethingelse"
       subject.save
 
-      subject.errors.messages[:title].should include("Cannot be modified")
+      expect(subject.errors.messages[:title]).to include("Cannot be modified")
     end
   end
 end

data/spec/trax/model/restorable_spec.rb

@@ -8,13 +8,13 @@ describe ::Trax::Model::Restorable do
   context "when destroyed" do
     it "should soft delete" do
       subject.destroy
-      subject.deleted.should be true
+      expect(subject.deleted).to be true
     end
 
     it "should be restorable" do
       subject.destroy
       subject.restore
-      subject.deleted.should be false
+      expect(subject.deleted).to be false
     end
   end
 
@@ -26,18 +26,18 @@ describe ::Trax::Model::Restorable do
 
       it do
         subject
-        Message.all.pluck(:id).should include(subject.id)
+        expect(Message.all.pluck(:id)).to include(subject.id)
       end
 
       it do
         subject.destroy
-        Message.all.pluck(:id).should_not include(subject.id)
+        expect(Message.all.pluck(:id)).to_not include(subject.id)
       end
     end
 
     it ".by_is_deleted" do
       subject.destroy
-      Message.by_is_deleted.pluck(:id).should include(subject.id)
+      expect(Message.by_is_deleted.pluck(:id)).to include(subject.id)
     end
   end
 end

data/spec/trax/model/unique_id_spec.rb

@@ -7,8 +7,10 @@ describe ::Trax::Model::UniqueId do
   describe "uuid_prefix" do
     context "bad prefixes" do
       ["a", "1p", "a1a", "bl", "1", "111"].each do |prefix|
+        let(:test_subject) { ::Trax::Core::NamedClass.new("Product::Asdfg#{prefix}", subject)}
+
         it "raises error when passed hex incompatible prefix #{prefix}" do
-          expect{ subject.trax_defaults.uuid_prefix=(prefix) }.to raise_error
+          expect{ test_subject.mixins(:unique_id => {:uuid_prefix => prefix})}.to raise_error(::Trax::Core::Errors::ConfigurationError)
         end
       end
     end

data/spec/trax/validators/email_validator_spec.rb

@@ -6,7 +6,7 @@ describe ::EmailValidator do
   ["bill@somewhere", "bill", "@initech.com", "!!!@!!!.com"].each do |bad_email|
     it "should fail validation for #{bad_email}" do
       widget = ::Widget.create(:email_address => bad_email)
-      widget.valid?.should eq false
+      expect(widget.valid?).to eq false
     end
   end
 end

data/spec/trax/validators/subdomain_spec.rb

@@ -7,7 +7,7 @@ describe ::SubdomainValidator do
   ["bad!", "-asdasd", "www", "ac"].each do |bad_subdomain|
     it "should fail validation for #{bad_subdomain}" do
       widget = ::Widget.create(:subdomain => bad_subdomain)
-      widget.valid?.should eq false
+      expect(widget.valid?).to eq false
     end
   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.74"
+  spec.add_dependency "trax_core", "~> 0.0.76"
   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.93
+  version: 0.0.95
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-09 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.74
+        version: 0.0.76
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.74
+        version: 0.0.76
 - !ruby/object:Gem::Dependency
   name: default_value_for
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,7 @@ files:
 - 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/json.rb
 - lib/trax/model/attributes/types/string.rb
 - lib/trax/model/attributes/types/uuid_array.rb
@@ -366,6 +367,7 @@ files:
 - spec/support/pg/models.rb
 - 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/json_spec.rb
 - spec/trax/model/attributes_spec.rb
 - spec/trax/model/errors_spec.rb
@@ -419,6 +421,7 @@ test_files:
 - spec/support/pg/models.rb
 - 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/json_spec.rb
 - spec/trax/model/attributes_spec.rb
 - spec/trax/model/errors_spec.rb