spout 0.8.0.beta14 → 0.8.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44da8a99f11bf9cf6c779e891428be644ed2caf8
-  data.tar.gz: 1880dbb0521218e67434e10912c0802c4b64b836
+  metadata.gz: c0ad7fac5482c072ad581a633a31afe12086a659
+  data.tar.gz: 20de4cb06ae7b431d5e96aa3d82308088986ee43
 SHA512:
-  metadata.gz: 9ab9390da28670115f571beec8d1a266398a0e41906668aa926e200277b115e2f267ad2a52ed07fd492b4053590bec1effb9767aabcecc779a9bb4029243e69b
-  data.tar.gz: 246aeeec4351aa0558e10d00320d3e1317d9801f942d9a8677742b4c9be5af16596cb9da5f669d445d6b8ed4d9bb875f5c819916652fbe3be7d584e50dd549b5
+  metadata.gz: 5b12a3c4217018bf0cd8f55344a3d0aace8693a538555ed1d234487872631841a4c4526cabd73f44b438368729cda39ed176086ca3bfebbd1c8769d38c7c9cb1
+  data.tar.gz: 48936868e7b7732ebd84eb2d7c71ff4724889a4395afa9e8adbbaca3ce270a3d95ec982342dde2b3a1a5258d79b9628b44f9b82c4ac0bd0fc04d1e7644458c44

data/CHANGELOG.md

@@ -5,6 +5,9 @@
   - `include Spout::Tests::FormExistenceValidation`
   - `include Spout::Tests::FormNameUniqueness`
   - `include Spout::Tests::FormNameMatch`
