danica 2.7.6 → 3.0.0

data/lib/danica/variables_holder/variables_builder.rb

@@ -5,31 +5,32 @@ module Danica::VariablesHolder
     include Danica::DSL
     include Danica::Wrapper
 
-    attr_reader :instance, :attr_names
+    attr_reader :instance, :attr_names, :names_hash
 
-    def initialize(attr_names, instance)
+    def initialize(instance, attr_names)
       @instance = instance
       @attr_names = attr_names
+      @names_hash = attr_names.extract_options!.symbolize_keys
     end
 
     def build
-      names_hash = attr_names.extract_options!.symbolize_keys
-
       attr_names.map(&:to_sym).each do |name|
-        add_setter(name)
-        add_reader(name)
-        instance.variables_hash[name] = wrap_value(name)
+        build_variable(name, name)
       end
 
       names_hash.each do |name, default|
-        add_setter(name)
-        add_reader(name)
-        instance.variables_hash[name] = wrap_value(default)
+        build_variable(name, default)
       end
     end
 
     private
 
+    def build_variable(name, default)
+      add_setter(name)
+      add_reader(name)
+      instance.variables_hash[name] = wrap_value(default)
+    end
+
     def add_setter(name)
       instance.send(:define_method, "#{name}=") do |value|
         containers_hash[name].content = wrap_value(value)

data/lib/danica/variables_holder.rb

@@ -20,7 +20,7 @@ module Danica
 
     class_methods do
       def variables(*names)
-        VariablesBuilder.new(names, self).build
+        VariablesBuilder.new(self, names).build
       end
 
       def variable_alias(origin, destiny)
@@ -41,7 +41,7 @@ module Danica
       end
 
       def superclass_variables_hash
-        @superclass_variables_hash ||= (superclass.try(:variables_hash) || {})
+        @superclass_variables_hash ||= superclass.try(:variables_hash) || {}
       end
     end
 
@@ -61,8 +61,8 @@ module Danica
       end
     end
 
-    def calculate(*args)
-      Calculator.new(self, *args).calculate
+    def calculate(*)
+      Calculator.new(self, *).calculate
     end
 
     private

data/lib/danica/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Danica
-  VERSION = '2.7.6'
+  VERSION = '3.0.0'
 end

data/lib/danica/wrapper/constant.rb

@@ -41,11 +41,7 @@ module Danica
 
     private
 
-    attr_writer :value
-
-    attr_writer :latex
-
-    attr_writer :gnuplot
+    attr_writer :value, :latex, :gnuplot
   end
 
   E = Wrapper::Constant.new(Math::E, :e, 'exp(1)')

data/lib/danica/wrapper/group.rb

@@ -16,12 +16,12 @@ module Danica
       @value = wrap_value(value)
     end
 
-    def to_tex(**options)
-      "\\left(#{value.to_tex(options)}\\right)"
+    def to_tex(**)
+      "\\left(#{value.to_tex(**)}\\right)"
     end
 
-    def to_gnu(**options)
-      "(#{value.to_gnu(options)})"
+    def to_gnu(**)
+      "(#{value.to_gnu(**)})"
     end
 
     def ==(other)

data/lib/danica/wrapper/negative.rb

@@ -21,8 +21,8 @@ module Danica
       -value.to_f
     end
 
-    def to(*args)
-      "-#{wrap_as_group(value).to(*args)}"
+    def to(format, **)
+      "-#{wrap_as_group(value).to(format, **)}"
     end
 
     def ==(other)

data/lib/danica/wrapper/number.rb

@@ -27,7 +27,7 @@ module Danica
     end
 
     def signaled?
-      value < 0
+      value.negative?
     end
 
     def ==(other)

data/lib/danica/wrapper/plus_minus.rb

@@ -21,12 +21,12 @@ module Danica
       value.to_f
     end
 
-    def to_tex(**options)
-      "\\pm #{wrap_as_group(value).to_tex(options)}"
+    def to_tex(**)
+      "\\pm #{wrap_as_group(value).to_tex(**)}"
     end
 
-    def to_gnu(**options)
-      "+ #{wrap_as_group(value).to_gnu(options)}"
+    def to_gnu(**)
+      "+ #{wrap_as_group(value).to_gnu(**)}"
     end
 
     def ==(other)

data/lib/danica/wrapper/variable.rb

@@ -34,14 +34,14 @@ module Danica
         other.gnuplot == gnuplot
     end
 
-    def to_tex(**options)
-      return value.to_tex(options) if value
+    def to_tex(**)
+      return value.to_tex(**) if value
 
       (latex || name).to_s
     end
 
-    def to_gnu(**options)
-      return value.to_gnu(options) if value
+    def to_gnu(**)
+      return value.to_gnu(**) if value
 
       (gnuplot || name).to_s
     end

data/lib/danica/wrapper.rb

@@ -32,7 +32,7 @@ module Danica
     end
 
     def self.wrap_numeric(number)
