danica 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88c93cc9b46fa1f9ced587a49535bc0eeec427cc
-  data.tar.gz: af6ae43ee59d5b15f204203f2a56c6978fec5125
+  metadata.gz: 7e650cc12cd4ccaaf7eaebd6f8084ae46211f0cf
+  data.tar.gz: 7b9cef3c43db7851160e95f6a2700dfde13f5a28
 SHA512:
-  metadata.gz: a547b35c6f1d7c14534ab87ee7d1c6a08222cdcbbb166f435276355a99decfe0bcc458e4aef8e4a011ec79203363fc3fc4f8aa22d80cea260c45c45aedd9ce8f
-  data.tar.gz: 7c168e661e244debbd6e7c68ca0b3acadebb59cc9f9920ce76f6b632ba7c16e6eb102a70259970887477469bbda3cb23a02ef71a3a605e02ef2c902f0880394e
+  metadata.gz: 0acaff19e60a377126d74cfa90441098329f19603b7467e208f672e1ba7a95242beed67125028cd8c1979f5fb9b4443b877aa27ec24bf8e421f6f44970f983b3
+  data.tar.gz: 3d5be06b0da8ea1569f17354b711ce328f0577b169af1a8a191f6de883d6cbb2b3aab38fe3c2f03511f0f1aa5f72d819146d3bac3107e32364d9e6030d0ace14

data/lib/danica/common.rb

@@ -12,6 +12,7 @@ module Danica
 
       default_value :constant?, false
       default_value :signaled?, false
+      default_value :container?, false
     end
 
     def to_f
@@ -43,6 +44,10 @@ module Danica
       false
     end
 
+    def content
+      self
+    end
+
     private
 
     def wrap_as_group(value)

data/lib/danica/function.rb

@@ -4,6 +4,9 @@ module Danica
     include VariablesHolder
     include DSL
 
+    autoload :Gauss,    'danica/function/gauss'
+    autoload :Name,    'danica/function/name'
+
     attr_accessor :name
 
     default_value :priority, 3
@@ -49,7 +52,7 @@ module Danica
     end
 
     def describe(format)
-      "#{name}(#{description_variables(format)}) = #{to(format)}"
+      "#{name.to(format)} = #{to(format)}"
     end
 
     def describe_tex
@@ -60,7 +63,9 @@ module Danica
       describe(:gnu)
     end
 
-    autoload :Gauss,    'danica/function/gauss'
+    def name
+      @name_object ||= Name.new(name: @name, variables: containers)
+    end
 
     private
 

data/lib/danica/function/name.rb

@@ -0,0 +1,33 @@
+module Danica
+  class Function::Name
+    include Common
+    attr_reader :name, :containers
+
+    def initialize(name:, variables:)
+      @name = name
+      @containers = variables.map do |v|
+        v = wrap_value(v)
+        v = Wrapper::Container.new(v) unless v.container?
+        v
+      end
+    end
+
+    def to(format)
+      "#{name}(#{description_variables(format)})"
+    end
+
+    def variables
+      containers.map(&:content)
+    end
+
+    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/operator/chained.rb

@@ -1,8 +1,6 @@
 module Danica
   class Operator
     class Chained < Operator
-      attr_reader :variables
-
       def variables=(vars)
         @variables = vars.map { |v| wrap_value(v) }
       end
@@ -13,7 +11,7 @@ module Danica
 
       def include?(value)
         value = wrap_value(value)
-        variables.include?(value)
+        variables.include?(value.content)
       end
 
       def to(format)
@@ -21,6 +19,10 @@ module Danica
         variables.procedural_join(extractor, &join_proc(symbol(format)))
       end
 
+      def variables
+        @variables.map(&:content)
+      end
+
       private
 
       def symbol(format)

data/lib/danica/variables_holder.rb

@@ -20,16 +20,28 @@ module Danica
 
     def variables=(vars)
       vars = vars.as_hash(self.class.variables_names).compact unless vars.is_a? Hash
-      vars = vars.change_values(skip_inner: false) { |v| wrap_value(v) }
-      @variables_hash = self.class.variables_hash.merge(vars)
+      vars = vars.dup.change_values!(skip_inner: false) { |v| wrap_value(v) }
+      vars.each do |k, v|
+        public_send("#{k}=", v)
+      end
     end
 
     def variables
-      variables_hash.values
+      containers.map(&:content)
+    end
+
+    def containers
+      containers_hash.values
+    end
+
+    def containers_hash
+      @containers_hash ||= {}.merge(self.class.variables_hash.change_values do |value|
+        Wrapper::Container.new(value)
+      end)
     end
 
     def variables_hash
-      @variables_hash ||= {}.merge(self.class.variables_hash)
+      containers_hash.change_values(&:content)
     end
 
     def variables_value_hash

data/lib/danica/variables_holder/variables_builder.rb

@@ -30,13 +30,19 @@ module Danica::VariablesHolder
 
     def add_setter(name)
       instance.send(:define_method, "#{name}=") do |value|
-        variables_hash[name.to_sym] = wrap_value(value)
+        if(containers_hash[name.to_sym].try(:container?))
+          containers_hash[name.to_sym].content = wrap_value(value)
+        else
+          value = wrap_value(value)
+          value = Danica::Wrapper::Container.new value unless value.container?
+          containers_hash[name.to_sym] = value
+        end
       end
     end
 
     def add_reader(name)
       instance.send(:define_method, name) do
-        variables_hash[name.to_sym]
+        containers_hash[name.to_sym]
       end
     end
   end

data/lib/danica/version.rb

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

data/lib/danica/wrapper.rb

@@ -1,27 +1,38 @@
 module Danica
   module Wrapper
     def wrap_value(value)
+      Wrapper.wrap_value(value)
+    end
+
+    def self.wrap_value(value)
       case value
       when Numeric
