danica 2.2.1 → 2.3.0

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Danica::Variable do
+describe Danica::Wrapper::Variable do
   it_behaves_like 'an object that respond to basic_methods'
 
   it_behaves_like 'an object with basic operation' do

data/spec/lib/danica_spec.rb

@@ -4,24 +4,24 @@ describe Danica do
   describe '.build' do
     let(:result) { described_class.build(&block) }
 
-    context 'when creating a sum' do
+    context 'when creating a addition' do
       let(:block) do
-        proc { sum(1, 2) }
+        proc { addition(1, 2) }
       end
 
-      it 'returns the expected sum' do
-        expect(result).to eq(Danica::Sum.new(1,2))
+      it 'returns the expected addition' do
+        expect(result).to eq(Danica::Operator::Addition.new(1,2))
       end
     end
 
-    context 'when creating a power of sum and product' do
+    context 'when creating a power of addition and multiplication' do
       let(:block) do
-        proc { power(sum(1, 2), product(2,3)) }
+        proc { power(addition(1, 2), multiplication(2,3)) }
       end
       let(:expected) do
-        Danica::Power.new(
-          Danica::Sum.new(1, 2),
-          Danica::Product.new(2, 3)
+        Danica::Operator::Power.new(
+          Danica::Operator::Addition.new(1, 2),
+          Danica::Operator::Multiplication.new(2, 3)
         )
       end
 
@@ -40,7 +40,7 @@ describe Danica do
       end
       let(:function) do
         Danica::Function.build(:x) do
-          Danica::Power.new(x, 2)
+          Danica::Operator::Power.new(x, 2)
         end.new
       end
 

data/spec/support/models/functions/baskara.rb

@@ -4,7 +4,7 @@ module Danica
     private
 
     def numerator
-       negative(b) + PositiveNegative.new(squared_root(delta))
+       negative(b) + Wrapper::PlusMinus.new(squared_root(delta))
     end
 
     def denominator
@@ -12,7 +12,7 @@ module Danica
     end
 
     def delta
-      power(b, 2) - product(4, a, c)
+      power(b, 2) - multiplication(4, a, c)
     end
   end
 end

data/spec/support/models/functions/gauss.rb

@@ -1,5 +1,5 @@
 module Danica
-  class Function::Gauss < Function.build(:x, median: :u, variance_root: { latex: '\theta', gnu: :v }) { product(parcels) }
+  class Function::Gauss < Function.build(:x, median: :u, variance_root: { latex: '\theta', gnu: :v }) { multiplication(parcels) }
 
     private
 
@@ -12,7 +12,7 @@ module Danica
 
     def denominator
       squared_root(
-        product(2, PI, variance),
+        multiplication(2, PI, variance),
       )
     end
 
@@ -20,9 +20,9 @@ module Danica
       negative(
         division(
           power(group(
-            sum(x, negative(median))
+            addition(x, negative(median))
           ), 2),
-          product(2, variance)
+          multiplication(2, variance)
         )
       )
     end

data/spec/support/models/functions/spatial.rb

@@ -1,5 +1,5 @@
 module Danica
-  class Function::Spatial < Function.build(:time, :acceleration, :initial_space, :initial_velocity) { sum(parcels) }
+  class Function::Spatial < Function.build(:time, :acceleration, :initial_space, :initial_velocity) { addition(parcels) }
 
     private
 
@@ -12,11 +12,11 @@ module Danica
     end
 
     def spatial_velocity
-      product(initial_velocity, time)
+      multiplication(initial_velocity, time)
     end
 
     def spatial_acceleration
-      division(product(acceleration, time_squared), 2)
+      division(multiplication(acceleration, time_squared), 2)
     end
 
     def time_squared

data/spec/support/shared_examples/base_operations.rb

@@ -21,11 +21,11 @@ shared_examples 'an object with + operation' do
   let(:result) { subject + other }
   let(:subject_included) { subject }
 
-  it_behaves_like 'an object with an operation', Danica::Sum
+  it_behaves_like 'an object with an operation', Danica::Operator::Addition
 
   context 'when operating as reverse' do
-    let(:result) { Danica::Number.new(other) + subject }
-    it_behaves_like 'an object with an operation', Danica::Sum
+    let(:result) { Danica::Wrapper::Number.new(other) + subject }
+    it_behaves_like 'an object with an operation', Danica::Operator::Addition
   end
 end
 
@@ -34,20 +34,20 @@ shared_examples 'an object with * operation' do
   let(:result) { subject * other }
   let(:subject_included) { subject }
 
-  it_behaves_like 'an object with an operation', Danica::Product
+  it_behaves_like 'an object with an operation', Danica::Operator::Multiplication
 
   context 'when operating as reverse' do
-    let(:result) { Danica::Number.new(other) * subject }
-    it_behaves_like 'an object with an operation', Danica::Product
+    let(:result) { Danica::Wrapper::Number.new(other) * subject }
+    it_behaves_like 'an object with an operation', Danica::Operator::Multiplication
   end
 end
 
 shared_examples 'an object with / operation' do
   let(:other) { 104 }
-  let(:other_number) { Danica::Number.new(104) }
+  let(:other_number) { Danica::Wrapper::Number.new(104) }
   let(:result) { subject / other }
 
-  it { expect(result).to be_a(Danica::Division) }
+  it { expect(result).to be_a(Danica::Operator::Division) }
 
   it 'includes other as denominator' do
     expect(result.denominator).to eq(other_number)
@@ -60,11 +60,11 @@ end
 
 shared_examples 'an object with - operation' do
   let(:other) { 104 }
-  let(:negative_other) { Danica::Negative.new(other) }
+  let(:negative_other) { Danica::Wrapper::Negative.new(other) }
   let(:result) { subject - other }
   let(:subject_included) { subject }
 
-  it { expect(result).to be_a(Danica::Sum) }
+  it { expect(result).to be_a(Danica::Operator::Addition) }
 
   it 'includes other as negative parcel' do
     expect(result).to include(negative_other)

data/spec/support/shared_examples/operator/chained.rb

@@ -15,7 +15,7 @@ shared_examples 'a operator that knows how to calculate' do |arguments|
   subject { described_class.new(*variables) }
 
   describe 'to_f' do
-    it 'returns the sum of variables value' do
+    it 'returns the addition of variables value' do
       expect(subject.to_f).to eq(calculated)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,49 +155,51 @@ files:
 - lib/danica/base_operations.rb
 - lib/danica/builder.rb
 - lib/danica/common.rb
-- lib/danica/constant.rb
-- lib/danica/cos.rb
-- lib/danica/division.rb
 - lib/danica/dsl.rb
 - lib/danica/exception.rb
-- lib/danica/exception/not_defined.rb
-- lib/danica/exponential.rb
 - lib/danica/function.rb
-- lib/danica/group.rb
-- lib/danica/negative.rb
-- lib/danica/number.rb
 - lib/danica/operator.rb
+- lib/danica/operator/addition.rb
 - lib/danica/operator/chained.rb
-- lib/danica/positive_negative.rb
-- lib/danica/power.rb
-- lib/danica/product.rb
-- lib/danica/sin.rb
-- lib/danica/squared_root.rb
-- lib/danica/sum.rb
-- lib/danica/variable.rb
+- lib/danica/operator/cos.rb
+- lib/danica/operator/division.rb
+- lib/danica/operator/exponential.rb
+- lib/danica/operator/functional.rb
+- lib/danica/operator/multiplication.rb
+- lib/danica/operator/power.rb
+- lib/danica/operator/sin.rb
+- lib/danica/operator/squared_root.rb
 - lib/danica/variables_holder.rb
 - lib/danica/variables_holder/variables_builder.rb
 - lib/danica/version.rb
+- lib/danica/wrapper.rb
+- lib/danica/wrapper/constant.rb
+- lib/danica/wrapper/group.rb
+- lib/danica/wrapper/negative.rb
+- lib/danica/wrapper/number.rb
+- lib/danica/wrapper/plus_minus.rb
+- lib/danica/wrapper/variable.rb
 - spec/integration/negative_spec.rb
 - spec/integration/positive_negative_spec.rb
 - spec/integration/power_spec.rb
 - spec/integration/product_spec.rb
 - spec/integration/sum_spec.rb
-- spec/lib/danica/constant_spec.rb
-- spec/lib/danica/cos_spec.rb
-- spec/lib/danica/division_spec.rb
 - spec/lib/danica/dsl_spec.rb
-- spec/lib/danica/exponential_spec.rb
 - spec/lib/danica/function_spec.rb
-- spec/lib/danica/negative_spec.rb
-- spec/lib/danica/number_spec.rb
-- spec/lib/danica/positive_negative_spec.rb
-- spec/lib/danica/power_spec.rb
-- spec/lib/danica/product_spec.rb
-- spec/lib/danica/sin_spec.rb
-- spec/lib/danica/squared_root_spec.rb
-- spec/lib/danica/sum_spec.rb
-- spec/lib/danica/variable_spec.rb
+- spec/lib/danica/operator/addition_spec.rb
+- spec/lib/danica/operator/cos_spec.rb
+- spec/lib/danica/operator/division_spec.rb
+- spec/lib/danica/operator/exponential_spec.rb
+- spec/lib/danica/operator/multiplication_spec.rb
+- spec/lib/danica/operator/power_spec.rb
+- spec/lib/danica/operator/sin_spec.rb
+- spec/lib/danica/operator/squared_root_spec.rb
+- spec/lib/danica/wrapper/constant_spec.rb
+- spec/lib/danica/wrapper/group_spec.rb
+- spec/lib/danica/wrapper/negative_spec.rb
+- spec/lib/danica/wrapper/number_spec.rb
+- spec/lib/danica/wrapper/plus_minus_spec.rb
+- spec/lib/danica/wrapper/variable_spec.rb
 - spec/lib/danica_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/functions/baskara.rb
@@ -240,21 +242,22 @@ test_files:
 - spec/integration/power_spec.rb
 - spec/integration/product_spec.rb
 - spec/integration/sum_spec.rb
-- spec/lib/danica/constant_spec.rb
-- spec/lib/danica/cos_spec.rb
-- spec/lib/danica/division_spec.rb
 - spec/lib/danica/dsl_spec.rb
-- spec/lib/danica/exponential_spec.rb
 - spec/lib/danica/function_spec.rb
-- spec/lib/danica/negative_spec.rb
-- spec/lib/danica/number_spec.rb
-- spec/lib/danica/positive_negative_spec.rb
-- spec/lib/danica/power_spec.rb
-- spec/lib/danica/product_spec.rb
-- spec/lib/danica/sin_spec.rb
-- spec/lib/danica/squared_root_spec.rb
-- spec/lib/danica/sum_spec.rb
-- spec/lib/danica/variable_spec.rb
+- spec/lib/danica/operator/addition_spec.rb
+- spec/lib/danica/operator/cos_spec.rb
+- spec/lib/danica/operator/division_spec.rb
+- spec/lib/danica/operator/exponential_spec.rb
+- spec/lib/danica/operator/multiplication_spec.rb
+- spec/lib/danica/operator/power_spec.rb
+- spec/lib/danica/operator/sin_spec.rb
+- spec/lib/danica/operator/squared_root_spec.rb
+- spec/lib/danica/wrapper/constant_spec.rb
+- spec/lib/danica/wrapper/group_spec.rb
+- spec/lib/danica/wrapper/negative_spec.rb
+- spec/lib/danica/wrapper/number_spec.rb
+- spec/lib/danica/wrapper/plus_minus_spec.rb
+- spec/lib/danica/wrapper/variable_spec.rb
 - spec/lib/danica_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/functions/baskara.rb

data/lib/danica/cos.rb

@@ -1,20 +0,0 @@
-module Danica
-  class Cos < Operator
-    variables :variable
-
-    def to_f
-      Math.cos(variable.to_f)
-    end
-
-    def to_tex
-      "cos(#{variable.to_tex})"
-    end
-
-    def to_gnu
-      "cos(#{variable.to_gnu})"
-    end
-  end
-end
-
-
-

data/lib/danica/exception/not_defined.rb

@@ -1,2 +0,0 @@
-class Danica::Exception::NotDefined < Danica::Exception
-end

data/lib/danica/exponential.rb

@@ -1,20 +0,0 @@
-module Danica
-  class Exponential < Operator
-    variables :exponent
-    default_value :is_grouped?, true
-
-    def to_f
-      Math.exp(exponent.to_f)
-    end
-
-    def to_tex
-      "e^{#{exponent.to_tex}}"
-    end
-
-    def to_gnu
-      "exp(#{exponent.to_gnu})"
-    end
-  end
-end
-
-

data/lib/danica/sin.rb

@@ -1,19 +0,0 @@
-module Danica
-  class Sin < Operator
-    variables :variable
-
-    def to_f
-      Math.sin(variable.to_f)
-    end
-
-    def to_tex
-      "sin(#{variable.to_tex})"
-    end
-
-    def to_gnu
-      "sin(#{variable.to_gnu})"
-    end
-  end
-end
-
-

data/lib/danica/squared_root.rb

@@ -1,19 +0,0 @@
-module Danica
-  class SquaredRoot < Operator
-    variables :variable
-    default_value :is_grouped?, true
-
-    def to_f
-      Math.sqrt(variable.to_f)
-    end
-
-    def to_tex
-      "\\sqrt{#{variable.to_tex}}"
-    end
-
-    def to_gnu
-      "sqrt(#{variable.to_gnu})"
-    end
-  end
-end
-