danica 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16850a566b9ec30cc48ed15fbe2db94136cb3365
-  data.tar.gz: 7735a1b8ebb9d70684565bc0f6e3ffbcf6e57ce1
+  metadata.gz: a6ab0d9ea017c75592538650e87321f8223d1ae8
+  data.tar.gz: 5ad1639d117735e732418131973c42a18f0c90fd
 SHA512:
-  metadata.gz: 9de604b1d39697a6f239d2d623b0f028d40a335584beb2df8df8c9cce80c81ec04775c00f300659bc2d8e5a803d3fb44a00b1a4ad1ddc72cf736456839a8b39e
-  data.tar.gz: 97701eaafa8489ee781e5209482b8784d7443b05a14512dc14e1c239757d9f3521317f8dacb5242bdc808cd1331059629d743ffb3580a6d5ed2449be6ff95f60
+  metadata.gz: 252bf663163b2229951c1d1dcc5c261b48f7a6bd737d484036b08a052f0c9b68fb9efd973fa3e11acc07ba78e83e6b1a3a5e699197a6c0359f90a180f7b6daad
+  data.tar.gz: cb75b81a3d39061fe4eaaaceafbcd8d9ba103ff746f98022d80c7fc8434276a94f347d031d49048d4df75ff39218f0916f3626c27c1c9984d9aee28a9fc20280

data/lib/danica/common.rb

@@ -8,11 +8,16 @@ module Danica
         def default_value(name, value)
           define_method(name) { |*_| value }
         end
+
+        def default_values(*names, value)
+          names.each do |name|
+            default_value(name, value)
+          end
+        end
       end
 
-      default_value :constant?, false
-      default_value :signaled?, false
-      default_value :container?, false
+      default_values :constant?, :signaled?, :container?, :variable?,
+                     :variable_holder?, false
     end
 
     def to_f

data/lib/danica/equation.rb

@@ -1,14 +1,9 @@
 module Danica
   class Equation
-    include Common
     include VariablesHolder
   
     autoload :Builder, 'danica/equation/builder'
 
-    def initialize(*args)
-      self.variables = args.flatten
-    end
-
     class << self
       def build(*variables, &block)
         Builder.new(*variables, &block).build

data/lib/danica/expressable.rb

@@ -1,8 +1,8 @@
 module Danica
   module Expressable extend ::ActiveSupport::Concern
-    included do
-      include VariablesHolder
+    include VariablesHolder
 
+    included do
       class << self
         def built_with(block_name)
           self.send(:delegate, :to_f, to: block_name)

data/lib/danica/function.rb

@@ -1,6 +1,5 @@
 module Danica
   class Function
-    include Common
     include VariablesHolder
     include DSL
     include Expressable

data/lib/danica/function/name.rb

@@ -5,11 +5,7 @@ module Danica
 
     def initialize(name:, variables:)
       @name = name || :f
-      @containers = variables.map do |v|
-        v = wrap_value(v)
-        v = Wrapper::Container.new(v) unless v.container?
-        v
-      end
+      @containers = variables.map { |v| wrap_value(v) }
     end
 
     def to(format)

data/lib/danica/operator.rb

@@ -1,18 +1,11 @@
 module Danica
   class Operator
-    include Common
     include VariablesHolder
     include BaseOperations
 
     default_value :priority, 3
     default_value :is_grouped?, false
 
-    def initialize(*args)
-      args = args.flatten
-      args = args.first if (args.length == 1) && args.first.is_a?(Hash) && args.first.keys == self.class.variables_names
-      self.variables = args
-    end
-
     def ==(other)
       return false unless other.class == self.class
       variables == other.variables

data/lib/danica/variables_holder.rb

@@ -1,10 +1,19 @@
 module Danica
   module VariablesHolder extend ::ActiveSupport::Concern
+    include Common
+
     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'
+
+    delegate :containers_hash, :containers, :variables,
+             :variables_hash, :variables_value_hash,
+             :extract_variables, to: :store
 
     included do
+      default_value :variable_holder?,  true
+
       class << self
         def variables(*names)
           VariablesBuilder.new(names, self).build
@@ -33,6 +42,14 @@ module Danica
       end
     end
 
+    def initialize(*args)
+      args = args.flatten
+      args = args.first if (args.length == 1) && args.first.try(:keys).try(:all?) do |k|
+        self.class.variables_names.include?(k)
+      end
+      self.variables = args
+    end
+
     def variables=(vars)
       vars = vars.as_hash(self.class.variables_names).compact unless vars.is_a? Hash
       vars = vars.dup.change_values!(skip_inner: false) { |v| wrap_value(v) }
