danica 2.7.1 → 2.7.6

data/lib/danica/function.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 module Danica
   class Function
+    autoload :Name, 'danica/function/name'
+
     include VariablesHolder
     include DSL
     include Expressable
 
-    autoload :Name,    'danica/function/name'
-    attr_accessor :name
+    attr_writer :name
 
     built_with(:function_block)
 
@@ -24,4 +27,3 @@ module Danica
     end
   end
 end
-

data/lib/danica/function/name.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Function::Name
     include Common

data/lib/danica/operator.rb

@@ -1,15 +1,8 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator
     include VariablesHolder
-    include BaseOperations
-
-    default_value :priority, 3
-    default_value :is_grouped?, false
-
-    def ==(other)
-      return false unless other.class == self.class
-      variables == other.variables
-    end
 
     autoload :Functional,     'danica/operator/functional'
     autoload :Chained,        'danica/operator/chained'
@@ -21,5 +14,16 @@ module Danica
     autoload :Sin,            'danica/operator/sin'
     autoload :SquaredRoot,    'danica/operator/squared_root'
     autoload :Exponential,    'danica/operator/exponential'
+
+    include BaseOperations
+
+    default_value :priority, 4
+    default_value :is_grouped?, false
+
+    def ==(other)
+      return false unless other.class == self.class
+
+      variables == other.variables
+    end
   end
 end

data/lib/danica/operator/addition.rb

@@ -1,17 +1,15 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Addition < Operator::Chained
     default_value :priority, 1
 
-    def +(other)
-      repack(other)
-    end
-
     private
 
     default_value :symbol, :+
 
-    def chain_operation(a, b)
-      a + b
+    def chain_operation(first, second)
+      first + second
     end
 
     def join_proc(symbol)
@@ -21,4 +19,3 @@ module Danica
     end
   end
 end
-

data/lib/danica/operator/chained.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator
     class Chained < Operator
@@ -45,17 +47,11 @@ module Danica
         end
       end
 
-      def repack(other)
-        other_variables = other.is_a?(self.class) ? other.variables : [ other ]
-        self.class.new(variables + other_variables)
-      end
-
       def chain(numbers)
-        numbers.inject do |a,b|
-          chain_operation(a,b)
+        numbers.inject do |a, b|
+          chain_operation(a, b)
         end.to_f
       end
     end
   end
 end
-

data/lib/danica/operator/cos.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Cos < Operator::Functional.build(operator: :cos)
   end
 end
-

data/lib/danica/operator/division.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Division < Operator
     variables :numerator, :denominator
-    default_value :priority, 2
+    default_value :priority, 3
     default_value :is_grouped?, true
 
     def to_f
@@ -17,4 +19,3 @@ module Danica
     end
   end
 end
-

data/lib/danica/operator/exponential.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Exponential < Operator::Functional.build(operator: :exp, tex: 'e^{:value:}')
   end
 end
-

data/lib/danica/operator/functional.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Functional < Operator
     variables :value
@@ -9,7 +11,7 @@ module Danica
       gnu = text if gnu.nil?
 
       Class.new(self) do
