stats_package_syntax_file_generator 1.1.3 → 1.1.6

data/lib/syntax_file/maker_sts.rb

@@ -4,171 +4,171 @@
 #   https://github.com/mnpopcenter/stats_package_syntax_file_generator
 
 module SyntaxFile
-  class MakerSTS < Maker
+class MakerSTS < Maker
 
-    def initialize(sfc, syntax_type)
-      super
+def initialize (sfc, syntax_type)
+    super
 
-      m = @sfc.max_var_name_length
-      @var_lab_format = "  %-#{m}s  %s"
-      @var_loc_format = "  %-#{m}s  %s  %s"
-
-      @vars_with_values = get_vars_with_sts_supported_values # cache
-    end
+    m = @sfc.max_var_name_length
+    @var_lab_format   = "  %-#{m}s  %s"
+    @var_loc_format   = "  %-#{m}s  %s  %s"
+    
+    @vars_with_values = get_vars_with_sts_supported_values     # cache
+end
 
-    def syntax
-      r = [
+def syntax
+    r = [
         syn_df,
         syn_var_labs,
         syn_val_labs,
-      ]
-      r.flatten
-    end
+    ]
+    r.flatten
+end
 
-    def convert_to_comments(lines)
-      return [] if lines.empty?
-      [
+def convert_to_comments (lines)
+    return [] if lines.empty?
+    [
         lines.map { |ln| '// ' + ln },
         blank,
-      ].flatten
-    end
+    ].flatten
+end
 
-    def syn_df
-      r = [
+def syn_df
+    r = [
         syn_df_start,
         syn_var_locations(@sfc.variables),
         syntax_end,
-      ]
-      r.flatten
-    end
+    ]
+    r.flatten
+end
 
-    def syn_df_start
-      ['FORMAT fixed', '', (@sfc.data_structure == 'hier') ? hier_fyi : '']
-    end
+def syn_df_start
+    ['FORMAT fixed', '', (@sfc.data_structure == 'hier') ? hier_fyi : '']
+end
 
-    def hier_fyi
-      convert_to_comments(['',
-        'Hierarchical data structures are not directly supported by Stat/Transfer.',
-        'Please see the README for the stats_package_syntax_file_generator gem for more information.', ''
-      ])
-    end
+def hier_fyi
+  convert_to_comments([ '',
+    'Hierarchical data structures are not directly supported by Stat/Transfer.',
+    'Please see the README for the stats_package_syntax_file_generator gem for more information.', ''
+  ])
+end
 
-    def syn_var_locations(var_list)
-      r = [
+def syn_var_locations (var_list)
+    r = [
         'VARIABLES',
         var_list.map { |v| sprintf @var_loc_format, v.name, var_loc_with_fmt(v), var_val_lbl_id(v) }
-      ]
-      r.flatten
-    end
+    ]
+    r.flatten
+end
 
-    def var_val_lbl_id(var)
-      return '' unless @vars_with_values.include?(var)
-      '\\' + var.name
-    end
+def var_val_lbl_id (var)
+    return '' unless @vars_with_values.include?(var)
+    '\\' + var.name
+end
 
-    def syn_var_labs(var_list = [])
-      var_list = @sfc.get_vars_with_var_labels if var_list.empty?
-      var_list = var_list.reject { |var| !supported_var_label?(var) }
-      return [] if var_list.empty?
-      r = [
+def syn_var_labs (var_list = [])
+    var_list = @sfc.get_vars_with_var_labels if var_list.empty?
+    var_list = var_list.reject { |var| !supported_var_label?(var) }
+    return [] if var_list.empty?
+    r = [
         'VARIABLE LABELS',
         var_list.map { |var| syn_var_lab_for_var(var) },
         syntax_end,
-      ]
-      r.flatten
-    end
+    ]
+    r.flatten
+end
 
-    def syn_var_lab_for_var(var)
-      sprintf @var_lab_format, var.name, esc(q(var.label))
-    end
+def syn_var_lab_for_var (var)
+    sprintf @var_lab_format, var.name, esc(q(var.label))
+end
 
