danica 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42d3abe8f4cb30ba5f39df22450aa6b258897516
-  data.tar.gz: 556b8f2d44f534d97bbce6d4e0a9d8cfbe9b1af2
+  metadata.gz: 88c93cc9b46fa1f9ced587a49535bc0eeec427cc
+  data.tar.gz: af6ae43ee59d5b15f204203f2a56c6978fec5125
 SHA512:
-  metadata.gz: 6357c1036ab3949b292e94c0835b99812d7eaaeb426372c75e41cf6145b274592c821935e86dffd957b13c193e9875b6caf0824e8de8db862455d09f6f14d443
-  data.tar.gz: df8178314d284efe3d623e40d3c974e5876dfcad6e0a703d5e57d925d2ce8f5ed01ed099618a46195cca08584a2acae35e3724221e79431f8a8d5eb373054b37
+  metadata.gz: a547b35c6f1d7c14534ab87ee7d1c6a08222cdcbbb166f435276355a99decfe0bcc458e4aef8e4a011ec79203363fc3fc4f8aa22d80cea260c45c45aedd9ce8f
+  data.tar.gz: 7c168e661e244debbd6e7c68ca0b3acadebb59cc9f9920ce76f6b632ba7c16e6eb102a70259970887477469bbda3cb23a02ef71a3a605e02ef2c902f0880394e

data/lib/danica/common.rb

@@ -6,21 +6,43 @@ module Danica
 
       class << self
         def default_value(name, value)
-          define_method(name) { value }
+          define_method(name) { |*_| value }
         end
       end
+
+      default_value :constant?, false
+      default_value :signaled?, false
     end
 
     def to_f
-      raise 'Not IMplemented yet'
+      raise Exception::NotImplemented
+    end
+
+    def to_tex
+      to(:tex)
+    end
+
+    def to_gnu
+      to(:gnu)
     end
-  
+
+    def to(format)
+      case format.to_sym
+      when :tex
+        to_tex
+      when :gnu
+        to_gnu
+      else
+        raise Exception::FormatNotFound.new
+      end
+    end
+
     def valued?
       to_f.present?
     rescue Exception::NotDefined
       false
     end
-  
+
     private
 
     def wrap_as_group(value)

data/lib/danica/dsl.rb

@@ -35,4 +35,5 @@ module Danica
   DSL.register_wrapper  :num,     :Number
   DSL.register_operator :sum,     :Addition
   DSL.register_operator :product, :Multiplication
+  DSL.register_operator :sqrt,    :SquaredRoot
 end

data/lib/danica/exception.rb

@@ -1,4 +1,6 @@
 class Danica::Exception < ::Exception
-  class Danica::Exception::NotDefined < self; end
+  class NotDefined < self; end
+  class FormatNotFound < self; end
+  class NotImplemented < self; end
 end
 

data/lib/danica/function.rb

@@ -3,12 +3,12 @@ module Danica
     include Common
     include VariablesHolder
     include DSL
-  
+
     attr_accessor :name
 
     default_value :priority, 3
     default_value :is_grouped?, false
-    delegate :to_f, :to_tex, :to_gnu, to: :function_block
+    delegate :to_f, :to, to: :function_block
 
     def self.build(*vars, &block)
       Class.new(self) do
@@ -48,14 +48,28 @@ module Danica
       self.class.new(vars_map).to_f
     end
 
+    def describe(format)
+      "#{name}(#{description_variables(format)}) = #{to(format)}"
+    end
+
     def describe_tex
-      "#{name}(#{variables.reject(&:valued?).map(&:to_tex).join(', ')}) = #{to_tex}"
+      describe(:tex)
     end
 
     def describe_gnu
-      "#{name}(#{variables.reject(&:valued?).map(&:to_gnu).join(', ')}) = #{to_gnu}"
+      describe(:gnu)
     end
 
     autoload :Gauss,    'danica/function/gauss'
+
+    private
+
+    def description_variables(format)
+      non_constant_variables.map { |v| v.to(format) }.join(', ')
+    end
+
+    def non_constant_variables
+      variables.reject(&:constant?)
+    end
   end
 end

data/lib/danica/function/gauss.rb

@@ -1,35 +1,21 @@
 module Danica
-  class Function::Gauss < Function.build(:x, average: { latex: '\mu', gnu: :u }, variance_root: { latex: '\sigma', gnu: :v }) { multiplication(elements) }
+  class Function::Gauss < Function.build(:x, average: { latex: '\mu', gnu: :u }, variance_root: { latex: '\sigma', gnu: :v }) { num(1) / denominator * exponential(exp) }
 
     private
 
