schemad 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1479b0fa1d4f80709b1a8cbbed8d71ee60201bd3
-  data.tar.gz: fa853a747cc4e901bead3b2d8971a44b35eb928b
+  metadata.gz: d48d9b403dc5e8cfcfbb150bde2e0144db96bca7
+  data.tar.gz: a7017532f492064910b0132665df4b5c3320008c
 SHA512:
-  metadata.gz: b33e6555f9aeee54a1be65026a796876f75ac19309a6935f88fe678eb17a2b071e12fb8fda31e689c71aeda4fcd530265da8497c79893b7cbbfcaa296252c147
-  data.tar.gz: b103e20938c0a2ee01f78d3c10d58dab32d641981bbd4c1f566841fe9e966da4d1fb4fb8e5fdc985a400763943bee4fb05ce1d5c9339ddc00cb729d894bd8458
+  metadata.gz: 280241afecc47aeedcc4bcfbd1fd2db1fa9d269534e77fa3d23ba098320d39c88eeb2072d0d1396f0901ef11327d090dda1934bcfed9841afaddcc96f5239960
+  data.tar.gz: 4976125bebf023752e7d7f69fdfc92563f9901ff74ce3fcb63fcc1c30ed962fd7da114a5440d9b6c952b0d9599f8983e948fdd9c08940a26c67f5f2173681657

data/lib/schemad/entity.rb

@@ -2,37 +2,59 @@ require 'schemad/extensions'
 require 'schemad/type_handler'
 
 module Schemad
-  class Entity
+  module Entity
+    extend ActiveSupport::Concern
     include Schemad::Extensions
 
-    def self.inherited(subclass)
-      default_attrs = inherited_var(:@attributes, [])
-      subclass.instance_variable_set(:@attributes, default_attrs)
+    included do
+      instance_variable_set(:@attributes, [])
     end
 
-    def self.attribute(name, args={}, &block)
-      attr_accessor name
+    module ClassMethods
+      def inherited(subclass)
+        puts "INHERITED BY #{subclass}"
+        default_attrs = inherited_var(:@attributes, [])
+        subclass.instance_variable_set(:@attributes, default_attrs)
+      end
 
-      define_parser_for(name, args, &block)
+      def attribute(name, args={}, &block)
+        attr_accessor name
 
-      @attributes << name
-    end
+        define_parser_for(name, args, &block)
+        @attributes << name
+      end
+
+      # expect data hash to have symbol keys at this point
+      # normalizer should standardize this
+      def from_data(data)
+        obj = new
 
-    # expect data hash to have symbol keys at this point
-    # normalizer should standardize this
-    def self.from_data(data)
-      obj = new
+        @attributes.each do |key|
+          value = obj.send "parse_#{key}", data
+          obj.send "#{key}=", value
+        end
 
-      @attributes.each do |key|
-        value = obj.send "parse_#{key}", data
-        obj.send "#{key}=", value
+        obj
       end
 
-      obj
-    end
+      def attribute_names
+        @attributes
+      end
+
+      private
+
+      def define_parser_for(name, args, &block)
+        define_method "parse_#{name}" do |data|
+          value = data[name]
+          value ||= get_default(args[:default])
 
-    def self.attribute_names
-      @attributes
+          self.send "#{name}=", coerce_to_type(value, args[:type])
+        end
+
+        define_method "#{name}?" do
+          !!send(name)
+        end if args[:type] == :boolean
+      end
     end
 
     def attribute_names
@@ -47,23 +69,11 @@ module Schemad
 
       hash
     end
+
     alias_method :attributes, :to_hash
 
     private
 
-    def self.define_parser_for(name, args, &block)
-      define_method "parse_#{name}" do |data|
-        value = data[name]
-        value ||= get_default(args[:default])
-
-        self.send "#{name}=", coerce_to_type(value, args[:type])
-      end
-
-      define_method "#{name}?" do
-        !!send(name)
-      end if args[:type] == :boolean
-    end
-
     def get_default(default_provider)
       return default_provider unless default_provider.is_a? Proc
       default_provider.call

