trax_core 0.0.80 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b39cbcb96dc9520177e708af2f7a6d4da012db
-  data.tar.gz: 8315baf151a282bb86eca3af662263c48ebe3415
+  metadata.gz: b2e6a4cb955ae996c2b8941aebb6e4e80013aa35
+  data.tar.gz: 50dd9c4f7fe2ca36378c597dc704fdd237a8a4a1
 SHA512:
-  metadata.gz: db71816ca4ea5f756af2d0c3c1b94f27119530dacc318c09c85b7482e3ff1f1fd4c4e15457fb5ee82e4312c3266303f95d5071d1d53010c2f57a78a64647a669
-  data.tar.gz: 54ec1e6399a46528aa7febf7764af721b7cf2478d60bef574b3d69c00cee88951c538dd1011634ac515fdd36bd87b38e3772c5e13207cbb3f5593a0a77a5287a
+  metadata.gz: d36c531fe5f70a9fab622b66c09e109a5fa3bb5c9ad0e1566ad14f7e8e2bf5d188a9203902f24c4754f680bc0ed4897436bb7a4491023a275006683d3d175b5b
+  data.tar.gz: 1600fa9f8511c58cd69c23d90ee17bbd7581eb65cdd5adc1d11bce0d69a73b342371008ecc05358dfd34eedd6a1d8eeff6ae11061ff9eb27ce46645855c7ca0a

data/.gitignore

@@ -20,3 +20,6 @@ tmp
 *.o
 *.a
 mkmf.log
+*.DSSTORE
+*.DS_STORE
+

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+script: bundle exec rspec
+rvm:
+  - 2.2
+  - 2.1
+notifications:
+  email: false

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in trax_core.gemspec
 gemspec
+
+group :development do
+  gem 'guard-bundler'
+end
+
+group :test do
+  gem 'guard-rspec'
+end

data/lib/trax/core.rb

@@ -18,6 +18,7 @@ module Trax
     extend ::ActiveSupport::Autoload
 
     autoload :AbstractMethods
+    autoload :Blueprint
     autoload :Configuration
     autoload :Concern
     autoload :Definition
@@ -28,11 +29,13 @@ module Trax
     autoload :Fields
     autoload :FS
     autoload :HasMixins
+    autoload :HasDependencies
     autoload :InheritanceHooks
     autoload :Mixin
     autoload :Mixable
     autoload :NamedClass
     autoload :NamedModule
+    autoload :SilenceWarnings
     autoload :Types
   end
 end

data/lib/trax/core/blueprint.rb

@@ -0,0 +1,15 @@
+module Trax
+  module Core
+    class Blueprint < ::Trax::Core::Types::Struct
+      def self.const_missing(const_name)
+        if fields.const_defined?(const_name, false)
+          result = const_set(const_name, fields.const_get(const_name)) if fields.const_defined?(const_name, false)
+        else
+          result = super(const_name)
+        end
+
+        result
+      end
+    end
+  end
+end

data/lib/trax/core/errors.rb

@@ -93,6 +93,15 @@ module Trax
         }
       end
 
+      class MissingRequiredDependency < ::Trax::Core::Errors::Base
+        argument :source
+        argument :missing_dependencies
+
+        message {
+          "#{source} was initialized without required dependencies, #{missing_dependencies.join(', ')}"
+        }
+      end
+
       class MixinNotRegistered < ::Trax::Core::Errors::Base
         argument :mixin
         argument :source

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/fs.rb

@@ -216,6 +216,14 @@ module Trax
           return sample[0,4] == "GIF8"
         end
 
+        def name
+          basename.to_s
+        end
+
+        def name_without_extension
+          name.split('.')[0]
+        end
+
         def image?
           bitmap? || gif? || jpeg?
         end

data/lib/trax/core/has_dependencies.rb

@@ -0,0 +1,44 @@
+module Trax
+  module Core
+    module HasDependencies
+      def self.included(klass)
+        klass.class_attribute :_depends_on
+        klass.class_attribute :_depends_on_config
+        klass._depends_on_config = {}
+        klass._depends_on = []
+        klass.extend(ClassMethods)
+        klass.prepend(InstanceMethods)
+      end
+
+      module ClassMethods
+        def depends_on(*args, pass_options_to_super:true)
+          self._depends_on += args
+          self._depends_on.map{|_dependency_key| self.__send__("attr_reader", _dependency_key) }
+          self._depends_on_config[:pass_options_to_super] = pass_options_to_super
+        end
+      end
+
+      module InstanceMethods
+        def initialize(*args, **options)
+          if self.class._depends_on.length
+            missing_dependencies = self.class._depends_on.select{|k| !options.key?(k) }
+
+            if missing_dependencies.any?
+              raise ::Trax::Core::Errors::MissingRequiredDependency.new(:source => self.class, :missing_dependencies => missing_dependencies)
+            else
+              options.extract!(*self._depends_on).each_pair do |k,v|
+                instance_variable_set("@#{k}", v)
+              end
+            end
+          end
+
+          if self.class._depends_on_config[:pass_options_to_super]
+            super(*args, **options)
+          else
+            super(*args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trax/core/named_class.rb

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

data/lib/trax/core/silence_warnings.rb

@@ -0,0 +1,17 @@
+module Trax
+  module Core
+    module SilenceWarnings
+      extend ::ActiveSupport::Concern
+
+      module ClassMethods
+        def silence_warnings
+          original_verbosity = $VERBOSE
+          $VERBOSE = nil
+          result = yield
+          $VERBOSE = original_verbosity
+          return result
+        end
+      end
+    end
+  end
+end

data/lib/trax/core/types.rb

@@ -4,6 +4,8 @@ module Trax
       extend ::ActiveSupport::Autoload
 
       autoload :Array
+      autoload :ArrayOf
+      autoload :Behaviors
       autoload :Boolean
       autoload :Enum
       autoload :EnumValue

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

@@ -5,6 +5,13 @@ module Trax
         def self.type
           :array
         end
+
+        def self.of(klass)
+          return ::Class.new(self) do
+            include ::Trax::Core::Types::Behaviors::ArrayOfMembers
+            self.member_class = klass
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,15 @@
+module Trax
+  module Core
+    module Types
+      class ArrayOf < ::Trax::Core::Types::Array
+        def self.[](member_class)
+          return of(member_class)
+        end
+
+        def self.type
+          :array_of
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Trax
+  module Core
+    module Types
+      module Behaviors
+        extend ::ActiveSupport::Autoload
+
+        autoload :ArrayOfMembers
+      end
+    end
+  end
+end

data/lib/trax/core/types/behaviors/array_of_members.rb

@@ -0,0 +1,34 @@
+module Trax
+  module Core
+    module Types
+      module Behaviors
+        module ArrayOfMembers
+          extend ::ActiveSupport::Concern
+
+          included do
+            include ::Enumerable
+
+            class_attribute :member_class
+          end
+
+          def initialize(*args)
+            super([args].flatten.compact)
+            self.map!{ |ele| self.class.member_class.new(ele) } if self.any?
+          end
+
+          def <<(val)
+            if self.class.member_class && val.class == self.class.member_class
+              super(val)
+            else
+              super(self.class.member_class.new(val))
+            end
+          end
+
+          def each(&block)
+            yield __getobj__.each(&block)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -15,7 +15,7 @@ module Trax
         class_attribute :allow_nil, :raise_on_invalid
 
         ### Class Methods ###
-        def self.define_enum_value(const_name, val=nil)
+        def self.define_enum_value(const_name, val=nil, **attributes)
           name = "#{const_name}".underscore.to_sym
           const_name = name.to_s.camelize
           val = (self._values_hash.length + 1) if val.nil?
@@ -23,25 +23,18 @@ module Trax
           raise ::Trax::Core::Errors::DuplicateEnumValue.new(:klass => self.class.name, :value => const_name) if self === name
           raise ::Trax::Core::Errors::DuplicateEnumValue.new(:klass => self.class.name, :value => val) if self === val
 
-          value_klass = self.const_set(const_name, ::Class.new(::Trax::Core::Types::EnumValue){
+          value_klass = ::Trax::Core::NamedClass.new("#{self.name}::#{const_name}", ::Trax::Core::Types::EnumValue){
             self.tag = name
             self.value = val
-          })
+            self.attributes = attributes
+          }
 
           self._values_hash[val] = value_klass
           self._names_hash[name] = value_klass
         end
 
         def self.[](val)
-          if ::Is.numeric?(val)
-            self._values_hash[val]
-          elsif ::Is.symbolic?(val)
-            val = val.to_sym if val.is_a?(::String)
-            self._names_hash[val]
-          elsif val.superclass.name == "Trax::Core::Types::EnumValue"
-            val = val.to_sym
-            self._names_hash[val]
-          end
+          find_enum_value(val)
         end
 
         def self.as_json(options={})
@@ -63,6 +56,23 @@ module Trax
           args.map{|arg| self[arg].to_i }
         end
 
+        def self.select_enum_values(*args)
+          args.flat_compact_uniq!
+          args.map{ |arg| find_enum_value(arg) }.compact
+        end
+
+        def self.find_enum_value(val)
+          if ::Is.numeric?(val)
+            self._values_hash[val]
+          elsif ::Is.symbolic?(val)
+            val = val.to_sym if val.is_a?(::String)
+            self._names_hash[val]
+          elsif val.superclass.name == "Trax::Core::Types::EnumValue"
+            val = val.to_sym
+            self._names_hash[val]
+          end
+        end
+
         def self.define(*args)
           define_enum_value(*args)
         end

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

@@ -2,7 +2,12 @@ module Trax
   module Core
     module Types
       class EnumValue
-        class_attribute :tag, :value
+        def self.inherited(subclass)
+          super(subclass)
+          self.class_attribute(:tag)
+          self.class_attribute(:value)
+          self.class_attribute(:attributes)
+        end
 
         def self.as_json(options={})
           tag.to_s
@@ -28,6 +33,10 @@ module Trax
           val == parent
         end
 
+        def self.[](attribute_name)
+          attributes[attribute_name]
+        end
+
         def self.to_schema
           ::Trax::Core::Definition.new(
             :source => self.name,

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

@@ -15,13 +15,13 @@ 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,
-          :integer_property => nil
+          :array   => [],
+          :boolean => nil,
+          :float   => 0.0,
+          :string  => "",
+          :struct  => {},
+          :enum    => nil,
+          :integer => nil
         }.with_indifferent_access.freeze
 
         def self.fields_module
@@ -107,18 +107,18 @@ module Trax
         #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
+          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
+            _klass_prototype = options[:extend].is_a?(::String) ? options[:extend].safe_constantize : options[:extend]
             _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__]