-    def elements
-      [
-        division(1, denominator),
-        exponential(exp)
-      ]
-    end
-
     def denominator
-      variance_root *
-      squared_root(
-        multiplication(2, PI),
-      )
+      variance_root * sqrt(num(2) * PI)
     end
 
     def exp
-      negative(
-        division(
-          power(group(
-            addition(x, negative(average))
-          ), 2),
-          multiplication(2, variance)
-        )
+      - (
+          ((x - average) ** 2) /
+          (num(2) * variance)
       )
     end
 
     def variance
-      @variance ||= power(variance_root, 2)
+      @variance ||= variance_root ** 2
     end
   end
 end

data/lib/danica/operator.rb

@@ -6,7 +6,7 @@ module Danica
 
     default_value :priority, 3
     default_value :is_grouped?, false
-  
+
     def initialize(*args)
       self.variables = args.flatten
     end

data/lib/danica/operator/addition.rb

@@ -8,19 +8,15 @@ module Danica
 
     private
 
-    def tex_symbol
-      '+'
-    end
+    default_value :symbol, :+
 
     def chain_operation(a, b)
       a + b
     end
 
-    alias_method :gnu_symbol, :tex_symbol
-
     def join_proc(symbol)
       proc do |_, value|
-        value.is_a?(Wrapper::Negative) || value.is_a?(Wrapper::PlusMinus) ? ' ' : " #{symbol} "
+        value.signaled? ? ' ' : " #{symbol} "
       end
     end
   end

data/lib/danica/operator/chained.rb

@@ -16,20 +16,20 @@ module Danica
         variables.include?(value)
       end
 
-      def to_tex
-        to_string(:tex)
-      end
-
-      def to_gnu
-        to_string(:gnu)
+      def to(format)
+        extractor = string_extractor(format)
+        variables.procedural_join(extractor, &join_proc(symbol(format)))
       end
 
       private
 
-      def to_string(type)
-        extractor = string_extractor("to_#{type}")
-        symbol = { tex: tex_symbol, gnu: gnu_symbol }[type]
-        variables.procedural_join(extractor, &join_proc(symbol))
+      def symbol(format)
+        case format.to_sym
+        when :tex
+          tex_symbol
+        when :gnu
+          gnu_symbol
+        end
       end
 
       def join_proc(symbol)
@@ -39,7 +39,7 @@ module Danica
       def string_extractor(method)
         proc do |parcel|
           parcel = wrap_as_group(parcel)
-          parcel.public_send(method)
+          parcel.to(method)
         end
       end
 

data/lib/danica/operator/multiplication.rb

@@ -8,13 +8,8 @@ module Danica
 
     private
 
-    def tex_symbol
-      '\cdot'
-    end
-
-    def gnu_symbol
-      '*'
-    end
+    default_value :tex_symbol, '\cdot'
+    default_value :gnu_symbol, :*
 
     def chain_operation(a, b)
       a * b

data/lib/danica/variables_holder.rb

@@ -27,7 +27,7 @@ module Danica
     def variables
       variables_hash.values
     end
-  
+
     def variables_hash
       @variables_hash ||= {}.merge(self.class.variables_hash)
     end
@@ -37,11 +37,5 @@ module Danica
         var.try(:value)
       end.as_hash(self.class.variables_names)
     end
-
-    private
-
-    def non_valued_variables
-      variables.reject(&:valued?)
-    end
   end
 end

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '2.4.2'
+  VERSION = '2.4.3'
 end

data/lib/danica/wrapper/constant.rb

@@ -8,6 +8,7 @@ module Danica
     default_value :priority, 10
     default_value :valued?, true
     default_value :is_grouped?, false
+    default_value :constant?, true
 
     def initialize(*args)
       attrs = args.extract_options!

data/lib/danica/wrapper/group.rb

@@ -7,7 +7,7 @@ module Danica
 
     default_value :priority, 10
     default_value :is_grouped?, true
-    
+
     delegate :to_f, :valued?, to: :value
 
     def initialize(value)

data/lib/danica/wrapper/negative.rb

@@ -8,7 +8,8 @@ module Danica
 
     default_value :priority, 2
     default_value :is_grouped?, false
-    
+    default_value :signaled?, true
+
     delegate :valued?, to: :value
 
     def initialize(value)
@@ -19,12 +20,8 @@ module Danica
       -value.to_f
     end
 
-    def to_tex
-      "-#{wrap_as_group(value).to_tex}"
-    end
-
-    def to_gnu
-      "-#{wrap_as_group(value).to_gnu}"
+    def to(format)
+      "-#{wrap_as_group(value).to(format)}"
     end
 
     def ==(other)

data/lib/danica/wrapper/number.rb

@@ -13,7 +13,7 @@ module Danica
       @value = value
     end
 
-    def to_tex
+    def to(_)
       return value.to_i.to_s if value.to_i == value
       value.to_s
     end
@@ -22,12 +22,14 @@ module Danica
       value.present?
     end
 
+    def signaled?
+      value < 0
+    end
+
     def ==(other)
       return false unless other.class == self.class
       value == other.value
     end
-
-    alias_method :to_gnu, :to_tex
   end
 end
 

data/lib/danica/wrapper/plus_minus.rb

@@ -8,7 +8,8 @@ module Danica
 
     default_value :priority, 2
     default_value :is_grouped?, false
-    
+    default_value :signaled?, true
+
     delegate :valued?, to: :value
 
     def initialize(value)

data/spec/integration/addition_spec.rb

@@ -8,19 +8,20 @@ describe 'integration of addition' do
         2,
         -3,
         4,
-        Danica::Wrapper::PlusMinus.new(5)
+        Danica::Wrapper::PlusMinus.new(5),
+        Danica::Wrapper::Number.new(-6)
       )
     end
 
     describe '#to_gnu' do
       it 'returns the correct string' do