-    def syn_val_labs
-      var_list = @vars_with_values
-      return [] if var_list.empty?
-      r = [
+def syn_val_labs
+    var_list = @vars_with_values
+    return [] if var_list.empty?
+    r = [
         'VALUE LABELS',
         syn_val_labs_for_var_list(var_list),
         syntax_end,
-      ]
-      r.flatten
-    end
-
-    def syn_val_labs_for_var_list(var_list)
-      var_list.map { |var| syn_val_labs_for_var(var) }
-    end
+    ]
+    r.flatten
+end
 
-    def syn_val_labs_for_var(var)
-      val_list = labelable_values(var)
-      return [] if val_list.empty?
+def syn_val_labs_for_var_list (var_list)
+    var_list.map { |var| syn_val_labs_for_var(var) }
+end
 
-      m = max_value_length(var, val_list.select { |x| supported_val?(x) })
-      value_format = "    %-#{m}s %s"
-      r = [
+def syn_val_labs_for_var (var)
+    val_list = labelable_values(var)
+    return [] if val_list.empty?
+    
+    m = max_value_length(var, val_list.select {|x| supported_val?(x)})  
+    value_format = "    %-#{m}s %s"
+    r = [
         syn_val_labs_for_var_start(var),
-        val_list.reject { |val| !supported_val?(val) }.map { |val| syn_val_lab_for_val(var, val, value_format) }
-      ]
-      r.flatten
-    end
+        val_list.reject{ |val| !supported_val?(val) }.map { |val| syn_val_lab_for_val(var, val, value_format) }
+    ]
+    r.flatten
+end
 
-    def syn_val_labs_for_var_start(var)
-      '  \\' + var.name
-    end
+def syn_val_labs_for_var_start (var)
+    '  \\' + var.name
+end
 
-    def syn_val_lab_for_val(var, val, fmt)
-      sprintf fmt, sts_val_q(var, val_as_s(var, val.value.to_s)), esc(q(val.label))
-    end
+def syn_val_lab_for_val (var, val, fmt)
+    sprintf fmt, sts_val_q(var, val_as_s(var, val.value.to_s)), esc(q(val.label))
+end
 
-    # value codes (aka value values) need to be quoted with single quotes if they are strings
-    def sts_val_q(var, v)
-      var.is_string_var ? "'#{v}'" : v.to_s
-    end
+# value codes (aka value values) need to be quoted with single quotes if they are strings
+def sts_val_q (var, v)
+    var.is_string_var ? "'#{v}'" : v.to_s
+end
 
-    def var_loc_with_fmt(var)
-      return var.column_locations_as_s + var_fmt(var) unless var.implied_decimals > 0
-      var.start_column.to_s + var_fmt(var)
-    end
+def var_loc_with_fmt (var)
+    return var.column_locations_as_s + var_fmt(var) unless var.implied_decimals > 0
+    var.start_column.to_s + var_fmt(var)
+end
 
-    def var_fmt(var)
-      return ' (A)' if var.is_string_var
-      return '' unless var.implied_decimals > 0
-      ' (F' + var.width.to_s + '.' + var.implied_decimals.to_s + ')'
-    end
+def var_fmt (var)
+    return ' (A)' if var.is_string_var
+    return '' unless var.implied_decimals > 0
+    ' (F' + var.width.to_s + '.' + var.implied_decimals.to_s + ')'
+end
 
-    def q(s)
-      '"' + s.to_s.gsub('"', '\'\'') + '"'
-    end
+def q (s)
+    '"' + s.to_s.gsub('"', '\'\'') + '"'
+end
 
-    def esc(s)
-      s.gsub(/\n/, " [New line.] ")
-    end
+def esc (s)
+    s.gsub(/\n/, " [New line.] ")
+end
 
-    # Stat/Transfer does not like blank value labels
-    def get_vars_with_sts_supported_values()
-      @sfc.get_vars_with_values.select do |var|
+# Stat/Transfer does not like blank value labels
+def get_vars_with_sts_supported_values()
+    @sfc.get_vars_with_values.select do |var|
         sts_supported_values(var).size > 0
-      end
     end
+end
 
-    def sts_supported_values(var)
-      return [] if (var.nil? || var.values.nil?)
-      var.values.select { |val| supported_val?(val) }
-    end
+def sts_supported_values(var)
+    return [] if (var.nil? || var.values.nil?)
+    var.values.select { |val| supported_val?(val) }
+end
 