+          options[:default] = options.key?(:default) ? options[:default] : DEFAULT_VALUES_FOR_PROPERTY_TYPES[type_name]
           property(property_name.to_sym, *args, **options)
 
           if coerce.is_a?(::Proc)

data/lib/trax_core/version.rb

@@ -1,3 +1,3 @@
 module TraxCore
-  VERSION = "0.0.80"
+  VERSION = "0.0.81"
 end

data/spec/spec_helper.rb

@@ -10,6 +10,9 @@ end
 RSpec.configure do |config|
   config.before(:suite) do
   end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
 end
 
 Bundler.require(:default, :development, :test)

data/spec/trax/core/has_dependencies_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe ::Trax::Core::HasDependencies do
+  before(:all) do
+    class MyFakeItem
+      include ::Trax::Core::HasDependencies
+
+      attr_reader :my_options
+
+      def initialize(title, body, **options)
+        @title = title
+        @body = body
+        @my_options = options
+      end
+
+      depends_on :organization, :pass_options_to_super => true
+    end
+
+    class MyFakeItemThatAcceptsNoOptions
+      include ::Trax::Core::HasDependencies
+
+      def initialize(title, body)
+        @title = title
+        @body = body
+      end
+
+      depends_on :organization, :pass_options_to_super => false
+    end
+
+    class MyFakeOrganization < Struct.new(:name)
+    end
+  end
+
+  let(:organization) { MyFakeOrganization.new("whatever") }
+  let(:my_fake_item) { MyFakeItem.new("mytitle", "mybody", :organization => organization, my_other_thing: 'whatever') }
+
+  it "throws error if dependency not passed in" do
+    expect{ MyFakeItem.new }.to raise_error(::Trax::Core::Errors::MissingRequiredDependency)
+  end
+
+  it "sets instance variables from dependency keys" do
+    expect(my_fake_item.organization).to eq(organization)
+  end
+
+  it "allows options to be passed to it normally" do
+    expect(my_fake_item.my_options[:my_other_thing]).to eq 'whatever'
+  end
+
+  it "rips out dependency keys from options when setting them" do
+    expect(my_fake_item.my_options).to_not have_key('organization')
+  end
+
+  context "no options accepted by super intialize" do
+    let(:my_fake_item) { ::MyFakeItemThatAcceptsNoOptions.new("mytitle", "mybody", :organization => organization) }
+
+    it "sets instance variables from dependency keys" do
+      expect(my_fake_item.organization).to eq(organization)
+    end
+  end
+end

