danica 2.4.4 → 2.5.0

data/spec/lib/danica/variables_holder_spec.rb

@@ -30,22 +30,33 @@ end
 
 
 describe Danica::VariablesHolder do
-  class Danica::VariablesHolder::Dummy
-    include Danica::Common
-    include Danica::VariablesHolder
+  let(:clazz) { described_class::Dummy }
+  subject { clazz.new }
 
-    variables :x, y: { latex: '\y' }, z: 10
-  end
+  describe 'variables assignement' do
+    it 'creates setters and getters for the variables' do
+      %i(x y z).each do |var|
+        expect(subject).to respond_to(var)
+        expect(subject).to respond_to("#{var}=")
+      end
+    end
 
-  let(:clazz) { described_class::Dummy }
-  subject do
-    clazz.new
-  end
+    it 'accepts variable assignment' do
+      expect do
+        subject.x = 1
+      end.to change(subject.x, :content).to(Danica::Wrapper::Number.new(1))
+    end
 
-  it 'creates setters and getters for the variables' do
-    %i(x y z).each do |var|
-      expect(subject).to respond_to(var)
-      expect(subject).to respond_to("#{var}=")
+    it 'variable assignemnt does not change the container' do
+      expect do
+        subject.x = 1
+      end.not_to change(subject, :x)
+    end
+
+    xit 'accepts containter assignment' do
+      expect do
+        subject.x = Danica::Wrapper::Container.new(Danica::Wrapper::Number.new(1))
+      end.to change(subject, :x)
     end
   end
 
@@ -53,6 +64,70 @@ describe Danica::VariablesHolder do
     it 'returns the list of variables pre configured' do
       expect(clazz.variables_names).to eq(%i(x y z))
     end
+
+    context 'when variables are defined in super class' do
+      let(:clazz) { described_class::DummyChild }
+
+      it 'returns the list of variables of both classes merged' do
+        expect(clazz.variables_names).to eq(%i(x y z k))
+      end
+    end
+
+    context 'when variables are reseted on child class' do
+      let(:clazz) { described_class::DummyOverwrite }
+
+      it 'returns the list of variables of both classes merged' do
+        expect(clazz.variables_names).to eq(%i(k z))
+      end
+    end
+
+    context 'when we alias a variable' do
+      let(:clazz) { described_class::DummyAlias }
+
+      it 'returns the list of variables of both classes merged' do
+        expect(clazz.variables_names).to eq(%i(a y z))
+      end
+
+      context 'when original variable is set' do
+        before do
+          subject.x = 10
+        end
+
+        context 'when calling the alias variable' do
+          it 'returns the aliased value' do
+            expect(subject.a).to eq(subject.x)
+          end
+        end
+
+        context 'when changing the new alias value' do
+          it do
+            expect do
+              subject.a = 20
+            end.to change { subject.x.content }
+          end
+        end
+      end
+
+      context 'when alias variable is set' do
+        before do
+          subject.a = 10
+        end
+
+        context 'when calling the original variable' do
+          it 'returns the aliased value' do
+            expect(subject.x).to eq(subject.a)
+          end
+        end
+
+        context 'when changing the original variable value' do
+          it do
+            expect do
+              subject.x = 20
+            end.to change { subject.a.content }
+          end
+        end
+      end
+    end
   end
 
   describe '#variables=' do
@@ -195,4 +270,114 @@ describe Danica::VariablesHolder do
       end
     end
   end
