danica 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97379e35fd308207eb9c9fce91da8235e36ac3ea
-  data.tar.gz: a254b8b7911c64d5a6a6d99cb86279098f864012
+  metadata.gz: 16850a566b9ec30cc48ed15fbe2db94136cb3365
+  data.tar.gz: 7735a1b8ebb9d70684565bc0f6e3ffbcf6e57ce1
 SHA512:
-  metadata.gz: f4e74d4eb9dcee0763c72342cdf6b2ae08c892284ca7c4d4fc9bea5898f18481a343c0407bc2ccd1b96de8a238ed6d327e5fbd70bf1421b7e296b7238d84c18d
-  data.tar.gz: 3dbfa63432ff97ea589d12f5331abf83e051aea1bdef257bb9caf8a17fbec8f982551f8ec519d0805652adb40f698b21becf69cbc1cdef5496369d360a0aef62
+  metadata.gz: 9de604b1d39697a6f239d2d623b0f028d40a335584beb2df8df8c9cce80c81ec04775c00f300659bc2d8e5a803d3fb44a00b1a4ad1ddc72cf736456839a8b39e
+  data.tar.gz: 97701eaafa8489ee781e5209482b8784d7443b05a14512dc14e1c239757d9f3521317f8dacb5242bdc808cd1331059629d743ffb3580a6d5ed2449be6ff95f60

data/README.md

@@ -42,7 +42,7 @@ create gnu or tex output strings to be used on your template
 ### Operators
 Operators represent a matematical operation such as sum, product, sin, etc..
 
-Operators are to be composed to create an [expression](#expressions), [equation](#expressions) or [function](#functions) (see below)
+Operators are to be composed to create an [expression](#expressions), [equation](#equations) or [function](#functions) (see below)
 
 ```ruby
 class MyOperator < Danica::Operator
@@ -176,13 +176,16 @@ clazz.new.to_tex
 Equations are formed by two expressions with their own variables
 
 ```ruby
-Danica::Equation.new.tap do |equation|
-  equation.left = Danica.build(:x, :y) do
-    x ** 2 + y ** 2
-  end
-  equation.right = Danica.build(:x, :z) do
-    number(1) - z ** 2
-  end
+Danica::Equation.build(:x, :y, :z) do
+  left { x ** 2 + y ** 2 }
+  right { number(1) - z ** 2 }
+end.new.to_tex
+```
+
+```ruby
+Danica::Equation.create(:x, :y, :z) do
+  left { x ** 2 + y ** 2 }
+  right { number(1) - z ** 2 }
 end.to_tex
 ```
 

data/lib/danica/equation.rb

@@ -2,16 +2,27 @@ module Danica
   class Equation
     include Common
     include VariablesHolder
-
-    variables :left, :right
+  
+    autoload :Builder, 'danica/equation/builder'
 
     def initialize(*args)
       self.variables = args.flatten
     end
 
+    class << self
+      def build(*variables, &block)
+        Builder.new(*variables, &block).build
+      end
+
+      def create(*variables, &block)
+        build(*variables, &block).new
+      end
+    end
+
     def to(format)
       "#{left.to(format)} = #{right.to(format)}"
     end
   end
 end
 
+

data/lib/danica/equation/builder.rb

@@ -0,0 +1,33 @@
+module Danica
+  class Equation::Builder
+    attr_reader :variables
+
+    def initialize(*variables, &block)
+      @variables = variables
+      instance_eval(&block)
+    end
+
+    def build
+      vars = variables
+      l = left
+      r = right
+
+      Class.new(Equation) do
+        variables(*vars)
+
+        define_method :left, l
+        define_method :right, r
+      end
+    end
+
+    def left(&block)
+      @left = block if block_given?
+      @left
+    end
+
+    def right(&block)
+      @right = block if block_given?
+      @right
+    end
+  end
+end

data/lib/danica/function.rb

@@ -1,32 +1,22 @@
 module Danica
-  class Function < Equation
+  class Function
     include Common
+    include VariablesHolder
     include DSL
     include Expressable
 
     autoload :Name,    'danica/function/name'
     attr_accessor :name
 
-    reset_variables
-
     built_with(:function_block)
 
     def name
-      containers_hash[:left] ||= Danica::Wrapper::Container.new Name.new(name: @name, variables: containers)
-    end
-
-    def expression
-      @expression ||= Expression.build(:x) do
-        x
-      end.new(function_block)
+      Name.new(name: @name, variables: containers)
     end
 
-    def left
-      name
-    end
-
-    def right
-      expression
+    def to(*args)
+      "#{name.to(*args)} = #{function_block.to(*args)}"
     end
   end
 end
+

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '2.5.1'
+  VERSION = '2.6.0'
 end

data/spec/integration/readme/equation_spec.rb

@@ -2,14 +2,10 @@ require 'spec_helper'
 
 describe Danica::Equation do
   subject do
-    described_class.new.tap do |equation|
-      equation.left = Danica.build(:x, :y) do
-        x ** 2 + y ** 2
-      end
-      equation.right = Danica.build(:x, :z) do
-        number(1) - z ** 2
-      end
-    end
+    described_class.build(:x, :y, :z) do
+      left { x ** 2 + y ** 2 }
+      right { number(1) - z ** 2 }
+    end.new
   end
 
   describe '#to_gnu' do

data/spec/lib/danica/equation_spec.rb

@@ -1,14 +1,35 @@
 require 'spec_helper'
 
 describe Danica::Equation do
-  let(:left) do
-    Danica::Expression.create(:y) { y }
+  let(:clazz) do
+    described_class.build(:x, :y) do
+      left { y }
+      right { x ** 2 }
+    end
+  end
+
+  subject do
+    clazz.new
   end
-  let(:right) do
-    Danica::Expression.create(:x) { x ** 2 }
+
+  describe '.build' do
+    it 'returns a class that is also an equation' do
+      expect(subject).to be_a(Danica::Equation)
+    end
   end
 
-  subject { described_class.new(left, right) }
+  describe '.create' do
+    subject do
+      described_class.create(:x, :y) do
+        left { y }
+        right { x ** 2 }
+      end
+    end
+
+    it 'returns a class that is also an equation' do
+      expect(subject).to be_a(Danica::Equation)
+    end
+  end
 
   describe '#to_f' do
     it do

data/spec/lib/danica/function_spec.rb

@@ -242,25 +242,5 @@ describe Danica::Function do
         expect(function.to_gnu).to eq('f(2, y) = 2**(y)')
       end
     end
-
-    describe '#left' do
-      it 'is an alias for name' do
-        expect(subject.left).to eq(subject.name)
-      end
-    end
-
-    describe '#left=' do
-      it 'is an alias for the expression' do
-        expect do
-          subject.left = Danica::Operator::Power.new(:x, 2)
-        end.to change { subject.left.content }
-      end
-    end
-
-    describe '#right' do
-      it 'is an alias for the expression' do
-        expect(subject.right).to eq(subject.right)
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -144,6 +144,7 @@ files:
 - lib/danica/common.rb
 - lib/danica/dsl.rb
 - lib/danica/equation.rb
+- lib/danica/equation/builder.rb
 - lib/danica/exception.rb
 - lib/danica/expressable.rb
 - lib/danica/expression.rb