danica 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d679c98744cf0b50bc7cdb70cb70e2d08c99dc29
-  data.tar.gz: d21601f2005622dd2cb2ef9248c1fc42ee4bc9b7
+  metadata.gz: 8d8ae393046bb15fcbcd46af8e9430aa50bbbad6
+  data.tar.gz: 835a4b71b6348e1a3da11a34771d4b4864a37894
 SHA512:
-  metadata.gz: 9b1add172a4a3486cd170bd410a163c613684a6c96897be6b83be1cbe3525e02d78f8efcb259cef544f4ed518460a47fbf545ead9849f6749b97a696083705c3
-  data.tar.gz: e2402e6dbcd8b71f8ed81c9029aba06ab87a418239a7927ec54f7a631cc1a0d4bb8116d1bf8e477e4cb1e0804197dde9353d50f68c07b3183a26fdcebe2071ff
+  metadata.gz: 74eb602d0265187cc3505c25b0870d9564a05bb82e6ae072efdca3cba8be6c9a5b04c243c179a68e8fc94f5f5e73fdfca5c941e547ff1d24e4197f14c78e02ba
+  data.tar.gz: a389e884fa35861559a76b78ee907b6525a42a3274ddb6ee25d41a896361b5df5003328b2186fdc6d4a1382b9944b80318c022256e22861b27bd551ec7850425

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danica (0.2.0)
+    danica (0.3.0)
       activemodel
       activesupport
 

data/lib/danica/function.rb

@@ -6,6 +6,7 @@ class Danica::Function
   require 'danica/function/sum'
   require 'danica/function/division'
   require 'danica/function/power'
+  require 'danica/function/square_root'
 
   attr_accessor :name, :variables
 

data/lib/danica/function/division.rb

@@ -8,6 +8,8 @@ module Danica
       end
 
       def to_tex
+        Number.new(to_f).to_tex
+      rescue NotDefined
         "\\frac{#{numerator.to_tex}}{#{denominator.to_tex}}"
       end
 

data/lib/danica/function/power.rb

@@ -8,7 +8,9 @@ module Danica
       end
 
       def to_tex
-        [ base, exponent ].map(&:to_tex).join('^')
+        Number.new(to_f).to_tex
+      rescue NotDefined
+        "#{base.to_tex}^{#{exponent.to_tex}}"
       end
 
       def base=(value)

data/lib/danica/function/square_root.rb

@@ -0,0 +1,23 @@
+module Danica
+  class Function
+    class SquareRoot < Function
+      attr_reader :variable
+
+      def to_f
+        Math.sqrt(variable.to_f)
+      end
+
+      def to_tex
+        Number.new(to_f).to_tex
+      rescue NotDefined
+        "\\sqrt{#{variable.to_tex}}"
+      end
+
+      def variable=(value)
+        @variable = wrap_value(value)
+      end
+
+    end
+  end
+end
+

data/lib/danica/number.rb

@@ -11,8 +11,8 @@ module Danica
     end
 
     def to_tex
-      return value.to_i if value.to_i == value
-      value
+      return value.to_i.to_s if value.to_i == value
+      value.to_s
     end
 
     def valued?

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/lib/danica/function/division_spec.rb

@@ -72,8 +72,8 @@ describe Danica::Function::Division do
     end
 
     context 'when both variables are numeric' do
-      it 'prints both numbers' do
-        expect(subject.to_tex).to eq('\frac{2}{4}')
+      it 'prints the result of the division' do
+        expect(subject.to_tex).to eq('0.5')
       end
     end
 

data/spec/lib/danica/function/power_spec.rb

@@ -14,7 +14,7 @@ describe Danica::Function::Power do
 
   describe 'to_f' do
     context 'when variables are not numbers but have value' do
-      it 'returns the division of the values' do
+      it 'returns the power of the values' do
         expect(subject.to_f).to eq(9.0)
       end
 
@@ -26,7 +26,7 @@ describe Danica::Function::Power do
     context 'when all the variables are numbers' do
       let(:variables) { [ 3, 2 ] }
 
-      it 'returns the division of the values' do
+      it 'returns the power of the values' do
         expect(subject.to_f).to eq(9.0)
       end
 
@@ -40,7 +40,7 @@ describe Danica::Function::Power do
         variables[0] = 3
       end
 
-      it 'returns the division of the values' do
+      it 'returns the power of the values' do
         expect(subject.to_f).to eq(9.0)
       end
 