-      return Negative.new(Number.new(-number)) if number < 0
+      return Negative.new(Number.new(-number)) if number.negative?
 
       Number.new(number)
     end

data/spec/integration/global/danica/operator/multiplication_spec.rb

@@ -16,7 +16,7 @@ describe Danica::Operator::Multiplication do
       end
     end
 
-    describe '#to_gnu' do
+    describe '#to_tex' do
       it 'returns the correct string' do
         expect(subject.to_tex).to eq('3 \cdot \left(2 + 4\right)')
       end

data/spec/integration/readme/{equation_spec.rb → danica/equation_spec.rb}

@@ -5,8 +5,8 @@ require 'spec_helper'
 describe Danica::Equation do
   subject do
     described_class.build(:x, :y, :z) do
-      left { x**2 + y**2 }
-      right { number(1) - z**2 }
+      left { (x**2) + (y**2) }
+      right { number(1) - (z**2) }
     end.new
   end
 

data/spec/integration/readme/danica/expression/baskara_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Danica::Expression::Baskara do
+  describe '#to_tex' do
+    it 'returns bascara tex string' do
+      expect(subject.to_tex).to eq('\frac{-b \pm \sqrt{b^{2} -4 \cdot a \cdot c}}{2 \cdot a}')
+    end
+  end
+end

data/spec/integration/readme/{expression_spec.rb → danica/expression_spec.rb}

@@ -2,14 +2,6 @@
 
 require 'spec_helper'
 
-describe Danica::Expression::Baskara do
-  describe '#to_tex' do
-    it 'returns bascara tex string' do
-      expect(subject.to_tex).to eq('\frac{-b \pm \sqrt{b^{2} -4 \cdot a \cdot c}}{2 \cdot a}')
-    end
-  end
-end
-
 describe Danica::Expression do
   subject { clazz.new }
 

data/spec/integration/readme/danica/function/my_function_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Danica::Function::MyFunction do
+  describe '#to_gnu' do
+    it 'returns the function' do
+      expect(subject.to_gnu).to eq('f(x, y) = x**(2) + y')
+    end
+  end
+end

data/spec/integration/readme/danica/function/quadratic_sum_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Danica::Function::QuadraticSum do
+  describe '#to_tex' do
+    it 'creates a funcion out of an expression' do
+      expect(subject.to_tex).to eq('f(x, y) = \\left(x + y\\right)^{2}')
+    end
+  end
+end

data/spec/integration/readme/{function_spec.rb → danica/function/spatial_spec.rb}

@@ -67,35 +67,3 @@ describe Danica::Function::Spatial do
     end
   end
 end
-
-describe Danica::Function::MyFunction do
-  describe '#to_gnu' do
-    it 'returns the function' do
-      expect(subject.to_gnu).to eq('f(x, y) = x**(2) + y')
-    end
-  end
-end
-
-describe Danica::Function::QuadraticSum do
-  describe '#to_tex' do
-    it 'creates a funcion out of an expression' do
-      expect(subject.to_tex).to eq('f(x, y) = \\left(x + y\\right)^{2}')
-    end
-  end
-end
-
-describe Danica::Function do
-  subject { described_class.build(:x, :y, :z) { z * (x**y) }.new(y: 3, z: Danica::PI) }
-
-  describe '#to_tex' do
-    it do
-      expect(subject.to_tex).to eq('f(x, 3) = \pi \cdot x^{3}')
-    end
-  end
-
-  describe '#to_gnu' do
-    it do
-      expect(subject.to_gnu).to eq('f(x) = pi * x**(3)')
-    end
-  end
-end

data/spec/integration/readme/danica/function_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Danica::Function do
+  subject { described_class.build(:x, :y, :z) { z * (x**y) }.new(y: 3, z: Danica::PI) }
+
+  describe '#to_tex' do
+    it do
+      expect(subject.to_tex).to eq('f(x, 3) = \pi \cdot x^{3}')
+    end
+  end
+
+  describe '#to_gnu' do
+    it do
+      expect(subject.to_gnu).to eq('f(x) = pi * x**(3)')
+    end
+  end
+end

data/spec/integration/readme/{operator_spec.rb → danica/operator/inverse_spec.rb}

@@ -2,28 +2,6 @@
 
 require 'spec_helper'
 
-describe MyOperator do
-  describe '#to_gnu' do
-    it 'returns the gnu format' do
-      expect(subject.to_gnu).to eq('x**(pi)')
-    end
-  end
-
-  describe '#to_tex' do
-    it 'returns the tex format' do
-      expect(subject.to_tex).to eq('x^{\pi}')
-    end
-  end
-
-  describe '#to_f' do
-    subject { described_class.new(x: 2) }
-
-    it 'returns the result of the operation' do
-      expect(subject.to_f).to eq(2**Math::PI)
-    end
-  end
-end
-
 describe Danica::Operator::Inverse do
   subject { described_class.new(:x) }
 