@@ -41,46 +58,14 @@ module Danica
       end
     end
 
-    def extract_variables
-      variables.select do |var|
-        var.is_a?(VariablesHolder)
-      end.inject({}) do |hash, container|
-        hash.merge!(container.content.extract_variables)
-      end.tap do |hash|
-        containers_hash.select do |_, container|
-          container.content.is_a?(Wrapper::Variable)
-        end.each do |key, container|
-          hash[(container.content.name || key).to_sym] = container
-        end
-      end
-    end
-
-    def variables
-      containers.map(&:content)
-    end
-
-    def containers
-      containers_hash.values
-    end
-
-    def containers_hash
-      @containers_hash ||= {}.merge(self.class.variables_hash.change_values do |value|
-        Wrapper::Container.new(value)
-      end)
-    end
-
-    def variables_hash
-      containers_hash.change_values(&:content)
+    def calculate(*args)
+      Calculator.new(self, *args).calculate
     end
 
-    def variables_value_hash
-      variables.map do |var|
-        var.try(:value)
-      end.as_hash(self.class.variables_names)
-    end
+    private
 
-    def calculate(*args)
-      Calculator.new(self, *args).calculate
+    def store
+      @store ||= Store.new(self.class.variables_hash)
     end
   end
 end

data/lib/danica/variables_holder/store.rb

@@ -0,0 +1,67 @@
+module Danica
+  class VariablesHolder::Store
+    attr_reader :default_variables_hash, :variables_names
+
+    def initialize(default_variables_hash)
+      @default_variables_hash = default_variables_hash
+      @variables_names = default_variables_hash.keys
+    end
+
+    def containers_hash
+      @containers_hash ||= {}.merge(default_containers_hash)
+    end
+
+    def containers
+      containers_hash.values
+    end
+
+    def variables
+      containers.map(&:content)
+    end
+
+    def variables_hash
+      containers_hash.change_values(&:content)
+    end
+
+    def variables_value_hash
+      variables.map do |var|
+        var.try(:value)
+      end.as_hash(variables_names)
+    end
+
+    def extract_variables
+      inner_containers_hash.merge(named_variables_hash)
+    end
+
+    private
+
+    def named_variables_hash
+      variable_variables.inject({}) do |hash, (key, container)|
+        hash.merge( (container.content.name || key).to_sym => container )
+      end
+    end
+
+    def variable_variables
+      containers_hash.select do |_, container|
+        container.variable?
+      end
+    end
+
+    def inner_containers_hash
+      variable_holders.inject({}) do |hash, container|
+        hash.merge!(container.content.extract_variables)
+      end
+    end
+
+    def variable_holders
+      variables.select(&:variable_holder?)
+    end
+
+    def default_containers_hash
+      default_variables_hash.change_values do |value|
+        Wrapper::Container.new(value)
+      end
+    end
+  end
+end
+

data/lib/danica/variables_holder/variables_builder.rb

@@ -11,18 +11,18 @@ module Danica::VariablesHolder
     end
 
     def build
-      names_hash = attr_names.extract_options!
+      names_hash = attr_names.extract_options!.symbolize_keys
 
-      attr_names.each do |name|
+      attr_names.map(&:to_sym).each do |name|
         add_setter(name)
         add_reader(name)
-        instance.variables_hash[name.to_sym] = wrap_value(name)
+        instance.variables_hash[name] = wrap_value(name)
       end
 
       names_hash.each do |name, default|
         add_setter(name)
         add_reader(name)
-        instance.variables_hash[name.to_sym] = wrap_value(default)
+        instance.variables_hash[name] = wrap_value(default)
       end
     end
 
@@ -30,13 +30,13 @@ module Danica::VariablesHolder
 
     def add_setter(name)
       instance.send(:define_method, "#{name}=") do |value|
-        containers_hash[name.to_sym].content = wrap_value(value)
+        containers_hash[name].content = wrap_value(value)
       end
     end
 
     def add_reader(name)
       instance.send(:define_method, name) do
-        containers_hash[name.to_sym]
+        containers_hash[name]
       end
     end
   end

data/lib/danica/version.rb

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

data/lib/danica/wrapper/container.rb

