danica 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204973e375504667567ab1246d44e05a1375e407
-  data.tar.gz: 0ec10d6273e79affbbb3624795cc00dd06321687
+  metadata.gz: 1cb8a797fc699f5234e08cd31d87caa9706cea6a
+  data.tar.gz: 03cc19287859762cf1554f7243f550905bede4c3
 SHA512:
-  metadata.gz: d63fd9fa21b3a5894d55d3a53d6af203f4bfb2f4f78162a9c7d38877f146c9a69f04851fffa6a331f03d2bd533f0945a3de70b88236e577af278e95fdc3cccae
-  data.tar.gz: 21d8fb184a94220c656d8631cf9b230f6f4911cc675333b5188176b379177499cb2522c4e2a306107d4347aa86585ec2c9ee281cedab70e47eaff743668b567f
+  metadata.gz: 32c7797d3108c0598c6c18ed33e355e669c03fa944639038ab0d7fb3c2afc7c74feb9975c06e4c2fd80d253e9a2ad1c80d3d44263996c760836a204fe5b798ae
+  data.tar.gz: 16078df081cd008fa485d03f48a006030021cdd7a22ccccad7b86a6f3b4f9d55142429405fb88fc3d88fdadaee3982a3797f93bb7130ebee4ad15ee3e3c14999

data/lib/danica/common.rb

@@ -47,11 +47,11 @@ module Danica
     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)

data/lib/danica/formatted.rb

@@ -1,14 +1,13 @@
 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)
@@ -17,13 +16,29 @@ class Danica::Formatted
            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)

data/lib/danica/version.rb

@@ -1,3 +1,3 @@
 module Danica
-  VERSION = '2.7.2'
+  VERSION = '2.7.3'
 end

data/spec/lib/danica/common_spec.rb

@@ -81,6 +81,21 @@ describe Danica::Common do
         expect(subject.to_tex).to eq('formatted: tex')
       end
     end
+
+    context 'when formatted was generated with gnu and with options' do
+      let(:number) { Danica::Wrapper::Number.new(1.0/3) }
+      subject { number.gnu(decimals: 3) }
+
+      it 'formats with the current options' do
+        expect(subject.to_tex).to eq('0.333')
+      end
+
+      context 'but overwritting options' do
+        it 'formats with the current options' do
+          expect(subject.to_tex(decimals: 4)).to eq('0.3333')
+        end
+      end
+    end
   end
 
   describe '#to_gnu' do
@@ -90,6 +105,38 @@ describe Danica::Common do
         expect(subject.to_gnu).to eq('formatted: gnu')
       end
     end
+
+    context 'when formatted was generated with tex and with options' do
+      let(:number) { Danica::Wrapper::Number.new(1.0/3) }
+      subject { number.tex(decimals: 3) }
+
+      it 'formats with the current options' do
+        expect(subject.to_gnu).to eq('0.333')
+      end
+
+      context 'but overwritting options' do
+        it 'formats with the current options' do
+          expect(subject.to_gnu(decimals: 4)).to eq('0.3333')
+        end
+      end
+    end
+  end
+
+  describe 'to' do
+    context 'when already formatted with options' do
+      let(:number) { Danica::Wrapper::Number.new(1.0/3) }
+      subject { number.tex(decimals: 3) }
+
+      it 'uses to with options' do
+        expect(subject.to(:gnu)).to eq('0.333')
+      end
+
+      context 'when calling with options' do
+        it 'uses options' do
+          expect(subject.to(:gnu, decimals: 4)).to eq('0.3333')
+        end
+      end
+    end
   end
 
   describe '#tex' do
@@ -98,12 +145,12 @@ describe Danica::Common do
     end
 
     it 'knows how to return a tex string' do
-      expect(subject.tex.to_s).to eq('tex {:decimals=>nil}')
+      expect(subject.tex.to_s).to eq('tex {:format=>:tex}')
     end
 
     context 'when passing options' do
       it 'uses the arguments' do
-        expect(subject.tex(decimals: 3).to_s).to eq('tex {:decimals=>3}')
+        expect(subject.tex(decimals: 3).to_s).to eq('tex {:format=>:tex, :decimals=>3}')
       end
     end
   end
@@ -114,23 +161,23 @@ describe Danica::Common do
     end
 
     it 'knows how to return a gnu string' do
-      expect(subject.gnu.to_s).to eq('gnu {:decimals=>nil}')
+      expect(subject.gnu.to_s).to eq('gnu {:format=>:gnu}')
     end
 
     context 'when passing options' do
       it 'uses the arguments' do
-        expect(subject.gnu(decimals: 3).to_s).to eq('gnu {:decimals=>3}')
+        expect(subject.gnu(decimals: 3).to_s).to eq('gnu {:format=>:gnu, :decimals=>3}')
       end
     end
   end
 
   describe '#formatted' do
     it do
-      expect(subject.formatted(:gnu)).to be_a(Danica::Formatted)
+      expect(subject.formatted(format: :gnu)).to be_a(Danica::Formatted)
     end
 
     it 'knows how to return to build the string string' do
-      expect(subject.formatted(:gnu, decimals: 3).to_s).to eq('gnu {:decimals=>3}')
+      expect(subject.formatted(format: :gnu, decimals: 3).to_s).to eq('gnu {:format=>:gnu, :decimals=>3}')
     end
   end
 end

data/spec/lib/danica/formatted_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 shared_examples 'a formatted result' do |output|
   it do
     expect(result).to be_a(described_class)
@@ -29,7 +28,23 @@ describe Danica::Formatted do
   let(:format) { :tex }
   let(:options) { {} }
   subject do
-    described_class.new(content, format, options)
+    described_class.new(content, format: format, **options)
+  end
+
+  describe '#repack' do
+    let(:expression) { Danica::Wrapper::Number.new(1.0 / 3) }
+
+    it do
+      expect(subject.repack(expression)).to be_a(Danica::Formatted)
+    end
+
+    context 'when there are options' do
+      let(:options) { { decimals: 3 } }
+
+      it 'wraps expression with options' do
+        expect(subject.repack(expression).to_s).to eq('0.333')
+      end
+    end
   end
 
   describe '#to_s' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danica
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport