trax_core 0.0.84 → 0.0.85

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

@@ -12,13 +12,13 @@ describe ::Trax::Core::Types::Enum do
       end
 
       enum :Category do
-        define :default, 1
-        define :clothing, 2
-        define :shoes, 3
-        define :accessories, 4
+        define :default, 1, :display_name => "Default"
+        define :clothing, 2, :display_name => "Clothing"
+        define :shoes, 3, :display_name => "Shoes"
+        define :accessories, 4, :display_name => "Accessories"
       end
 
-      enum :ExtendedCategory, :extend => "MyFakeEnumNamespace::Category" do
+      enum :ExtendedCategory, :extends => "MyFakeEnumNamespace::Category" do
         define :watches,    5
         define :sunglasses, 6
       end
@@ -50,31 +50,31 @@ describe ::Trax::Core::Types::Enum do
     let(:expected_values) { [1,2,3,4] }
 
     describe ".key?" do
-      it { subject.key?(:default).should eq true }
+      it { expect(subject.key?(:default)).to eq true }
     end
 
     describe "[](val)" do
-      it { subject[:default].to_i.should eq 1 }
+      it { expect(subject[:default].to_i).to eq 1 }
     end
 
     describe "[](val)" do
-      it { subject["default"].to_i.should eq 1 }
+      it { expect(subject["default"].to_i).to eq 1 }
     end
 
     describe ".value?" do
-      it { subject.value?(1).should eq true }
+      it { expect(subject.value?(1)).to eq true }
     end
 
     describe ".keys" do
-      it { subject.keys.should eq [:default, :clothing, :shoes, :accessories] }
+      it { expect(subject.keys).to eq [:default, :clothing, :shoes, :accessories] }
     end
 
     describe ".names" do
-      it { subject.keys.should eq expected_names }
+      it { expect(subject.keys).to eq expected_names }
     end
 
     describe ".values" do
-      it { subject.values.should eq expected_values }
+      it { expect(subject.values).to eq expected_values }
     end
 
     context "duplicate enum name" do
@@ -91,18 +91,18 @@ describe ::Trax::Core::Types::Enum do
       end
       subject { described_object.new(:clothing) }
 
-      it { subject.choice.should eq :clothing }
-      it { subject.choice.should eq 2 }
+      it { expect(subject.choice).to eq :clothing }
+      it { expect(subject.choice).to 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 described_object.new(:shoes).choice }
+        it { expect(subject.select_next_value).to eq described_object.new(:shoes).choice }
       end
       context "value is last" do
         subject { described_object.new(:accessories) }
-        it { subject.next_value?.should eq false }
-        it { subject.previous_value?.should eq true }
+        it { expect(subject.next_value?).to eq false }
+        it { expect(subject.previous_value?).to eq true }
 
         context "selection of value" do
           it { expect(subject.select_next_value).to eq described_object.new(:accessories) }
@@ -125,8 +125,13 @@ describe ::Trax::Core::Types::Enum do
       let(:described_object) do
         "::MyFakeEnumNamespace::Category".constantize
       end
-      
+
       it { expect(described_object.names).to_not include(:watches)}
     end
   end
+
+  context ".to_schema" do
+    subject { "::MyFakeEnumNamespace::Category".constantize.new(2).to_schema }
+    it { expect(subject[:attributes][:display_name]).to eq "Clothing" }
+  end
 end

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

@@ -29,6 +29,7 @@ describe ::Trax::Core::Types::Struct do
         string :en, :default => ""
         string :da, :default => ""
         string :ca, :default => "eh"
+        string :fr
 
         struct :territories do
           string :en, :default => "US"
@@ -40,18 +41,15 @@ describe ::Trax::Core::Types::Struct do
 
         json :phone_formats
         json :date_formats, :default => {:en_US => "%m-%d-%y"}
+
+        set :widgets
       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))
-  }
+  let!(:fake_time1) { ::Time.mktime(1970,1,1) }
 
   it { expect(subject).to have_key("en") }
   it { expect(subject.en).to eq "something" }
@@ -138,7 +136,7 @@ describe ::Trax::Core::Types::Struct 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) }
+      it { expect(test_subject.created_at).to be_a(::Time) }
     end
 
     context "default value" do
