danica 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9452b255fbf76168b5420387cfc63e578f61e2d
-  data.tar.gz: 52e4a1dc89abe24a06b337d6fee11a09670455d4
+  metadata.gz: 819638dac151e3f8b6ebff32f9cbe3d0e5478d79
+  data.tar.gz: 4bc0a877096317ab2e3a85eb481526057c3e5c9c
 SHA512:
-  metadata.gz: 8e703c6ebbecb67468d686145e91546209a1330c68e2f02992313b7255ea6439970fdd817addaa00e0f88e9bf6cece0fdb00ce0c1ea7c9e99d383ac3b48c4fef
-  data.tar.gz: 3e495695b72e62546b941d7a6838657574dbd54bc94044177dd90c39a77dbad1170cac77ccea7be96eaa9843145f68789f3e0b2c7e543db50dc86320ea873f05
+  metadata.gz: f9342e9487fa8c29b7b507f669798acde6a8e5b5884abb096e8286317dc4ae2edf05b7d5113caeec7ac6fc422d04041d994665d86656033efc122c7fa752c9b8
+  data.tar.gz: a5c184b88248538b8b538cfa875f172a6efc41b1145175ddbb696fb013da2d63f1c5952ce8aa3cf7fcd4af3b57b3455408a13966868f5bf8dbeb0742bf8ba88b

data/danica.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 5.1.4'
   spec.add_runtime_dependency 'activemodel', '~> 5.1.4'
   spec.add_runtime_dependency 'concern_builder', '~> 0.0.3'
-  spec.add_runtime_dependency 'darthjee-core_ext', '~> 1.4.1'
+  spec.add_runtime_dependency 'darthjee-core_ext', '~> 1.5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

data/lib/danica.rb

@@ -2,6 +2,7 @@ require 'active_model'
 
 module Danica
   autoload :BaseOperations, 'danica/base_operations'
+  autoload :VariablesHolder, 'danica/variables_holder'
   autoload :Common,        'danica/common'
   autoload :Number,        'danica/number'
   autoload :Negative,      'danica/negative'

data/lib/danica/common.rb

@@ -1,49 +1,36 @@
 module Danica
-  class Common
-    include BaseOperations
-    require 'danica/common/class_methods'
-    require 'danica/common/variables_builder'
+  module Common extend ::ActiveSupport::Concern
+    included do
+      class << self
+        def default_value(name, value)
+          define_method(name) { value }
+        end
+      end
+    end
 
-    attr_accessor :variables
- 
     def to_f
       raise 'Not IMplemented yet'
     end
   
-    def variables=(variables)
-      @variables = variables.map { |v| wrap_value(v) }
-    end
-  
     def valued?
       to_f.present?
     rescue Exception::NotDefined
       false
     end
-
-    def variables
-      @variables ||= variables_hash.values
-    end
   
-    def variables_hash
-      @variabels_map ||= (@variables || []).as_hash(self.class.variables_names)
-    end
-
-    def variables_value_hash
-      variables.map(&:value).as_hash(self.class.variables_names)
-    end
-
     private
 
-    def non_valued_variables
-      variables.reject(&:valued?)
-    end
-  
     def wrap_value(value)
-      return Number.new(value) if value.is_a?(Numeric)
-      return Variable.new(value) if value.is_a?(Hash)
-      return Variable.new(name: value) if [ String, Symbol ].any? { |c| value.is_a?(c) }
-      return Variable.new if value.nil?
+      return wrap_value(Number.new(value)) if value.is_a?(Numeric)
+      return wrap_value(Variable.new(value)) if value.is_a?(Hash)
+      return wrap_value(Variable.new(name: value)) if [ String, Symbol ].any? { |c| value.is_a?(c) }
+      return wrap_value(Variable.new) if value.nil?
       value
     end
+
+    def wrap_as_group(value)
+      return value if is_grouped? || value.priority >= priority
+      Group.new(value)
+    end
   end
 end

data/lib/danica/constant.rb

@@ -1,9 +1,14 @@
 module Danica
   class Constant
     include BaseOperations
+    include Common
 
     attr_reader :value, :latex, :gnu
 
+    default_value :priority, 10
+    default_value :valued?, true
+    default_value :is_grouped?, false
+
     def initialize(value, latex, gnu)
       @value = value
       @latex = latex
@@ -26,10 +31,6 @@ module Danica
     def to_gnu
       gnu.to_s
     end
-
-    def valued?
-      true
-    end
   end
 end
 

data/lib/danica/division.rb

@@ -1,6 +1,8 @@
 module Danica
   class Division < Operator
     variables :numerator, :denominator
