trax_core 0.0.77 → 0.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa0d0a5564b1b1fb8a26de8475b203848b4c1aea
-  data.tar.gz: d3b6b0c5ad07512b6e767ab7f1c5b8fc850286e6
+  metadata.gz: e2b7a8eaa68c5ba0e58ce17e426d9888212bb2d2
+  data.tar.gz: d6c4d99b50c554de6dfc0090f6c2853a4af1882a
 SHA512:
-  metadata.gz: 88518e6d9a919091b3a3b2db65a2ebb68cf1ec1e7508a8bf7b731bb56e68a23596973b80967c504ce9d0d433832f90e25336f7d421efcceb10c9ff6e95dbbf60
-  data.tar.gz: 1f66e3eb60887b82a2bd44369dfd48a26f76fe5b62ec83aaaaba3e267eda57775b9eae76b24b19e473a6836873ee14f61e3b0fcafeff4ee6bb908eb0d31dc51d
+  metadata.gz: e3d6f6e388fd4e729b4c012dce5dca53c76e794b25a660beb24b106b7a141b9f8a9cde451903d0fbbce49fcfef3272b859aad9535392e9e67a903e286921e767
+  data.tar.gz: 2ec398604380438ff8414522351a79835077a18870521b8332276383456c54578c37c23ac23232bfb999a40c050fb53ce1bad989c95c103e5bf3b46b938dec95

data/lib/trax/core/definitions.rb

@@ -2,9 +2,7 @@ module Trax
   module Core
     module Definitions
       def self.extended(base)
-        base.module_attribute(:_definitions) {
-          ::Hashie::Mash.new
-        }
+        base.extend(Trax::Core::Fields)
       end
 
       def enum(klass_name, **options, &block)
@@ -28,22 +26,6 @@ module Trax
 
         attribute_klass
       end
-
-      def all
-        @all ||= begin
-          constants.map{|const_name| const_get(const_name) }.each_with_object(self._definitions) do |klass, result|
-            result[klass.name.symbolize] = klass
-          end
-        end
-      end
-
-      def values
-        all.values
-      end
-
-      def [](_name)
-        const_get(_name.to_s.camelize)
-      end
     end
   end
 end

data/lib/trax/core/ext/object.rb

@@ -60,7 +60,7 @@ class Object
     segs = const_name.split("::")
 
     raise(::StandardError.new("Set fully qualified constant requires a preexisting namespace to set under")) unless segs.length > 1
-
+    
     as, on = segs.pop, segs.join("::").constantize
     on.const_set(as, value)
   end

data/lib/trax/core/fields.rb

@@ -1,6 +1,8 @@
 module Trax
   module Core
     module Fields
