danica 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05b7fa3ae186fb5821ec4db27048ff78db65b806
-  data.tar.gz: 4258d4543ccb64352a89543686599cabc93ad4aa
+  metadata.gz: be618ffc1e1620cc02cad2c42ad749bd75b9cf5c
+  data.tar.gz: c8388dda1c1763dbb12945e6da568c2077e68626
 SHA512:
-  metadata.gz: df83dcbe526b2ed7ac74df6e69016ae68db54e62d3c22d78810f0d3fd9daa879e572ac22094f880faed6bec9e9238790b74f440a6da127abeb6b56078a7dbcfe
-  data.tar.gz: eebfc744cd15f9b483b8758a3c5f4f57008bebdaf2ebf471d19f9fca27e3b4a75342bce061a8b42ded63293a0923728549a3e13188a936338f3c766ec1a5c396
+  metadata.gz: cfa2f7388464148bbe4124527ae798f813c53c5ed0461d52c0105501465df6d25df687959fdeb9ddc2bcb98c2d258e7e4604a87a0ad4759f43bf05f42f99cd11
+  data.tar.gz: 76caede443c7296d5aee872f391888838b4ea662dc4f209e255485a4119b1277892ab9a8ba23c3e95c3b8b3cf7d5767931cbe5139fe3264db470943f7b6b22da

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danica (1.1.0)
+    danica (1.2.0)
       activemodel
       activesupport
       bidu-core_ext

data/lib/danica/function.rb

@@ -22,6 +22,18 @@ module Danica
     def to_f
       raise 'Not IMplemented yet'
     end
+
+    def calculate(*args)
+      vars_map = args.extract_options!
+      vars_map = variables_value_hash.merge(vars_map)
+      vars_map.each do |k, v|
+        unless v && (v.is_a?(Fixnum) || v.valued?)
+          vars_map[k] = args.shift
+        end
+      end
+
+      self.class.new(vars_map).to_f
+    end
   
     def to_tex
       Number.new(to_f).to_tex
@@ -53,8 +65,16 @@ module Danica
       @variabels_map ||= (@variables || []).as_hash(self.class.variables_names)
     end
 
+    def variables_value_hash
+      variables.map(&:value).as_hash(self.class.variables_names)
+    end
+
     private
 
+    def non_valued_variables
+      variables.reject(&:valued?)
+    end
+
     def tex_string
       raise 'Not IMplemented yet'
     end
@@ -67,6 +87,7 @@ module Danica
       return Number.new(value) if value.is_a?(Numeric)
       return Variable.new(value) if value.is_a?(Hash)
       return Variable.new(name: value) if [ String, Symbol ].any? { |c| value.is_a?(c) }
+      return Variable.new if value == nil
       value
     end
   end

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/lib/danica/function_spec.rb

@@ -4,7 +4,7 @@ describe Danica::Function do
   class Danica::Function
     class Spatial < Danica::Function
       variables :time, :acceleration, :initial_space, :initial_velocity
-      delegate :to_tex, :to_gnu, to: :sum
+      delegate :to_f, :to_tex, :to_gnu, to: :sum
 
       private
 
@@ -198,4 +198,52 @@ describe Danica::Function do
       end
     end
   end
+
+  describe '#calculate' do
+    context 'when all variables have value' do
+      let(:time_value) { 2 }
+      let(:time) { time_value }
+      let(:acceleration) { 3 }
+      let(:initial_space) { 1 }
+      let(:initial_velocity) { 1 }
+      let(:subject) { described_class::Spatial.new(time, acceleration, initial_space, initial_velocity) }
+      let(:expected) { initial_space + initial_velocity * time_value + acceleration * (time_value ** 2) / 2.0 }
+
+      it 'retuirns the calculated value' do
+        expect(subject.calculate).to eq(expected)
+      end
+
+      context 'when not all variables have value' do
+        let(:time) { :t }
+
+        it do
+          expect { subject.calculate }.to raise_error(Danica::Exception::NotDefined)
+        end
+
+        context 'but calling calculate with a value for the variables' do
+          it 'calculate using the given value' do
+            expect(subject.calculate(time_value)).to eq(expected)
+          end
+
+          it 'does not change the values of then valued variables' do
+            expect do
+              subject.calculate(time_value)
+            end.not_to change(subject.time, :valued?)
+          end
+        end
+
+        context 'when calling with a hash for the values' do
+          it 'calculate using the given value' do
+            expect(subject.calculate(time: time_value)).to eq(expected)
+          end
+
+          it 'does not change the values of then valued variables' do
+            expect do
+              subject.calculate(time: time_value)
+            end.not_to change(subject.time, :valued?)
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport