schemad 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 591b51216e927a53f322119b2c11659e905d14fd
-  data.tar.gz: 8c3d791c8bb7ee3c74c2726a8cfb99c363850b86
+  metadata.gz: c365fd42508eefbf5df2f46504c0a12ecdda0a02
+  data.tar.gz: 72dc0e423ede9244418d7c1df9a3405d51b2ccfe
 SHA512:
-  metadata.gz: f425f6ab0594c9a3a9152f47ab05974c0648d3e6185795423d38fe6737d93b12350364d6af9dd9605d86e52d7991d157a445b876c9fadf76a3a621d53a4e740c
-  data.tar.gz: b59de05f895f35cae43e727240ab9fe069035258715efea8501eabf1bc9a97edc5bf48f30f4020993b2603cc8963f388c7f333affef38e7eed2124a0ab3b3bc6
+  metadata.gz: 8e6b7c4c4557ed40b1ae2236b032ec9e24c6c33741ea979c641bca682ac4c1305eb3596a85151830be4a54ce4ddbb129325c653c162020a9af76e71a6a234af1
+  data.tar.gz: 31e85397afe6b80b73ad7f3894ee12402f24c0e3e34ed99da6037f7499fff0ceb2672ce7927c5d07bf967fa92012e61f69737f29953ec05b00dce011544645aa

data/.travis.yml

@@ -1,14 +1,17 @@
 language: ruby
 rvm:
-  - 2.0
-  - 2.1
-  - 1.9.3
-  - rbx
-  - jruby-19mode
-
+- 1.9.3
+- 2.0
+- 2.1
+- 2.2
+- rbx
+- jruby-19mode
 matrix:
   allow_failures:
-    - rvm: rbx
-    - rvm: jruby-19mode
-
-script: bundle exec rake spec
+  - rvm: 1.9.3
+  - rvm: rbx
+  - rvm: jruby-19mode
+script: bundle exec rake spec
+env:
+  global:
+    secure: oXespZsV0esupERqRSdJe6WMV4pyUtRUxKqgZZ7+lHDiLf0rUfXeJ96atyqHF293C7oApAkyoM6Lf92Vw5wDJJzdghuDMMa+e18ilHHGD0eDUB3MfDCuj6oHdCTxYs5q9L0rGPTkUcx+EVw3PeFe9CDaWHhIkvosfrdzXf9volU=

data/lib/schemad/entity.rb

@@ -3,10 +3,11 @@ require 'schemad/type_handler'
 
 module Schemad
   class Entity
-    extend Schemad::Extensions
+    include Schemad::Extensions
 
     def self.inherited(subclass)
-      subclass.instance_variable_set(:@attributes, inherited_attrs)
+      default_attrs = inherited_var(:@attributes, [])
+      subclass.instance_variable_set(:@attributes, default_attrs)
     end
 
     def self.attribute(name, args={}, &block)
@@ -45,10 +46,6 @@ module Schemad
     alias_method :attributes, :to_hash
 
     private
-    def self.inherited_attrs
-      parent_attrs = self.instance_variable_get(:@attributes)
-      default_attrs = (parent_attrs ? parent_attrs.dup : [])
-    end
 
     def self.define_parser_for(name, args, &block)
       define_method "parse_#{name}" do |data|

data/lib/schemad/extensions.rb

@@ -11,6 +11,11 @@ module Schemad
       def base_class_name
         name.demodulize
       end
+
+      def inherited_var(attr_name, default)
+        parent_attrs = self.instance_variable_get(attr_name)
+        default_attrs = (parent_attrs ? parent_attrs.dup : default)
+      end
     end
 
     def base_class_name
@@ -35,5 +40,7 @@ module Schemad
     def indifferent_hash(hash)
       ActiveSupport::HashWithIndifferentAccess.new hash
     end
+
+
   end
 end

data/lib/schemad/normalizer.rb

@@ -9,8 +9,11 @@ module Schemad
     InvalidPath = Class.new(Exception)
 
     def self.inherited(subclass)
-      subclass.instance_variable_set(:@normalizers, {})
-      subclass.instance_variable_set(:@allowed_attributes, [])
+      default_normalizers = inherited_var(:@normalizers, {})
+      subclass.instance_variable_set(:@normalizers, default_normalizers)
+
+      default_allowed = inherited_var(:@allowed_attributes, [])
+      subclass.instance_variable_set(:@allowed_attributes, default_allowed)
     end
 
     def self.include_fields(*fields)

data/lib/schemad/version.rb

@@ -1,3 +1,3 @@
 module Schemad
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemad
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Luke van der Hoeven