data/spec/trax/core/types/array_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe ::Trax::Core::Types::Array do
+  before(:all) do
+    module AnotherFakeStructNamespace
+      extend ::Trax::Core::Definitions
+      struct :Widget do
+        integer :height, :default => 0
+        integer :width, :default => 0
+      end
+    end
+  end
+
+  subject { ::Trax::Core::Types::Array.of(::AnotherFakeStructNamespace::Widget) }
+
+  context ".of" do
+    let(:test_subject) { subject.new({:width => 1}) }
+    it { test_subject[0].width.should eq 1 }
+    it { test_subject[0].height.should eq 0 }
+  end
+
+  context "ArrayOf" do
+    subject { ::Trax::Core::Types::ArrayOf[::AnotherFakeStructNamespace::Widget] }
+    let(:test_subject) { subject.new({:width => 1}) }
+    it { test_subject[0].width.should eq 1 }
+    it { test_subject[0].height.should eq 0 }
+  end
+end

data/spec/trax/core/types/struct_spec.rb

@@ -9,6 +9,10 @@ describe ::Trax::Core::Types::Struct do
         string :en, :default => ""
         string :da, :default => ""
         string :ca, :default => "eh"
+
+        struct :territories do
+          string :en, :default => "US"
+        end
       end
     end
   end
@@ -19,6 +23,7 @@ describe ::Trax::Core::Types::Struct do
   it { expect(subject.en).to eq "something" }
   it { expect(subject.da).to eq "" }
   it { expect(subject.ca).to eq "eh" }