@@ -57,7 +57,7 @@ describe Danica::Function::Power do
       end
 
       it 'returns a latex format fraction' do
-        expect(subject.to_tex).to eq('X1^X2')
+        expect(subject.to_tex).to eq('X1^{X2}')
       end
     end
 
@@ -66,14 +66,14 @@ describe Danica::Function::Power do
         subject.exponent.value = nil
       end
 
-      it 'returns the number instead of the value' do
-        expect(subject.to_tex).to eq('3^X2')
+      it 'returns both variables' do
+        expect(subject.to_tex).to eq('3^{X2}')
       end
     end
 
     context 'when both variables are numeric' do
-      it 'prints both numbers' do
-        expect(subject.to_tex).to eq('3^2')
+      it 'prints the final calculation' do
+        expect(subject.to_tex).to eq('9')
       end
     end
 
@@ -83,8 +83,8 @@ describe Danica::Function::Power do
         subject.exponent.value = nil
       end
 
-      it 'prints both numbers' do
-        expect(subject.to_tex).to eq('1^X2')
+      it 'prints both variables' do
+        expect(subject.to_tex).to eq('1^{X2}')
       end
     end
   end

data/spec/lib/danica/function/square_root_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Danica::Function::SquareRoot do
+  let(:variables_number) { 4 }
+  let(:variable) { { name: "X", value: 9 } }
+  let(:subject) do
+    described_class.new(variable: variable)
+  end
+
+  describe 'to_f' do
+    context 'when variables are not numbers but have value' do
+      it 'returns the division of the values' do
+        expect(subject.to_f).to eq(3.0)
+      end
+
+      it do
+        expect(subject.to_f).to be_a(Float)
+      end
+    end
+
+    context 'when the variable is a number' do
+      let(:variable) { 9 }
+
+      it 'returns the squared root of the value' do
+        expect(subject.to_f).to eq(3.0)
+      end
+
+      it do
+        expect(subject.to_f).to be_a(Float)
+      end
+    end
+  end
+
+  describe 'to_tex' do
+    context 'when variables have no value' do
+      let(:variable) { :X }
+
+      it 'returns a latex format fraction' do
+        expect(subject.to_tex).to eq('\sqrt{X}')
+      end
+    end
+
+    context 'when the variable is numeric' do
+      before do
+        subject.variable.value = 9
+      end
+      it 'prints both numbers' do
+        expect(subject.to_tex).to eq('3')
+      end
+    end
+  end
+end
+

data/spec/lib/danica/function_spec.rb

@@ -46,7 +46,7 @@ describe Danica::Function do
       end
 
       let(:subject) { described_class::Spatial.new(variables) }
-      let(:expected) { 'S_0 + V_0 \cdot t + \frac{a \cdot t^2}{2}'  }
+      let(:expected) { 'S_0 + V_0 \cdot t + \frac{a \cdot t^{2}}{2}'  }
 
       it 'return the latex format CAM' do
         expect(subject.to_tex).to eq(expected)

data/spec/lib/danica/variable_spec.rb

@@ -10,7 +10,9 @@ describe Danica::Variable do
       let(:value) { 100 }
       let(:subject) { described_class.new(value: value) }
 
-      it { expect(subject.to_f).to eq(value) }
+      it 'returns the value' do
+        expect(subject.to_f).to eq(value)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Darthjee
@@ -142,6 +142,7 @@ files:
 - lib/danica/function/division.rb
 - lib/danica/function/power.rb
 - lib/danica/function/product.rb
+- lib/danica/function/square_root.rb
 - lib/danica/function/sum.rb
 - lib/danica/not_defined.rb
 - lib/danica/number.rb
@@ -150,6 +151,7 @@ files:
 - spec/lib/danica/function/division_spec.rb
 - spec/lib/danica/function/power_spec.rb
 - spec/lib/danica/function/product_spec.rb
+- spec/lib/danica/function/square_root_spec.rb
 - spec/lib/danica/function/sum_spec.rb
 - spec/lib/danica/function_spec.rb
 - spec/lib/danica/variable_spec.rb
@@ -182,6 +184,7 @@ test_files:
 - spec/lib/danica/function/division_spec.rb
 - spec/lib/danica/function/power_spec.rb
 - spec/lib/danica/function/product_spec.rb
+- spec/lib/danica/function/square_root_spec.rb
 - spec/lib/danica/function/sum_spec.rb
 - spec/lib/danica/function_spec.rb
 - spec/lib/danica/variable_spec.rb