trax_core 0.0.83 → 0.0.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6d3edf83c6a6d1b9b57bfacf6e6b185139c5e9e
-  data.tar.gz: fe41bc8fa78daa685df68da9d513bb3d5377b421
+  metadata.gz: cc61a40b6e173df7ff14e66550fd7c5fa558ab4c
+  data.tar.gz: 9b5f6b14a3b4c714b094f8020b66f3d532a79855
 SHA512:
-  metadata.gz: 2c3579335b54d9831cd2bf708aad4ad3d6bcd011b208b0514ccf75ab43a272dd3aa52fdab1aff545382606d26535740bdb6ba56dd7879676f027368ef755bbc9
-  data.tar.gz: 0c29fc5fd805a2476345dd692ed5b6a19720241343b8bcba259c428e6cd31d16e257fa5d033209a838d488567c4732809f22586da9b644749598f48c598401b6
+  metadata.gz: 18b3e5d1d9dc44a315bc88480c76b68ecb81a00d07dd41d14b831040ea3e62c7c696477ba9965c34f449a5f168aa35529f94ef3619f7ef2ebc99af8a5457bab7
+  data.tar.gz: 1013d42d2b1900af67bd2e46edf65c0e28a59c301c400ae60423d945acf7d06ae2656b260a95d5baec813671323b50adabcfefb4438fd40102be00f349e47a47

data/Gemfile

@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in trax_core.gemspec
 gemspec
 
+# gem 'hashie', :github => "intridea/hashie"
+#pointing at branch until default value procs for dash is merged
+gem 'hashie', :github => "jasonayre/hashie"
+
 group :development do
   gem 'guard-bundler'
 end

data/lib/trax/core/types.rb

@@ -12,6 +12,7 @@ module Trax
       autoload :Float
       autoload :Integer
       autoload :Json
+      autoload :Set
       autoload :String
       autoload :Struct
       autoload :Time

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

@@ -5,6 +5,11 @@ module Trax
         def self.type
           :boolean
         end
+
+        def self.to_schema
+          result = super
+          result[:values] = [true, false]
+        end
       end
     end
   end

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

@@ -0,0 +1,15 @@
+module Trax
+  module Core
+    module Types
+      class Set < ::Trax::Core::Types::ValueObject
+        def initialize(*args)
+          super(::Set[*args.flatten])
+        end
+
+        def self.type
+          :set
+        end
+      end
+    end
+  end
+end

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

@@ -22,6 +22,7 @@ module Trax
           :float    => 0.0,
           :integer  => nil,
           :json     => {},
+          :set      => [],
           :string   => "",
           :struct   => {},
           :time     => nil
@@ -70,6 +71,10 @@ module Trax
           define_attribute_class_for_type(:json, name, *args, **options, &block)
         end
 
+        def self.set_property(name, *args, **options, &block)
+          define_attribute_class_for_type(:set, name, *args, :coerce => true, **options, &block)
+        end
+
         def self.string_property(name, *args, **options, &block)
           define_attribute_class_for_type(:string, name, *args, :coerce => ::String, **options, &block)
         end
@@ -79,7 +84,20 @@ module Trax
         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)
+          define_attribute_class_for_type(:time, name, *args, :coerce => ->(value){
+            result = if value
+              case value
+              when ::String
+                ::Time.parse(value)
+              when ::Time
+                value
+              when ::Proc
+                value.call
+              end
+            end
+
+            result
+          }, **options, &block)
         end
 
         def self.to_schema
@@ -110,6 +128,7 @@ module Trax
           alias :float :float_property
           alias :integer :integer_property
           alias :json :json_property
+          alias :set :set_property
           alias :string :string_property
           alias :struct :struct_property
           alias :time :time_property
@@ -136,6 +155,7 @@ module Trax
           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)

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

@@ -17,6 +17,14 @@ module Trax
         def self.to_sym
           :value
         end
+
+        def self.to_schema
+          ::Trax::Core::Definition.new(
+            :name => self.name.demodulize.underscore,
+            :source => self.name,
+            :type => self.type
+          )
+        end
       end
     end
   end

data/lib/trax_core/version.rb

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

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

@@ -17,6 +17,19 @@ describe ::Trax::Core::Types::Array do
     let(:test_subject) { subject.new({:width => 1}) }
     it { test_subject[0].width.should eq 1 }
     it { test_subject[0].height.should eq 0 }
+
+    context "does not duplicate values" do
+      it {
+        test_subject << {:width => 2, :height => 2}
+        expect(test_subject.length).to eq 2
+      }
+
+      it {
+        test_subject << {}
+        test_subject << {}
+        expect(test_subject.last.width).to eq 0
+      }
+    end
   end
 
   context "ArrayOf" do

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

@@ -16,6 +16,13 @@ describe ::Trax::Core::Types::Struct do
         end
 
         time :created_at
+        time :last_updated_at, :default => lambda{|record| ::Time.mktime(1980,1,1) }
+
+        float :latitude, :default => 1.0
+        float :longitude, :default => 5.0
+
+        set :place_ids
+        set :lat_long_with_sum, :default => lambda{|record| [ record.latitude, record.longitude, (record.latitude + record.longitude) ] }
       end
 
       struct :Locale do
@@ -85,6 +92,27 @@ describe ::Trax::Core::Types::Struct do
     end
   end
 
+  context "with set property" do
+    let(:definition) { "::MyFakeStructNamespace::Location".constantize.new(:place_ids => [1, 2]) }
+
+    subject { definition }
+    it { expect(definition.place_ids.first).to eq(1) }
+
+    context "behaves like a set" do
+      it {
+        subject.place_ids << 1
+        subject.place_ids << 1
+        expect(subject.place_ids.length).to eq 2
+      }
+    end
+
+    context "default value" do
+      it {
+        expect(subject.lat_long_with_sum).to eq [1.0, 5.0, 6.0].to_set
+      }
+    end
+  end
+
   context "with boolean property" do
     let(:definition) { "::MyFakeStructNamespace::Locale".constantize }
     subject { definition.new(:is_whatever => false) }
@@ -107,10 +135,15 @@ describe ::Trax::Core::Types::Struct do
     subject { definition.new(:created_at => fake_time1) }
     it { expect(subject.created_at).to eq fake_time1 }
 
-    context do
+    context "parsing timestamps" 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
+
+    context "default value" do
+      subject{ definition.new }
+      it { expect(subject.last_updated_at).to eq ::Time.mktime(1980,1,1) }
+    end
   end
 end

data/trax_core.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 "hashie"
+  spec.add_dependency "hashie", '~>3.4.4'
   spec.add_dependency "activesupport"
   spec.add_dependency "activemodel"
   spec.add_dependency "wannabe_bool"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: trax_core
 version: !ruby/object:Gem::Version
-  version: 0.0.83
+  version: 0.0.84
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +239,7 @@ files:
 - lib/trax/core/types/float.rb
 - lib/trax/core/types/integer.rb
 - lib/trax/core/types/json.rb
+- lib/trax/core/types/set.rb
 - lib/trax/core/types/string.rb
 - lib/trax/core/types/struct.rb
 - lib/trax/core/types/time.rb