data/spec/integration/readme/danica/operator/my_operator_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe MyOperator do
+  describe '#to_gnu' do
+    it 'returns the gnu format' do
+      expect(subject.to_gnu).to eq('x**(pi)')
+    end
+  end
+
+  describe '#to_tex' do
+    it 'returns the tex format' do
+      expect(subject.to_tex).to eq('x^{\pi}')
+    end
+  end
+
+  describe '#to_f' do
+    subject { described_class.new(x: 2) }
+
+    it 'returns the result of the operation' do
+      expect(subject.to_f).to eq(2**Math::PI)
+    end
+  end
+end

data/spec/integration/readme/{constant_spec.rb → danica/wrapper/constant_spec.rb}

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Danica::Wrapper::Constant do
-  subject do
+  subject(:constant) do
     described_class.new(gnuplot: 'pi', latex: '\pi', value: 3.141592)
   end
 
@@ -18,7 +18,7 @@ describe Danica::Wrapper::Constant do
   describe 'outputs' do
     it do
       output.each do |format, expected|
-        expect(subject.to(format)).to eq(expected)
+        expect(constant.to(format)).to eq(expected)
       end
     end
   end

data/spec/integration/readme/{number_spec.rb → danica/wrapper/number_spec.rb}

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Danica::Wrapper::Number do
-  subject do
+  subject(:wrapper) do
     Danica::DSL.build do
       number(3)
     end
@@ -14,11 +14,11 @@ describe Danica::Wrapper::Number do
   end
 
   it do
-    expect(subject).to eq(number)
+    expect(wrapper).to eq(number)
   end
 
   describe 'from basic operation' do
-    let(:sum) do
+    subject(:sum) do
       Danica::DSL.build do
         power(:x, 2) + 3
       end

data/spec/integration/readme/{variables_spec.rb → danica/wrapper/variables_spec.rb}

@@ -5,63 +5,63 @@ require 'spec_helper'
 describe Danica::Wrapper::Variable do
   describe '#to_tex' do
     context 'when initializing with the name' do
-      subject do
+      subject(:variable) do
         described_class.new(:x)
       end
 
       it do
-        expect(subject.to_tex).to eq('x')
+        expect(variable.to_tex).to eq('x')
       end
     end
 
     context 'when initializing with a hash' do
-      subject do
+      subject(:variable) do
         described_class.new(name: :x)
       end
 
       it do
-        expect(subject.to_tex).to eq('x')
+        expect(variable.to_tex).to eq('x')
       end
     end
 
     context 'when initializing from DSL' do
-      subject do
+      subject(:variable) do
         Danica::DSL.build do
           variable(:x)
         end
       end
 
       it do
-        expect(subject.to_tex).to eq('x')
+        expect(variable.to_tex).to eq('x')
       end
     end
 
     context 'when variable has value' do
-      subject do
+      subject(:variable) do
         Danica::DSL.build do
           variable(name: :frequency, latex: '\lambda', gnuplot: :f, value: 2)
         end
       end
 
       it do
-        expect(subject.to_tex).to eq('2')
+        expect(variable.to_tex).to eq('2')
       end
     end
   end
 
   describe '#to_f' do
-    subject do
+    subject(:variable) do
       Danica::DSL.build do
         variable(name: :x, value: 2)
       end
     end
 
     it do
-      expect(subject.to_f).to eq(2)
+      expect(variable.to_f).to eq(2)
     end
 
     context 'when adding the value later' do
-      subject do
+      subject(:variable) do
         Danica::DSL.build do
           variable(:x)
         end
@@ -75,14 +75,14 @@ describe Danica::Wrapper::Variable do
       end
 
       it do
-        subject.value = 4
+        variable.value = 4
         expect(power.to_f).to eq(16)
       end
     end
   end
 
   describe 'custom outputs' do
-    subject do
+    subject(:variable) do
       Danica::DSL.build do
         variable(name: :frequency, latex: '\lambda', gnuplot: :f)
       end
@@ -90,13 +90,13 @@ describe Danica::Wrapper::Variable do
 
     describe '#to_tex' do
       it do
-        expect(subject.to_tex).to eq('\lambda')
+        expect(variable.to_tex).to eq('\lambda')
       end
     end
 
     describe '#to_gnu' do
       it do
-        expect(subject.to_gnu).to eq('f')
+        expect(variable.to_gnu).to eq('f')
       end
     end
   end

data/spec/integration/readme/danica_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Danica do
   describe 'formatting' do
-    subject do
+    subject(:expression) do
       value = 1 / 3.0
       described_class.build(:x) do
         x + value
@@ -13,14 +13,14 @@ describe Danica do
 
     describe '#to_tex' do
       it 'formats the output' do
-        expect(subject.to_tex(decimals: 3)).to eq('x + 0.333')
+        expect(expression.to_tex(decimals: 3)).to eq('x + 0.333')
       end
     end
   end
 
   describe '.build' do
     context 'when building an expression' do
-      let(:expression) do
+      subject(:expression) do
         described_class.build do
           (number(1) + 2) * power(3, 4)
         end