marty 2.5.2 → 2.5.4

data/spec/lib/xl_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'marty'
 require 'delorean_lang'
 
-CODE =<<EOS
+CODE = <<EOS
 M:
     cfmt = {
         "type": ":cellIs",
@@ -83,26 +83,24 @@ M:
     format = "xlsx"
 EOS
 
-
 describe Marty::Xl do
-
-  let(:engine) {
-    Delorean::Engine.new "YYY"
-  }
+  let(:engine) do
+    Delorean::Engine.new 'YYY'
+  end
 
   def worksheet(ind, c)
     code = CODE.clone
-    map = {'C1' => c[0].to_s, 'C2' => c[1].to_s}
-    map.each { |k,v| code.sub!(k,v)  }
+    map = { 'C1' => c[0].to_s, 'C2' => c[1].to_s }
+    map.each { |k, v| code.sub!(k, v)  }
     engine.parse(code)
-    engine.evaluate("M", ["result"]).flatten(1)
+    engine.evaluate('M', ['result']).flatten(1)
   end
 
   before(:all) do
     @coords = [
-               [[9, 5], [2, 5]],   # coords for non-overlaping datasets
-               [[5, 8], [2, 5]],   # coords for overlaping datasets
-              ]
+      [[9, 5], [2, 5]],   # coords for non-overlaping datasets
+      [[5, 8], [2, 5]],   # coords for overlaping datasets
+    ]
   end
 
   it "should be able to create a spreadsheet that includes multiple datasets that don't overlap " do
@@ -111,91 +109,91 @@ describe Marty::Xl do
     file = Tempfile.new('file.xlsx')
     lambda { sp.serialize(file) }.should_not raise_error()
 
-    sp.workbook.worksheets[0].rows[0].cells[0..1].map { |c| c.value }.should ==
-      ["Threshold", 5]
-
-    sp.workbook.worksheets[0].rows[1].cells[0..1].map { |c| c.value }.should ==
-      ["", ""]
+    sp.workbook.worksheets[0].rows[0].cells[0..1].map(&:value).should ==
+      ['Threshold', 5]
 
-    sp.workbook.worksheets[0].rows[5].cells[0..15].map { |c| c.value }.should == 
-      ["", "", "Sec Inst Name", "Market Change Sec Inst", "", "", "", "", "", "Sec Inst Name", "Market Change Sec Inst", "","", "", ""]
+    sp.workbook.worksheets[0].rows[1].cells[0..1].map(&:value).should ==
+      ['', '']
 
-    sp.workbook.worksheets[0].rows[6].cells[0..15].map { |c| c.value }.should == 
-      ["", "", "title", 2, 4, 5, 6, 8, "", "title", 2, 4, 5, 6, 8]
+    sp.workbook.worksheets[0].rows[5].cells[0..15].map(&:value).should ==
+      ['', '', 'Sec Inst Name', 'Market Change Sec Inst', '', '', '', '',
+       '', 'Sec Inst Name', 'Market Change Sec Inst', '', '', '', '']
 
-    sp.workbook.worksheets[0].rows[7].cells[0..15].map { |c| c.value }.should == 
-      ["", "", "text", 12, 4, 15, 6, 18, "", "text", 12, 4, 15, 6, 18]
+    sp.workbook.worksheets[0].rows[6].cells[0..15].map(&:value).should ==
+      ['', '', 'title', 2, 4, 5, 6, 8, '', 'title', 2, 4, 5, 6, 8]
 
-    sp.workbook.worksheets[0].rows[8].cells[0..15].map { |c| c.value }.should == 
-      ["", "", "text", 22, 4, 25, 6, 28, "", "text", 22, 4, 25, 6, 28]
+    sp.workbook.worksheets[0].rows[7].cells[0..15].map(&:value).should ==
+      ['', '', 'text', 12, 4, 15, 6, 18, '', 'text', 12, 4, 15, 6, 18]
 
-    sp.workbook.worksheets[0].rows[9].cells[0..15].map { |c| c.value }.should == 
-      ["", "", "text", 32, 4, 35, 6, 38, "", "text", 32, 4, 35, 6, 38]
+    sp.workbook.worksheets[0].rows[8].cells[0..15].map(&:value).should ==
+      ['', '', 'text', 22, 4, 25, 6, 28, '', 'text', 22, 4, 25, 6, 28]
 
