marty 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df53e49739260b578673a704246805ddfdfe299a
-  data.tar.gz: 192942a02df9fd61b9062311a55d5a3fecb72bc0
+  metadata.gz: 4fec0c9190bc1dc21dcf6b875d0caea7e18a02b2
+  data.tar.gz: ba68943aa93960504fdb34e75396fd4fbeb5cb63
 SHA512:
-  metadata.gz: b4ca86582715a4d856d5aecceda3c85d30be2adafdd586bf0bdda524d35cbbc668cb797bbfe7e5b4bb3c2e4bf4c7b621aaf54be533b958a2315169525dc3ecf7
-  data.tar.gz: 5e720b5bc6a02a55bf2e3db22a07ecfe0167f42f7710df2fcbb5e4cef216c357f4b5dba2e3df429082b89b5056a5c9569dca01253cc893cc0502cc733196f3cc
+  metadata.gz: 7b9a2d7be4f5442c2fe6738e5a2bbb4bdc6644724eb4847af362f281428545491925273dfdf84d058a1373a967f82fcf5f3d8e564aeb74518d147e49ad875425
+  data.tar.gz: 538254b2f9553151d7a87b86ef6636b47e11b068d7e2f3f6e5ff8e68b005cf3655555994258a3a9a6520b4739606a5e8c1ee75801581a059fd3bfa6f6eafac9d

data/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     marty (1.1.3)
       axlsx (= 2.1.0pre)
       coderay
-      delorean_lang (~> 0.3.24)
+      delorean_lang (~> 0.3.33)
       json-schema
       mcfly (= 0.0.19)
       net-ldap (~> 0.12.0)
@@ -83,7 +83,7 @@ GEM
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
-    delorean_lang (0.3.32)
+    delorean_lang (0.3.33)
       activerecord (>= 3.2)
       treetop (~> 1.5)
     diff-lcs (1.3)

data/app/models/marty/tag.rb

@@ -40,7 +40,7 @@ class Marty::Tag < Marty::Base
     # many different types of arguments.
 
     case tag_id
-    when Fixnum, /\A[0-9]+\z/
+    when Integer, /\A[0-9]+\z/
       tag = find_by_id(tag_id)
     when String
       tag = find_by_name(tag_id)

data/lib/marty/data_importer.rb

@@ -65,7 +65,7 @@ module Marty
           []
 
         raise "bad cleaner function result" unless
-          cleaner_ids.all? {|id| id.is_a?(Fixnum) }
+          cleaner_ids.all? {|id| id.is_a?(Integer) }
 
         eline = 0
 

data/lib/marty/util.rb

@@ -7,7 +7,7 @@ module Marty::Util
 
   def self.get_posting
     sid = Netzke::Base.session && Netzke::Base.session[:posting]
-    return unless sid.is_a? Fixnum
+    return unless sid.is_a? Integer
     sid && Marty::Posting.find_by_id(sid)
   end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/lib/marty/xl.rb

@@ -107,14 +107,14 @@ class Marty::Xl
     x1, y1, x2, y2, w, h = d[1]
     column_offset, row_offset = offset
 
-    y_coords = y2.is_a?(Fixnum) || d[0] != "image" ? [y1, y2] : [y1]
-    x_coords = x2.is_a?(Fixnum) || d[0] != "image" ? [x1, x2] : [x1]
+    y_coords = y2.is_a?(Integer) || d[0] != "image" ? [y1, y2] : [y1]
+    x_coords = x2.is_a?(Integer) || d[0] != "image" ? [x1, x2] : [x1]
 
     # add the row offset:
     y1, y2 = y_coords.map { |y|
-      if y.is_a?(Fixnum)
+      if y.is_a?(Integer)
         row_offset + y
-      elsif y.is_a?(Hash) && y["off"].is_a?(Fixnum)
+      elsif y.is_a?(Hash) && y["off"].is_a?(Integer)
         last_row + y["off"]
       else
         raise "bad offset #{y}"
@@ -123,7 +123,7 @@ class Marty::Xl
 
     # add the column offset:
     x1, x2 = x_coords.map { |x|
-      raise "bad range point #{x}" unless x.is_a? Fixnum
+      raise "bad range point #{x}" unless x.is_a? Integer
       column_offset + x
     }
 
@@ -341,12 +341,12 @@ class Marty::Xl
 
     y1, y2 = [y1, y2].map { |y|
       next y unless y.is_a?(Hash)
-      raise "bad offset #{y}" unless y["off"].is_a?(Fixnum)
+      raise "bad offset #{y}" unless y["off"].is_a?(Integer)
       ws.rows.last.row_index + y["off"]
     }
 
     [x1, y1, x2, y2].each { |x|
-      raise "bad range point #{x}" unless x.is_a? Fixnum
+      raise "bad range point #{x}" unless x.is_a? Integer
     }
     Axlsx.cell_r(x1, y1) + ":" + Axlsx.cell_r(x2, y2)
   end
@@ -400,7 +400,7 @@ class Marty::Xl
         op, offset, data = opl
         raise "bad offset #{offset}" unless
           offset.is_a?(Array) && offset.length == 2 &&
-          offset.all? {|x| x.is_a? Fixnum}
+          offset.all? {|x| x.is_a? Integer}
         # column offset, row offset:
         column_offset, row_offset = offset
         r_number, last_row = row_offset, row_offset
@@ -443,7 +443,7 @@ class Marty::Xl
 
         # FIXME: need to handle Array?
         raise "non hash arg for row_style" unless style.is_a?(Hash)
-        raise "bad row num #{opl}" unless row_num.is_a?(Fixnum)
+        raise "bad row num #{opl}" unless row_num.is_a?(Integer)
 
         style = self.class.symbolize_keys(style, ':')
 
@@ -490,14 +490,14 @@ class Marty::Xl
           range.is_a?(Array) && range.length == 6
         x1, y1, x2, y2, w, h = range
         raise "bad image range, width or height #{range}" unless
-          [ x1, y1, w, h ].all? {|x| x.is_a? Fixnum}
+          [ x1, y1, w, h ].all? {|x| x.is_a? Integer}
         ws.add_image(image_src: "#{Rails.public_path}/images/#{img}",
                      noSelect: true,
                      noMove: true) do |image|
           image.width  = w
           image.height = h
           image.start_at x1, y1
-          image.end_at x2, y2 if x2.is_a?(Fixnum) && y2.is_a?(Fixnum)
+          image.end_at x2, y2 if x2.is_a?(Integer) && y2.is_a?(Integer)
         end
       else
         raise "unknown op #{opl[0]}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1660,7 +1660,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data