danica 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f27550f7488c80de59bfa28553dd0922778607
-  data.tar.gz: 9dfbb7cb1c84689e5798305c9cc255294ee1938f
+  metadata.gz: 05b7fa3ae186fb5821ec4db27048ff78db65b806
+  data.tar.gz: 4258d4543ccb64352a89543686599cabc93ad4aa
 SHA512:
-  metadata.gz: cfb395f94ecd24d165a833cd4c88991538378a8789ae892aadc34335e51cfdb52bc4a35f17b4b3a3898797e14bb9d81be6d685c6835448ecef0ac964641a4883
-  data.tar.gz: 57bb42340df18ee9e09233c89917452f65bf069f2ca93ee926bcf40296300db2a8fb11604a265fa09ff6ff9325f2d536350529ee15607e61041861ba5426e177
+  metadata.gz: df83dcbe526b2ed7ac74df6e69016ae68db54e62d3c22d78810f0d3fd9daa879e572ac22094f880faed6bec9e9238790b74f440a6da127abeb6b56078a7dbcfe
+  data.tar.gz: eebfc744cd15f9b483b8758a3c5f4f57008bebdaf2ebf471d19f9fca27e3b4a75342bce061a8b42ded63293a0923728549a3e13188a936338f3c766ec1a5c396

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    danica (1.0.0)
+    danica (1.1.0)
       activemodel
       activesupport
+      bidu-core_ext
+      concern_builder
 
 GEM
   remote: https://rubygems.org/
@@ -15,9 +17,13 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    bidu-core_ext (1.2.2)
+      activesupport
     codeclimate-test-reporter (0.5.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
+    concern_builder (0.0.2)
+      activesupport
     concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)

data/README.md