-        expect(subject.to_gnu).to eq('-1 + 2 -3 + 4 + 5')
+        expect(subject.to_gnu).to eq('-1 + 2 -3 + 4 + 5 -6')
       end
     end
 
     describe '#to_tex' do
       it 'returns the correct string' do
-        expect(subject.to_tex).to eq('-1 + 2 -3 + 4 \pm 5')
+        expect(subject.to_tex).to eq('-1 + 2 -3 + 4 \pm 5 -6')
       end
     end
   end

data/spec/lib/danica/common_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+module Danica
+  module Common
+    class Dummy
+      include Common
+
+      def to_tex
+        'tex'
+      end
+
+      def to_gnu
+        'gnu'
+      end
+    end
+
+    class Dummy2
+      include Common
+
+      def to(format)
+        "formatted: #{format}"
+      end
+    end
+  end
+end
+
+describe Danica::Common do
+  let(:clazz) { described_class::Dummy }
+  subject { clazz.new }
+
+  describe '#to_f' do
+    it do
+      expect do
+        subject.to_f
+      end.to raise_error(Danica::Exception::NotImplemented)
+    end
+  end
+
+  describe '#to' do
+    context 'when defining to_tex and to_gnu' do
+      context 'when requesting :tex' do
+        it 'has a string for latex' do
+          expect(subject.to(:tex)).to eq('tex')
+        end
+      end
+      context "when requesting 'tex'" do
+        it 'has a string for latex' do
+          expect(subject.to('tex')).to eq('tex')
+        end
+      end
+      context 'when requesting :gnu' do
+        it 'has a string for gnu' do
+          expect(subject.to(:gnu)).to eq('gnu')
+        end
+      end
+      context "when requesting 'gnu'" do
+        it 'has a string for gnu' do
+          expect(subject.to('gnu')).to eq('gnu')
+        end
+      end
+      context "when requesting wrong format" do
+        it do
+          expect do
+            subject.to('format')
+          end.to raise_error(Danica::Exception::FormatNotFound)
+        end
+      end
+    end
+  end
+
+  describe '#to_tex' do
+    context 'when defined the #to method' do
+      let(:clazz) { described_class::Dummy2 }
+      it 'returns the call of #to(:tex)' do
+        expect(subject.to_tex).to eq('formatted: tex')
+      end
+    end
+  end
+
+  describe '#to_gnu' do
+    context 'when defined the #to method' do
+      let(:clazz) { described_class::Dummy2 }
+      it 'returns the call of #to(:gnu)' do
+        expect(subject.to_gnu).to eq('formatted: gnu')
+      end
+    end
+  end
+end

data/spec/lib/danica/dsl_spec.rb

@@ -23,6 +23,7 @@ shared_context 'a class with mapped dsl' do
   end
   {
     squared_root:  Danica::Operator::SquaredRoot,
+    sqrt:          Danica::Operator::SquaredRoot,
     exponential:   Danica::Operator::Exponential,
     sin:           Danica::Operator::Sin,
     cos:           Danica::Operator::Cos,

data/spec/lib/danica/function_spec.rb

@@ -126,9 +126,39 @@ describe Danica::Function do
         function_class.new(name: :f, x: Danica::PI)
       end
 
-      it do
+      it 'ignores the constant in the definition' do
         expect(function.describe_tex).to eq('f(y) = \pi^{y}')
       end
+
+      context 'from a hash' do
+        let(:function) do
+          function_class.new(name: :f, x: { latex: '\pi', gnu: 'pi', value: 3.14 })
+        end
+
+        it 'ignores the constant in the definition' do
+          expect(function.describe_tex).to eq('f(y) = \pi^{y}')
+        end
+      end
+    end
+
+    context 'when a variable is a number' do
+      let(:function) do
+        function_class.new(name: :f, x: 2)
+      end
+
+      it 'sohws the variable as number' do
+        expect(function.describe_tex).to eq('f(2, y) = 2^{y}')
+      end
+    end
+
+    context 'when a variable has value' do
+      let(:function) do
+        function_class.new(name: :f, x: 2)
+      end
+
+      it 'sohws the variable as number' do
+        expect(function.describe_tex).to eq('f(2, y) = 2^{y}')
+      end
     end
   end
 
@@ -148,9 +178,39 @@ describe Danica::Function do
         function_class.new(name: :f, x: Danica::PI)
       end
 
-      it do
+      it 'ignores the constant in the definition' do
         expect(function.describe_gnu).to eq('f(y) = pi**(y)')
       end
+
+      context 'from a hash' do
+        let(:function) do
+          function_class.new(name: :f, x: { latex: '\pi', gnu: 'pi', value: 3.14 })
+        end
+
+        it 'ignores the constant in the definition' do
+          expect(function.describe_gnu).to eq('f(y) = pi**(y)')
+        end
+      end
+    end
+
+    context 'when a variable has value' do
+      let(:function) do
+        function_class.new(name: :f, x: { name: :x, value: 2 })
+      end
+
+      it 'sohws the variable as number' do
+        expect(function.describe_gnu).to eq('f(2, y) = 2**(y)')
+      end
+    end
+
+    context 'when a variable is a number' do
+      let(:function) do
+        function_class.new(name: :f, x: 2)
+      end
+
+      it 'sohws the variable as number' do
+        expect(function.describe_gnu).to eq('f(2, y) = 2**(y)')
+      end
     end
   end
 

data/spec/lib/danica/operator/addition_spec.rb

@@ -30,12 +30,12 @@ describe Danica::Operator::Addition do
   it_behaves_like 'a operator that joins many variables with same operation', {
     calculated: 10,
     numeric_variables: [ 1.5, 3.0, 3.5 ],
-    to_tex: {
+    tex: {
       string_expected: 'X1 + X2 + X3 + X4',
       integer_expected: '1.5 + 3 + X3 + X4',
       float_expected: '1.5 + 3 + 3.5 + X4'
     },
-    to_gnu: {
+    gnu: {
       string_expected: 'X1 + X2 + X3 + X4',
       integer_expected: '1.5 + 3 + X3 + X4',
       float_expected: '1.5 + 3 + 3.5 + X4'

data/spec/lib/danica/operator/multiplication_spec.rb

@@ -27,12 +27,12 @@ describe Danica::Operator::Multiplication do
   it_behaves_like 'a operator that joins many variables with same operation', {
     calculated: 24,
     numeric_variables: [ 1.5, 2, 3.5 ],
-    to_tex: { 
+    tex: {
       string_expected: %w(X1 X2 X3 X4).join(' \cdot '),
       integer_expected: %w(1.5 2 X3 X4).join(' \cdot '),
       float_expected: %w(1.5 2 3.5 X4).join(' \cdot ')
     },
-    to_gnu: {
+    gnu: {
       string_expected: %w(X1 X2 X3 X4).join(' * '),
       integer_expected: %w(1.5 2 X3 X4).join(' * '),
       float_expected: %w(1.5 2 3.5 X4).join(' * '),

data/spec/lib/danica/variables_holder_spec.rb

@@ -129,7 +129,7 @@ describe Danica::VariablesHolder do
       end
     end
   end
-  
+
   describe '#variables_value_hash' do
     context 'when instance has no variables defined' do
       it 'returns the default value' do

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

@@ -19,6 +19,36 @@ describe Danica::Wrapper::Constant do
     end
   end
 
+  describe '#to' do
+    context 'when requesting :tex' do
+      it 'has a string for latex' do
+        expect(subject.to(:tex)).to eq('M')
+      end
+    end
+    context "when requesting 'tex'" do
+      it 'has a string for latex' do
+        expect(subject.to('tex')).to eq('M')
+      end
+    end
+    context 'when requesting :gnu' do
+      it 'has a string for gnu' do
+        expect(subject.to(:gnu)).to eq('m')
+      end
+    end
+    context "when requesting 'gnu'" do
+      it 'has a string for gnu' do
+        expect(subject.to('gnu')).to eq('m')
+      end
+    end
+    context "when requesting wrong format" do
+      it do
+        expect do
+          subject.to('format')
+        end.to raise_error(Danica::Exception::FormatNotFound)
+      end
+    end
+  end
+
   describe '#to_gnu' do
     it 'has a string for gnu' do
       expect(subject.to_gnu).to eq('m')

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

@@ -8,6 +8,16 @@ describe Danica::Wrapper::Number do
 
   it_behaves_like 'an object with basic operation'
 
+  describe '#valued?' do
+    context 'when value is present' do
+      it { expect(subject.valued?).to be_truthy }
+    end
+    context 'when value is not present' do
+      let(:value) { false }
+      it { expect(subject.valued?).to be_falsey }
+    end
+  end
+
   describe '#to_f' do
     it 'returns the float of value' do
       expect(subject.to_f).to eq(10)

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

@@ -38,26 +38,26 @@ shared_examples 'a operator that knows how to calculate' do |arguments|
 end
 
 shared_examples 'a operator that knows how to write to tex' do |arguments|
-  it_behaves_like 'a operator that knows how to write to a string', :to_tex, arguments
+  it_behaves_like 'a operator that knows how to write to a string', :tex, arguments
 end
 
 shared_examples 'a operator that knows how to write to gnu' do |arguments|
-  it_behaves_like 'a operator that knows how to write to a string', :to_gnu, arguments
+  it_behaves_like 'a operator that knows how to write to a string', :gnu, arguments
 end
 
-shared_examples 'a operator that knows how to write to a string' do |command, arguments|
+shared_examples 'a operator that knows how to write to a string' do |format, arguments|
   let(:numeric_variables) { arguments[:numeric_variables]  }
-  include_context 'variables are initialized', arguments[command], *%w(integer_expected string_expected float_expected)
+  include_context 'variables are initialized', arguments[format], *%w(integer_expected string_expected float_expected)
   subject { described_class.new(*variables) }
 
-  describe "#{command}" do
+  describe "#to(#{format})" do
     let(:variables) do
       (1..4).map { |i| "X#{i}" }
     end
 
     context 'when variables have no value' do
       it 'outputs a text format' do
-        expect(subject.public_send(command)).to eq(string_expected)
+        expect(subject.to(format)).to eq(string_expected)
       end
     end
 
@@ -70,14 +70,14 @@ shared_examples 'a operator that knows how to write to a string' do |command, ar
       end
 
       it 'outputs a latex format with colapsed numbers' do
-        expect(subject.public_send(command)).to eq(integer_expected)
+        expect(subject.to(format)).to eq(integer_expected)
       end
 
       context 'when numeric variables calculated is a float value' do
         let(:numeric_variables_index) { 2 }
 
         it 'outputs a text format with colapsed numbers' do
-          expect(subject.public_send(command)).to eq(float_expected)
+          expect(subject.to(format)).to eq(float_expected)
         end
       end
     end
@@ -91,14 +91,14 @@ shared_examples 'a operator that knows how to write to a string' do |command, ar
       end
 
       it 'outputs a text format of numbers' do
-        expect(subject.public_send(command)).to eq(integer_expected)
+        expect(subject.to(format)).to eq(integer_expected)
       end
 
       context 'when numeric variables are a float value' do
         let(:numeric_variables_index) { 2 }
 
         it 'outputs a text format of numbers' do
-          expect(subject.public_send(command)).to eq(float_expected)
+          expect(subject.to(format)).to eq(float_expected)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,6 +172,7 @@ files:
 - spec/integration/negative_spec.rb
 - spec/integration/plus_minus_spec.rb
 - spec/integration/power_spec.rb
+- spec/lib/danica/common_spec.rb
 - spec/lib/danica/dsl_spec.rb
 - spec/lib/danica/function/gauss_spec.rb
 - spec/lib/danica/function_spec.rb
@@ -233,6 +234,7 @@ test_files:
 - spec/integration/negative_spec.rb
 - spec/integration/plus_minus_spec.rb
 - spec/integration/power_spec.rb
+- spec/lib/danica/common_spec.rb
 - spec/lib/danica/dsl_spec.rb
 - spec/lib/danica/function/gauss_spec.rb
 - spec/lib/danica/function_spec.rb