danica 2.7.2 → 2.7.7

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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Multiplication < Operator::Chained
     default_value :priority, 3
@@ -7,8 +9,8 @@ module Danica
     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,18 +1,21 @@
-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_methods do

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.2'
+  VERSION = '2.7.7'
 end

data/lib/danica/wrapper.rb

@@ -1,5 +1,15 @@
+# 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
@@ -16,26 +26,21 @@ module Danica
         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
-

data/lib/danica/wrapper/container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Wrapper::Container
     include Common
@@ -15,10 +17,8 @@ module Danica
 
     def ==(other)
       return content == other unless other.is_a?(self.class)
+
       content == other.content
     end
   end
 end
-
-
-

data/lib/danica/wrapper/group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Wrapper::Group
     include Common
@@ -24,9 +26,8 @@ module Danica
 
     def ==(other)
       return value == other unless other.is_a?(self.class)
+
       value == other.value
     end
   end
 end
-
-

data/lib/danica/wrapper/negative.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Wrapper::Negative
     include BaseOperations
@@ -25,8 +27,8 @@ module Danica
 
     def ==(other)
       return false unless other.class == self.class
+
       value == other.value
     end
   end
 end
-

data/lib/danica/wrapper/number.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Wrapper::Number
     include BaseOperations
@@ -13,9 +15,10 @@ module Danica
       @value = value
     end
 
-    def to(_, decimals: nil, **__)
+    def to(_format, decimals: nil, **_options)
       return value.to_i.to_s if value.to_i == value
-      return ("%.#{decimals}f" % value).to_f.to_s if decimals
+      return format("%.#{decimals}f", value).to_f.to_s if decimals
+
       value.to_s
     end
 
@@ -29,8 +32,8 @@ module Danica
 
     def ==(other)
       return false unless other.class == self.class
+
       value == other.value
     end
   end
 end
-

data/lib/danica/wrapper/plus_minus.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Wrapper::PlusMinus
     include BaseOperations
@@ -29,8 +31,8 @@ module Danica
 
     def ==(other)
       return false unless other.class == self.class
+
       value == other.value
     end
   end
 end
-

data/lib/danica/wrapper/variable.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module Danica
   class Wrapper::Variable
     include BaseOperations
     include Common
 
-    attr_accessor :value, :name, :latex, :gnuplot
+    attr_accessor :name, :latex, :gnuplot
+    attr_reader :value
 
     default_value :priority,    10
     default_value :is_grouped?, false
@@ -11,10 +14,10 @@ module Danica
 
     def initialize(*args)
       attrs = args.extract_options!
-      attrs = args.as_hash(%i(name value latex gnuplot)).merge(attrs)
+      attrs = args.as_hash(%i[name value latex gnuplot]).merge(attrs)
 
       attrs.each do |key, value|
-        self.public_send("#{key}=", value)
+        public_send("#{key}=", value)
       end
     end
 
@@ -24,19 +27,22 @@ module Danica
 
     def ==(other)
       return false unless other.class == self.class
-      return other.value == value &&
-             other.name == name &&
-             other.latex == latex &&
-             other.gnuplot == gnuplot
+
+      other.value == value &&
+        other.name == name &&
+        other.latex == latex &&
+        other.gnuplot == gnuplot
     end
 
     def to_tex(**options)
       return value.to_tex(options) if value
+
       (latex || name).to_s
     end
 
     def to_gnu(**options)
       return value.to_gnu(options) if value
+
       (gnuplot || name).to_s
     end
 
@@ -45,4 +51,3 @@ module Danica
     end
   end
 end
-