+
+  describe '#extract_variables' do
+    let(:clazz) { described_class::DummyChild }
+    context 'when holder has straight variables' do
+      it 'returns the variables hash' do
+        expect(subject.extract_variables).to eq(subject.containers.as_hash([:x, :y, :zeta, :k]))
+      end
+
+      context 'but one of them is a number' do
+        let(:clazz) { described_class::Dummy }
+        let(:expected) do
+          subject.containers_hash.reject { |k,v| k == :z }
+        end
+
+        it 'returns only the variables' do
+          expect(subject.extract_variables).to eq(expected)
+        end
+      end
+    end
+
+    context 'when variables names are different' do
+      let(:subject) { clazz.new(x: :xis, y: :lambda, z: :zeta, k: :key) }
+
+      it 'returns the names as keys' do
+        expect(subject.extract_variables.keys).to eq(%i(xis lambda zeta key))
+      end
+    end
+
+    context 'when a variable is another variable holder' do
+      let(:inner) { Danica::Operator::Power.new }
+      let(:subject) do
+        clazz.new(z: inner)
+      end
+      let(:expected) do
+        subject.containers_hash.reject { |k,v| k == :z }
+                               .merge(inner.containers_hash)
+      end
+
+      it 'returns the ineer variables of the inner holder as well' do
+        expect(subject.extract_variables).to eq(expected)
+      end
+
+      context 'when inner holder has the same variables' do
+        let(:inner) { clazz.new }
+        let(:expected) do
+          inner.containers.as_hash([:x, :y, :zeta, :k])
+        end
+
+        it 'merges them together in favor of the inner variables' do
+          expect(subject.extract_variables).to eq(expected)
+        end
+      end
+    end
+  end
+
+  describe '#calculate' do
+    context 'when object doesnt have the values defined' do
+      context 'when trying to calculate without passing the values' do
+        it do
+          expect { subject.calculate }.to raise_error(Danica::Exception::NotDefined)
+        end
+
+        context 'which does not complete the values' do
+          it do
+            expect { subject.calculate(2) }.to raise_error(Danica::Exception::NotDefined)
+          end
+        end
+      end
+
+      context 'when passing the values' do
+        context 'as a list of values' do
+          it do
+            expect { subject.calculate(2, 4) }.not_to raise_error
+          end
+
+          it 'calculates the expression' do
+            expect(subject.calculate(2, 4)).to eq(26)
+          end
+
+          context 'and replacing all the values' do
+            it do
+              expect { subject.calculate(2, 4, 5) }.not_to raise_error
+            end
+
+            it 'calculates the expression' do
+              expect(subject.calculate(2, 4, 5)).to eq(21)
+            end
+          end
+        end
+
+        context 'as a hash' do
+          context 'which completes the values' do
+            it do
+              expect { subject.calculate(x: 2, y: 4) }.not_to raise_error
+            end
+
+            it 'calculates the expression' do
+              expect(subject.calculate(2, 4)).to eq(26)
+            end
+          end
+
+          context 'which does not complete the values' do
+            it do
+              expect { subject.calculate(x: 2, z: 4) }.to raise_error(Danica::Exception::NotDefined)
+            end
+          end
+        end
+      end
+    end
+  end
 end

data/spec/support/models/{functions → expression}/baskara.rb

@@ -1,5 +1,5 @@
 module Danica
-  class Function::Baskara < Function.build(:a, :b, :c) { numerator / denominator }
+  class Expression::Baskara < Expression.build(:a, :b, :c) { numerator / denominator }
 
     private
 

data/spec/support/models/{functions → expression}/hyperbole.rb

@@ -1,5 +1,5 @@
 module Danica
-  class Hyperbole < Function.build(:x) { power(x, 2) }
+  class Hyperbole < Expression.build(:x) { power(x, 2) }
   end
 end
 
@@ -7,7 +7,7 @@ module Danica
   class SaddleHyperbole < Hyperbole
     variables :y
 
-    def function_block
+    def expression_block
       super - power(y, 2)
     end
   end

data/spec/support/models/{functions → expression}/spatial.rb

@@ -1,5 +1,5 @@
 module Danica
-  class Function::Spatial < Function.build(:time, :acceleration, :initial_space, :initial_velocity) { addition(parcels) }
+  class Expression::Spatial < Expression.build(:time, :acceleration, :initial_space, :initial_velocity) { addition(parcels) }
 
     private
 

data/spec/support/models/function/hyperbole.rb

@@ -0,0 +1,16 @@
+
+module Danica
+  class Function::Hyperbole < Function.build(:x) { Danica::Hyperbole.new }
+  end
+end
+
+module Danica
+  class Function::SaddleHyperbole < Function::Hyperbole
+    variables :y
+
+    def function_block
+      super - power(y, 2)
+    end
+  end
+end
+

data/spec/support/models/variables_holder/dummy.rb