-    def supported_val?(val)
-      supported_val_label?(val) && supported_val_value?(val)
-    end
+def supported_val?(val)
+    supported_val_label?(val) && supported_val_value?(val)
+end
 
-    def supported_val_label?(val)
-      !(val.nil?) && !(val.label.nil?) && !(val.label.strip.empty?)
-    end
+def supported_val_label?(val)
+    !(val.nil?) && !(val.label.nil?) && !(val.label.strip.empty?)
+end
 
-    def supported_val_value?(val)
-      !(val.nil?) && !(val.value.nil?) && !!(val.value.to_s =~ /^[A-Za-z0-9\-\_\.]+$/)
-    end
+def supported_val_value?(val)
+    !(val.nil?) && !(val.value.nil?) && !!(val.value.to_s =~ /^[A-Za-z0-9\-\_\.]+$/)
+end
 
-    def supported_var_label?(var)
-      !(var.nil?) && !(var.label.nil?) && !(var.label.strip.empty?)
-    end
+def supported_var_label?(var)
+    !(var.nil?) && !(var.label.nil?) && !(var.label.strip.empty?)
+end
 
-  end
+end
 end

data/lib/syntax_file/value.rb

@@ -4,25 +4,26 @@
 #   https://github.com/mnpopcenter/stats_package_syntax_file_generator
 
 module SyntaxFile
-  class Value
+class Value
 
-    ATTR = {
-      :value => { :req => true, :rw => 'rw', :def => nil },
-      :label => { :req => false, :rw => 'rw', :def => '' },
-    }
+ATTR = {
+    :value => { :req => true,  :rw => 'rw', :def =>  nil   },
+    :label => { :req => false, :rw => 'rw', :def =>  ''    },
+}
 
-    ATTR.each_key do |k|
-      attr_reader k if ATTR[k][:rw].include? 'r'
-      attr_writer k if ATTR[k][:rw].include? 'w'
-    end
+ATTR.each_key do |k|
+    attr_reader k if ATTR[k][:rw].include? 'r'
+    attr_writer k if ATTR[k][:rw].include? 'w'
+end
 
-    def initialize(args = {})
-      ATTR.each_key { |k|
-        raise(ArgumentError, "Missing required parameter: '#{k}'.") if ATTR[k][:req] and not args.has_key?(k)
+def initialize (args = {})
+    ATTR.each_key { |k|
+        raise(ArgumentError, "Missing required parameter: '#{k}'.") if
+            ATTR[k][:req] and not args.has_key?(k)
         v = args.has_key?(k) ? args[k] : ATTR[k][:def]
         instance_variable_set("@#{k}".to_sym, v)
-      }
-    end
+    }
+end
 
-  end
+end
 end

data/lib/syntax_file/variable.rb

@@ -4,52 +4,53 @@
 #   https://github.com/mnpopcenter/stats_package_syntax_file_generator
 
 module SyntaxFile