+- Test iterators have been added to provide access to `@variables`, `@forms`, and `@domains` to build custom tests in `dictionary_test.rb`
+  - Add the line `include Spout::Helpers::Iterators` to `dictionary_test.rb` to access the iterators
+  - See [README.md](https://github.com/sleepepi/spout/blob/master/README.md) for examples
 - Added `spout graphs` command that generates JSON charts and tables of each variable in a dataset
   - This command requires a .spout.yml file to be specified to identify the following variables:
     - `visit`: This variable is used to separate subject encounters in a histogram
@@ -15,6 +18,12 @@
 - Added `spout outliers` command that returns a list of integer or numeric variables that contain major and minor outliers
 - Removed the deprecated `spout hybrid` command
 - Spout tests are now run using minitest in favor of test unit
+- Spout dictionary can now be loaded using the following command in irb:
+  - `require 'spout'; dictionary = Spout::Models::Dictionary.new(Dir.pwd)`
+  - `dictionary.load_all!`
+  - `dictionary.variables.count`
+  - `dictionary.domains.count`
+  - `dictionary.forms.count`
 - **Gem Changes**
   - Updated to colorize 0.7.2
   - Updated to minitest

data/README.md

@@ -101,19 +101,20 @@ If not, you can add the following to your `test` directory to include all Spout
 
 `test/dictionary_test.rb`
 
-```
+```ruby
 require 'spout/tests'
 
 class DictionaryTest < Minitest::Test
+  # This line includes all default Spout Dictionary tests
   include Spout::Tests
 end
 ```
 
-```
+```ruby
 require 'spout/tests'
 
 class DictionaryTest < Minitest::Test
-  # Or only include certain tests
+  # You can include only certain Spout tests by including them individually
   include Spout::Tests::JsonValidation
   include Spout::Tests::VariableTypeValidation
   include Spout::Tests::VariableNameUniqueness
@@ -128,10 +129,54 @@ end
 
 Then run either `spout test` or `bundle exec rake` to run your tests.
 
+You can also use Spout iterators to create custom tests for variables, forms, and domains in your data dictionary.
+
+**Example Custom Test 1:** Test that `integer` and `numeric` variables have a valid unit type
+
+```ruby
+class DictionaryTest < Minitest::Test
+  # This line includes all default Spout Dictionary tests
+  include Spout::Tests
+
+  # This line provides access to @variables, @forms, and @domains iterators
+  # iterators that can be used to write custom tests
+  include Spout::Helpers::Iterators
+
+  VALID_UNITS = ['minutes', 'hours']
+
+  @variables.select{|v| v.type == 'numeric' or v.type == 'integer'}.each do |variable|
+    define_method("test_valid_units: "+variable.path) do
+      puts variable.class
+      # => Spout::Models::Variable
+      assert VALID_UNITS.include?(variable.units)
+    end
+  end
+end
+```
+
+**Example Custom Test 2:** Tests that variables have at least 2 or more labels.
+
+```ruby
+class DictionaryTest < Minitest::Test
+  # This line includes all default Spout Dictionary tests
+  include Spout::Tests
+
+  # This line provides access to @variables, @forms, and @domains
+  # iterators that can be used to write custom tests
+  include Spout::Helpers::Iterators
+
+  @variables.select{|v| ['numeric','integer'].include?(v.type)}.each do |variable|
+    define_method("test_at_least_two_labels: "+variable.path) do
+      assert_operator 2, :<=, variable.labels.size
+    end
+  end
+end
+```
+
 
 ### Test your data dictionary coverage of your dataset
 
-Spout lets you generate a nice visual coverage report that displays how well the data dictionary covers your dataset. Place your dataset csvs into `./csvs/` and then run the following Spout command:
+Spout lets you generate a nice visual coverage report that displays how well the data dictionary covers your dataset. Place your dataset csvs into `./csvs/<version>/` and then run the following Spout command:
 
 ```
 spout coverage

data/lib/spout/commands/exporter.rb

@@ -1,6 +1,7 @@
 require 'csv'
 require 'json'
 require 'fileutils'
+require 'colorize'
 
 module Spout
   module Commands

data/lib/spout/commands/images.rb

@@ -15,7 +15,8 @@ module Spout
         @variable_files = Dir.glob('variables/**/*.json')
         @standard_version = standard_version
         @pretend = (argv.delete('--pretend') != nil)
-
+        @sizes = sizes
+        @types = types
 
         @valid_ids = variable_ids
 
@@ -47,13 +48,12 @@ module Spout
         FileUtils.mkpath( options_folder )
         tmp_options_file = File.join( options_folder, 'options.json' )
 
-        sizes = []
-
         variable_files_count = @variable_files.count
         @variable_files.each_with_index do |variable_file, file_index|
           json = JSON.parse(File.read(variable_file)) rescue json = nil
           next unless json
           next unless @valid_ids.include?(json["id"].to_s.downcase) or @valid_ids.size == 0
+          next unless @types.include?(json["type"]) or @types.size == 0
           next unless ["numeric", "integer", "choices"].include?(json["type"])
           variable_name  = json['id'].to_s.downcase
           next unless Spout::Models::Subject.method_defined?(variable_name)
@@ -96,170 +96,14 @@ module Spout
                 }
               eos
             end
-            run_phantom_js("#{json['id']}-lg.png", 600, tmp_options_file) if sizes.size == 0 or sizes.include?('lg')
-            run_phantom_js("#{json['id']}.png",     75, tmp_options_file) if sizes.size == 0 or sizes.include?('sm')
+            run_phantom_js("#{json['id']}-lg.png", 600, tmp_options_file) if @sizes.size == 0 or @sizes.include?('lg')
+            run_phantom_js("#{json['id']}.png",     75, tmp_options_file) if @sizes.size == 0 or @sizes.include?('sm')
           end
 
         end
-        File.delete(tmp_options_file) if File.exists?(tmp_options_file)
+        File.delete(tmp_options_file) if File.exist?(tmp_options_file)
       end
 