@@ -146,4 +144,49 @@ describe ::Trax::Core::Types::Struct do
       it { expect(subject.last_updated_at).to eq ::Time.mktime(1980,1,1) }
     end
   end
+
+  context "#reverse_merge" do
+    subject { "::MyFakeStructNamespace::Locale".constantize.new(:en => "something") }
+    let(:other_struct) { "::MyFakeStructNamespace::Locale".constantize.new(:en => "changedvalue", :fr => "somefrench") }
+    it {
+      expect(subject.fr).to eq nil
+    }
+
+    it {
+      expect(subject.fr).to eq nil
+      result = subject.reverse_merge(other_struct)
+      expect(result.en).to eq "something"
+    }
+  end
+
+  context "#reverse_merge_present_values_only!" do
+    context "values that do not get overwritten" do
+      subject { "::MyFakeStructNamespace::Locale".constantize.new(:en => "something", :is_whatever => false, :widgets => ['one']) }
+      let(:other_struct) { "::MyFakeStructNamespace::Locale".constantize.new(:en => "changedvalue", :fr => "somefrench", :is_whatever => true, :widgets => ['two']) }
+      it {
+        expect(subject.fr).to eq nil
+      }
+
+      it {
+        expect(subject.fr).to eq nil
+        subject.reverse_merge_present_values_only!(other_struct)
+        expect(subject.en).to eq "something"
+        expect(subject.fr).to eq "somefrench"
+        expect(subject.is_whatever).to eq false
+        expect(subject.widgets.first).to eq 'one'
+      }
+    end
+
+    context "values which should be overwritten" do
+      subject { "::MyFakeStructNamespace::Locale".constantize.new(:en => "", :is_whatever => nil, :widgets => []) }
+      let(:other_struct) { "::MyFakeStructNamespace::Locale".constantize.new(:en => "changedvalue", :fr => "somefrench", :is_whatever => true, :widgets => ['two']) }
+      it {
+        subject.reverse_merge_present_values_only!(other_struct)
+        expect(subject.en).to eq "changedvalue"
+        expect(subject.fr).to eq "somefrench"
+        expect(subject.is_whatever).to eq true
+        expect(subject.widgets.first).to eq 'two'
+      }
+    end
+  end
 end

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

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe ::Trax::Core::Types::ValueObject do
+  subject { described_class.new(nil) }
+  it{ is_expected.to be_nil }
+end

data/spec/trax/core_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
 describe ::Trax::Core do
-  it {
-    expect{ Trax::Core::EagerAutoloadNamespace }.to_not raise_error
-  }
+  it { expect { Trax::Core::EagerAutoloadNamespace }.to_not raise_error }
 end

data/spec/trax/hash_spec.rb

@@ -8,10 +8,8 @@ describe ::Hash do
     ]
   end
 
-  describe "#to_proc" do
-    it{
-      subject.map(&{:name => :name, :cost => :price }).map(&[:cost]).sum.should eq 90
-    }
+  describe "#to_transformer" do
+    it { expect(subject.map(&{:name => :name, :cost => :price }.to_transformer).map(&[:cost]).sum).to eq 90 }
 
     context "single hash" do
       subject do
@@ -19,8 +17,8 @@ describe ::Hash do
       end
 
       it do
-        result = subject.tap(&{:cost => :price})
-        result[:cost].should eq 40
+        result = subject.tap(&{:cost => :price}.to_transformer)
+        expect(result[:cost]).to eq 40
       end
 
       context "transforming of values" do
@@ -30,9 +28,9 @@ describe ::Hash do
           result = subject.tap(&{
             :name => :name,
             :sale_price => {:price => ->(val){ val / 2 } }
-          })
+          }.to_transformer)
 
-          result[:sale_price].should eq 20
+          expect(result[:sale_price]).to eq 20
         end
       end
     end
@@ -41,37 +39,37 @@ describe ::Hash do
       subject { ::OpenStruct.new({:name => "something", :price => 40}) }
 
       it do
-        subject.as!(&{:cost => :price})[:cost].should eq 40
+        expect(subject.as!({:cost => :price})[:cost]).to eq 40
       end
 
       context "transforming of values" do
         let(:original_subject) { ::OpenStruct.new({:name => "something", :price => 40 }) }
 
         subject do
