trax_core 0.0.82 → 0.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f1e920cce6d37d61b4a163ff1a38595795b68d1
-  data.tar.gz: a9f3bebf1be7bcec987b8c5b146340b2a82a4005
+  metadata.gz: c6d3edf83c6a6d1b9b57bfacf6e6b185139c5e9e
+  data.tar.gz: fe41bc8fa78daa685df68da9d513bb3d5377b421
 SHA512:
-  metadata.gz: c595c9cb3ceb58fdbd8b9341a2473a56f56625231878d2a39a0429cd12ebb7c86ff7cce743c0a21ac1f808478d4ff4f361ea66745e84988cd59437e73eeebabd
-  data.tar.gz: 9e2a8ba3c40ce20abedb1c913e2bd6b053499982c7fee790ca5d1e638439770d3ca02394910cc308171c97b36e4cc93300ef77686ae8cf300c27397adc00b88a
+  metadata.gz: 2c3579335b54d9831cd2bf708aad4ad3d6bcd011b208b0514ccf75ab43a272dd3aa52fdab1aff545382606d26535740bdb6ba56dd7879676f027368ef755bbc9
+  data.tar.gz: 0c29fc5fd805a2476345dd692ed5b6a19720241343b8bcba259c428e6cd31d16e257fa5d033209a838d488567c4732809f22586da9b644749598f48c598401b6

data/lib/trax/core.rb

@@ -1,4 +1,5 @@
 require 'active_support/all'
+require 'wannabe_bool'
 require_relative './core/fs'
 require_relative './core/ext/array'
 require_relative './core/ext/class'

data/lib/trax/core/types.rb

@@ -11,8 +11,10 @@ module Trax
       autoload :EnumValue
       autoload :Float
       autoload :Integer
-      autoload :Struct
+      autoload :Json
       autoload :String
+      autoload :Struct
+      autoload :Time
       autoload :ValueObject
     end
   end

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

@@ -10,6 +10,7 @@ module Trax
           return ::Class.new(self) do
             include ::Trax::Core::Types::Behaviors::ArrayOfMembers
             self.member_class = klass
+            self
           end
         end
       end

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

@@ -2,6 +2,8 @@ module Trax
   module Core
     module Types
       class ArrayOf < ::Trax::Core::Types::Array
+        include ::Trax::Core::Types::Behaviors::ArrayOfMembers
+
         def self.[](member_class)
           return of(member_class)
         end

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

@@ -8,7 +8,7 @@ module Trax
           included do
             include ::Enumerable
 
-            class_attribute :member_class
+            class_attribute :member_class unless self.respond_to?(:member_class) && self.member_class
           end
 
           def initialize(*args)

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

@@ -0,0 +1,11 @@
+module Trax
+  module Core
+    module Types
+      class Json
+        def self.type
+          :json
+        end
+      end
+    end
+  end
+end

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

@@ -15,13 +15,16 @@ 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   => [],
-          :boolean => nil,
-          :float   => 0.0,
-          :string  => "",
-          :struct  => {},
-          :enum    => nil,
-          :integer => nil
+          :array    => [],
+          :array_of => [],
+          :boolean  => nil,
+          :enum     => nil,
+          :float    => 0.0,
+          :integer  => nil,
+          :json     => {},
+          :string   => "",
+          :struct   => {},
+          :time     => nil
         }.with_indifferent_access.freeze
 
         def self.fields_module
@@ -38,13 +41,17 @@ module Trax
         end
 
         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)
+          of_object = of && of.is_a?(::String) ? const_get(of) : of
+          coercer = of_object ? true : ::Array
+          options.merge!(:member_class => of_object) if of
+          array_or_array_of = of ? :array_of : :array
+          define_attribute_class_for_type(array_or_array_of, name, *args, :coerce => coercer, **options, &block)
         end
 
         def self.boolean_property(name, *args, **options, &block)
-          define_attribute_class_for_type(:boolean, name, *args, :coerce => ->(value){!!value}, **options, &block)
+          define_attribute_class_for_type(:boolean, name, *args, :coerce => ->(value){
+            [true, false].include?(value) ? value : value.to_b
+          }, **options, &block)
         end
 
         def self.enum_property(name, *args, **options, &block)
@@ -59,6 +66,10 @@ module Trax
           define_attribute_class_for_type(:integer, name, *args, :coerce => ::Integer, **options, &block)
         end
 
+        def self.json_property(name, *args, **options, &block)
+          define_attribute_class_for_type(:json, name, *args, **options, &block)
+        end
+
         def self.string_property(name, *args, **options, &block)
           define_attribute_class_for_type(:string, name, *args, :coerce => ::String, **options, &block)
         end
@@ -67,6 +78,10 @@ module Trax
           define_attribute_class_for_type(:struct, name, *args, :coerce => true, **options, &block)
         end
 
+        def self.time_property(name, *args, **options, &block)
+          define_attribute_class_for_type(:time, name, *args, :coerce => ->(value){ ::Time.parse(value) if value }, **options, &block)
+        end
+
         def self.to_schema
           ::Trax::Core::Definition.new(
             :source => self.name,
@@ -94,8 +109,10 @@ module Trax
           alias :enum :enum_property
           alias :float :float_property
           alias :integer :integer_property
-          alias :struct :struct_property
+          alias :json :json_property
           alias :string :string_property
+          alias :struct :struct_property
+          alias :time :time_property
         end
 
         def value
@@ -112,17 +129,17 @@ module Trax
 
           attribute_klass = if options.key?(:extend)
             _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 = ::Trax::Core::NamedClass.new(klass_name, _klass_prototype, :parent_definition => self, **options, &block)
             _klass
           else
-            ::Trax::Core::NamedClass.new(klass_name, "::Trax::Core::Types::#{type_name.to_s.classify}".constantize, :parent_definition => self, &block)
+            ::Trax::Core::NamedClass.new(klass_name, "::Trax::Core::Types::#{type_name.to_s.classify}".constantize, :parent_definition => self, **options, &block)
           end
 
           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)