+    default_value :priority, 2
+    default_value :is_grouped?, true
 
     def to_f
       numerator.to_f / denominator.to_f

data/lib/danica/exponential.rb

@@ -1,6 +1,7 @@
 module Danica
   class Exponential < Operator
     variables :exponent
+    default_value :is_grouped?, true
 
     def to_f
       Math.exp(exponent.to_f)

data/lib/danica/function.rb

@@ -1,9 +1,14 @@
 module Danica
-  class Function < Common
+  class Function
+    include Common
+    include VariablesHolder
     include ActiveModel::Model
   
     attr_accessor :name
 
+    default_value :priority, 3
+    default_value :is_grouped?, false
+
     def initialize(*args)
       options = args.extract_options!
 

data/lib/danica/group.rb

@@ -1,8 +1,12 @@
 module Danica
-  class Group <  Common
+  class Group
+    include Common
     include ActiveModel::Model
 
     attr_accessor :value
+
+    default_value :priority, 10
+    default_value :is_grouped?, true
     
     delegate :to_f, :valued?, to: :value
 
@@ -17,6 +21,11 @@ module Danica
     def to_gnu
       "(#{value.to_gnu})"
     end
+
+    def ==(other)
+      return value == other unless other.is_a?(self.class)
+      value == other.value
+    end
   end
 end
 

data/lib/danica/negative.rb

@@ -1,8 +1,13 @@
 module Danica
-  class Negative <  Common
+  class Negative
+    include Common
+    include VariablesHolder
     include ActiveModel::Model
 
     attr_accessor :value
+
+    default_value :priority, 1
+    default_value :is_grouped?, false
     
     delegate :valued?, to: :value
 

data/lib/danica/number.rb

@@ -2,10 +2,13 @@ module Danica
   class Number
     include ActiveModel::Model
     include BaseOperations
+    include Common
 
     attr_accessor :value
 
+    default_value :priority, 10
     delegate :to_f, to: :value
+    default_value :is_grouped?, false
 
     def initialize(value)
       @value = value

data/lib/danica/operator.rb

@@ -1,6 +1,12 @@
 module Danica
-  class Operator < Common
+  class Operator
+    include Common
+    include VariablesHolder
+    include BaseOperations
     include ActiveModel::Model
+
+    default_value :priority, 3
+    default_value :is_grouped?, false
   
     def initialize(*args)
       super( variables: args.flatten )

data/lib/danica/operator/chained.rb

@@ -11,15 +11,32 @@ module Danica
       end
 
       def to_tex
-        variables.map(&:to_tex).join(" #{tex_symbol} ")
+        to_string(:tex)
       end
 
       def to_gnu
-        variables.map(&:to_gnu).join(" #{gnu_symbol} ")
+        to_string(:gnu)
       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))
+      end
+
+      def join_proc(symbol)
+        proc { " #{symbol} " }
+      end
+
+      def string_extractor(method)
+        proc do |parcel|
+          parcel = wrap_as_group(parcel)
+          parcel.public_send(method)
+        end
+      end
+
       def repack(other)
         other_variables = other.is_a?(self.class) ? other.variables : [ other ]
         self.class.new(variables + other_variables)

data/lib/danica/power.rb

@@ -1,17 +1,18 @@
 module Danica
   class Power < Operator
     variables :base, :exponent
+    default_value :is_grouped?, false
 
     def to_f
       base.to_f ** exponent.to_f
     end
 
     def to_tex
-      "#{base.to_tex}^{#{exponent.to_tex}}"
+      "#{wrap_as_group(base).to_tex}^{#{exponent.to_tex}}"
     end
 
     def to_gnu
-      "#{base.to_gnu}**#{exponent.to_gnu}"
+      "#{ wrap_as_group(base).to_gnu}**(#{exponent.to_gnu})"
     end
   end
 end

data/lib/danica/product.rb

@@ -2,6 +2,8 @@ require 'danica/operator/chained'
 
 module Danica
   class Product < Operator::Chained
+    default_value :priority, 2
+
     def *(other)
       repack(other)
     end

data/lib/danica/squared_root.rb

@@ -1,6 +1,7 @@
 module Danica
   class SquaredRoot < Operator
     variables :variable
+    default_value :is_grouped?, true
 
     def to_f
       Math.sqrt(variable.to_f)

data/lib/danica/sum.rb

@@ -2,6 +2,8 @@ require 'danica/operator/chained'
 
 module Danica
   class Sum < Operator::Chained
+    default_value :priority, 1
+
     def +(other)
       repack(other)
     end