+  it { expect(subject.territories.en).to eq "US" }
 
   context "unknown value" do
     subject { "::MyFakeStructNamespace::Locale".constantize.new(:blah => "something") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trax_core
 version: !ruby/object:Gem::Version
-  version: 0.0.80
+  version: 0.0.81
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -173,6 +173,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -181,6 +182,7 @@ files:
 - lib/trax.rb
 - lib/trax/core.rb
 - lib/trax/core/abstract_methods.rb
+- lib/trax/core/blueprint.rb
 - lib/trax/core/concern.rb
 - lib/trax/core/configuration.rb
 - lib/trax/core/definition.rb
@@ -200,6 +202,7 @@ files:
 - lib/trax/core/ext/uri.rb
 - lib/trax/core/fields.rb
 - lib/trax/core/fs.rb
+- lib/trax/core/has_dependencies.rb
 - lib/trax/core/has_mixins.rb
 - lib/trax/core/inheritance_hooks.rb
 - lib/trax/core/isolated_mixin.rb
@@ -209,8 +212,12 @@ files:
 - lib/trax/core/named_module.rb
 - lib/trax/core/primitives/enum.rb
 - lib/trax/core/primitives/enum_value.rb
+- lib/trax/core/silence_warnings.rb
 - lib/trax/core/types.rb
 - lib/trax/core/types/array.rb
+- lib/trax/core/types/array_of.rb
+- lib/trax/core/types/behaviors.rb
+- lib/trax/core/types/behaviors/array_of_members.rb
 - lib/trax/core/types/boolean.rb
 - lib/trax/core/types/enum.rb
 - lib/trax/core/types/enum_value.rb
@@ -222,7 +229,6 @@ files:
 - lib/trax_core.rb
 - lib/trax_core/version.rb
 - spec/spec_helper.rb
-- spec/support/category_enum.rb
 - spec/support/defs.rb
 - spec/support/ecom.rb
 - spec/support/ecom/widget.rb
@@ -247,14 +253,15 @@ files:
 - spec/trax/core/ext/module_spec.rb
 - spec/trax/core/ext/object_spec.rb
 - spec/trax/core/ext/uri_spec.rb
+- spec/trax/core/has_dependencies_spec.rb
 - spec/trax/core/has_mixins_spec.rb
 - spec/trax/core/inheritance_spec.rb
 - spec/trax/core/named_class_spec.rb
 - spec/trax/core/named_module_spec.rb
+- spec/trax/core/types/array_spec.rb
 - spec/trax/core/types/enum_spec.rb
 - spec/trax/core/types/struct_spec.rb
 - spec/trax/core_spec.rb
-- spec/trax/enum_spec.rb
 - spec/trax/hash_spec.rb
 - trax_core.gemspec
 homepage: http://github.com/jasonayre/trax_core
@@ -283,7 +290,6 @@ specification_version: 4
 summary: Core Trax Dependencies
 test_files:
 - spec/spec_helper.rb
-- spec/support/category_enum.rb
 - spec/support/defs.rb
 - spec/support/ecom.rb
 - spec/support/ecom/widget.rb
@@ -308,12 +314,13 @@ test_files:
 - spec/trax/core/ext/module_spec.rb
 - spec/trax/core/ext/object_spec.rb
 - spec/trax/core/ext/uri_spec.rb
+- spec/trax/core/has_dependencies_spec.rb
 - spec/trax/core/has_mixins_spec.rb
 - spec/trax/core/inheritance_spec.rb
 - spec/trax/core/named_class_spec.rb
 - spec/trax/core/named_module_spec.rb
+- spec/trax/core/types/array_spec.rb
 - spec/trax/core/types/enum_spec.rb
 - spec/trax/core/types/struct_spec.rb
 - spec/trax/core_spec.rb
-- spec/trax/enum_spec.rb
 - spec/trax/hash_spec.rb

data/spec/support/category_enum.rb

@@ -1,6 +0,0 @@
-class CategoryEnum < ::Enum
-  define :default, 1
-  define :clothing, 2
-  define :shoes, 3
-  define :accessories, 4
-end

data/spec/trax/enum_spec.rb

@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe ::Enum do
-  subject do
-    ::CategoryEnum
-  end
-
-  let(:expected_names) {  [:default, :clothing, :shoes, :accessories] }
-  let(:expected_values) { [1,2,3,4] }
-
-  describe ".key?" do
-    it { subject.key?(:default).should eq true }
-  end
-
-  describe "[](val)" do
-    it { subject[:default].to_i.should eq 1 }
-  end
-
-  describe "[](val)" do
-    it { subject["default"].to_i.should eq 1 }
-  end
-
-  describe ".value?" do
-    it { subject.value?(1).should eq true }
-  end
-
-  describe ".keys" do
-    it { subject.keys.should eq [:default, :clothing, :shoes, :accessories] }
-  end
-
-  describe ".names" do
-    it { subject.keys.should eq expected_names }
-  end
-
-  describe ".values" do
-    it { subject.values.should eq expected_values }
-  end
-
-  context "duplicate enum name" do
-    it { expect{subject.define_enum_value(:default, 6)}.to raise_error(::Trax::Core::Errors::DuplicateEnumValue) }
-  end
-
-  context "duplicate enum value" do
-    it {expect{subject.define_enum_value(:newthing, 1)}.to raise_error(::Trax::Core::Errors::DuplicateEnumValue) }
-  end
-
-  context "InstanceMethods" do
-    subject { ::CategoryEnum.new(:clothing) }
-
-    it { subject.choice.should eq :clothing }
-    it { subject.choice.should eq 2 }
-    it { expect(subject.next_value.to_sym).to eq :shoes }
-    it { expect(subject.previous_value.to_sym).to eq :default }
-
-    context "selection of values" do
-      it { subject.select_next_value.should eq ::CategoryEnum.new(:shoes).choice }
-    end
-    context "value is last" do
-      subject { ::CategoryEnum.new(:accessories) }
-      it { subject.next_value?.should eq false }
-      it { subject.previous_value?.should eq true }
-
-      context "selection of value" do
-        it { expect(subject.select_next_value).to eq ::CategoryEnum.new(:accessories) }
-        it { expect(subject.select_previous_value).to eq ::CategoryEnum.new(:shoes) }
-      end
-    end
-  end
-end