+      extend ::Enumerable
+
       def self.extended(base)
         base.module_attribute(:_blank_fields_hash) {
           ::Hashie::Mash.new

data/lib/trax/core/named_class.rb

@@ -2,9 +2,9 @@ module Trax
   module Core
     class NamedClass
       def self.new(_name, _parent_klass=Object, **options, &block)
-        klass = ::Object.set_fully_qualified_constant(_name, ::Class.new(_parent_klass) do
+        klass = ::Object.set_fully_qualified_constant(_name, ::Class.new(_parent_klass) {
           define_singleton_method(:name) { _name }
-        end)
+        })
 
         options.each_pair do |k,v|
           klass.class_attribute k

data/lib/trax/core/types/array.rb

@@ -0,0 +1,11 @@
+module Trax
+  module Core
+    module Types
+      class Array < ::Trax::Core::Types::ValueObject
+        def self.type
+          :array
+        end
+      end
+    end
+  end
+end

data/lib/trax/core/types/boolean.rb

@@ -0,0 +1,11 @@
+module Trax
+  module Core
+    module Types
+      class Boolean < ::Trax::Core::Types::ValueObject
+        def self.type
+          :boolean
+        end
+      end
+    end
+  end
+end

data/lib/trax/core/types/enum.rb

@@ -1,19 +1,11 @@
-# require 'trax/core/inheritance_hooks'
-# require 'active_model/attribute_methods'
 ### Examples
 # ProductCategory < Enum
-#   CLOTHING = 1
-#   SHOES = 2
-#   ACCESSORIES = 3
+#   define :clothing,    1
+#   define :shoes,       2
+#   define :accessories, 3
 # end
 # ProductCategory.keys => [:clothing, :shoes, :accessories]
 
-# StoreYearlyRevenue < Enum
-#   :'0_100000' = 1
-#   :'100000_999999' = 2
-#   :'1000000_99999999' = 3
-# end
-
 ### Accepts either an integer or the name when setting a value
 # ProductCategory.new(1) => #{name: :clothing, :value => 1}
 module Trax

data/lib/trax/core/types/enum_value.rb

@@ -1,11 +1,8 @@
-require 'trax/core/abstract_methods'
 module Trax
   module Core
     module Types
       class EnumValue
-        include ::Trax::Core::AbstractMethods
-
-        abstract_class_attribute :tag, :value
+        class_attribute :tag, :value
 
         def self.as_json(options={})
           tag.to_s

data/lib/trax/core/types/float.rb

@@ -0,0 +1,11 @@
+module Trax
+  module Core
+    module Types
+      class Float < ::Trax::Core::Types::ValueObject
+        def self.type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/trax/core/types/integer.rb

@@ -0,0 +1,11 @@
+module Trax
+  module Core
+    module Types
+      class Integer < ::Trax::Core::Types::ValueObject
+        def self.type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/trax/core/types/string.rb

@@ -0,0 +1,11 @@
+module Trax
+  module Core
+    module Types
+      class String < ::Trax::Core::Types::ValueObject
+        def self.type
+          :string
+        end
+      end
+    end
+  end
+end

data/lib/trax/core/types/struct.rb

@@ -15,7 +15,9 @@ module Trax
         # It defeats the whole purpose of being a 'struct'
         # if we fail to do so, and it makes our data far more error prone
         DEFAULT_VALUES_FOR_PROPERTY_TYPES = {
+          :array_property   => [],
           :boolean_property => nil,
+          :float_property   => 0.0,
           :string_property  => "",
           :struct_property  => {},
           :enum_property    => nil,
@@ -25,7 +27,9 @@ module Trax
         def self.fields_module
           @fields_module ||= begin
             module_name = "#{self.name}::Fields"
-            ::Trax::Core::NamedModule.new(module_name, ::Trax::Core::Fields)
+            mod = ::Trax::Core::NamedModule.new(module_name, ::Trax::Core::Fields.clone)
+            mod.include(superclass.fields) if superclass.instance_variable_defined?("@fields_module")
+            mod
           end
         end
 
@@ -33,60 +37,34 @@ module Trax
           fields_module
         end
 
-        def self.boolean_property(name, *args, **options, &block)
-          name = name.is_a?(Symbol) ? name.to_s : name
-          klass_name = "#{fields_module.name.underscore}/#{name}".camelize
-          options[:default] = options.key?(:default) ? options[:default] : DEFAULT_VALUES_FOR_PROPERTY_TYPES[__method__]
-          property(name.to_sym, *args, **options)
-          coerce_key(name.to_sym, ->(value) { !!value })
+        def self.array_property(name, *args, of:false, **options, &block)
+          of_object = of && of.is_a?(::String) ? of.safe_constantize : of
+          coercer = of_object ? ::Array[of_object] : ::Array
+          define_attribute_class_for_type(:array, name, *args, :coerce => coercer, **options, &block)
         end
 
-        def self.integer_property(name, *args, **options, &block)
-          name = name.is_a?(Symbol) ? name.to_s : name
-          options[:default] = options.key?(:default) ? options[:default] : DEFAULT_VALUES_FOR_PROPERTY_TYPES[__method__]
-          property(name.to_sym, *args, **options)
-          coerce_key(name.to_sym, Integer)
+        def self.boolean_property(name, *args, **options, &block)
+          define_attribute_class_for_type(:boolean, name, *args, :coerce => ->(value){!!value}, **options, &block)
         end
 
-        def self.string_property(name, *args, **options, &block)
-          name = name.is_a?(Symbol) ? name.to_s : name
-          options[:default] = options.key?(:default) ? options[:default] : DEFAULT_VALUES_FOR_PROPERTY_TYPES[__method__]
-          property(name.to_sym, *args, **options)
-          coerce_key(name.to_sym, String)
+        def self.enum_property(name, *args, **options, &block)
+          define_attribute_class_for_type(:enum, name, *args, :coerce => true, **options, &block)
         end
 
-        def self.struct_property(name, *args, **options, &block)
-          name = name.is_a?(Symbol) ? name.to_s : name
-          klass_name = "#{fields_module.name.underscore}/#{name}".camelize
-
-          attribute_klass = if options.key?(:extend)
-            _klass_prototype = options[:extend].constantize.clone
-            _klass = ::Trax::Core::NamedClass.new(klass_name, _klass_prototype, :parent_definition => self, &block)
-            _klass
-          else
-            ::Trax::Core::NamedClass.new(klass_name, ::Trax::Core::Types::Struct, :parent_definition => self, &block)
-          end
-
-          options[:default] = options.key?(:default) ? options[:default] : DEFAULT_VALUES_FOR_PROPERTY_TYPES[__method__]
-          property(name.to_sym, *args, **options)
-          coerce_key(name.to_sym, attribute_klass)
+        def self.float_property(name, *args, **options, &block)
+          define_attribute_class_for_type(:float, name, *args, :coerce => ::Float, **options, &block)
         end
 
-        def self.enum_property(name, *args, **options, &block)
-          name = name.is_a?(Symbol) ? name.to_s : name
-          klass_name = "#{fields_module.name.underscore}/#{name}".camelize
+        def self.integer_property(name, *args, **options, &block)
+          define_attribute_class_for_type(:integer, name, *args, :coerce => ::Integer, **options, &block)
+        end
 
-          attribute_klass = if options.key?(:extend)
-            _klass_prototype = options[:extend].constantize.clone
-            _klass = ::Trax::Core::NamedClass.new(klass_name, _klass_prototype, :parent_definition => self, &block)
-            _klass
-          else
-            ::Trax::Core::NamedClass.new(klass_name, ::Trax::Core::Types::Enum, :parent_definition => self, &block)
-          end
+        def self.string_property(name, *args, **options, &block)
+          define_attribute_class_for_type(:string, name, *args, :coerce => ::String, **options, &block)
+        end
 
-          options[:default] = options.key?(:default) ? options[:default] : DEFAULT_VALUES_FOR_PROPERTY_TYPES[__method__]
-          property(name.to_sym, *args, **options)
-          coerce_key(name.to_sym, attribute_klass)
+        def self.struct_property(name, *args, **options, &block)
+          define_attribute_class_for_type(:struct, name, *args, :coerce => true, **options, &block)
         end
 
         def self.to_schema
@@ -111,8 +89,10 @@ module Trax
         end
 
         class << self
+          alias :array :array_property
           alias :boolean :boolean_property
           alias :enum :enum_property
+          alias :float :float_property
           alias :integer :integer_property
           alias :struct :struct_property
           alias :string :string_property
@@ -121,6 +101,36 @@ module Trax
         def value
           self
         end
+
+        private
+
+        #By default, strings/int/bool wont get cast to value objects
+        #mainly for the sake of performance/avoid unneccessary object allocation
+        def self.define_attribute_class_for_type(type_name, property_name, *args, coerce:false, **options, &block)
+          name = name.is_a?(Symbol) ? name.to_s : name
+          klass_name = "#{fields_module.name.underscore}/#{property_name}".camelize
+
+          attribute_klass = if options.key?(:extend)
+            _klass_prototype = options[:extend].constantize.clone
+            _klass = ::Trax::Core::NamedClass.new(klass_name, _klass_prototype, :parent_definition => self, &block)
+            _klass
+          else
+            ::Trax::Core::NamedClass.new(klass_name, "::Trax::Core::Types::#{type_name.to_s.classify}".constantize, :parent_definition => self, &block)
+          end
+
+          options[:default] = options.key?(:default) ? options[:default] : DEFAULT_VALUES_FOR_PROPERTY_TYPES[__method__]
+          property(property_name.to_sym, *args, **options)
+
+          if coerce.is_a?(::Proc)
+            coerce_key(property_name.to_sym, &coerce)
+          elsif coerce.is_a?(::Array)
+            coerce_key(property_name.to_sym, coerce)
+          elsif [ ::Integer, ::Float, ::String ].include?(coerce)
+            coerce_key(property_name.to_sym, coerce)
+          elsif coerce
+            coerce_key(property_name.to_sym, attribute_klass)
+          end
+        end
       end
     end
   end

data/lib/trax/core/types/value_object.rb

@@ -0,0 +1,23 @@
+module Trax
+  module Core
+    module Types
+      class ValueObject < SimpleDelegator
+        def initialize(val)
+          @value = val
+        end
+
+        def __getobj__
+          @value
+        end
+
+        def self.symbolic_name
+          name.demodulize.underscore.to_sym
+        end
+
+        def self.to_sym
+          :value
+        end
+      end
+    end
+  end
+end

data/lib/trax/core/types.rb

@@ -3,9 +3,15 @@ module Trax
     module Types
       extend ::ActiveSupport::Autoload
 
+      autoload :Array
+      autoload :Boolean
       autoload :Enum
       autoload :EnumValue
+      autoload :Float
+      autoload :Integer
       autoload :Struct
+      autoload :String
+      autoload :ValueObject
     end
   end
 end

data/lib/trax_core/version.rb

@@ -1,3 +1,3 @@
 module TraxCore
-  VERSION = "0.0.77"
+  VERSION = "0.0.78"
 end

data/spec/support/defs.rb

@@ -10,8 +10,10 @@ module Defs
 
   struct :ProductAttributes do
     string :name, :default => ""
-    integer :price, :default => ""
+    float :price, :default => 9.99
+    integer :quantity_in_stock, :default => 0
     boolean :is_active, :default => false
+    array :categories, :of => "Defs::Category", :default => []
   end
 
   struct :ShoesAttributes, :extend => "Defs::ProductAttributes" do

data/spec/trax/core/definitions_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe ::Trax::Core::Definitions do
   subject { ::Defs }
 
+  context "fields" do
+    it { subject[:category].should eq subject::Category }
+  end
+
   context "enum" do
     let(:test_subject) { subject::Category.new(1) }
 
@@ -12,6 +16,24 @@ describe ::Trax::Core::Definitions do
 
   context "struct" do
     it { expect(subject::ProductAttributes.new).to be_a(::Trax::Core::Types::Struct) }
+
+    context "float" do
+      it { expect(subject::ProductAttributes.new.price).to eq 9.99 }
+      it { expect(subject::ProductAttributes.new(:price => 9).price).to eq 9.0 }
+    end
+
+    context "integer" do
+      it { expect(subject::ProductAttributes.new.quantity_in_stock).to eq 0 }
+      it { expect(subject::ProductAttributes.new(:quantity_in_stock => 9.19).quantity_in_stock).to eq 9 }
+    end
+
+    context "array" do
+      it { expect(subject::ProductAttributes.new.categories).to be_a(Array) }
+      context "it instantiates members into objects if provided" do
+        it { expect(subject::ProductAttributes.new(:categories => [ :clothing ]).categories[0].to_i).to eq 2 }
+        it { expect(subject::ProductAttributes.new(:categories => [ 2 ]).categories[0].to_s).to eq "clothing" }
+      end
+    end
   end
 
   context "inheritance" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trax_core
 version: !ruby/object:Gem::Version
-  version: 0.0.77
+  version: 0.0.78
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -210,9 +210,15 @@ files:
 - lib/trax/core/primitives/enum.rb
 - lib/trax/core/primitives/enum_value.rb
 - lib/trax/core/types.rb
+- lib/trax/core/types/array.rb
+- lib/trax/core/types/boolean.rb
 - lib/trax/core/types/enum.rb
 - lib/trax/core/types/enum_value.rb
+- lib/trax/core/types/float.rb
+- lib/trax/core/types/integer.rb
+- lib/trax/core/types/string.rb
 - lib/trax/core/types/struct.rb
+- lib/trax/core/types/value_object.rb
 - lib/trax_core.rb
 - lib/trax_core/version.rb
 - spec/spec_helper.rb