danica 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dba135a4f791725d368c362643ef501190943d30
-  data.tar.gz: e4b6a1f88467df5f1204b403716a6204b140549e
+  metadata.gz: 42d3abe8f4cb30ba5f39df22450aa6b258897516
+  data.tar.gz: 556b8f2d44f534d97bbce6d4e0a9d8cfbe9b1af2
 SHA512:
-  metadata.gz: 56724c4c1a82158835825b305aaab1e15be2ce21287fa6c97401e87d3be80197f6726b571d3a89b2875438d476119b72a63cd84d6166b895aa548a5288b9f6ed
-  data.tar.gz: 1cae4a159cc2e17831f2451c2ee8ef42ef1a00f70ef1ccf57d55da35387e551b3895b5516c863370bd82f60da1299f7dcc41bf31d4703f5f5478c1b92efbabfa
+  metadata.gz: 6357c1036ab3949b292e94c0835b99812d7eaaeb426372c75e41cf6145b274592c821935e86dffd957b13c193e9875b6caf0824e8de8db862455d09f6f14d443
+  data.tar.gz: df8178314d284efe3d623e40d3c974e5876dfcad6e0a703d5e57d925d2ce8f5ed01ed099618a46195cca08584a2acae35e3724221e79431f8a8d5eb373054b37

data/lib/danica/dsl.rb

@@ -28,7 +28,7 @@ module Danica
     DSL.register_operator(method)
   end
 
-  %i(number group negative plus_minus variable).each do |method|
+  %i(number group negative plus_minus variable constant).each do |method|
     DSL.register_wrapper(method)
   end
 

data/lib/danica/function.rb

@@ -49,11 +49,11 @@ module Danica
     end
 
     def describe_tex
-      "#{name}(#{variables.map(&:to_tex).join(', ')}) = #{to_tex}"
+      "#{name}(#{variables.reject(&:valued?).map(&:to_tex).join(', ')}) = #{to_tex}"
     end
 
     def describe_gnu
-      "#{name}(#{variables.map(&:to_gnu).join(', ')}) = #{to_gnu}"
+      "#{name}(#{variables.reject(&:valued?).map(&:to_gnu).join(', ')}) = #{to_gnu}"
     end
 
     autoload :Gauss,    'danica/function/gauss'

data/lib/danica/version.rb

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

data/lib/danica/wrapper.rb

@@ -1,11 +1,20 @@
 module Danica
   module Wrapper
     def wrap_value(value)
-      return wrap_value(number(value)) if value.is_a?(Numeric)
-      return wrap_value(variable(value)) if value.is_a?(Hash)
-      return wrap_value(variable(name: value)) if [ String, Symbol ].any? { |c| value.is_a?(c) }
-      return wrap_value(variable) if value.nil?
-      value
+      case value
+      when Numeric
+        return negative(number(-value)) if value < 0
+        number(value)
+      when Hash
+        return constant(value) if value.keys.map(&:to_sym).sort == %i(gnu latex value)
+        variable(value)
+      when String, Symbol
+        variable(name: value)
+      when NilClass
+        variable
+      else
+        value
+      end
     end
 
     autoload :Number,    'danica/wrapper/number'

data/lib/danica/wrapper/constant.rb

@@ -9,10 +9,13 @@ module Danica
     default_value :valued?, true
     default_value :is_grouped?, false
 
-    def initialize(value, latex, gnu)
-      @value = value
-      @latex = latex
-      @gnu = gnu
+    def initialize(*args)
+      attrs = args.extract_options!
+      attrs = args.as_hash(%i(value latex gnu)).merge(attrs)
+
+      attrs.each do |key, value|
+        self.send("#{key}=", value)
+      end
     end
 
     def to_f
@@ -31,6 +34,20 @@ module Danica
     def to_gnu
       gnu.to_s
     end
+
+    private
+
+    def value=(value)
+      @value = value
+    end
+
+    def latex=(latex)
+      @latex = latex
+    end
+
+    def gnu=(gnu)
+      @gnu = gnu
+    end
   end
 
   E = Wrapper::Constant.new(Math::E, :e, 'exp(1)')

data/spec/integration/addition_spec.rb

