acu127014 - Begin Attributor 1.0 work

praxis · Sep 24, 2013 · 175b014 · 175b014 · flexera-ci · Sep 24, 2013
1 parent 3538652
commit 175b014
Show file tree

Hide file tree

Showing 16 changed files with 2,833 additions and 1,052 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,8 @@ gem "randexp"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec"
-  gem "yard", "~> 0.7"
+  gem "yard", "~> 0.8.7"
+  gem "redcarpet"
   gem "rdoc", "~> 3.12"
   gem "bundler"
   gem "jeweler", "~> 1.8.4"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,6 +45,7 @@ GEM
     randexp (0.1.7)
     rdoc (3.12.2)
       json (~> 1.4)
+    redcarpet (3.0.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -53,7 +54,7 @@ GEM
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.1)
-    yard (0.8.6.2)
+    yard (0.8.7)
 
 PLATFORMS
   ruby
@@ -63,5 +64,6 @@ DEPENDENCIES
   jeweler (~> 1.8.4)
   randexp
   rdoc (~> 3.12)
+  redcarpet
   rspec
-  yard (~> 0.7)
+  yard (~> 0.8.7)
diff --git a/lib/attributor.rb b/lib/attributor.rb
@@ -4,13 +4,19 @@
 module Attributor
 
   require_relative 'attributor/attribute'
+  require_relative 'attributor/base'
 
-  require_relative 'attributor/hash'
+#  require_relative 'attributor/hash'
   require_relative 'attributor/integer'
   require_relative 'attributor/string'
-  require_relative 'attributor/array'
-  require_relative 'attributor/csv'
-  require_relative 'attributor/ids'
-  require_relative 'attributor/date_time'
-  require_relative 'attributor/boolean'
+#  require_relative 'attributor/array'
+#  require_relative 'attributor/csv'
+#  require_relative 'attributor/ids'
+#  require_relative 'attributor/date_time'
+#  require_relative 'attributor/boolean'
+  require_relative 'attributor/model'
+  require_relative 'attributor/struct'
+  require_relative 'attributor/dsl_compiler'
+
+
 end
diff --git a/lib/attributor/array.rb b/lib/attributor/array.rb
@@ -112,7 +112,9 @@ def decode( value, context )
           element_index += 1
           sub_object
         end
-        [ loaded_value, loaded_errors ]
+
+        loaded_value , sub_errors = decode_substructure( loaded_value, context )
+        [ loaded_value, loaded_errors + sub_errors ]
       end
 
       def decode_substructure( decoded_value , context )