-
-      # def initialize(types, variable_ids, sizes, standard_version)
-      #   @standard_version = standard_version
-      #   total_index_count = Dir.glob("variables/**/*.json").count
-
-      #   last_completed = 0
-
-      #   options_folder = "images/#{@standard_version}"
-      #   FileUtils.mkpath( options_folder )
-      #   tmp_options_file = File.join( options_folder, 'options.json' )
-
-      #   Dir.glob("csvs/#{standard_version}/*.csv").each do |csv_file|
-      #     puts "Working on: #{csv_file}"
-      #     t = Time.now
-      #     csv_table = CSV.table(csv_file, encoding: 'iso-8859-1').by_col!
-      #     puts "Loaded #{csv_file} in #{Time.now - t} seconds."
-
-      #     total_header_count = csv_table.headers.count
-      #     csv_table.headers.each_with_index do |header, index|
-      #       puts "Column #{ index + 1 } of #{ total_header_count } for #{header} in #{csv_file}"
-      #       if variable_file = Dir.glob("variables/**/#{header.downcase}.json", File::FNM_CASEFOLD).first
-      #         json = JSON.parse(File.read(variable_file)) rescue json = nil
-      #         next unless json
-      #         next unless ["choices", "numeric", "integer"].include?(json["type"])
-      #         next unless types.size == 0 or types.include?(json['type'])
-      #         next unless variable_ids.size == 0 or variable_ids.include?(json['id'].to_s.downcase)
-
-      #         basename = File.basename(variable_file).gsub(/\.json$/, '').downcase
-      #         col_data = csv_table[header]
-
-      #         case json["type"] when "choices"
-      #           domain_file = Dir.glob("domains/**/#{json['domain']}.json").first
-      #           domain_json = JSON.parse(File.read(domain_file)) rescue domain_json = nil
-      #           next unless domain_json
-
-      #           create_pie_chart_options_file(col_data, tmp_options_file, domain_json)
-      #         when 'numeric', 'integer'
-      #           create_line_chart_options_file(col_data, tmp_options_file, json["units"])
-      #         else
-      #           next
-      #         end
-
-      #         run_phantom_js("#{basename}-lg.png", 600, tmp_options_file) if sizes.size == 0 or sizes.include?('lg')
-      #         run_phantom_js("#{basename}.png",     75, tmp_options_file) if sizes.size == 0 or sizes.include?('sm')
-      #       end
-      #     end
-      #   end
-      #   File.delete(tmp_options_file) if File.exists?(tmp_options_file)
-      # end
-
-      # def graph_values(col_data)
-      #   categories = []
-
-      #   col_data = col_data.select{|v| !['', 'null'].include?(v.to_s.strip.downcase)}.collect(&:to_f)
-
-      #   all_integers = false
-      #   all_integers = (col_data.count{|i| i.denominator != 1} == 0)
-
-      #   minimum = col_data.min || 0
-      #   maximum = col_data.max || 100
-
-      #   default_max_buckets = 30
-      #   max_buckets = all_integers ? [maximum - minimum + 1, default_max_buckets].min : default_max_buckets
-      #   bucket_size = (maximum - minimum + 1).to_f / max_buckets
-
-      #   (0..(max_buckets-1)).each do |bucket|
-      #     val_min = (bucket_size * bucket) + minimum
-      #     val_max = bucket_size * (bucket + 1) + minimum
-      #     # Greater or equal to val_min, less than val_max
-      #     # categories << "'#{val_min} to #{val_max}'"
-      #     categories << "#{all_integers || (maximum - minimum) > (default_max_buckets / 2)  ? val_min.round : "%0.02f" % val_min}"
-      #   end
-
-      #   new_values = []
-      #   (0..max_buckets-1).each do |bucket|
-      #     val_min = (bucket_size * bucket) + minimum
-      #     val_max = bucket_size * (bucket + 1) + minimum
-      #     # Greater or equal to val_min, less than val_max
-      #     new_values << col_data.count{|i| i >= val_min and i < val_max}
-      #   end
-
-      #   values = []
-
-      #   values << { name: '', data: new_values, showInLegend: false }
-
-      #   [ values, categories ]
-      # end
-
-
-      # def create_pie_chart_options_file(values, options_file, domain_json)
-
-      #   values.select!{|v| !['', 'null'].include?(v.to_s.strip.downcase) }
-      #   counts = values.group_by{|a| a}.collect{|k,v| [(domain_json.select{|h| h['value'] == k.to_s}.first['display_name'] rescue (k.to_s == '' ? 'NULL' : k)), v.count]}
-
-      #   total_count = counts.collect(&:last).inject(&:+)
-
-      #   data = counts.collect{|value, count| [value, (count * 100.0 / total_count)]}
-
-      #   File.open(options_file, "w") do |outfile|
-      #     outfile.puts <<-eos
-      #       {
-      #         "title": {
-      #           "text": ""
-      #         },
-
-      #         "credits": {
-      #             "enabled": false,
-      #         },
-      #         "series": [{
-      #                   "type": "pie",
-      #                   "name": "",
-      #                   "data": #{data.to_json}
-      #         }]
-      #       }
-      #     eos
-      #   end
-      # end
-
-
-      # def create_line_chart_options_file(values, options_file, units)
-      #   ( series, categories ) = graph_values(values)
-
-      #   File.open(options_file, "w") do |outfile|
-      #     outfile.puts <<-eos
-      #       {
-      #         "chart": {
-      #             "type": "areaspline"
-      #         },
-      #         "title": {
-      #           "text": ""
-      #         },
-      #         "credits": {
-      #             "enabled": false,
-      #         },
-      #         "xAxis": {
-      #             "categories": #{categories.to_json},
-      #             "labels": {
-      #                 "step": #{(categories.size.to_f / 12).ceil}
-      #             },
-      #             "title": {
-      #                 "text": #{units.to_json}
-      #             }
-      #         },
-      #         "yAxis": {
-      #             "maxPadding": 0,
-      #             "minPadding": 0,
-      #             "title": {
-      #               "text": "Count"
-      #             }
-      #         },
-      #         "series": #{series.to_json}
-      #       }
-      #     eos
-      #   end
-      # end
-
       def run_phantom_js(png_name, width, tmp_options_file)
         graph_path = File.join(Dir.pwd, 'images', @standard_version, png_name)
         directory = File.join( File.dirname(__FILE__), '..', 'support', 'javascripts' )