-            coerce_key(property_name.to_sym, &coerce)
+            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)

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

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

data/lib/trax_core/version.rb

@@ -1,3 +1,3 @@
 module TraxCore
-  VERSION = "0.0.82"
+  VERSION = "0.0.83"
 end

data/spec/trax/core/definitions_spec.rb

@@ -28,7 +28,7 @@ describe ::Trax::Core::Definitions do
     end
 
     context "array" do
-      it { expect(subject::ProductAttributes.new.categories).to be_a(Array) }
+      it { expect(subject::ProductAttributes.new.categories.__getobj__).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" }

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

@@ -2,9 +2,22 @@ require 'spec_helper'
 
 describe ::Trax::Core::Types::Struct do
   before(:all) do
+
     module MyFakeStructNamespace
       extend ::Trax::Core::Definitions
 
+      struct :Location do
+        string :region
+        enum :continent do
+          define :north_america, 1
+          define :south_america, 2
+          define :Europe,        3
+          define :Asia,          4
+        end
+
+        time :created_at
+      end
+
       struct :Locale do
         string :en, :default => ""
         string :da, :default => ""
@@ -13,21 +26,91 @@ describe ::Trax::Core::Types::Struct do
         struct :territories do
           string :en, :default => "US"
         end
+
+        array :locations, :of => "MyFakeStructNamespace::Location"
+
+        boolean :is_whatever, :default => true
+
+        json :phone_formats
+        json :date_formats, :default => {:en_US => "%m-%d-%y"}
       end
     end
   end
 
   subject { "::MyFakeStructNamespace::Locale".constantize.new(:en => "something") }
 
+  let!(:fake_time1) {
+    @fake_time1 = ::Time.stub(:now).and_return(::Time.mktime(1970,1,1))
+  }
+  let!(:fake_time2) {
+    @fake_time2 = ::Time.stub(:now).and_return(::Time.mktime(1971,1,1))
+  }
+
   it { expect(subject).to have_key("en") }
   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" }
 
+  it { expect(subject.phone_formats).to eq({}) }
+  it { expect(subject.date_formats).to eq('en_US' => "%m-%d-%y") }
+
   context "unknown value" do
     subject { "::MyFakeStructNamespace::Locale".constantize.new(:blah => "something") }
     it { expect(subject).to_not respond_to(:blah) }
     it { expect(subject.en).to eq "" }
   end
+
+  context "with json property" do
+    let(:locale) { :en_GB }
+    let(:date_format) { "%d/%m/%Y" }
+    let(:definition){ "::MyFakeStructNamespace::Locale".constantize.new(:date_formats => {locale => date_format}) }
+    subject { definition.date_formats }
+
+    it { expect(subject[locale.to_s]).to eq date_format }
+    it { expect(subject[locale.to_sym]).to eq date_format }
+  end
+
+  context "with array_of property" do
+    let(:definition) { "::MyFakeStructNamespace::Locale".constantize.new(:locations => [{:continent => :asia}]) }
+
+    subject { definition }
+    it { expect(definition.locations.first.continent.to_i).to eq(4) }
+
+    context "casts to empty array" do
+      let(:definition) { "::MyFakeStructNamespace::Locale".constantize.new }
+      it { expect(definition.locations.length).to eq 0 }
+      it { expect(definition.locations).to_not eq nil }
+    end
+  end
+
+  context "with boolean property" do
+    let(:definition) { "::MyFakeStructNamespace::Locale".constantize }
+    subject { definition.new(:is_whatever => false) }
+
+    it { expect(subject.is_whatever).to eq false }
+    context "default" do
+      subject { definition.new }
+      it{ expect(subject.is_whatever).to eq true }
+    end
+
+    context "coercion" do
+      subject { definition.new(:is_whatever => '') }
+      it{ expect(subject.is_whatever).to eq false }
+      it{ expect(subject.is_whatever).to be_falsey }
+    end
+  end
+
+  context "with time property" do
+    let(:definition) { "::MyFakeStructNamespace::Location".constantize }
+    subject { definition.new(:created_at => fake_time1) }
+    it { expect(subject.created_at).to eq fake_time1 }
+
+    context do
+      let(:db_timestamp) { "2015-12-05 15:34:57.701289" }
+      let(:test_subject) { definition.new(:created_at => db_timestamp) }
+      it { test_subject.created_at.should be_a(::Time) }
+    end
+  end
 end

data/trax_core.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hashie"
   spec.add_dependency "activesupport"
   spec.add_dependency "activemodel"
+  spec.add_dependency "wannabe_bool"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trax_core
 version: !ruby/object:Gem::Version
-  version: 0.0.82
+  version: 0.0.83
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wannabe_bool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -224,8 +238,10 @@ files:
 - lib/trax/core/types/enum_value.rb
 - lib/trax/core/types/float.rb
 - lib/trax/core/types/integer.rb
+- lib/trax/core/types/json.rb
 - lib/trax/core/types/string.rb
 - lib/trax/core/types/struct.rb
+- lib/trax/core/types/time.rb
 - lib/trax/core/types/value_object.rb
 - lib/trax_core.rb
 - lib/trax_core/version.rb