-  class Variable
-
-    ATTR = {
-      :name              => { :req => true,  :rw => 'rw', :def =>  ''    },
-      :label             => { :req => false, :rw => 'rw', :def =>  ''    },
-      :start_column      => { :req => true,  :rw => 'rw', :def =>  nil   },
-      :width             => { :req => true,  :rw => 'rw', :def =>  nil   },
-      :is_string_var     => { :req => false, :rw => 'rw', :def =>  false },
-      :is_double_var     => { :req => false, :rw => 'rw', :def =>  false },
-      :is_common_var     => { :req => false, :rw => 'rw', :def =>  false },
-      :record_type       => { :req => false, :rw => 'rw', :def =>  ''    },
-      :implied_decimals  => { :req => false, :rw => 'rw', :def =>  0     },
-      :suppress_labels   => { :req => false, :rw => 'rw', :def =>  false },
-      :values            => { :req => false, :rw => 'r',  :def =>  nil   },
-    }
-
-    ATTR.each_key do |k|
-      attr_reader k if ATTR[k][:rw].include? 'r'
-      attr_writer k if ATTR[k][:rw].include? 'w'
-    end
+class Variable
+
+ATTR = {
+    :name              => { :req => true,  :rw => 'rw', :def =>  ''    },
+    :label             => { :req => false, :rw => 'rw', :def =>  ''    },
+    :start_column      => { :req => true,  :rw => 'rw', :def =>  nil   },
+    :width             => { :req => true,  :rw => 'rw', :def =>  nil   },
+    :is_string_var     => { :req => false, :rw => 'rw', :def =>  false },
+    :is_double_var     => { :req => false, :rw => 'rw', :def =>  false },
+    :is_common_var     => { :req => false, :rw => 'rw', :def =>  false },
+    :record_type       => { :req => false, :rw => 'rw', :def =>  ''    },
+    :implied_decimals  => { :req => false, :rw => 'rw', :def =>  0     },
+    :suppress_labels   => { :req => false, :rw => 'rw', :def =>  false },
+    :values            => { :req => false, :rw => 'r',  :def =>  nil   },
+}
+
+ATTR.each_key do |k|
+    attr_reader k if ATTR[k][:rw].include? 'r'
+    attr_writer k if ATTR[k][:rw].include? 'w'
+end
 
-    def initialize(args = {})
-      ATTR.each_key { |k|
-        raise(ArgumentError, "Missing required parameter: '#{k}'.") if ATTR[k][:req] and not args.has_key?(k)
+def initialize (args = {})
+    ATTR.each_key { |k|
+        raise(ArgumentError, "Missing required parameter: '#{k}'.") if
+            ATTR[k][:req] and not args.has_key?(k)
         v = args.has_key?(k) ? args[k] : ATTR[k][:def]
         instance_variable_set("@#{k}".to_sym, v)
-      }
-      @values = [] if @values.nil?
-    end
+    }
+    @values = [] if @values.nil?
+end
 
-    def column_locations_as_s
-      @start_column.to_s + '-' + end_column.to_s
-    end
+def column_locations_as_s
+    @start_column.to_s + '-' + end_column.to_s
+end
 
-    def end_column
-      @start_column + @width - 1
-    end
+def end_column
+    @start_column + @width - 1
+end
 
-    def add_value(args)
-      @values.push Value.new(args)
-      @values[-1]
-    end
+def add_value (args)
+    @values.push Value.new(args)
+    @values[-1]
+end
 
-    def clear_values
-      @values = []
-    end
+def clear_values
+    @values = []
+end
 
-  end
+end
 end

data/tests/setup.rb

@@ -31,7 +31,7 @@ def new_value
     SyntaxFile::Value.new params_value()
 end
 
-def new_maker(syntax_type = '')
+def new_maker (syntax_type = '')
     maker_class = 'SyntaxFile::Maker' + syntax_type.upcase
     eval(maker_class).new(new_controller, syntax_type)
 end
@@ -57,7 +57,7 @@ def params_variable
     }
 end
 
-def params_value(val = 99, lab = 'bar')
+def params_value (val = 99, lab = 'bar')
     {
         :value => val,
         :label => 'Test value: ' + lab,
@@ -70,30 +70,30 @@ def params_values
     [0,1,2,9,9999].map { |v| params_value(v, 'bar' + v.to_s) }
 end
 
-def add_new_values_to_var(var)
+def add_new_values_to_var (var)
     params_values.each { |pv| var.add_value(pv) }
 end
 
 # Helper functions.
 
-def params_variable_lookup(k)
+def params_variable_lookup (k)
     params_variable[k]
 end
 
-def vars_to_names(var_list)
+def vars_to_names (var_list)
     return nil if var_list.nil?
     var_list.map { |v| v.name }
 end
 
-def names_to_vars(sfc, var_list)
+def names_to_vars (sfc, var_list)
     var_list.map { |nm| sfc.get_var_by_name(nm) }
 end
 
-def dir_contents(dir_name)
+def dir_contents (dir_name)
     Dir.entries(dir_name).sort.reject { |f| f[0,1] == '.' }
 end
 
-def remove_file_from_dir(d, files)
+def remove_file_from_dir (d, files)
     files.each do |f|
         full_path = File.join(d, f)
         File.delete(full_path) if File.file?(full_path)