@@ -17,6 +19,12 @@ module Danica
     end
 
     alias_method :gnu_symbol, :tex_symbol
+
+    def join_proc(symbol)
+      proc do |_, value|
+        value.is_a?(Negative) ? ' ' : " #{symbol} "
+      end
+    end
   end
 end
 

data/lib/danica/variable.rb

@@ -2,8 +2,13 @@ module Danica
   class Variable
     include ActiveModel::Model
     include BaseOperations
+    include Common
+
     attr_accessor :value, :name, :latex, :gnu
 
+    default_value :priority, 10
+    default_value :is_grouped?, false
+
     def to_f
       value.nil? ? raise(Exception::NotDefined) : value.to_f
     end
@@ -26,10 +31,6 @@ module Danica
       (gnu || name).to_s
     end
 
-    def valued?
-      value.present?
-    end
-
     def value=(value)
       @value = value.is_a?(Numeric) ? Number.new(value) : value
     end

data/lib/danica/variables_holder.rb

@@ -0,0 +1,41 @@
+module Danica
+  module VariablesHolder extend ::ActiveSupport::Concern
+    require 'danica/variables_holder/variables_builder'
+
+    included do
+      class << self
+        def variables(*names)
+          VariablesBuilder.new(names, self).build
+        end
+
+        def variables_names
+          @variables_names ||= []
+        end
+      end
+    end
+
+    attr_accessor :variables
+ 
+    def variables=(variables)
+      @variables = variables.map { |v| wrap_value(v) }
+    end
+
+    def variables
+      @variables ||= variables_hash.values
+    end
+  
+    def variables_hash
+      @variabels_map ||= (@variables || []).as_hash(self.class.variables_names)
+    end
+
+    def variables_value_hash
+      variables.map(&:value).as_hash(self.class.variables_names)
+    end
+
+    private
+
+    def non_valued_variables
+      variables.reject(&:valued?)
+    end
+  end
+end

data/lib/danica/{common → variables_holder}/variables_builder.rb

@@ -1,7 +1,7 @@
 require 'concern_builder'
 require 'darthjee/core_ext'
 
-class Danica::Common
+module Danica::VariablesHolder
   class VariablesBuilder < ::ConcernBuilder
     attr_reader :instance
 

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

data/spec/integration/power_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe 'integration of power' do
+  describe 'of sums' do
+    subject do
+      Danica::Power.new(
+        Danica::Sum.new(3, 4),
+        Danica::Sum.new(5, 6)
+      )
+    end
+
+    describe '#to_gnu' do
+      it 'returns the correct string' do
+        expect(subject.to_gnu).to eq('(3 + 4)**(5 + 6)')
+      end
+    end
+
+    describe '#to_tex' do
+      it 'returns the correct string' do
+        expect(subject.to_tex).to eq('\left(3 + 4\right)^{5 + 6}')
+      end
+    end
+  end
+end

data/spec/integration/product_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'integration of product' do
+  describe 'of number and sum' do
+    subject do
+      Danica::Product.new(
+        3, Danica::Sum.new(2, 4)
+      )
+    end
+
+    describe '#to_gnu' do
+      it 'returns the correct string' do
+        expect(subject.to_gnu).to eq('3 * (2 + 4)')
+      end
+    end
+
+    describe '#to_gnu' do
+      it 'returns the correct string' do
+        expect(subject.to_tex).to eq('3 \cdot \left(2 + 4\right)')
+      end
+    end
+  end
+
+  describe 'of sums' do
+    subject do
+      Danica::Product.new(
+        Danica::Sum.new(1,2),
+        Danica::Sum.new(3,4)
+      )
+    end
+
+    describe '#to_gnu' do
+      it 'returns the correct string' do
+        expect(subject.to_gnu).to eq('(1 + 2) * (3 + 4)')
+      end
+    end
+
+    describe '#to_tex' do
+      it 'returns the correct string' do
+        expect(subject.to_tex).to eq('\left(1 + 2\right) \cdot \left(3 + 4\right)')
+      end
+    end
+  end
+end

data/spec/integration/sum_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'integration of sum' do
+  describe 'with negative numbers' do
+    subject do
+      Danica::Sum.new(Danica::Negative.new(1), 2, Danica::Negative.new(3), 4)
+    end
+
+    describe '#to_gnu' do
+      it 'returns the correct string' do
+        expect(subject.to_gnu).to eq('-1 + 2 -3 + 4')
+      end
+    end
+
+    describe '#to_tex' do
+      it 'returns the correct string' do
+        expect(subject.to_tex).to eq('-1 + 2 -3 + 4')
+      end
+    end
+  end
+end