-    sp.workbook.worksheets[0].rows[10].cells[0..15].map { |c| c.value }.should == 
-      ["", "", "text", 42, 4, 45, 6, 48, "", "text", 42, 4, 45, 6, 48]
+    sp.workbook.worksheets[0].rows[9].cells[0..15].map(&:value).should ==
+      ['', '', 'text', 32, 4, 35, 6, 38, '', 'text', 32, 4, 35, 6, 38]
 
-    sp.workbook.worksheets[0].rows[11].cells[0..15].map { |c| c.value }.should == 
-      ["", "", "text", 52, 4, 55, 6, 58, "", "text", 52, 4, 55, 6, 58]
+    sp.workbook.worksheets[0].rows[10].cells[0..15].map(&:value).should ==
+      ['', '', 'text', 42, 4, 45, 6, 48, '', 'text', 42, 4, 45, 6, 48]
 
-    sp.workbook.worksheets[0].rows[12].cells[0..15].map { |c| c.value }.should == 
-      ["", "", "text", 62, 4, 65, 6, 68, "", "text", 62, 4, 65, 6, 68]
+    sp.workbook.worksheets[0].rows[11].cells[0..15].map(&:value).should ==
+      ['', '', 'text', 52, 4, 55, 6, 58, '', 'text', 52, 4, 55, 6, 58]
 
-    sp.workbook.worksheets[0].rows[13].cells[0..15].map { |c| c.value }.should == 
-      ["", "", "text", 72, 4, 75, 6, 78, "", "text", 72, 4, 75, 6, 78]
+    sp.workbook.worksheets[0].rows[12].cells[0..15].map(&:value).should ==
+      ['', '', 'text', 62, 4, 65, 6, 68, '', 'text', 62, 4, 65, 6, 68]
 
+    sp.workbook.worksheets[0].rows[13].cells[0..15].map(&:value).should ==
+      ['', '', 'text', 72, 4, 75, 6, 78, '', 'text', 72, 4, 75, 6, 78]
   end
 
-  it "should be able to create a spreadsheet that includes multiple datasets that overlap " do
+  it 'should be able to create a spreadsheet that includes multiple datasets that overlap ' do
     ws = worksheet(1, @coords[1])
     sp = Marty::Xl.spreadsheet(ws)
     file = Tempfile.new('file.xlsx')
     lambda { sp.serialize(file) }.should_not raise_error()
 
-    sp.workbook.worksheets[0].rows[0].cells[0..1].map { |c| c.value }.should ==
-      ["Threshold", 5]
+    sp.workbook.worksheets[0].rows[0].cells[0..1].map(&:value).should ==
+      ['Threshold', 5]
 
-    sp.workbook.worksheets[0].rows[1].cells[0..1].map { |c| c.value }.should ==
-      ["", ""]
+    sp.workbook.worksheets[0].rows[1].cells[0..1].map(&:value).should ==
+      ['', '']
 
-    sp.workbook.worksheets[0].rows[5].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "Sec Inst Name", "Market Change Sec Inst", "", "", "", "", "", "", ""]
+    sp.workbook.worksheets[0].rows[5].cells[0..11].map(&:value).should ==
+      ['', '', 'Sec Inst Name', 'Market Change Sec Inst', '', '', '', '', '', '', '']
 
-    sp.workbook.worksheets[0].rows[6].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "title", 2, 4, 5, 6, 8, "", "", ""]
+    sp.workbook.worksheets[0].rows[6].cells[0..11].map(&:value).should ==
+      ['', '', 'title', 2, 4, 5, 6, 8, '', '', '']
 
-    sp.workbook.worksheets[0].rows[7].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "text", 12, 4, 15, 6, 18, "", "", ""]
+    sp.workbook.worksheets[0].rows[7].cells[0..11].map(&:value).should ==
+      ['', '', 'text', 12, 4, 15, 6, 18, '', '', '']
 
-    sp.workbook.worksheets[0].rows[8].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "text", 22, 4, "Sec Inst Name", "Market Change Sec Inst", 28, "", "", ""]
+    sp.workbook.worksheets[0].rows[8].cells[0..11].map(&:value).should ==
+      ['', '', 'text', 22, 4, 'Sec Inst Name', 'Market Change Sec Inst', 28, '', '', '']
 