@@ -5,7 +5,7 @@ module Danica
 
     delegate :to_f, :contentd?, :to, :to_tex, :to_gnu, :priority, :grouped?,
              :signaled?, :constant?, :valued?, :*, :+, :-, :/, :**,
-             :variables, to: :content
+             :variables, :variable?, to: :content
 
     default_value :container?, true
 

data/lib/danica/wrapper/negative.rb

@@ -1,6 +1,5 @@
 module Danica
   class Wrapper::Negative
-    include Common
     include BaseOperations
     include VariablesHolder
 

data/lib/danica/wrapper/plus_minus.rb

@@ -1,6 +1,5 @@
 module Danica
   class Wrapper::PlusMinus
-    include Common
     include BaseOperations
     include VariablesHolder
 

data/lib/danica/wrapper/variable.rb

@@ -5,11 +5,15 @@ module Danica
 
     attr_accessor :value, :name, :latex, :gnu
 
-    default_value :priority, 10
+    default_value :priority,    10
     default_value :is_grouped?, false
+    default_value :variable?,   true
 
-    def initialize(attributes={})
-      attributes.each do |key, value|
+    def initialize(*args)
+      attrs = args.extract_options!
+      attrs = args.as_hash(%i(value name latex gnu)).merge(attrs)
+
+      attrs.each do |key, value|
         self.public_send("#{key}=", value)
       end
     end

data/spec/lib/danica/variables_holder/store_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Danica::VariablesHolder::Store do 
+  let(:default_variables_hash) do
+    {
+      x: Danica::Wrapper::Variable.new(name: :x),
+      y: Danica::Wrapper::Variable.new( latex: '\y' ),
+      z: Danica::Wrapper::Number.new(10)
+    }
+  end
+  subject do
+    described_class.new(default_variables_hash)
+  end
+
+  describe '#variables' do
+    context 'when instance has no variables defined' do
+      it do
+        expect(subject.variables).not_to be_empty
+      end
+
+      #it_behaves_like 'an object that returns the default variables'
+    end
+
+    context 'when some variables where defined' do
+      before do
+        subject.containers_hash[:y] = Danica::Wrapper::Number.new(1)
+      end
+
+      it 'returns the default variables and the new set one' do
+        expect(subject.variables).to eq([
+          Danica::Wrapper::Variable.new(name: :x),
+          Danica::Wrapper::Number.new(1),
+          Danica::Wrapper::Number.new(10)
+        ])
+      end
+
+      it 'does not change the default variables' do
+        expect do
+          subject.containers_hash[:x] = Danica::Wrapper::Number.new(2)
+        end.not_to change(subject, :default_variables_hash)
+      end
+    end
+  end
+
+  describe '#variables_hash' do
+    context 'when instance has no variables defined' do
+      #it_behaves_like 'an object that returns the default variables hash'
+    end
+
+    context 'when some variables where defined' do
+      before do
+        subject.containers_hash[:y] = Danica::Wrapper::Number.new(1)
+      end
+
+      it 'returns the default hash with the set value' do
+        expect(subject.variables_hash).to eq(
+          x: Danica::Wrapper::Variable.new(name: :x),
+          y: Danica::Wrapper::Number.new(1),
+          z: Danica::Wrapper::Number.new(10)
+        )
+      end
+    end
+  end
+
+  describe '#containers' do
+    it 'is an array of Containers' do
+      subject.containers.each do |container|
+        expect(container).to be_a(Danica::Wrapper::Container)
+      end
+    end
+  end
+end

data/spec/lib/danica/variables_holder_spec.rb

@@ -28,11 +28,83 @@ shared_examples 'an variable set that does not change the class variables' do
   end
 end
 