data/lib/schemad/normalizer.rb

@@ -1,38 +1,51 @@
 require 'schemad/extensions'
 
 module Schemad
-  class Normalizer
+  module Normalizer
+    extend ActiveSupport::Concern
     include Schemad::Extensions
 
     DELIMITER = "/"
 
     InvalidPath = Class.new(Exception)
 
-    def self.inherited(subclass)
-      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)
+    included do
+      instance_variable_set(:@normalizers, {})
+      instance_variable_set(:@allowed_attributes, [])
     end
 
-    def self.include_fields(*fields)
-      @allowed_attributes.concat fields
-    end
+    module ClassMethods
+      def inherited(subclass)
+        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 include_fields(*fields)
+        @allowed_attributes.concat fields
+      end
 
-    def self.normalize(name, args={}, &block)
-      lookup = args[:key] || name
-      method_name = normalizer_method_name(name)
+      def normalize(name, args={}, &block)
+        lookup = args[:key] || name
+        method_name = normalizer_method_name(name)
 
-      @normalizers[lookup] = name
-      @allowed_attributes << lookup
+        @normalizers[lookup] = name
+        @allowed_attributes << lookup
 
-      define_method method_name do |data|
-        value = find_value lookup, data
-        return value unless block_given?
+        define_method method_name do |data|
+          value = find_value lookup, data
+          return value unless block_given?
 
-        yield value
+          yield value
+        end
+      end
+
+      def normalizer_method_name(field)
+        "normalize_#{field}".to_sym
       end
+
     end
 
     def normalize(data)
@@ -108,10 +121,6 @@ module Schemad
       search_data steps, data[step]
     end
 
-    def self.normalizer_method_name(field)
-      "normalize_#{field}".to_sym
-    end
-
     def normalizer_method_name(field)
       self.class.normalizer_method_name(field)
     end

data/lib/schemad/version.rb

@@ -1,3 +1,3 @@
 module Schemad
-  VERSION = "1.2.5"
+  VERSION = "1.3.0"
 end

data/spec/entity_spec.rb

@@ -70,7 +70,9 @@ describe Schemad::Entity do
   end
 
   context "inherited entities" do
-    class Base < Schemad::Entity
+    class Base
+      include Schemad::Entity
+
       attribute :name
     end
 

data/spec/fixtures/demo_class.rb

@@ -1,8 +1,10 @@
-class Ent < Schemad::Entity
+class Ent
+  include Schemad::Entity
+
   attribute :forest, type: :string, default: "Green"
   attribute :roads, type: :integer
   attribute :beasts, type: :integer
   attribute :world
   attribute :cool, type: :boolean
   attribute :created, type: :date_time, default: -> { Time.now }
-end
+end

data/spec/normalizer_spec.rb

@@ -1,7 +1,9 @@
 require 'spec_helper'
 require 'schemad/normalizer'
 
-class Demalizer < Schemad::Normalizer
+class Demalizer
+  include Schemad::Normalizer
+
   normalize :world, key: "Middle Earth" do |val|
     val.upcase
   end
@@ -72,7 +74,9 @@ describe Schemad::Normalizer do
   end
 
   context "can mine nested properties" do
-    class BucketNormalizer < Schemad::Normalizer
+    class BucketNormalizer
+      include Schemad::Normalizer
+
       normalize :answer_to_the_universe, key: "useless_root"
       normalize :username, key: "author/user/username"
       normalize :avatar_url, key: "author/user/links/avatar/href"
@@ -81,7 +85,8 @@ describe Schemad::Normalizer do
       end
     end
 
-    class BadNormalizer < Schemad::Normalizer
+    class BadNormalizer
+      include Schemad::Normalizer
       # missing the "links" part of the path
       normalize :avatar_url, key: "author/user/avatar/href"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemad
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Luke van der Hoeven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple schema DSL for services