danica 2.7.2 → 2.7.7

data/lib/danica.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'darthjee/core_ext'
 
 module Danica
@@ -27,4 +29,3 @@ module Danica
     end
   end
 end
-

data/lib/danica/base_operations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   module BaseOperations
     def +(other)
@@ -28,6 +30,7 @@ module Danica
 
     def formatted_operation(other, value)
       return other.repack(value) if other.is_a?(Danica::Formatted)
+
       value
     end
   end

data/lib/danica/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Builder
     include DSL

data/lib/danica/common.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 module Danica
-  module Common extend ::ActiveSupport::Concern
+  module Common
+    extend ::ActiveSupport::Concern
     included do
       include Wrapper
       include DSL
@@ -42,16 +45,16 @@ module Danica
       when :f
         to_f
       else
-        raise Exception::FormattedNotFound.new
+        raise Exception::FormattedNotFound
       end
     end
 
     def tex(**options)
-      formatted(:tex, options)
+      formatted(format: :tex, **options)
     end
 
     def gnu(**options)
-      formatted(:gnu, options)
+      formatted(format: :gnu, **options)
     end
 
     def formatted(*args)
@@ -72,6 +75,7 @@ module Danica
 
     def wrap_as_group(value)
       return value if is_grouped? || value.priority >= priority
+
       group(value)
     end
   end

data/lib/danica/dsl.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 module Danica
   module DSL
     autoload :Builder, 'danica/dsl/builder'
 
     class << self
-      def register_operator(method, clazz=nil)
+      def register_operator(method, clazz = nil)
         register(method, clazz, 'Danica::Operator')
       end
 
-      def register_wrapper(method, clazz=nil)
+      def register_wrapper(method, clazz = nil)
         register(method, clazz, 'Danica::Wrapper')
       end
 
-      def register(method, clazz=nil, base=nil)
+      def register(method, clazz = nil, base = nil)
         Builder.new(method, clazz, base).build
       end
 
@@ -39,14 +41,14 @@ module Danica
     end
   end
 
-  %i(
+  %i[
     addition multiplication division sin cos power
     squared_root exponential
-  ).each do |method|
+  ].each do |method|
     DSL.register_operator(method)
   end
 
-  %i(number group negative plus_minus variable constant).each do |method|
+  %i[number group negative plus_minus variable constant].each do |method|
     DSL.register_wrapper(method)
   end
 

data/lib/danica/dsl/builder.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Danica
   module DSL
     class Builder
       attr_reader :method, :claz, :base
 
-      def initialize(method, claz=nil, base=nil)
+      def initialize(method, claz = nil, base = nil)
         @method = method
         @claz = claz
         @base = base
@@ -22,6 +24,7 @@ module Danica
       def build_clazz
         return clazz_from_method unless claz
         return claz if claz.is_a? Class
+
         clazz_from_string
       end
 

data/lib/danica/equation.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Danica
   class Equation
     include VariablesHolder
-  
+
     autoload :Builder, 'danica/equation/builder'
 
     class << self
@@ -19,5 +21,3 @@ module Danica
     end
   end
 end
-
-

data/lib/danica/equation/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Equation::Builder
     attr_reader :variables

data/lib/danica/exception.rb

@@ -1,4 +1,6 @@
-class Danica::Exception < ::Exception
+# frozen_string_literal: true
+
+class Danica::Exception < RuntimeError
   class NotDefined < self; end
   class FormattedNotFound < self; end
   class NotImplemented < self; end
@@ -14,4 +16,3 @@ class Danica::Exception < ::Exception
     end
   end
 end
-

data/lib/danica/expressable.rb

@@ -1,24 +1,30 @@
+# frozen_string_literal: true
+
 module Danica
-  module Expressable extend ::ActiveSupport::Concern
+  module Expressable
+    extend ::ActiveSupport::Concern
     include VariablesHolder
 
     class_methods do
       def built_with(block_name)
-        self.delegate :to, :to_f, to: block_name
+        delegate :to, :to_f, to: block_name
 
-        self.define_singleton_method(:build) do |*vars, &block|
+        define_singleton_method(:build) do |*vars, &block|
           Class.new(self) do
             variables(*vars)
 
             private
 
-            module_eval("define_method :#{block_name} do
-                @#{block_name} ||= instance_eval(&block) if block
-              end")
+            module_eval do
+              define_method block_name do
+                instance_variable_get("@#{block_name}") ||
+                  block && instance_variable_set("@#{block_name}", instance_eval(&block))
+              end
+            end
           end
         end
 
-        self.define_singleton_method(:create) do |*vars, &block|
+        define_singleton_method(:create) do |*vars, &block|
           build(*vars, &block).new
         end
       end
@@ -30,7 +36,7 @@ module Danica
       attributes = { variables: args.flatten }.merge(options)
 
       attributes.each do |key, value|
-        self.public_send("#{key}=", value)
+        public_send("#{key}=", value)
       end
     end
   end

data/lib/danica/expression.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Danica
   class Expression
+    autoload :Gauss, 'danica/expression/gauss'
+
     include Common
     include DSL
     include BaseOperations
     include Expressable
 
-    autoload :Gauss,    'danica/expression/gauss'
-
     delegate :is_grouped?, :priority, to: :expression_block
 
     built_with(:expression_block)

data/lib/danica/expression/gauss.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Danica
   class Expression::Gauss < Expression.build(:x, average: { latex: '\mu', gnuplot: :u }, variance_root: { latex: '\sigma', gnuplot: :v }) { num(1) / denominator * exponential(exp) }
-
     private
 
     def denominator
@@ -9,14 +10,13 @@ module Danica
 
     def exp
       - (
-          ((x - average) ** 2) /
+          ((x - average)**2) /
           (num(2) * variance)
-      )
+        )
     end
 
     def variance
-      @variance ||= variance_root ** 2
+      @variance ||= variance_root**2
     end
   end
 end
-

data/lib/danica/formatted.rb

@@ -1,34 +1,53 @@
+# frozen_string_literal: true
+
 class Danica::Formatted
-  attr_reader :content, :format, :decimals
+  attr_reader :content, :options
 
-  def initialize(content, format, decimals: nil)
+  def initialize(content, **options)
     @content = content
-    @format = format
-    @decimals = decimals
+    @options = options
   end
 
   def to_s
-    content.to(format, decimals: decimals)
+    content.to(format, options)
   end
 
   def ==(other)
     return false unless other.class == self.class
-    return other.content == content &&
-           other.format == format
+
+    other.content == content &&
+      other.format == format
+  end
+
+  def format
+    options[:format]
   end
 
   def repack(object)
     self.class.new(
       object,
-      format
+      options
     )
   end
 
+  def to_tex(**opts)
+    to(:tex, **opts)
+  end
+
+  def to_gnu(**opts)
+    to(:gnu, **opts)
+  end
+
+  def to(format, **opts)
+    content.to(format, options.merge(opts))
+  end
+
   private
 
   def method_missing(method, *args)
     value = content.public_send(method, *args)
     return value unless value.is_a?(Danica::Common)
+
     repack(value)
   end
 end

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, 4
-    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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Addition < Operator::Chained
     default_value :priority, 1
@@ -6,8 +8,8 @@ module Danica
 
     default_value :symbol, :+
 
-    def chain_operation(a, b)
-      a + b
+    def chain_operation(first, second)
+      first + second
     end
 
     def join_proc(symbol)
@@ -17,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
@@ -46,11 +48,10 @@ module Danica
       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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danica
   class Operator::Division < Operator
     variables :numerator, :denominator
@@ -17,4 +19,3 @@ module Danica
     end
   end
 end
-