data/lib/spout/commands/importer.rb

@@ -1,6 +1,7 @@
 require 'csv'
 require 'json'
 require 'fileutils'
+require 'colorize'
 
 module Spout
   module Commands
@@ -10,7 +11,7 @@ module Spout
 
         @csv_file = argv[1].to_s
 
-        unless File.exists?(@csv_file)
+        unless File.exist?(@csv_file)
           puts csv_usage
           return self
         end

data/lib/spout/commands/project_generator.rb

@@ -1,3 +1,5 @@
+require 'colorize'
+
 TEMPLATES_DIRECTORY = File.expand_path('../../templates', __FILE__)
 
 module Spout
@@ -35,6 +37,8 @@ EOT
         copy_file 'keep', 'domains/.keep'
         directory 'variables'
         copy_file 'keep', 'variables/.keep'
+        directory 'forms'
+        copy_file 'keep', 'forms/.keep'
         directory 'test'
         copy_file 'test/dictionary_test.rb'
         copy_file 'test/test_helper.rb'

data/lib/spout/helpers/array_statistics.rb

@@ -1,5 +1,3 @@
-# array_statistics.rb
-
 class Array
   def n
     self.compact.count

data/lib/spout/helpers/iterators.rb

@@ -0,0 +1,17 @@
+require 'spout/models/dictionary'
+
+module Spout
+  module Helpers
+    module Iterators
+
+      def self.included(c)
+        class << c; attr_accessor :dictionary, :variables, :domains, :forms; end
+        c.instance_variable_set(:@dictionary, Spout::Models::Dictionary.new(Dir.pwd).load_all!)
+        c.instance_variable_set(:@variables, c.instance_variable_get(:@dictionary).variables)
+        c.instance_variable_set(:@domains, c.instance_variable_get(:@dictionary).domains)
+        c.instance_variable_set(:@forms, c.instance_variable_get(:@dictionary).forms)
+      end
+
+    end
+  end
+end

data/lib/spout/helpers/json_loader.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Spout
   module Helpers
     class JsonLoader

data/lib/spout/models/dictionary.rb

