spout 0.1.0.rc → 0.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e32f497120ec785b137d1c17e742276175bcefb1
-  data.tar.gz: fc4b7095bc652ca44c4ad0fc57bcb9b7e393faf1
+  metadata.gz: 107e09d3629aadfb7fd0e06b27c115a2d0e87fbd
+  data.tar.gz: 62ea6faceb8218158e870aebedb42ac3047a2a66
 SHA512:
-  metadata.gz: 348a4e793232013cfe12d1444ad6e68e802b095e3cc5b6ee0663ae3985ad010cb1d828c099827f86c991a156e6457fce97667b9ca1fc04ef270647c2bd7f4d6f
-  data.tar.gz: 559c1d2b2c288d81bd2be68387fce94d15f1ac2cccf03bb17ac56cad7457bc2d9d353a3a33cbc1bbc6c4b6e52c374f3ad525ca8f19131762863bebda090c401b
+  metadata.gz: 3d5710e58b74e66277fa1dd0c6a85fbf63edbea619e5b51c5b7720b00f786d7c43586e07f99733432f61c06ac6f83f8daabcf56d12b924a67acb553bc8bfae3b
+  data.tar.gz: a94c8b3c1bfd03586f62079dd01d91cd4563f2fbed2fabaf34d900ea2bc1d5801c22a8ad61846948b6ca80bce0d535aea8a9d741f82b86a9e3fd2ab5d8aee8bd

data/README.md

@@ -25,11 +25,20 @@ spout new my_data_dictionary
 
 cd my_data_dictionary
 
-spout import CSV=data_dictionary.csv
+spout import data_dictionary.csv
 ```
 
 ### Test your repository
 
+If you created your data dictionary repository using `spout new`, you can go ahead and test using:
+
+```
+spout test
+```
+
+If not, you can add the following to your `test` directory to include all Spout tests, or just a subset of Spout tests.
+
+`test/dictionary_test.rb`
 
 ```
 require 'spout/tests'
@@ -49,7 +58,7 @@ class DictionaryTest < Test::Unit::TestCase
 end
 ```
 
-Then run either `bundle exec rake` or `spout test` to run your tests
+Then run either `spout test` or `bundle exec rake` to run your tests.
 
 
 ### Create a CSV Data Dictionary from your JSON repository

data/lib/spout/tasks/engine.rake

@@ -54,7 +54,7 @@ namespace :dd do
       CSV.parse( File.open(ENV['CSV'].to_s, 'r:iso-8859-1:utf-8'){|f| f.read}, headers: true ) do |line|
         row = line.to_hash
         next if row['id'] == ''
-        folder = File.join('variables', row['folder'])
+        folder = File.join('variables', row.delete('folder').to_s.gsub(':', '/'))
         FileUtils.mkpath folder
         hash = {}
         id = row.delete('id')

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

@@ -4,7 +4,7 @@ class DictionaryTest < Test::Unit::TestCase
   include Spout::Tests
 
   # You may add additional tests here
-  # test "the truth" do
+  # def test_truth
   #   assert true
   # end
 end

data/lib/spout/tests/domain_existence_validation.rb

@@ -2,10 +2,24 @@ module Spout
   module Tests
     module DomainExistenceValidation
 
+      def assert_domain_existence(item, msg = nil)
+        result = begin
+          domain_name = JSON.parse(File.read(item))["domain"]+".json"
+          File.exists?(File.join("domains", domain_name))
+        rescue JSON::ParserError => e
+          error = e
+          false
+        end
+        full_message = build_message(msg, "The domain \"domains/#{domain_name}\" referenced by ? does not exist.", item)
+        assert_block(full_message) do
+          result
+        end
+      end
+
       Dir.glob("variables/**/*.json").each do |file|
         if (not [nil, ''].include?(JSON.parse(File.read(file))["domain"]) rescue false)
           define_method("test_domain_exists: "+file) do
-            assert_equal true, (File.exists?(File.join("domains", JSON.parse(File.read(file))["domain"]+".json")) rescue false)
+            assert_domain_existence file
           end
         end
       end

data/lib/spout/tests/json_validation.rb

@@ -2,15 +2,28 @@ module Spout
   module Tests
     module JsonValidation
 
+      def assert_valid_json(item, msg = nil)
+        result = begin
+          !!JSON.parse(File.read(item))
+        rescue JSON::ParserError => e
+          error = e
+          false
+        end
+        full_message = build_message(msg, "?", error)
+        assert_block(full_message) do
+          result
+        end
+      end
+
       Dir.glob("variables/**/*.json").each do |file|
         define_method("test_json: "+file) do
-          assert_equal true, (!!JSON.parse(File.read(file)) rescue false)
+          assert_valid_json file
         end
       end
 
       Dir.glob("domains/**/*.json").each do |file|
         define_method("test_json: "+file) do
-          assert_equal true, (!!JSON.parse(File.read(file)) rescue false)
+          assert_valid_json file
         end
       end
 

data/lib/spout/tests/variable_type_validation.rb

@@ -1,11 +1,18 @@
 module Spout
   module Tests
     module VariableTypeValidation
-      VALID_VARIABLE_TYPES = ['identifier', 'choices', 'integer', 'numeric']
+      VALID_VARIABLE_TYPES = ['identifier', 'choices', 'integer', 'numeric'].sort
+
+      def assert_variable_type(item, msg = nil)
+        full_message = build_message(msg, "? invalid variable type. Valid types: #{VALID_VARIABLE_TYPES.join(', ')}", item)
+        assert_block(full_message) do
+          VALID_VARIABLE_TYPES.include?(item)
+        end
+      end
 
       Dir.glob("variables/**/*.json").each do |file|
         define_method("test_variable_type: "+file) do
-          assert_equal true, (VALID_VARIABLE_TYPES.include?(JSON.parse(File.read(file))["type"]) rescue false)
+          assert_variable_type begin JSON.parse(File.read(file))["type"] rescue nil end
         end
       end
 

data/lib/spout/tests.rb

@@ -12,5 +12,7 @@ module Spout
     include Spout::Tests::JsonValidation
     include Spout::Tests::VariableTypeValidation
     include Spout::Tests::DomainExistenceValidation
+
+    Turn.config.trace = 1
   end
 end

data/lib/spout/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc
+  version: 0.1.0.rc2
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake