ass_ole-snippets-shared 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15ad4297c56ecc803b82f6d11790ac0811678b69
-  data.tar.gz: 6ac5e824f42a44761fc0020eafce4a3d76462099
+  metadata.gz: 5ef8af3522c444ae9dc38adca2ac74a46f6c88a6
+  data.tar.gz: 63163372c91ab83d973249f3f0a152ad70084c4d
 SHA512:
-  metadata.gz: b65c3b61ff9c4bdf149e595ff51bfeaf505fc52954c99ebcff4373e498581e57d1096dedc67de8b42391238e260f780fdd351fbbd4b36af767bb77d4582a8abd
-  data.tar.gz: fa74480b38d453141112f1c8f962143165a197d38473badfa980a12f04a6884bee68b8f978906b870ea596e5c4f9f9cc834cb89ff827916c2b508ac1d4866bda
+  metadata.gz: 9b17ae1e23d8cd2dce0af0e1d384e9c9a81a19440547ba99cf47e1371cc6ff9fdc6fb5b581f498a379fe8bf2ec0ae1092327fc2dff85c177f04ed5afdbc828e4
+  data.tar.gz: b8ea8240651d0bcd64c463c58490581589bf6ea97d6cfe0d1f1b46e2cfcc4448c08f4ed733091b46913882c7b98eb83e1d19e11c76c35b1188e394ceca9e54fc

data/lib/ass_ole/snippets/shared/value_table.rb

@@ -15,7 +15,7 @@ module AssOle
       #    vt_wrapper.add f1: 0, f2: 1, f3: 2
       #  end # => WIN32OLE
       #
-      #  # Make new ValueTable and insert into 3 rows
+      #  # Make new ValueTable without typing of columns and insert into 3 rows
       #  value_table :f1, :f2, :f3 do |vt_wrapper|
       #    3.times do |r|
       #      vt_wrapper.add do |row|
@@ -25,6 +25,17 @@ module AssOle
       #      end
       #    end
       #  end # => WIN32OLE
+      #
+      #  # Make new ValueTable with typing of columns and insert into 3 rows
+      #  value_table f1:%w{String Boolean}, f2:[String, Date], f3:'String,Date' do |vt_wrapper|
+      #    3.times do |r|
+      #      vt_wrapper.add do |row|
+      #        row.f1 = r
+      #        row.f2 = 10 + r
+      #        row.f3 = 20 + r
+      #      end
+      #    end
+      #  end # => WIN32OLE
       module ValueTable
         # Warapper for add rows into +ValueTable+
         # @api private
@@ -55,14 +66,42 @@ module AssOle
           end
         end
 
+        module Columns
+          def self.make(vtable, columns, columns_with_types, ole_connector)
+            to_columns_with_types(columns).merge(columns_with_types)
+              .each do |col, types|
+              type_desc_ = type_desc(types, ole_connector)
+              vtable.Columns.Add(col.to_s, type_desc_) if type_desc_
+              vtable.Columns.Add(col.to_s) unless type_desc_
+            end
+            vtable.Columns
+          end
+
+          def self.type_desc(types, ole_connector)
+            return unless types
+            types_ = types.clone
+            types_ = types_.split(',') if types.is_a? String
+            ole_connector.newObject('TypeDescription', types_.join(','))
+          end
+
+          def self.to_columns_with_types(columns)
+            r = {}
+            columns.each do |col|
+              r[col.to_sym] = nil
+            end
+            r
+          end
+        end
+
         # @param columns [Array] +ValueTable+ columns
+        # @param columns_with_types [Hash] +ValueTable+ columns with column
+        #  type names [Array] like %w{TypeName OtheTypeName}
+        #  or [String] like 'TypeName, OtheTypeName'
         # @yield [Wrapper]
         # @return [WIN32OLE] 1C +ValueTable+ object
-        def value_table(*columns, &block)
+        def value_table(*columns, **columns_with_types, &block)
           r = newObject('ValueTable')
-          columns.each do |coll|
-            r.Columns.Add(coll.to_s)
-          end
+          Columns.make(r, columns, columns_with_types, ole_connector)
           r = Wrapper.new(r)
           yield r if block_given?
           r.ole

data/lib/ass_ole/snippets/shared/version.rb

@@ -2,7 +2,7 @@ module AssOle
   module Snippets
     #
     module Shared
-      VERSION = '0.3.1'
+      VERSION = '0.3.2'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ass_ole-snippets-shared
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Leonid Vlasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ass_ole