@@ -0,0 +1,59 @@
+require 'spout/models/variable'
+require 'spout/models/domain'
+require 'spout/models/form'
+
+module Spout
+  module Models
+    class Dictionary
+      attr_accessor :variables, :domains, :forms
+      attr_accessor :app_path
+
+      attr_reader :variable_files, :domain_files, :form_files
+
+      def initialize(app_path)
+        @app_path = app_path
+
+        @variable_files = json_files('variables')
+        @domain_files = json_files('domains')
+        @form_files = json_files('forms')
+
+        @variables = []
+        @domains = []
+        @forms = []
+      end
+
+      def load_all!
+        load_variables!
+        load_domains!
+        load_forms!
+        self
+      end
+
+      def load_variables!
+        load_type!('Variable')
+      end
+
+      def load_domains!
+        load_type!('Domain')
+      end
+
+      def load_forms!
+        load_type!('Form')
+      end
+
+      private
+
+      def json_files(type)
+        Dir.glob(File.join(@app_path, type, "**", "*.json"))
+      end
+
+      def load_type!(method)
+        results = instance_variable_get("@#{method.downcase}_files").collect do |file|
+          Object.const_get("Spout::Models::#{method}").new(file, @app_path)
+        end
+
+        instance_variable_set("@#{method.downcase}s", results)
+      end
+    end
+  end
+end

data/lib/spout/models/domain.rb