-        return negative(number(-value)) if value < 0
-        number(value)
+        wrap_numeric(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
+        wrap_hash(value)
+      when String, Symbol, NilClass
+        Variable.new(name: value)
       else
         value
       end
     end
 
+    def self.wrap_numeric(number)
+      return Negative.new(Number.new(-number)) if number < 0
+      Number.new(number)
+    end
+
+    def self.wrap_hash(hash)
+      return Constant.new(hash) if hash.keys.map(&:to_sym).sort == %i(gnu latex value)
+      Variable.new(hash)
+    end
+
     autoload :Number,    'danica/wrapper/number'
     autoload :Group,     'danica/wrapper/group'
     autoload :Negative,  'danica/wrapper/negative'
     autoload :PlusMinus, 'danica/wrapper/plus_minus'
     autoload :Constant,  'danica/wrapper/constant'
     autoload :Variable,  'danica/wrapper/variable'
+    autoload :Container, 'danica/wrapper/container'
   end
 end

data/lib/danica/wrapper/container.rb

@@ -0,0 +1,23 @@
+module Danica
+  class Wrapper::Container
+    include Common
+    attr_accessor :content
+
+    delegate :to_f, :contentd?, :to, :to_tex, :to_gnu, :priority, :grouped?,
+             :signaled?, :constant?, :valued?, :*, :+, :-, :/, :**, to: :content
+
+    default_value :container?, true
+
+    def initialize(content)
+      @content = content
+    end
+
+    def ==(other)
+      return content == other unless other.is_a?(self.class)
+      content == other.content
+    end
+  end
+end
+
+
+

data/spec/lib/danica/function/name_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Danica::Function::Name do
+  let(:x) {  Danica::Wrapper::Variable.new(name: :x, latex: '\mu', gnu: 'u')}
+  let(:subject) { described_class.new(name: :f, variables: [x]) }
+
+  describe '#to_tex' do
+    it 'returns the name of the function with tex variables' do
+      expect(subject.to_tex).to eq('f(\mu)')
+    end
+
+    context 'when initializing variables from scratch' do
+      let(:x) { :x }
+
+      it 'returns the name of the function with tex variables' do
+        expect(subject.to_tex).to eq('f(x)')
+      end
+    end
+  end
+
+  describe '#to_tex' do
+    it 'returns the name of the function with tex variables' do
+      expect(subject.to_gnu).to eq('f(u)')
+    end
+
+    context 'when initializing variables from scratch' do
+      let(:x) { :x }
+
+      it 'returns the name of the function with tex variables' do
+        expect(subject.to_gnu).to eq('f(x)')
+      end
+    end
+  end
+end

data/spec/lib/danica/function_spec.rb

@@ -110,6 +110,24 @@ describe Danica::Function do
     it_behaves_like 'a generically generated function'
   end
 
+  describe '#name' do
+    let(:function) do
+      function_class.new(name: :f)
+    end
+
+    it do
+      expect(function.name).to be_a(Danica::Function::Name)
+    end
+
+    context 'when changing the function variables' do
+      it 'changes the name variables' do
+        expect do
+          function.x = 2
+        end.to change { function.name.variables.map(&:content) }
+      end
+    end
+  end
+
   describe '#describe_tex' do
     context 'when function has a name' do
       let(:function) do
@@ -119,6 +137,14 @@ describe Danica::Function do
       it 'returns the full function description' do
         expect(function.describe_tex).to eq('f(x, y) = x^{y}')
       end
+
+      context 'and one of the variables is changed' do
+        it 'uses the new variable value' do
+          expect do
+            function.y = 2
+          end.to change(function, :describe_tex).to('f(x, 2) = x^{2}')
+        end
+      end
     end
 
     context 'when a variable is set as a constant' do
@@ -328,7 +354,7 @@ describe Danica::Function do
     describe '#variables' do
       context 'when initialized with an array of variables' do
         subject { described_class::Spatial.new(variables: variables.values) }
-        let(:expected) { variables.values.map { |v| subject.send(:wrap_value, v)} }
+        let(:expected) { variables.values.map { |v| Danica::Wrapper::Variable.new(v.is_a?(Hash) ? v : { name: v }) } }
         it do
           expect(subject.variables.compact).to eq(expected)
         end

data/spec/lib/danica/variables_holder_spec.rb

@@ -20,6 +20,15 @@ shared_examples 'an object that returns the default variables' do
   end
 end
 
+shared_examples 'an variable set that does not change the class variables' do
+  it 'does not change the the class variables' do
+    expect do
+      subject.variables = variables
+    end.not_to change { clazz.variables_hash }
+  end
+end
+
+
 describe Danica::VariablesHolder do
   class Danica::VariablesHolder::Dummy
     include Danica::Common
@@ -47,11 +56,32 @@ describe Danica::VariablesHolder do
   end
 
   describe '#variables=' do
-    before do
-      subject.variables = variables
+    context 'when changing the variables of the object' do
+      context 'when all the variables are set with value' do
+        let(:variables) { [1, 2, 3] }
+        it_behaves_like 'an variable set that does not change the class variables'
+      end
+
+      context 'setting the variables through a hash' do
+        let(:variables) { { x: 1, y: 2, z: 3 } }
+        it_behaves_like 'an variable set that does not change the class variables'
+      end
+
+      context 'when none of the variables are set with values' do
+        let(:variables) { [] }
+        it_behaves_like 'an variable set that does not change the class variables'
+      end
+
+      context 'when the variables are set through an empty hash' do
+        let(:variables) { {} }
+        it_behaves_like 'an variable set that does not change the class variables'
+      end
     end
 
     context 'when setting the variables using a list' do
+      before do
+        subject.variables = variables
+      end
       let(:variables) { [1, 2, 3] }
 
       it 'changes the values of the variables' do
@@ -60,12 +90,15 @@ describe Danica::VariablesHolder do
 
       context 'but the array is empty' do
         let(:variables) { [] }
-
         it_behaves_like 'an object that returns the default variables hash'
       end
     end
 
     context 'when setting the variales using a hash' do
+      before do
+        subject.variables = variables
+      end
+
       let(:variables) { { x: 1, y: 2, z: 3 } }
 
       it 'changes the values of the variables' do
@@ -74,7 +107,6 @@ describe Danica::VariablesHolder do
 
       context 'but the hash is empty' do
         let(:variables) { {} }
-
         it_behaves_like 'an object that returns the default variables hash'
       end
     end
@@ -147,4 +179,20 @@ describe Danica::VariablesHolder do
       end
     end
   end
+
+  describe '#containers' do
+    it 'is an array of Containers' do
+      expect(subject.containers.first).to be_a(Danica::Wrapper::Container)
+    end
+
+    context 'when changing the variable on the object' do
+      let(:containers) { subject.containers }
+
+      it 'changes the variables in the containers' do
+        expect do
+          subject.x = 2
+        end.to change { containers.map(&:content) }
+      end
+    end
+  end
 end

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

@@ -7,6 +7,18 @@ describe Danica::Wrapper::Variable do
     subject { described_class.new(value: 100) }
   end
 
+  it 'can be initialize from nil value' do
+    expect do
+      described_class.new(nil)
+    end
+  end
+
+  it 'can be initialize from nil name' do
+    expect do
+      described_class.new(name: nil)
+    end
+  end
+
   describe '#to_f' do
     context 'when variable has no value' do
       it { expect { subject.to_f }.to raise_error(Danica::Exception::NotDefined) }

data/spec/lib/danica/wrapper_spec.rb

@@ -17,7 +17,7 @@ shared_examples 'a value wrapper' do |examples|
       let(:value) { val }
 
       it do
-        expect(subject.wrapped_value).to be_a(expected)
+        expect(subject.wrapped_value.content).to be_a(expected)
       end
     end
   end
@@ -41,7 +41,7 @@ describe Danica::Wrapper do
         let(:value) { { value: 10, latex: :x, gnu: :X } }
 
         it do
-          expect(subject.wrapped_value).to be_a(Danica::Wrapper::Constant)
+          expect(subject.wrapped_value.content).to be_a(Danica::Wrapper::Constant)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -146,6 +146,7 @@ files:
 - lib/danica/exception.rb
 - lib/danica/function.rb
 - lib/danica/function/gauss.rb
+- lib/danica/function/name.rb
 - lib/danica/operator.rb
 - lib/danica/operator/addition.rb
 - lib/danica/operator/chained.rb
@@ -162,6 +163,7 @@ files:
 - lib/danica/version.rb
 - lib/danica/wrapper.rb
 - lib/danica/wrapper/constant.rb
+- lib/danica/wrapper/container.rb
 - lib/danica/wrapper/group.rb
 - lib/danica/wrapper/negative.rb
 - lib/danica/wrapper/number.rb
@@ -175,6 +177,7 @@ files:
 - spec/lib/danica/common_spec.rb
 - spec/lib/danica/dsl_spec.rb
 - spec/lib/danica/function/gauss_spec.rb
+- spec/lib/danica/function/name_spec.rb
 - spec/lib/danica/function_spec.rb
 - spec/lib/danica/operator/addition_spec.rb
 - spec/lib/danica/operator/cos_spec.rb
@@ -237,6 +240,7 @@ test_files:
 - spec/lib/danica/common_spec.rb
 - spec/lib/danica/dsl_spec.rb
 - spec/lib/danica/function/gauss_spec.rb
+- spec/lib/danica/function/name_spec.rb
 - spec/lib/danica/function_spec.rb
 - spec/lib/danica/operator/addition_spec.rb
 - spec/lib/danica/operator/cos_spec.rb