danica 2.2.1 → 2.3.0

data/lib/danica/{group.rb → wrapper/group.rb}

@@ -1,6 +1,7 @@
 module Danica
-  class Group
+  class Wrapper::Group
     include Common
+    include BaseOperations
     include ActiveModel::Model
 
     attr_accessor :value

data/lib/danica/{negative.rb → wrapper/negative.rb}

@@ -1,5 +1,5 @@
 module Danica
-  class Negative
+  class Wrapper::Negative
     include Common
     include BaseOperations
     include VariablesHolder

data/lib/danica/{number.rb → wrapper/number.rb}

@@ -1,5 +1,5 @@
 module Danica
-  class Number
+  class Wrapper::Number
     include ActiveModel::Model
     include BaseOperations
     include Common

data/lib/danica/{positive_negative.rb → wrapper/plus_minus.rb}

@@ -1,5 +1,5 @@
 module Danica
-  class PositiveNegative
+  class Wrapper::PlusMinus
     include Common
     include BaseOperations
     include VariablesHolder

data/lib/danica/{variable.rb → wrapper/variable.rb}

@@ -1,5 +1,5 @@
 module Danica
-  class Variable
+  class Wrapper::Variable
     include ActiveModel::Model
     include BaseOperations
     include Common
@@ -14,7 +14,7 @@ module Danica
     end
 
     def ==(other)
-      return false unless other.class == Variable
+      return false unless other.class == self.class
       return other.value == value &&
              other.name == name &&
              other.latex == latex &&
@@ -32,7 +32,7 @@ module Danica
     end
 
     def value=(value)
-      @value = value.is_a?(Numeric) ? Number.new(value) : value
+      @value = value.is_a?(Numeric) ? number(value) : value
     end
   end
 end

data/spec/integration/negative_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe 'integration of negative' do
-  describe 'with a sum' do
+  describe 'with a addition' do
     subject do