-    sp.workbook.worksheets[0].rows[9].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "text", 32, 4, "title", 2, 4, 5, 6, 8]
+    sp.workbook.worksheets[0].rows[9].cells[0..11].map(&:value).should ==
+      ['', '', 'text', 32, 4, 'title', 2, 4, 5, 6, 8]
 
-    sp.workbook.worksheets[0].rows[10].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "text", 42, 4, "text", 12, 4, 15, 6, 18]
+    sp.workbook.worksheets[0].rows[10].cells[0..11].map(&:value).should ==
+      ['', '', 'text', 42, 4, 'text', 12, 4, 15, 6, 18]
 
-    sp.workbook.worksheets[0].rows[11].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "text", 52, 4, "text", 22, 4, 25, 6, 28]
+    sp.workbook.worksheets[0].rows[11].cells[0..11].map(&:value).should ==
+      ['', '', 'text', 52, 4, 'text', 22, 4, 25, 6, 28]
 
-    sp.workbook.worksheets[0].rows[12].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "text", 62, 4, "text", 32, 4, 35, 6, 38]
+    sp.workbook.worksheets[0].rows[12].cells[0..11].map(&:value).should ==
+      ['', '', 'text', 62, 4, 'text', 32, 4, 35, 6, 38]
 
-    sp.workbook.worksheets[0].rows[13].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "text", 72, 4, "text", 42, 4, 45, 6, 48]
+    sp.workbook.worksheets[0].rows[13].cells[0..11].map(&:value).should ==
+      ['', '', 'text', 72, 4, 'text', 42, 4, 45, 6, 48]
 
-    sp.workbook.worksheets[0].rows[14].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "", "", "", "text", 52, 4, 55, 6, 58]
+    sp.workbook.worksheets[0].rows[14].cells[0..11].map(&:value).should ==
+      ['', '', '', '', '', 'text', 52, 4, 55, 6, 58]
 
-    sp.workbook.worksheets[0].rows[15].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "", "", "", "text", 62, 4, 65, 6, 68]
+    sp.workbook.worksheets[0].rows[15].cells[0..11].map(&:value).should ==
+      ['', '', '', '', '', 'text', 62, 4, 65, 6, 68]
 
-    sp.workbook.worksheets[0].rows[16].cells[0..11].map { |c| c.value }.should == 
-      ["", "", "", "", "", "text", 72, 4, 75, 6, 78]
+    sp.workbook.worksheets[0].rows[16].cells[0..11].map(&:value).should ==
+      ['', '', '', '', '', 'text', 72, 4, 75, 6, 78]
   end
 
-  it "should not raise an exception when given an empty, frozen arg" do
+  it 'should not raise an exception when given an empty, frozen arg' do
     data = [].freeze
     expect { Marty::Xl.spreadsheet(data).to_stream.read }.to_not raise_error
   end

data/spec/lib/xl_styles_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 require 'marty'
 require 'delorean_lang'
 