@@ -0,0 +1,45 @@
+require 'json'
+
+require 'spout/models/option'
+
+module Spout
+  module Models
+
+    class Domain
+      attr_accessor :id, :folder, :options
+      attr_reader :errors
+
+      def initialize(file_name, dictionary_root)
+        @errors = []
+        @id = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
+
+        @folder = file_name.to_s.gsub(/^#{dictionary_root}\/domains\/|#{@id}\.json$/, '')
+        @options = []
+
+        json = begin
+          if File.exist?(file_name)
+            JSON.parse(File.read(file_name))
+          else
+            @errors << "No corresponding #{@id}.json file found."
+            nil
+          end
+        rescue => e
+          @errors << "Parsing error found in #{@id}.json: #{e.message}" if file_name != nil
+          nil
+        end
+
+        if json and json.kind_of? Array
+          @id = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
+          @options = (json || []).collect do |option|
+            Spout::Models::Option.new(option)
+          end
+        elsif json
+          @errors << "Domain must be a valid array in the following format: [\n  {\n    \"value\": \"1\",\n    \"display_name\": \"First Choice\",\n    \"description\": \"First Description\"\n  },\n  {\n    \"value\": \"2\",\n    \"display_name\": \"Second Choice\",\n    \"description\": \"Second Description\"\n  }\n]"
+        end
+
+      end
+
+
+    end
+  end
+end

data/lib/spout/models/form.rb

@@ -0,0 +1,42 @@
+# {
+#   "id": "intake_questionnaire",
+#   "display_name": "Intake Questionnaire at Baseline Visit",
+#   "code_book": "Baseline-Visit-Intake-Questionnaire.pdf"
+# }
+
+require 'json'
+
+module Spout
+  module Models
+    class Form
+      attr_accessor :id, :display_name, :code_book
+      attr_accessor :errors
+
+      def initialize(file_name, dictionary_root)
+        @errors = []
+        @id     = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
+        @folder = file_name.to_s.gsub(/^#{dictionary_root}\/forms\/|#{@id}\.json$/, '')
+
+        json = begin
+          JSON.parse(File.read(file_name))
+        rescue => e
+          form_name = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
+          @errors << "Error Parsing #{form_name}.json: #{e.message}"
+          nil
+        end
+
+        if json and json.kind_of? Hash
+          %w( display_name code_book ).each do |method|
+            instance_variable_set("@#{method}", json[method])
+          end
+
+          @errors << "'id': #{json['id'].inspect} does not match filename #{@id.inspect}" if @id != json['id']
+        elsif json
+          @errors << "Form must be a valid hash in the following format: {\n\"id\": \"FORM_ID\",\n  \"display_name\": \"FORM DISPLAY NAME\",\n  \"code_book\": \"FORMPDF.pdf\"\n}"
+        end
+
+      end
+
+    end
+  end
+end

data/lib/spout/models/option.rb

@@ -0,0 +1,14 @@
+module Spout
+  module Models
+    class Option
+      attr_accessor :display_name, :value, :description
+
+      def initialize(option_hash)
+        %w( display_name value description ).each do |method|
+          instance_variable_set("@#{method}", (option_hash.kind_of?(Hash) ? option_hash : {})[method])
+        end
+      end
+
+    end
+  end
+end

data/lib/spout/models/variable.rb

@@ -0,0 +1,52 @@
+require 'json'
+
+module Spout
+  module Models
+    class Variable
+      # VARIABLE_TYPES = ['choices', 'numeric', 'integer']
+
+      attr_accessor :id, :folder, :display_name, :description, :type, :units, :labels, :commonly_used
+      attr_accessor :domain_name, :form_names
+      attr_accessor :domain, :forms
+      attr_reader :errors
+
+      def initialize(file_name, dictionary_root)
+        @errors = []
+        @id     = file_name.to_s.gsub(/^(.*)\/|\.json$/, '').downcase
+        @folder = file_name.to_s.gsub(/^#{dictionary_root}\/variables\/|#{@id}\.json$/, '')
+
+
+        json = begin
+          JSON.parse(File.read(file_name))
+        rescue => e
+          error = e.message
+          nil
+        end
+
+        if json and json.kind_of? Hash
+
+          %w( display_name description type units commonly_used ).each do |method|
+            instance_variable_set("@#{method}", json[method])
+          end
+
+          @errors << "'id': #{json['id'].inspect} does not match filename #{@id.inspect}" if @id != json['id']
+
+          @domain_name  = json['domain'] # Spout::Models::Domain.new(json['domain'], dictionary_root)
+          @labels       = (json['labels'] || [])
+          @form_names   = (json['forms'] || []).collect do |form_name|
+            form_name
+          end
+        elsif json
+          @errors << "Variable must be a valid hash in the following format: {\n\"id\": \"VARIABLE_ID\",\n  \"display_name\": \"VARIABLE DISPLAY NAME\",\n  \"description\": \"VARIABLE DESCRIPTION\"\n}"
+        end
+
+        @errors = (@errors + [error]).compact
+      end
+
+      def path
+        File.join(@folder, "#{@id}.json")
+      end
+
+    end
+  end
+end

data/lib/spout/templates/Rakefile

@@ -1,2 +1 @@
-require 'spout'
-Spout::Application.new.load_tasks
+require 'spout/tasks'

data/lib/spout/templates/test/dictionary_test.rb

@@ -1,8 +1,32 @@
 require 'test_helper'
 
 class DictionaryTest < Minitest::Test
+  # This line includes all default Spout Dictionary tests
   include Spout::Tests
 
+  # This line provides access to @variables, @forms, and @domains iterators
+  # iterators that can be used to write custom tests
+  include Spout::Helpers::Iterators
+
+  # Example 1: Create custom tests to show that `integer` and `numeric` variables have a valid unit type
+  # VALID_UNITS = ['minutes', 'hours'] # Add your own valid units to this array
+  # @variables.select{|v| v.type == 'numeric' or v.type == 'integer'}.each do |variable|
+  #   define_method("test_units: "+variable.path) do
+  #     message = "\"#{variable.units}\"".colorize( :red ) + " invalid units.\n" +
+  #               "             Valid types: " +
+  #               VALID_UNITS.sort.collect{|u| u.inspect.colorize( :white )}.join(', ')
+  #     assert VALID_UNITS.include?(variable.units), message
+  #   end
+  # end
+
+  # Example 2: Create custom tests to show that variables have 2 or more labels.
+  # @variables.select{|v| ['numeric','integer'].include?(v.type)}.each do |variable|
+  #   define_method("test_at_least_two_labels: "+variable.path) do
+  #     assert_operator 2, :<=, variable.labels.size
+  #   end
+  # end
+
+  # Example 3: Create regular Ruby tests
   # You may add additional tests here
   # def test_truth
   #   assert true

data/lib/spout/tests.rb

@@ -75,6 +75,8 @@ require 'spout/tests/form_existence_validation'
 require 'spout/tests/form_name_uniqueness'
 require 'spout/tests/form_name_match'
 
+require 'spout/helpers/iterators'
+
 module Spout
   module Tests
     include Spout::Tests::JsonValidation

data/lib/spout/version.rb

@@ -3,7 +3,7 @@ module Spout
     MAJOR = 0
     MINOR = 8
     TINY = 0
-    BUILD = "beta14" # nil, "pre", "rc", "rc2"
+    BUILD = "beta15" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/lib/spout.rb

@@ -1,6 +1,6 @@
 require "spout/version"
-require "spout/application"
-require 'spout/tasks'
+
+require 'spout/models/dictionary'
 
 Spout::COMMANDS = {
   'n' => :new_project,
@@ -108,7 +108,7 @@ EOT
   private
 
   def self.flag_values(flags, param)
-    flags.select{|f| f[0..((param.size + 3) - 1)] == "--#{param}-" and f.length > param.size + 3}.collect{|f| f[(param.size + 3)..-1]}
+    flags.select{|f| f =~ /^--#{param}-/}.collect{|f| f[(param.size + 3)..-1]}
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta14
+  version: 0.8.0.beta15
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,7 +109,6 @@ files:
 - Rakefile
 - bin/spout
 - lib/spout.rb
-- lib/spout/application.rb
 - lib/spout/commands/coverage.rb
 - lib/spout/commands/exporter.rb
 - lib/spout/commands/graphs.rb
@@ -117,16 +116,21 @@ files:
 - lib/spout/commands/importer.rb
 - lib/spout/commands/outliers.rb
 - lib/spout/commands/project_generator.rb
-- lib/spout/commands/test_runner.rb
 - lib/spout/helpers/array_statistics.rb
 - lib/spout/helpers/chart_types.rb
+- lib/spout/helpers/iterators.rb
 - lib/spout/helpers/json_loader.rb
 - lib/spout/helpers/number_helper.rb
 - lib/spout/helpers/subject_loader.rb
 - lib/spout/helpers/table_formatting.rb
 - lib/spout/models/coverage_result.rb
+- lib/spout/models/dictionary.rb
+- lib/spout/models/domain.rb
+- lib/spout/models/form.rb
+- lib/spout/models/option.rb
 - lib/spout/models/outlier_result.rb
 - lib/spout/models/subject.rb
+- lib/spout/models/variable.rb
 - lib/spout/support/javascripts/data.js
 - lib/spout/support/javascripts/highcharts-convert.js
 - lib/spout/support/javascripts/highcharts-more.js

data/lib/spout/application.rb

@@ -1,13 +0,0 @@
-module Spout
-  class Application
-    attr_accessor :version
-
-    def initialize
-      @version = '1.0.0'
-    end
-
-    def load_tasks
-      require "spout/tasks"
-    end
-  end
-end

data/lib/spout/commands/test_runner.rb

@@ -1,35 +0,0 @@
-# module Spout
-#   module Commands
-#     class TestRunner
-#       def initialize(argv)
-#         verbose = (argv.delete('--verbose') != nil)
-
-#         puts "Loaded Suite test"
-
-#         files_loaded = []
-
-
-#         Dir.chdir("test") do
-#           $:.unshift(Dir.pwd)
-#           Dir.glob(File.join("**", "*_test.rb")).each do |test_file|
-#             files_loaded << test_file
-#             require 'spout/tests'
-#             Spout::Tests.class_eval File.read(test_file)
-#             # load test_file #.gsub(/\.rb$/, '')
-#           end
-#         end
-
-#         puts files_loaded.inspect
-#         puts Spout::Tests.constants
-
-#         Spout::Tests.constants.select{|c| Spout::Tests.const_get(c).is_a? Class}.each do |klass|
-#           puts "KLASS: #{klass}"
-#           my_instance = Spout::Tests.const_get(klass).new
-#           puts my_instance.methods.select{|m| m.to_s =~ /^test\_/}.inspect
-#         end
-#         # puts Spout::Tests::JsonValidation.methods
-
-#       end
-#     end
-#   end
-# end