-          original_subject.as!(&{
+          original_subject.as!({
             :name => :name,
             :sale_price => { :price => ->(val){ val / 2 } }
           })
         end
 
         it do
-          subject[:sale_price].should eq 20
+          expect(subject[:sale_price]).to eq 20
         end
 
         context "can transform into a new value while reusing value" do
           subject do
-            original_subject.as!(&{
+            original_subject.as!({
               :name => :name,
               :price => :price,
               :sale_price => { :price => ->(val){ val / 2 } }
             })
           end
 
-          it { [subject[:sale_price], subject[:price]].should eq [20, 40] }
+          it { expect([subject[:sale_price], subject[:price]]).to eq [20, 40] }
 
           context "order dependency" do
             subject do
-              original_subject.as!(&{
+              original_subject.as!({
                 :name => :name,
                 :sale_price => { :price => ->(val){ val / 2 } },
                 :price => :price
@@ -79,7 +77,7 @@ describe ::Hash do
             end
 
             it "should not matter" do
-              [subject[:sale_price], subject[:price]].should eq [20, 40]
+              expect([subject[:sale_price], subject[:price]]).to eq [20, 40]
             end
           end
         end

data/trax_core.gemspec

@@ -25,16 +25,17 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  # spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "ruby_dig"
+
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-pride"
   spec.add_development_dependency "pry-nav"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency 'rspec-its', '~> 1'
   spec.add_development_dependency 'rspec-collection_matchers', '~> 1'
-  # spec.add_development_dependency 'guard', '~> 2'
-  # spec.add_development_dependency 'guard-rspec', '~> 4'
-  # spec.add_development_dependency 'guard-bundler', '~> 2'
-  # spec.add_development_dependency 'rb-fsevent'
-  # spec.add_development_dependency 'terminal-notifier-guard'
+  spec.add_development_dependency 'guard', '~> 2'
+  spec.add_development_dependency 'guard-rspec', '~> 4'
+  spec.add_development_dependency 'guard-bundler', '~> 2'
+  spec.add_development_dependency 'rb-fsevent'
+  spec.add_development_dependency 'terminal-notifier-guard'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trax_core
 version: !ruby/object:Gem::Version
-  version: 0.0.84
+  version: 0.0.85
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_dig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +192,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Trax core dependencies and utilities
 email:
 - jasonayre@gmail.com
@@ -209,6 +293,7 @@ files:
 - lib/trax/core/ext/enumerable.rb
 - lib/trax/core/ext/hash.rb
 - lib/trax/core/ext/is.rb
+- lib/trax/core/ext/method.rb
 - lib/trax/core/ext/module.rb
 - lib/trax/core/ext/object.rb
 - lib/trax/core/ext/string.rb
@@ -228,6 +313,7 @@ files:
 - lib/trax/core/primitives/enum.rb
 - lib/trax/core/primitives/enum_value.rb
 - lib/trax/core/silence_warnings.rb
+- lib/trax/core/transformer.rb
 - lib/trax/core/types.rb
 - lib/trax/core/types/array.rb
 - lib/trax/core/types/array_of.rb
@@ -268,18 +354,21 @@ files:
 - spec/trax/core/errors_spec.rb
 - spec/trax/core/ext/array_spec.rb
 - spec/trax/core/ext/class_spec.rb
+- spec/trax/core/ext/hash_spec.rb
+- spec/trax/core/ext/method_spec.rb
 - 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/path_permutations_spec.rb
+- spec/trax/core/transformer_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/types/value_object_spec.rb
 - spec/trax/core_spec.rb
 - spec/trax/hash_spec.rb
 - trax_core.gemspec
@@ -303,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Core Trax Dependencies
@@ -330,17 +419,20 @@ test_files:
 - spec/trax/core/errors_spec.rb
 - spec/trax/core/ext/array_spec.rb
 - spec/trax/core/ext/class_spec.rb
+- spec/trax/core/ext/hash_spec.rb
+- spec/trax/core/ext/method_spec.rb
 - 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/path_permutations_spec.rb
+- spec/trax/core/transformer_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/types/value_object_spec.rb
 - spec/trax/core_spec.rb
 - spec/trax/hash_spec.rb