@@ -36,13 +36,13 @@ end
 ```ruby
 class Danica::Function
   class Spatial < Danica::Function
-    attr_accessor :time, :acceleration, :initial_space, :initial_velocity
-    delegate :to_tex, to: :sum
+    variables :time, :acceleration, :initial_space, :initial_velocity
+    delegate :to_tex, :to_gnu, to: :sum
 
     private
 
     def sum
-      @sum ||= Sum.new(variables: parcels)
+      @sum ||= Sum.new(parcels)
     end
 
     def parcels
@@ -53,12 +53,16 @@ class Danica::Function
       ]
     end
 
+    def spatial_velocity
+      Product.new(initial_velocity, time)
+    end
+
     def spatial_acceleration
-      Division.new(numerator: Product.new(variables: [ acceleration, time_squared ]), denominator: 2)
+      Division.new(Product.new(acceleration, time_squared), 2)
     end
 
     def time_squared
-      Power.new(base: time, exponent: 2)
+      Power.new(time, 2)
     end
   end
 end

data/danica.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'activemodel'
+  spec.add_runtime_dependency 'concern_builder'
+  spec.add_runtime_dependency 'bidu-core_ext'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

data/lib/danica/function.rb

@@ -2,6 +2,8 @@ module Danica
   class Function
     include ActiveModel::Model
   
+    require 'danica/function/variables_builder'
+    require 'danica/function/class_methods'
     require 'danica/function/chained'
     require 'danica/function/product'
     require 'danica/function/sum'
@@ -10,6 +12,12 @@ module Danica
     require 'danica/function/square_root'
   
     attr_accessor :name, :variables
+
+    def initialize(*args)
+      options = args.extract_options!
+
+      super({ variables: args.flatten }.merge(options))
+    end
   
     def to_f
       raise 'Not IMplemented yet'
@@ -32,13 +40,21 @@ module Danica
     end
   
     def valued?
-      to_f.presend?
+      to_f.present?
     rescue Exception::NotDefined
       false
     end
+
+    def variables
+      @variables ||= variables_hash.values
+    end
   
+    def variables_hash
+      @variabels_map ||= (@variables || []).as_hash(self.class.variables_names)
+    end
+
     private
-  
+
     def tex_string
       raise 'Not IMplemented yet'
     end

data/lib/danica/function/class_methods.rb

@@ -0,0 +1,11 @@
+class Danica::Function
+  class << self
+    def variables(*names)
+      VariablesBuilder.new(names, self).build
+    end
+
+    def variables_names
+      @variables_names ||= []
+    end
+  end
+end

data/lib/danica/function/division.rb

@@ -1,20 +1,12 @@
 module Danica
   class Function
     class Division < Function
-      attr_reader :numerator, :denominator
+      variables :numerator, :denominator
 
       def to_f
         numerator.to_f / denominator.to_f
       end
 
-      def numerator=(value)
-        @numerator = wrap_value(value)
-      end
-
-      def denominator=(value)
-        @denominator = wrap_value(value)
-      end
-
       private
 
       def tex_string

data/lib/danica/function/power.rb

@@ -1,20 +1,12 @@
 module Danica
   class Function
     class Power < Function
-      attr_reader :base, :exponent
+      variables :base, :exponent
 
       def to_f
         base.to_f ** exponent.to_f
       end
 
-      def base=(value)
-        @base = wrap_value(value)
-      end
-
-      def exponent=(value)
-        @exponent = wrap_value(value)
-      end
-
       private
 
       def tex_string

data/lib/danica/function/square_root.rb

@@ -1,16 +1,12 @@
 module Danica
   class Function
     class SquareRoot < Function
-      attr_reader :variable
+      variables :variable
 
       def to_f
         Math.sqrt(variable.to_f)
       end
 
-      def variable=(value)
-        @variable = wrap_value(value)
-      end
-
       private
 
       def tex_string

data/lib/danica/function/variables_builder.rb

@@ -0,0 +1,34 @@
+require 'concern_builder'
+require 'bidu/core_ext'
+
+class Danica::Function
+  class VariablesBuilder < ::ConcernBuilder
+    attr_reader :instance
+
+    def init
+      attr_names.each do |name|
+        add_setter(name)
+        add_reader(name)
+        instance.send(:variables_names) << name
+      end
+    end
+
+    private
+
+    def add_setter(name)
+      code = <<-CODE
+        variables_hash[:#{name}] = wrap_value(value)
+        @variables = variables_hash.values
+      CODE
+      add_method("#{name}=(value)", code)
+    end
+
+    def add_reader(name)
+      code = <<-CODE
+        variables_hash[:#{name}]
+      CODE
+      add_method("#{name}", code)
+    end
+  end
+end
+

data/lib/danica/variable.rb

@@ -7,6 +7,14 @@ module Danica
       value.nil? ? raise(Exception::NotDefined) : value.to_f
     end
 
+    def ==(other)
+      return false unless other.class == Variable
+      return other.value == value &&
+             other.name == name &&
+             other.latex == latex &&
+             other.gnu == gnu
+    end
+
     def to_tex
       return value.to_tex if value
       (latex || name).to_s

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/lib/danica/function_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe Danica::Function do
   class Danica::Function
     class Spatial < Danica::Function
-      attr_accessor :time, :acceleration, :initial_space, :initial_velocity
+      variables :time, :acceleration, :initial_space, :initial_velocity
       delegate :to_tex, :to_gnu, to: :sum
 
       private
 
       def sum
-        @sum ||= Sum.new(variables: parcels)
+        @sum ||= Sum.new(parcels)
       end
 
       def parcels
@@ -21,15 +21,15 @@ describe Danica::Function do
       end
 
       def spatial_velocity
-        Product.new(variables: [ initial_velocity, time ])
+        Product.new(initial_velocity, time)
       end
 
       def spatial_acceleration
-        Division.new(numerator: Product.new(variables: [ acceleration, time_squared ]), denominator: 2)
+        Division.new(Product.new(acceleration, time_squared), 2)
       end
 
       def time_squared
-        Power.new(base: time, exponent: 2)
+        Power.new(time, 2)
       end
     end
   end
@@ -64,4 +64,138 @@ describe Danica::Function do
       end
     end
   end
+
+  describe '#variables_hash' do
+    let(:expected) do
+      {
+        time: Danica::Variable.new(name: :t),
+        acceleration: Danica::Variable.new(name: 'a'),
+        initial_space: Danica::Variable.new( name: :S0, latex: 'S_0' ),
+        initial_velocity: Danica::Variable.new( name: :V0, latex: 'V_0' )
+      }
+    end
+
+    context 'when variables are already wrapped with DanicaVariable' do
+      let(:variables) { expected }
+      it 'returns a hash with the variabels' do
+        expect(subject.variables_hash).to eq(expected)
+      end
+    end
+
+    context 'when variables have been defined with string name' do
+      before do
+        variables.change_keys!(&:to_s)
+      end
+
+      it 'returns a hash with the variabels' do
+        expect(subject.variables_hash).to eq(expected)
+      end
+    end
+
+    context 'when variables are not wrapped yet' do
+      it 'returns a hash with the variabels' do
+        expect(subject.variables_hash).to eq(expected)
+      end
+    end
+
+    context 'when changing a variable' do
+      before do
+        subject.time = :x
+        expected[:time] = Danica::Variable.new(name: :x)
+      end
+
+      it do
+        expect(subject.variables_hash).to eq(expected)
+      end
+    end
+
+    context 'when initializing with array' do
+      context 'as hash' do
+        let(:variables) { [ :t, 'a', {name: :S0, latex: 'S_0'}, { name: :V0, latex: 'V_0' } ] }
+        let(:subject) { described_class::Spatial.new(variables) }
+
+        it 'returns a hash with the variabels' do
+          expect(subject.variables_hash).to eq(expected)
+        end
+      end
+    end
+
+    context 'when initializing with sequence' do
+      context 'as hash' do
+        let(:variables) { [ :t, 'a', {name: :S0, latex: 'S_0'}, { name: :V0, latex: 'V_0' } ] }
+        let(:subject) { described_class::Spatial.new(*variables, {}) }
+
+        it 'returns a hash with the variabels' do
+          expect(subject.variables_hash).to eq(expected)
+        end
+      end
+    end
+
+    context 'when initializing with variables array' do
+      context 'as hash' do
+        let(:variables) { [ :t, 'a', {name: :S0, latex: 'S_0'}, { name: :V0, latex: 'V_0' } ] }
+        let(:subject) { described_class::Spatial.new(variables: variables) }
+
+        it 'returns a hash with the variabels' do
+          expect(subject.variables_hash).to eq(expected)
+        end
+      end
+    end
+  end
+
+  describe '#variables' do
+    context 'when initialized with an array of variables' do
+      let(:subject) { described_class::Spatial.new(variables: variables.values) }
+      let(:expected) { variables.values.map { |v| subject.send(:wrap_value, v)} }
+      it do
+        expect(subject.variables.compact).to eq(expected)
+      end
+    end
+
+    context 'when not initializing all variables' do
+      let(:subject) { described_class::Spatial.new }
+      let(:time) { Danica::Variable.new(name: :t) }
+
+      context 'when initialized with an empty variable set' do
+        it do
+          expect(subject.variables.compact).to be_empty
+        end
+      end
+
+      context 'when changing a variable' do
+        before do
+          subject.time = time
+        end
+
+        it 'returns the list of variables' do
+          expect(subject.variables.compact).to eq([ time ])
+        end
+      end
+
+      context 'when initializing with a variable set' do
+        let(:names) { [ :t, :a, :s0, :v0 ] }
+        let(:subject) { described_class::Spatial.new *names }
+
+        it 'returns the variables given oin initialization' do
+          expect(subject.variables.map(&:name)).to eq(names)
+        end
+
+        context 'when initializing variables with a hash out of order' do
+          let(:variables) do
+            {
+              initial_velocity: :v0,
+              initial_space: :s0,
+              acceleration: :a,
+              time: :t
+            }
+          end
+          let(:subject) { described_class::Spatial.new variables }
+
+          it 'returns the variables given on initialization' do
+            expect(subject.variables.map(&:name)).to eq(names)
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concern_builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bidu-core_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -155,11 +183,13 @@ files:
 - lib/danica/exception/not_defined.rb
 - lib/danica/function.rb
 - lib/danica/function/chained.rb
+- lib/danica/function/class_methods.rb
 - lib/danica/function/division.rb
 - lib/danica/function/power.rb
 - lib/danica/function/product.rb
 - lib/danica/function/square_root.rb
 - lib/danica/function/sum.rb
+- lib/danica/function/variables_builder.rb
 - lib/danica/number.rb
 - lib/danica/variable.rb
 - lib/danica/version.rb