pour 0.0.2.0 → 0.0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e913502c1480108ff5c4507e962f0b1942cad854
-  data.tar.gz: c0a7002bce433cd57b7dc5991d33bd4ad196bc64
+  metadata.gz: f752e5c5701d52dabb1d1b96f9237bc44afac7d0
+  data.tar.gz: 960ffe276844fed404fe548686bae1fcfd084816
 SHA512:
-  metadata.gz: 18c66d5fc0cf2c61c66b5b19369d8c920cfc76814a04e970c40270f01f64a0da18fe837a87dedd1f5b241196f609d051285ce99b59b9b3d657f60d4463b89be6
-  data.tar.gz: ed13cc3654fc013b894406abbe1af802c82cb20519b559f841224231ff322a6b7c1ea4bee2bd1de57a3801bbdb22823a117d5a435fcfa71e55c68d0731a8fd28
+  metadata.gz: ff063ee9dd1919d3b62c084e5dca97fcd6fe607679386ef91d91fa599fbff291599a5dfd54b21103e178cee5c54e0832a03204a5ddad153978e66e15f3803a0b
+  data.tar.gz: 668640df8cb10d3e65a646cd3b959b31e282c2eb48e622e2bb097b0773d8c5668b97499fa5eddce1a59bec86aa1820078ea4694c846ac6b1462a43791622e21a

data/lib/pour/gem.rb

@@ -41,7 +41,7 @@ module Pour
     end
 
     module VERSION #:nodoc:
-      MAJOR, MINOR, PATCH, PRE = [0, 0, 2, 0]
+      MAJOR, MINOR, PATCH, PRE = [0, 0, 3, 0]
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
     end
 

data/lib/pour/mould.rb

@@ -2,14 +2,16 @@ module Pour
   class Mould
     module ClassMethods
       def pour(pourable)
-        unless pourable.class.included_modules.include?(Pour::Pourable)
-          raise Pour::Unpourable.new(pourable)
+        unless pourable.included_modules.include?(Pour::Pourable)
+          # TODO(mtwilliams): Use a custom exceptin type, Pour::Unpourable.
+          raise ":("
         end
 
         poured = self.class_variable_get(:@@__poured__)
 
         unless poured.include? pourable
-          self.class_variable_set(:@@__poured__, poured + pourable)
+          self.class_variable_set(:@@__poured__, poured + [pourable])
+
           # This capture all the properties as well as any user-defined methods.
           self.include(pourable)
         end
@@ -20,12 +22,21 @@ module Pour
     end
 
     def self.inherited(mould)
+      mould.send :include, Pour::Propertied
+
       mould.send :extend, ClassMethods
       mould.send :include, InstanceMethods
-
       # We can assume nothing has been "poured" into |mold|.
-      poured = self.class_variable_get(:@@__poured__) || []
-      mould.class_variable_set(:@@__poured__, poured)
+      mould.class_variable_set(:@@__poured__, [])
+
+      mould.define_singleton_method :inherited do |descendent|
+        mould.send :include, Pour::Propertied
+        descendent.class_variable_set(:@@__properties__, mould.class_variable_get(:@@__properties__))
+
+        descendent.send :extend, ClassMethods
+        descendent.send :include, InstanceMethods
+        descendent.class_variable_set(:@@__poured__, mould.class_variable_get(:@@__poured__))
+      end
     end
   end
 end

data/lib/pour/pourable.rb

@@ -1,57 +1,16 @@
 module Pour
   module Pourable
     module ClassMethods
-      def property(name, typespec)
-        if self.__properties__.map(&:name).include?(name)
-          raise "Already have a property called '#{name}'!"
-        end
-
-        property = Pour::Property.new(name: name, typespec: typespec)
-        self.__properties__ = self.__properties__ + [property]
-
-        decorated = "@#{name}".to_sym
-        reader = name.to_sym
-        writer = "#{name}=".to_sym
-
-        self.class_eval do
-          define_method reader do
-            self.insance_variable_get(decorated)
-          end
-
-          define_method writer do |new_value|
-            if property.typespec.valid?(new_value)
-              self.insance_variable_set(decorated, new_value)
-            else
-              # TODO(mtwilliams): recursively map to determine where and why the
-              # |new_value| doesn't match the typespec.
-              raise ":("
-            end
-          end
-        end
-      end
-
-      def __properties__
-        if self.class.superclass.included_modules.include? Pour::Pourable
-          properties = self.class.superclass.class_variable_get(:@@__properties__)
-          self.class_variable_set(:@@__properties__, properties)
-        end
-
-        self.class_variable_get(:@@__properties__)
-      end
-
-      def __properties__=(properties)
-        self.class_variable_set(:@@__properties__, properties)
-      end
     end
 
     module InstanceMethods
     end
 
     def self.included(pourable)
+      pourable.send :include, Pour::Propertied
+
       pourable.send :extend, ClassMethods
       pourable.send :include, InstanceMethods
-
-      pourable.class_variable_set :@@__properties__, []
     end
   end
 end

data/lib/pour/propertied.rb

@@ -0,0 +1,57 @@
+module Pour
+  module Propertied
+    module ClassMethods
+      def property(name, typespec)
+        if self.__properties__.map(&:name).include?(name)
+          raise "Already have a property called '#{name}'!"
+        end
+
+        property = Pour::Property.new(name: name, typespec: typespec)
+        self.__properties__ = self.__properties__ + [property]
+
+        decorated = "@#{name}".to_sym
+        reader = name.to_sym
+        writer = "#{name}=".to_sym
+
+        self.class_eval do
+          define_method reader do
+            self.insance_variable_get(decorated)
+          end
+
+          define_method writer do |new_value|
+            if property.typespec.valid?(new_value)
+              self.insance_variable_set(decorated, new_value)
+            else
+              # TODO(mtwilliams): recursively map to determine where and why the
+              # |new_value| doesn't match the typespec.
+              raise ":("
+            end
+          end
+        end
+      end
+
+      def __properties__
+        if self.class.superclass.included_modules.include? Pour::Pourable
+          properties = self.class.superclass.class_variable_get(:@@__properties__)
+          self.class_variable_set(:@@__properties__, properties)
+        end
+
+        self.class_variable_get(:@@__properties__)
+      end
+
+      def __properties__=(properties)
+        self.class_variable_set(:@@__properties__, properties)
+      end
+    end
+
+    module InstanceMethods
+    end
+
+    def self.included(pourable)
+      pourable.send :extend, ClassMethods
+      pourable.send :include, InstanceMethods
+
+      pourable.class_variable_set :@@__properties__, []
+    end
+  end
+end

data/lib/pour.rb

@@ -5,6 +5,7 @@ module Pour
   require 'pour/gem'
 
   require 'pour/property'
+  require 'pour/propertied'
   require 'pour/pourable'
   require 'pour/mould'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pour
 version: !ruby/object:Gem::Version
-  version: 0.0.2.0
+  version: 0.0.3.0
 platform: ruby
 authors:
 - Michael Williams
@@ -83,6 +83,7 @@ files:
 - lib/pour/gem.rb
 - lib/pour/mould.rb
 - lib/pour/pourable.rb
+- lib/pour/propertied.rb
 - lib/pour/property.rb
 - pour.gemspec
 homepage: http://mtwilliams.github.io/pour