data/spec/lib/danica/function_spec.rb

@@ -26,7 +26,7 @@ describe Danica::Function do
 
     describe '#to_gnu' do
       context 'when creating the spatial operator for constantly accelerated movement' do
-        let(:expected) { 'S0 + V0 * t + a * t**2/2'  }
+        let(:expected) { 'S0 + V0 * t + a * t**(2)/2'  }
 
         it 'return the latex format CAM' do
           expect(subject.to_gnu).to eq(expected)
@@ -231,7 +231,7 @@ describe Danica::Function do
 
     describe '#to_tex' do
       context 'when creating the spatial operator for constantly accelerated movement' do
-        let(:expected) { '\frac{1}{\sqrt{2 \cdot \pi \cdot v^{2}}} \cdot e^{-\frac{\left(x + -u\right)^{2}}{2 \cdot v^{2}}}'  }
+        let(:expected) { '\frac{1}{\sqrt{2 \cdot \pi \cdot v^{2}}} \cdot e^{-\frac{\left(x -u\right)^{2}}{2 \cdot v^{2}}}'  }
 
         it 'return the latex format CAM' do
           expect(subject.to_tex).to eq(expected)
@@ -241,7 +241,7 @@ describe Danica::Function do
 
     describe '#to_gnu' do
       context 'when creating the spatial operator for constantly accelerated movement' do
-        let(:expected) { '1/sqrt(2 * pi * v**2) * exp(-(x + -u)**2/2 * v**2)' }
+        let(:expected) { '1/sqrt(2 * pi * v**(2)) * exp(-(x -u)**(2)/2 * v**(2))' }
 
         it 'return the latex format CAM' do
           expect(subject.to_gnu).to eq(expected)

data/spec/lib/danica/power_spec.rb

@@ -16,9 +16,9 @@ describe Danica::Power do
       partial_string_expected: '3^{X2}'
     },
     to_gnu: {
-      string_expected: 'X1**X2',
-      numeric_string_expected: '3**2',
-      partial_string_expected: '3**X2'
+      string_expected: 'X1**(X2)',
+      numeric_string_expected: '3**(2)',
+      partial_string_expected: '3**(X2)'
     }
   }
 end

data/spec/support/shared_examples/base_operations.rb

@@ -8,11 +8,11 @@ shared_examples 'an object with an operation' do |clazz|
   it { expect(result).to be_a(clazz) }
 
   it 'includes other as parcel' do
-    expect(result).to be_include(other)
+    expect(result).to include(other)
   end
 
   it 'includes the subject as parcel' do
-    expect(result).to be_include(subject_included)
+    expect(result).to include(subject_included)
   end
 end
 
@@ -67,11 +67,11 @@ shared_examples 'an object with - operation' do
   it { expect(result).to be_a(Danica::Sum) }
 
   it 'includes other as negative parcel' do
-    expect(result).to be_include(negative_other)
+    expect(result).to include(negative_other)
   end
 
   it 'includes the subject as parcel' do
-    expect(result).to be_include(subject_included)
+    expect(result).to include(subject_included)
   end
 end
 

data/spec/support/shared_examples/common.rb

@@ -1,6 +1,6 @@
-shared_examples 'an object that respond to basic_methods' do |ignore: [], methods: %i(to_f to_tex to_gnu valued?)|
+shared_examples 'an object that respond to basic_methods' do |ignore: [], methods: %i(to_f to_tex to_gnu priority valued?)|
   (methods - ignore).each do |method|
-    it {expect(subject).to respond_to(method) }
+    it { expect(subject).to respond_to(method) }
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,8 +168,6 @@ files:
 - lib/danica.rb
 - lib/danica/base_operations.rb
 - lib/danica/common.rb
-- lib/danica/common/class_methods.rb
-- lib/danica/common/variables_builder.rb
 - lib/danica/constant.rb
 - lib/danica/cos.rb
 - lib/danica/division.rb
@@ -188,7 +186,12 @@ files:
 - lib/danica/squared_root.rb
 - lib/danica/sum.rb
 - lib/danica/variable.rb
+- lib/danica/variables_holder.rb
+- lib/danica/variables_holder/variables_builder.rb
 - lib/danica/version.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
@@ -231,11 +234,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Danica
 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

data/lib/danica/common/class_methods.rb

@@ -1,11 +0,0 @@
-class Danica::Common
-  class << self
-    def variables(*names)
-      VariablesBuilder.new(names, self).build
-    end
-
-    def variables_names
-      @variables_names ||= []
-    end
-  end
-end