-        module_eval(%Q(
+        module_eval(%(
           def to_f
             Math.#{operator}(value.to_f)
           end
@@ -26,4 +28,3 @@ module Danica
     end
   end
 end
-

data/lib/danica/operator/multiplication.rb

@@ -1,18 +1,16 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Multiplication < Operator::Chained
-    default_value :priority, 2
-
-    def *(other)
-      repack(other)
-    end
+    default_value :priority, 3
 
     private
 
     default_value :tex_symbol, '\cdot'
     default_value :gnu_symbol, :*
 
-    def chain_operation(a, b)
-      a * b
+    def chain_operation(first, second)
+      first * second
     end
   end
 end

data/lib/danica/operator/power.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Power < Operator
     variables :base, :exponent
     default_value :is_grouped?, false
 
     def to_f
-      base.to_f ** exponent.to_f
+      base.to_f**exponent.to_f
     end
 
     def to_tex(**options)
@@ -12,8 +14,7 @@ module Danica
     end
 
     def to_gnu(**options)
-      "#{ wrap_as_group(base).to_gnu(options)}**(#{exponent.to_gnu(options)})"
+      "#{wrap_as_group(base).to_gnu(options)}**(#{exponent.to_gnu(options)})"
     end
   end
 end
-

data/lib/danica/operator/sin.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Sin < Operator::Functional.build(operator: :sin)
   end
 end
-

data/lib/danica/operator/squared_root.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::SquaredRoot < Operator::Functional.build(operator: :sqrt, tex: '\sqrt{:value:}')
   end
 end
-

data/lib/danica/variables_holder.rb

@@ -1,44 +1,47 @@
-module Danica
-  module VariablesHolder extend ::ActiveSupport::Concern
-    include Common
+# frozen_string_literal: true
 
+module Danica
+  module VariablesHolder
     autoload :VariablesBuilder, 'danica/variables_holder/variables_builder'
     autoload :AliasBuilder,     'danica/variables_holder/alias_builder'
     autoload :Calculator,       'danica/variables_holder/calculator'
     autoload :Store,            'danica/variables_holder/store'
 
+    extend ::ActiveSupport::Concern
+    include Common
+
     delegate :containers_hash, :containers, :variables,
              :variables_hash, :variables_value_hash,
              :extract_variables, to: :store
 
     included do
-      default_value :variable_holder?,  true
+      default_value :variable_holder?, true
+    end
 
-      class << self
-        def variables(*names)
-          VariablesBuilder.new(names, self).build
-        end
+    class_methods do
+      def variables(*names)
+        VariablesBuilder.new(names, self).build
+      end
 
-        def variable_alias(origin, destiny)
-          AliasBuilder.new(origin, destiny, self).build
-        end
+      def variable_alias(origin, destiny)
+        AliasBuilder.new(origin, destiny, self).build
+      end
 
-        def variables_names
-          variables_hash.keys
-        end
+      def variables_names
+        variables_hash.keys
+      end
 
-        def variables_hash
-          @variables_hash ||= superclass_variables_hash.dup
-        end
+      def variables_hash
+        @variables_hash ||= superclass_variables_hash.dup
+      end
 
-        def reset_variables
-          @superclass_variables_hash = {}
-          @variables_hash = nil
-        end
+      def reset_variables
+        @superclass_variables_hash = {}
+        @variables_hash = nil
+      end
 
-        def superclass_variables_hash
-          @superclass_variables_hash ||= (superclass.try(:variables_hash) || {})
-        end
+      def superclass_variables_hash
+        @superclass_variables_hash ||= (superclass.try(:variables_hash) || {})
       end
     end
 

data/lib/danica/variables_holder/alias_builder.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Danica::VariablesHolder
   class AliasBuilder
-
     attr_reader :clazz, :origin, :destiny
 
     def initialize(origin, destiny, clazz)
@@ -11,10 +12,9 @@ module Danica::VariablesHolder
 
     def build
       clazz.variables_hash.change_keys! { |k| k == origin ? destiny : k }
-      VariablesBuilder.new([ destiny ], clazz).build
+      VariablesBuilder.new([destiny], clazz).build
       clazz.send(:alias_method, "#{origin}=", "#{destiny}=")
       clazz.send(:alias_method, origin, destiny)
-    end  
+    end
   end
 end
-

data/lib/danica/variables_holder/calculator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   module VariablesHolder
     class Calculator

data/lib/danica/variables_holder/store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class VariablesHolder::Store
     attr_reader :default_variables_hash, :variables_names
@@ -37,7 +39,7 @@ module Danica
 
     def named_variables_hash
       variable_variables.inject({}) do |hash, (key, container)|
-        hash.merge( (container.content.name || key).to_sym => container )
+        hash.merge((container.content.name || key).to_sym => container)
       end
     end
 
@@ -64,4 +66,3 @@ module Danica
     end
   end
 end
-

data/lib/danica/variables_holder/variables_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica::VariablesHolder
   class VariablesBuilder
     include Danica::DSL
@@ -41,4 +43,3 @@ module Danica::VariablesHolder
     end
   end
 end
-

data/lib/danica/version.rb

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

data/lib/danica/wrapper.rb

@@ -1,11 +1,23 @@
+# frozen_string_literal: true
+
 module Danica
   module Wrapper
+    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'
+
     def wrap_value(value)
       Wrapper.wrap_value(value)
     end
 
     def self.wrap_value(value)
       case value
+      when Formatted
+        value.content
       when Numeric
         wrap_numeric(value)
       when Hash
@@ -13,26 +25,22 @@ module Danica
       when String, Symbol, NilClass
         Variable.new(name: value)
       else
+        raise Exception::InvalidInput, value unless value.is_a?(Danica::Common)
+
         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(gnuplot latex value)
+      return Constant.new(hash) if hash.keys.map(&:to_sym).sort == %i[gnuplot 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/constant.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Wrapper::Constant
     include BaseOperations
@@ -12,10 +14,10 @@ module Danica
 
     def initialize(*args)
       attrs = args.extract_options!
-      attrs = args.as_hash(%i(value latex gnuplot)).merge(attrs)
+      attrs = args.as_hash(%i[value latex gnuplot]).merge(attrs)
 
       attrs.each do |key, value|
-        self.send("#{key}=", value)
+        send("#{key}=", value)
       end
     end
 
@@ -25,33 +27,27 @@ module Danica
 
     def ==(other)
       return false unless other.class == self.class
+
       gnuplot == other.gnuplot && latex == other.latex && value == other.value
     end
 
-    def to_tex(**_)
+    def to_tex(**_options)
       latex.to_s
     end
 
-    def to_gnu(**_)
+    def to_gnu(**_options)
       gnuplot.to_s
     end
 
     private
 
-    def value=(value)
-      @value = value
-    end
+    attr_writer :value
 
-    def latex=(latex)
-      @latex = latex
-    end
+    attr_writer :latex
 
-    def gnuplot=(gnuplot)
-      @gnuplot = gnuplot
-    end
+    attr_writer :gnuplot
   end
 
   E = Wrapper::Constant.new(Math::E, :e, 'exp(1)')
   PI = Wrapper::Constant.new(Math::PI, '\pi', :pi)
 end
-