@@ -0,0 +1,34 @@
+module Danica
+  module VariablesHolder
+    class Dummy
+      include Common
+      include VariablesHolder
+
+      variables :x, y: { latex: '\y' }, z: 10
+
+      delegate :to, :to_f, to: :block
+
+      def initialize(vars = {})
+        self.variables=vars
+      end
+
+      def block
+        x ** y + z
+      end
+    end
+
+    class DummyChild < Dummy
+      variables :k, z: { name: 'zeta' }
+    end
+
+    class DummyOverwrite < Dummy
+      variables :w
+      reset_variables
+      variables :k, z: { name: 'zeta' }
+    end
+
+    class DummyAlias < Dummy
+      variable_alias :x, :a
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.0
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,9 +143,12 @@ files:
 - lib/danica/builder.rb
 - lib/danica/common.rb
 - lib/danica/dsl.rb
+- lib/danica/equation.rb
 - lib/danica/exception.rb
+- lib/danica/expressable.rb
+- lib/danica/expression.rb
+- lib/danica/expression/gauss.rb
 - lib/danica/function.rb
-- lib/danica/function/gauss.rb
 - lib/danica/function/name.rb
 - lib/danica/operator.rb
 - lib/danica/operator/addition.rb
@@ -159,6 +162,8 @@ files:
 - lib/danica/operator/sin.rb
 - lib/danica/operator/squared_root.rb
 - lib/danica/variables_holder.rb
+- lib/danica/variables_holder/alias_builder.rb
+- lib/danica/variables_holder/calculator.rb
 - lib/danica/variables_holder/variables_builder.rb
 - lib/danica/version.rb
 - lib/danica/wrapper.rb
@@ -176,7 +181,10 @@ files:
 - spec/integration/power_spec.rb
 - spec/lib/danica/common_spec.rb
 - spec/lib/danica/dsl_spec.rb
-- spec/lib/danica/function/gauss_spec.rb
+- spec/lib/danica/equation_spec.rb
+- spec/lib/danica/expressable_spec.rb
+- spec/lib/danica/expression/gauss_spec.rb
+- spec/lib/danica/expression_spec.rb
 - spec/lib/danica/function/name_spec.rb
 - spec/lib/danica/function_spec.rb
 - spec/lib/danica/operator/addition_spec.rb
@@ -198,9 +206,11 @@ files:
 - spec/lib/danica/wrapper_spec.rb
 - spec/lib/danica_spec.rb
 - spec/spec_helper.rb
-- spec/support/models/functions/baskara.rb
-- spec/support/models/functions/hyperbole.rb
-- spec/support/models/functions/spatial.rb
+- spec/support/models/expression/baskara.rb
+- spec/support/models/expression/hyperbole.rb
+- spec/support/models/expression/spatial.rb
+- spec/support/models/function/hyperbole.rb
+- spec/support/models/variables_holder/dummy.rb
 - spec/support/shared_contexts/common.rb
 - spec/support/shared_examples/base_operations.rb
 - spec/support/shared_examples/common.rb
@@ -227,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Danica
@@ -239,7 +249,10 @@ test_files:
 - spec/integration/power_spec.rb
 - spec/lib/danica/common_spec.rb
 - spec/lib/danica/dsl_spec.rb
-- spec/lib/danica/function/gauss_spec.rb
+- spec/lib/danica/equation_spec.rb
+- spec/lib/danica/expressable_spec.rb
+- spec/lib/danica/expression/gauss_spec.rb
+- spec/lib/danica/expression_spec.rb
 - spec/lib/danica/function/name_spec.rb
 - spec/lib/danica/function_spec.rb
 - spec/lib/danica/operator/addition_spec.rb
@@ -261,9 +274,11 @@ test_files:
 - spec/lib/danica/wrapper_spec.rb
 - spec/lib/danica_spec.rb
 - spec/spec_helper.rb
-- spec/support/models/functions/baskara.rb
-- spec/support/models/functions/hyperbole.rb
-- spec/support/models/functions/spatial.rb
+- spec/support/models/expression/baskara.rb
+- spec/support/models/expression/hyperbole.rb
+- spec/support/models/expression/spatial.rb
+- spec/support/models/function/hyperbole.rb
+- spec/support/models/variables_holder/dummy.rb
 - spec/support/shared_contexts/common.rb
 - spec/support/shared_examples/base_operations.rb
 - spec/support/shared_examples/common.rb