@@ -6,7 +6,7 @@ describe 'integration of addition' do
       Danica::Operator::Addition.new(
         Danica::Wrapper::Negative.new(1),
         2,
-        Danica::Wrapper::Negative.new(3),
+        -3,
         4,
         Danica::Wrapper::PlusMinus.new(5)
       )

data/spec/lib/danica/dsl_spec.rb

@@ -30,7 +30,8 @@ shared_context 'a class with mapped dsl' do
     negative:      Danica::Wrapper::Negative,
     number:        Danica::Wrapper::Number,
     num:           Danica::Wrapper::Number,
-    plus_minus:    Danica::Wrapper::PlusMinus
+    plus_minus:    Danica::Wrapper::PlusMinus,
+    constant:      Danica::Wrapper::Constant
   }.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

@@ -120,6 +120,16 @@ describe Danica::Function do
         expect(function.describe_tex).to eq('f(x, y) = x^{y}')
       end
     end
+
+    context 'when a variable is set as a constant' do
+      let(:function) do
+        function_class.new(name: :f, x: Danica::PI)
+      end
+
+      it do
+        expect(function.describe_tex).to eq('f(y) = \pi^{y}')
+      end
+    end
   end
 
   describe '#describe_gnu' do
@@ -132,6 +142,16 @@ describe Danica::Function do
         expect(function.describe_gnu).to eq('f(x, y) = x**(y)')
       end
     end
+
+    context 'when a variable is set as a constant' do
+      let(:function) do
+        function_class.new(name: :f, x: Danica::PI)
+      end
+
+      it do
+        expect(function.describe_gnu).to eq('f(y) = pi**(y)')
+      end
+    end
   end
 
   describe 'spatial' do

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

@@ -25,12 +25,34 @@ describe Danica::Wrapper::Constant do
     end
   end
 
-  describe 'variables' do
+  describe 'attr_setters' do
     it { expect(subject).not_to respond_to(:value=) }
     it { expect(subject).not_to respond_to(:latex=) }
     it { expect(subject).not_to respond_to(:gnu=) }
   end
 
+  context 'when initializing from hash' do
+    subject { described_class.new(value: 2.5, latex: :M, gnu: :m) }
+
+    it 'initialize normaly' do
+      expect do
+        described_class.new(value: 2.5, latex: :M, gnu: :m)
+      end.not_to raise_error
+    end
+
+    it 'sets the value' do
+      expect(subject.value).to eq(2.5)
+    end
+
+    it 'sets the latex' do
+      expect(subject.to_tex).to eq('M')
+    end
+
+    it 'sets the gnu' do
+      expect(subject.to_gnu).to eq('m')
+    end
+  end
+
   describe '==' do
     context 'when comparing with the same object' do
       it { expect(subject).to eq(subject) }

data/spec/lib/danica/wrapper_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+class Danica::Wrapper::Dummy
+  include Danica::DSL
+  include Danica::Wrapper
+
+  attr_reader :wrapped_value
+
+  def initialize(value)
+    @wrapped_value = wrap_value(value)
+  end
+end
+
+shared_examples 'a value wrapper' do |examples|
+  examples.each do |val, expected|
+    context "when value is a #{val.class}" do
+      let(:value) { val }
+
+      it do
+        expect(subject.wrapped_value).to be_a(expected)
+      end
+    end
+  end
+end
+
+describe Danica::Wrapper do
+  let(:clazz) { described_class::Dummy }
+  subject { clazz.new(value) }
+
+  describe 'wrap_value' do
+    it_behaves_like 'a value wrapper', {
+      x: Danica::Wrapper::Variable,
+      'x' => Danica::Wrapper::Variable,
+      10 => Danica::Wrapper::Number,
+      -10 => Danica::Wrapper::Negative,
+      { name: :x } => Danica::Wrapper::Variable
+    }
+
+    context 'when value is a Hash' do
+      context 'but it is a constant' do
+        let(:value) { { value: 10, latex: :x, gnu: :X } }
+
+        it do
+          expect(subject.wrapped_value).to be_a(Danica::Wrapper::Constant)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -191,6 +191,7 @@ files:
 - 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/wrapper_spec.rb
 - spec/lib/danica_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/functions/baskara.rb
@@ -251,6 +252,7 @@ test_files:
 - 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/wrapper_spec.rb
 - spec/lib/danica_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/functions/baskara.rb