+shared_examples 'a class with mapped variables' do
+  context 'when initializing with an array' do
+    subject { clazz.new(1,2,3) }
+
+    it 'initialize variables in order of declaration' do
+      expect(subject.variables_hash).to eq({
+        x: Danica::Wrapper::Number.new(1),
+        y: Danica::Wrapper::Number.new(2),
+        z: Danica::Wrapper::Number.new(3)
+      })
+    end
+  end
+
+  context 'when initialized with a hash' do
+    subject { clazz.new(z: 1, y: 2) }
+
+    it 'initialize variables with the map given' do
+      expect(subject.variables_hash).to eq({
+        x: Danica::Wrapper::Variable.new(name: :x),
+        y: Danica::Wrapper::Number.new(2),
+        z: Danica::Wrapper::Number.new(1)
+      })
+    end
+  end
+
+  context 'when initializing with hashes' do
+    subject do
+      clazz.new(
+        {name: :xis, value: 1},
+        {name: :yps, value: 2},
+        {name: :zes, value: 3}
+      )
+    end
+
+    it 'initialize variables with the maps given' do
+      expect(subject.variables_hash).to eq({
+        x: Danica::Wrapper::Variable.new(name: :xis, value: 1),
+        y: Danica::Wrapper::Variable.new(name: :yps, value: 2),
+        z: Danica::Wrapper::Variable.new(name: :zes, value: 3)
+      })
+    end
+  end
+
+  context 'when initializing with array of hashes' do
+    subject do
+      clazz.new([
+        {name: :xis, value: 1},
+        {name: :yps, value: 2},
+        {name: :zes, value: 3}
+      ])
+    end
+
+    it 'initialize variables with the maps given' do
+      expect(subject.variables_hash).to eq({
+        x: Danica::Wrapper::Variable.new(name: :xis, value: 1),
+        y: Danica::Wrapper::Variable.new(name: :yps, value: 2),
+        z: Danica::Wrapper::Variable.new(name: :zes, value: 3)
+      })
+    end
+  end
+end
 
 describe Danica::VariablesHolder do
   let(:clazz) { described_class::Dummy }
   subject { clazz.new }
 
+  describe '#initialize' do
+    context 'when using a symbolized key definition' do
+      it_behaves_like 'a class with mapped variables'
+    end
+
+    context 'when using a string key definition' do
+      let(:clazz) { described_class::DummyString }
+      it_behaves_like 'a class with mapped variables'
+    end
+  end
+
   describe 'variables assignement' do
     it 'creates setters and getters for the variables' do
       %i(x y z).each do |var|
@@ -80,7 +152,9 @@ describe Danica::VariablesHolder do
         expect(clazz.variables_names).to eq(%i(k z))
       end
     end
+  end
 
+  describe 'variable alias' do
     context 'when we alias a variable' do
       let(:clazz) { described_class::DummyAlias }
 
@@ -212,7 +286,7 @@ describe Danica::VariablesHolder do
       it 'does not change the class variables' do
         expect do
           subject.z = 2
-        end.not_to change { clazz.variables_hash }
+        end.not_to change(clazz, :variables_hash)
       end
     end
   end

data/spec/support/models/function/my_function.rb

@@ -1,4 +1,4 @@
-class MyFunction < Danica::Function
+class Danica::Function::MyFunction < Danica::Function
   variables :x, :y
 
   def function_block

data/spec/support/models/variables_holder/dummy.rb

@@ -8,10 +8,6 @@ module Danica
 
       delegate :to, :to_f, to: :block
 
-      def initialize(vars = {})
-        self.variables=vars
-      end
-
       def block
         x ** y + z
       end
@@ -32,3 +28,14 @@ module Danica
     end
   end
 end
+
+module Danica
+  module VariablesHolder
+    class DummyString
+      include Common
+      include VariablesHolder
+
+      variables 'x', 'y' => { latex: '\y' }, 'z' => 10
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -165,6 +165,7 @@ files:
 - lib/danica/variables_holder.rb
 - lib/danica/variables_holder/alias_builder.rb
 - lib/danica/variables_holder/calculator.rb
+- lib/danica/variables_holder/store.rb
 - lib/danica/variables_holder/variables_builder.rb
 - lib/danica/version.rb
 - lib/danica/wrapper.rb
@@ -202,6 +203,7 @@ files:
 - spec/lib/danica/operator/sin_spec.rb
 - spec/lib/danica/operator/squared_root_spec.rb
 - spec/lib/danica/operator_spec.rb
+- spec/lib/danica/variables_holder/store_spec.rb
 - spec/lib/danica/variables_holder_spec.rb
 - spec/lib/danica/wrapper/constant_spec.rb
 - spec/lib/danica/wrapper/group_spec.rb
@@ -279,6 +281,7 @@ test_files:
 - spec/lib/danica/operator/sin_spec.rb
 - spec/lib/danica/operator/squared_root_spec.rb
 - spec/lib/danica/operator_spec.rb
+- spec/lib/danica/variables_holder/store_spec.rb
 - spec/lib/danica/variables_holder_spec.rb
 - spec/lib/danica/wrapper/constant_spec.rb
 - spec/lib/danica/wrapper/group_spec.rb