-      Danica::Negative.new(
-        Danica::Sum.new(1,2,3)
+      Danica::Wrapper::Negative.new(
+        Danica::Operator::Addition.new(1,2,3)
       )
     end
 

data/spec/integration/positive_negative_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe 'integration of positive negative' do
-  describe 'with a sum' do
+  describe 'with a addition' do
     subject do
-      Danica::PositiveNegative.new(
-        Danica::Sum.new(1,2,3)
+      Danica::Wrapper::PlusMinus.new(
+        Danica::Operator::Addition.new(1,2,3)
       )
     end
 

data/spec/integration/power_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe 'integration of power' do
-  describe 'of sums' do
+  describe 'of additions' do
     subject do
-      Danica::Power.new(
-        Danica::Sum.new(3, 4),
-        Danica::Sum.new(5, 6)
+      Danica::Operator::Power.new(
+        Danica::Operator::Addition.new(3, 4),
+        Danica::Operator::Addition.new(5, 6)
       )
     end
 

data/spec/integration/product_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe 'integration of product' do
-  describe 'of number and sum' do
+describe 'integration of multiplication' do
+  describe 'of number and addition' do
     subject do
-      Danica::Product.new(
-        3, Danica::Sum.new(2, 4)
+      Danica::Operator::Multiplication.new(
+        3, Danica::Operator::Addition.new(2, 4)
       )
     end
 
@@ -21,11 +21,11 @@ describe 'integration of product' do
     end
   end
 
-  describe 'of sums' do
+  describe 'of additions' do
     subject do
-      Danica::Product.new(
-        Danica::Sum.new(1,2),
-        Danica::Sum.new(3,4)
+      Danica::Operator::Multiplication.new(
+        Danica::Operator::Addition.new(1,2),
+        Danica::Operator::Addition.new(3,4)
       )
     end
 

data/spec/integration/sum_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe 'integration of sum' do
+describe 'integration of addition' do
   describe 'with negative and positivenegative (+/-) numbers' do
     subject do
-      Danica::Sum.new(
-        Danica::Negative.new(1),
+      Danica::Operator::Addition.new(
+        Danica::Wrapper::Negative.new(1),
         2,
-        Danica::Negative.new(3),
+        Danica::Wrapper::Negative.new(3),
         4,
-        Danica::PositiveNegative.new(5)
+        Danica::Wrapper::PlusMinus.new(5)
       )
     end
 

data/spec/lib/danica/dsl_spec.rb

@@ -12,21 +12,24 @@ end
 
 shared_context 'a class with mapped dsl' do
   {
-    sum: Danica::Sum,
-    product: Danica::Product,
-    division: Danica::Division,
-    sin: Danica::Sin,
-    cos: Danica::Cos,
-    power: Danica::Power
+    addition: Danica::Operator::Addition,
+    sum: Danica::Operator::Addition,
+    multiplication: Danica::Operator::Multiplication,
+    product: Danica::Operator::Multiplication,
+    division: Danica::Operator::Division,
+    sin: Danica::Operator::Sin,
+    cos: Danica::Operator::Cos,
+    power: Danica::Operator::Power
   }.each do |aliaz, clazz|
     it_behaves_like 'a class with alias to a clazz', aliaz, clazz, 2, 3
   end
   {
-    squared_root: Danica::SquaredRoot,
-    exponential: Danica::Exponential,
-    group: Danica::Group,
-    negative: Danica::Negative,
-    number: Danica::Number
+    squared_root: Danica::Operator::SquaredRoot,
+    exponential: Danica::Operator::Exponential,
+    group: Danica::Wrapper::Group,
+    negative: Danica::Wrapper::Negative,
+    number: Danica::Wrapper::Number,
+    plus_minus: Danica::Wrapper::PlusMinus
   }.each do |aliaz, clazz|
     it_behaves_like 'a class with alias to a clazz', aliaz, clazz, 9
   end

data/spec/lib/danica/function_spec.rb

@@ -5,7 +5,7 @@ describe Danica::Function do
     let(:variables) { %i(x y) }
     let(:function_class) do
       described_class.build(*variables) do
-        Danica::Power.new(x, y)
+        Danica::Operator::Power.new(x, y)
       end
     end
     let(:function) do
@@ -129,14 +129,14 @@ describe Danica::Function do
     describe '#variables_hash' do
       let(:expected) do
         {
-          time: Danica::Variable.new(name: :t),
-          acceleration: Danica::Variable.new(name: 'a'),
-          initial_space: Danica::Variable.new( name: :S0, latex: 'S_0' ),
-          initial_velocity: Danica::Variable.new( name: :V0, latex: 'V_0' )
+          time: Danica::Wrapper::Variable.new(name: :t),
+          acceleration: Danica::Wrapper::Variable.new(name: 'a'),
+          initial_space: Danica::Wrapper::Variable.new( name: :S0, latex: 'S_0' ),
+          initial_velocity: Danica::Wrapper::Variable.new( name: :V0, latex: 'V_0' )
         }
       end
 
-      context 'when variables are already wrapped with DanicaVariable' do
+      context 'when variables are already wrapped with Danica::Wrapper::Variable' do
         let(:variables) { expected }
         it 'returns a hash with the variabels' do
           expect(subject.variables_hash).to eq(expected)
@@ -162,7 +162,7 @@ describe Danica::Function do
       context 'when changing a variable' do
         before do
           subject.time = :x
-          expected[:time] = Danica::Variable.new(name: :x)
+          expected[:time] = Danica::Wrapper::Variable.new(name: :x)
         end
 
         it do
@@ -215,7 +215,7 @@ describe Danica::Function do
 
       context 'when not initializing all variables' do
         subject { described_class::Spatial.new }
-        let(:time) { Danica::Variable.new(name: :t) }
+        let(:time) { Danica::Wrapper::Variable.new(name: :t) }
 
         context 'when initialized with an empty variable set' do
           it do

data/spec/lib/danica/{sum_spec.rb → operator/addition_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::Sum do
+describe Danica::Operator::Addition do
   subject { described_class.new(10, 2) }
 
   it_behaves_like 'an object that respond to basic_methods'
@@ -9,10 +9,10 @@ describe Danica::Sum do
   it_behaves_like 'an object with + operation' do
     let(:subject_included) { 10 }
 
-    context 'when other is also a sum' do
+    context 'when other is also a addition' do
       let(:other) { described_class.new(200, 5) }
 
-      it 'includes the sum parcels' do
+      it 'includes the addition parcels' do
         expect(result).to include(200)
       end
     end

data/spec/lib/danica/{cos_spec.rb → operator/cos_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::Cos do
+describe Danica::Operator::Cos do
   subject { described_class.new(:x) }
 
   it_behaves_like 'an object that respond to basic_methods'

data/spec/lib/danica/{division_spec.rb → operator/division_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::Division do
+describe Danica::Operator::Division do
   let(:variables) { [2, 4] }
   subject { described_class.new(*variables) }
 
@@ -23,11 +23,11 @@ describe Danica::Division do
   }
 
   describe 'more complex division' do
-    describe 'of two sums' do
+    describe 'of two additions' do
       subject do
-        Danica::Division.new(
-          Danica::Sum.new(2, :x),
-          Danica::Sum.new(3, :y)
+        Danica::Operator::Division.new(
+          Danica::Operator::Addition.new(2, :x),
+          Danica::Operator::Addition.new(3, :y)
         )
       end
 
@@ -36,7 +36,7 @@ describe Danica::Division do
           '(2 + x)/(3 + y)'
         end
 
-        it 'groups sum' do
+        it 'groups addition' do
           expect(subject.to_gnu).to eq(expected)
         end
       end

data/spec/lib/danica/{exponential_spec.rb → operator/exponential_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::Exponential do
+describe Danica::Operator::Exponential do
   subject { described_class.new(2) }
 
   it_behaves_like 'an object that respond to basic_methods'

data/spec/lib/danica/{product_spec.rb → operator/multiplication_spec.rb}

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Danica::Product do
+describe Danica::Operator::Multiplication do
   subject { described_class.new(2,4) }
   it_behaves_like 'an object that respond to basic_methods'
 
   it_behaves_like 'an object with * operation' do
     let(:subject_included) { 4 }
 
-    context 'when other is also a sum' do
+    context 'when other is also a addition' do
       let(:other) { described_class.new(200, 5) }
 
-      it 'includes the sum parcels' do
+      it 'includes the addition parcels' do
         expect(result).to include(200)
       end
     end

data/spec/lib/danica/{power_spec.rb → operator/power_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::Power do
+describe Danica::Operator::Power do
   let(:variables) { [2, 4] }
   subject { described_class.new(*variables) }
 

data/spec/lib/danica/{sin_spec.rb → operator/sin_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::Sin do
+describe Danica::Operator::Sin do
   subject { described_class.new(10) }
 
   it_behaves_like 'an object that respond to basic_methods'

data/spec/lib/danica/{squared_root_spec.rb → operator/squared_root_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::SquaredRoot do
+describe Danica::Operator::SquaredRoot do
   subject { described_class.new(9) }
 
   it_behaves_like 'an object that respond to basic_methods'

data/spec/lib/danica/{constant_spec.rb → wrapper/constant_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::Constant do
+describe Danica::Wrapper::Constant do
   subject { described_class.new(2.5, :M, :m) }
   let(:other) { described_class.new(3, :N, :n) }
 

data/spec/lib/danica/wrapper/group_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Danica::Wrapper::Group do
+  let(:value) { 10 }
+  subject { described_class.new(value) }
+
+  it_behaves_like 'an object that respond to basic_methods'
+  it_behaves_like 'an object with basic operation'
+
+  describe '#to_f' do
+    it 'returns the float of value' do
+      expect(subject.to_f).to eq(10)
+    end
+
+    it { expect(subject.to_f).to be_a(Float) }
+  end
+
+  describe '#to_tex' do
+    context 'when value should be integer' do
+      let(:value) { 10.0 }
+
+      it 'returns the positive negative string' do
+        expect(subject.to_tex).to eq('\left(10\right)')
+      end
+    end
+
+    context 'when value should be float' do
+      let(:value) { 10.5 }
+
+      it 'returns the positive negative string' do
+        expect(subject.to_tex).to eq('\left(10.5\right)')
+      end
+    end
+  end
+
+  describe '#to_gnu' do
+    context 'when value should be integer' do
+      let(:value) { 10.0 }
+
+      it 'returns the value integer string' do
+        expect(subject.to_gnu).to eq('(10)')
+      end
+    end
+
+    context 'when value should be a float' do
+      let(:value) { 10.5 }
+
+      it 'returns the value float string' do
+        expect(subject.to_gnu).to eq('(10.5)')
+      end
+    end
+  end
+end

data/spec/lib/danica/{negative_spec.rb → wrapper/negative_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Danica::Negative do
-  let(:value) { Danica::Number.new(10) }
+describe Danica::Wrapper::Negative do
+  let(:value) { 10 }
   subject { described_class.new(value) }
 
   it_behaves_like 'an object that respond to basic_methods'

data/spec/lib/danica/{number_spec.rb → wrapper/number_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::Number do
+describe Danica::Wrapper::Number do
   let(:value) { 10 }
   subject { described_class.new(value) }
 

data/spec/lib/danica/{positive_negative_spec.rb → wrapper/plus_minus_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Danica::PositiveNegative do
-  let(:value) { Danica::Number.new(10) }
+describe Danica::Wrapper::PlusMinus do
+  let(:value) { 10 }
   subject { described_class.new(value) }
 
   it_behaves_like 'an object that respond to basic_methods'