-
-STYLE_CODE =<<EOS
+STYLE_CODE = <<EOS
 S:
     data =
         [
@@ -35,18 +34,17 @@ S:
 EOS
 
 describe Marty::Xl do
-
-  let(:engine) {
-    Delorean::Engine.new "YYY"
-  }
+  let(:engine) do
+    Delorean::Engine.new 'YYY'
+  end
 
   before(:each) do
     code = STYLE_CODE.clone
     engine.parse(code)
-    @ws =  engine.evaluate("S", ["result"]).flatten(1)
+    @ws = engine.evaluate('S', ['result']).flatten(1)
   end
 
-  it "should be able to create a spreadsheet with overlapping border styles" do
+  it 'should be able to create a spreadsheet with overlapping border styles' do
     sp = Marty::Xl.spreadsheet(@ws)
     wb = sp.workbook
 
@@ -58,17 +56,17 @@ describe Marty::Xl do
       b.prs.each do |pr|
         edges << [pr.name, pr.style, pr.color.rgb]
       end
-      edges.sort_by{ |k| k[0] }
+      edges.sort_by { |k| k[0] }
     end
 
-    sp.workbook.worksheets[0].rows[0].cells[0..1].map { |c| c.value }.should ==
-      ["", ""]
+    sp.workbook.worksheets[0].rows[0].cells[0..1].map(&:value).should ==
+      ['', '']
 
-    sp.workbook.worksheets[0].rows[1].cells[0..2].map { |c| c.value }.should ==
-      ["", 1, 2]
+    sp.workbook.worksheets[0].rows[1].cells[0..2].map(&:value).should ==
+      ['', 1, 2]
 
-    sp.workbook.worksheets[0].rows[2].cells[0..2].map { |c| c.value }.should ==
-      ["", 3, 4]
+    sp.workbook.worksheets[0].rows[2].cells[0..2].map(&:value).should ==
+      ['', 3, 4]
 
     wb.worksheets[0].styles.borders.count.should >= 4
 
@@ -79,11 +77,11 @@ describe Marty::Xl do
       when 0
         b.should == []
       when 2
-        b.should == [[:left, :thin, "FF000000"]]
+        b.should == [[:left, :thin, 'FF000000']]
       when 3
-        b.should == [[:top, :thick, "FFFF0000"]]
+        b.should == [[:top, :thick, 'FFFF0000']]
       when 4
-        b.should == [[:left, :thin, "FF000000"], [:top, :thick, "FFFF0000"]]
+        b.should == [[:left, :thin, 'FF000000'], [:top, :thick, 'FFFF0000']]
       else
         next
       end
@@ -110,6 +108,5 @@ describe Marty::Xl do
         next
       end
     end
-
   end
 end

data/spec/models/api_auth_spec.rb

@@ -4,8 +4,8 @@ module Marty
   describe ApiAuth do
     before(:each) do
       Marty::Script.load_script_bodies({
-                           "Script1" => "A:\n    a = 1\n",
-                           "NewScript1" => "B:\n    b = 0\n",
+                           'Script1' => "A:\n    a = 1\n",
+                           'NewScript1' => "B:\n    b = 0\n",
                          }, Date.today)
 
       @api = ApiAuth.new
@@ -16,11 +16,11 @@ module Marty
     end
 
     def create_params script, key
-      {script: script, api_key: key}
+      { script: script, api_key: key }
     end
 
-    describe "validations" do
-      it "should require app name, api key and script name" do
+    describe 'validations' do
+      it 'should require app name, api key and script name' do
         api = ApiAuth.new
         expect(api).to_not be_valid
         expect(api.errors[:app_name].any?).to be_truthy
@@ -28,7 +28,7 @@ module Marty
         expect(api.errors[:script_name].any?).to be_truthy
       end
 
-      it "should require unique app name/script name" do
+      it 'should require unique app name/script name' do
         api = @api.dup
         expect(api).to_not be_valid
         expect(api.errors[:app_name].to_s).to include('already been taken')
@@ -36,7 +36,7 @@ module Marty
         expect(api).to be_valid
       end
 
-      it "should require unique api key/script name" do
+      it 'should require unique api key/script name' do
         api = @api.dup
         expect(api).to_not be_valid
         expect(api.errors[:api_key].to_s).to include('must be unique')
@@ -44,7 +44,7 @@ module Marty
         expect(api).to be_valid
       end
 
-      it "should require a valid associated script name" do
+      it 'should require a valid associated script name' do
         api = ApiAuth.new
         api.app_name = 'NewApp'
         api.script_name = @api.script_name + 'Bad'
@@ -52,8 +52,8 @@ module Marty
         expect(api.errors[:base].to_s).to include('reference a valid script')
       end
 
-      it "should allow a tagged script version to be associated when a DEV " +
-        "version of that script also exists" do
+      it 'should allow a tagged script version to be associated when a DEV ' +
+        'version of that script also exists' do
         s = Marty::Script.find_by(obsoleted_dt: 'infinity', name: 'Script1')
         s.body = "A:\n    a = 3\n"
         s.save!
@@ -64,8 +64,8 @@ module Marty
         expect(api).to be_valid
       end
 
-      it "should not allow a DEV script to be associated if there is no " +
-        "tagged version of that script" do
+      it 'should not allow a DEV script to be associated if there is no ' +
+        'tagged version of that script' do
         s = Marty::Script.new
         s.name = 'TestScript'
         s.body = '-- Test3'
@@ -81,16 +81,16 @@ module Marty
       end
     end
 
-    describe "key management" do
-      it "should require a 38 character key" do
+    describe 'key management' do
+      it 'should require a 38 character key' do
         expect(@api.api_key.length).to eq(38)
 
-        @api.api_key = "123456789"
+        @api.api_key = '123456789'
         expect(@api).to_not be_valid
         expect(@api.errors[:base].to_s).to include('length must be 38')
       end
 
-      it "should create the api key if necessary when the record is created" do
+      it 'should create the api key if necessary when the record is created' do
         a = ApiAuth.new
         a.app_name = 'MyApp'
         a.script_name = 'NewScript1'
@@ -99,7 +99,7 @@ module Marty
         expect(a.api_key).to_not be_nil
       end
 
-      it "should allow api key to be updated for an existing record" do
+      it 'should allow api key to be updated for an existing record' do
         old = @api.api_key
         @api.api_key = ApiAuth.generate_key
         new = @api.api_key
@@ -110,7 +110,7 @@ module Marty
         expect(@api.api_key).to eq(new)
       end
 
-      it "should generate new api key if old one is cleared" do
+      it 'should generate new api key if old one is cleared' do
         old = @api.api_key
         @api.api_key = ''
         @api.app_name += 'x'
@@ -118,7 +118,7 @@ module Marty
         expect(@api.api_key).to_not eq(old)
       end
 
-      it "should generate new api key if old one is cleared (2)" do
+      it 'should generate new api key if old one is cleared (2)' do
         old = @api.api_key
         @api.api_key = nil
         @api.app_name += 'x'
@@ -127,21 +127,21 @@ module Marty
       end
     end
 
-    describe "authorization" do
-      it "should pass when script is not secured" do
+    describe 'authorization' do
+      it 'should pass when script is not secured' do
         # Script is not secured by any entries
-        params = create_params('SomeScript','SomeKey')
+        params = create_params('SomeScript', 'SomeKey')
         expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
       end
 
-      it "should pass when script is secured and key is valid" do
+      it 'should pass when script is secured and key is valid' do
         expect(@api.script_name).to include('Script1')
 
         params = create_params(@api.script_name, @api.api_key)
         expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
       end
 
-      it "should pass when script is secured and key is valid 2" do
+      it 'should pass when script is secured and key is valid 2' do
         a = ApiAuth.new
         a.app_name = @api.app_name + 'x'
         a.script_name = 'NewScript1'
@@ -151,7 +151,7 @@ module Marty
         expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
       end
 
-      it "should match on exact script name" do
+      it 'should match on exact script name' do
         a = ApiAuth.new
         a.app_name = @api.app_name + 'x'
         a.script_name = 'NewScript1'
@@ -161,12 +161,12 @@ module Marty
         expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
       end
 
-      it "should fail when script is secured and key is invalid" do
+      it 'should fail when script is secured and key is invalid' do
         params = create_params('Script1', 'SomeKey')
         expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
       end
 
-      it "should fail when script is secured and key is invalid (2)" do
+      it 'should fail when script is secured and key is invalid (2)' do
         a = ApiAuth.new
         a.app_name = @api.app_name + 'x'
         a.script_name = 'NewScript1'
@@ -176,7 +176,7 @@ module Marty
         expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
       end
 
-      it "should fail when script is secured and key is not specified" do
+      it 'should fail when script is secured and key is not specified' do
         params = create_params('Script1', nil)
         expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
 
@@ -184,7 +184,7 @@ module Marty
         expect(Marty::Api::Base.is_authorized?(params)).to be_falsey
       end
 
-      it "should pass when api_auth is deleted and no other auths exist" do
+      it 'should pass when api_auth is deleted and no other auths exist' do
         params = create_params(@api.script_name, @api.api_key)
         expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
         @api.delete
@@ -192,7 +192,7 @@ module Marty
         expect(Marty::Api::Base.is_authorized?(params)).to be_truthy
       end
 
-      it "should fail when api_auth is deleted and another auth exists" do
+      it 'should fail when api_auth is deleted and another auth exists' do
         api = @api.dup
         api.app_name += 'x'
         api.api_key = nil