rfunk 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c539b96a759a551a6d9fbb57f06415dc09d0cb26
-  data.tar.gz: b5f8bb018a680fcfff0efcc0b18f9e32f4ba4dd5
+  metadata.gz: 19d4d78e7405dd0df4292227a632888722874ea1
+  data.tar.gz: a7c3e340bbc434670d8a524d8c30ff8a7923bab9
 SHA512:
-  metadata.gz: 292cf72c0c5f89b49d368453f5183b0063da281ee86531832d07c61183336fb2dae11604a463f4efd19b7671e5e61ec0df9eb2a923152a15d09b6692e9bd82b2
-  data.tar.gz: 4b0b4dae55ee2f40a9a9a79f336a3f8cec5711058d55bec443b0be45e3afecde0ac45cb4053800e95e5820918a67d6a35bcf8ac82d6ef436873de71b61ebe33b
+  metadata.gz: d74968aa0449b85a88e54e5bfc876cefe809937eb38a21c4e5b7038ce669de34aef258509f373bb1f4be2014d5e5fed1ffd71c464c89a42030b096340d58b6c3
+  data.tar.gz: 0ce78139b5124ee24939f52f2e58eea0ab963f642349e21827070d7b5d46d447b3f5dbb46fb5388eef05068e9df9e7cc011da7ef9259bf3913d1add235e942fc

data/lib/rfunk/attribute.rb

@@ -7,22 +7,13 @@ module RFunk
     end
 
     def initialize(options = {})
-      attributes = self.class.instance_variable_get(ATTRIBUTES_VARIABLE_NAME)
-
-      options.each { |key, value|
-        raise_not_found(key, attributes)
-
-        type = attributes[key]
-
-        raise_expected_type(key, value, type)
-
-        self.instance_variable_set(variable_name(key), value)
-      }
+      with_defaults
+      with_attributes(options)
     end
 
     module ClassMethods
-      def attribute(name, type)
-        add_attribute(name, type)
+      def attribute(name, type, options = {})
+        add_attribute(name, type, options)
 
         self.send :define_method, name do |value = nil|
           if value
@@ -36,15 +27,38 @@ module RFunk
 
       private
 
-      def add_attribute(name, type)
+      def add_attribute(name, type, options)
         attributes = self.instance_variable_get(ATTRIBUTES_VARIABLE_NAME) || {}
-        attributes[name] = type
+        attributes[name] = AttributeType.new(name, type, options)
         self.instance_variable_set(ATTRIBUTES_VARIABLE_NAME, attributes)
       end
     end
 
     private
 
+    def attributes
+      self.class.instance_variable_get(ATTRIBUTES_VARIABLE_NAME)
+    end
+
+    def with_defaults
+      attributes.each { |key, attribute|
+        value = attribute.options[:default]
+        set_variable(attribute, key, value) if value
+      }
+    end
+
+    def with_attributes(options)
+      options.each { |key, value|
+        raise_not_found(key, attributes)
+        set_variable(attributes[key], key, value)
+      }
+    end
+
+    def set_variable(attribute, key, value)
+      raise_expected_type(key, value, attribute.type)
+      self.instance_variable_set(variable_name(key), value)
+    end
+
     def variable_name(name)
       "@#{name}"
     end
@@ -62,11 +76,17 @@ module RFunk
     end
 
     def raise_expected_type(name, value, type)
-      raise TypeError, "Expected a type of '#{type}' for attribute '#{name}'" unless value.instance_of?(type)
+      unless value.instance_of?(type)
+        message = "Expected a type of '#{type}' for attribute '#{name}'"
+        raise TypeError, message
+      end
     end
 
     def raise_not_found(key, attributes)
-      raise RFunk::NotFoundError, "Attribute with name '#{key}' does not exist. The only available attributes are '#{attributes}'" unless attributes.key?(key)
+      unless attributes.key?(key)
+        message = "Attribute with name '#{key}' does not exist. The only available attributes are '#{attributes.keys}'"
+        raise RFunk::NotFoundError, message
+      end
     end
   end
 end

data/lib/rfunk/attribute_type.rb

@@ -0,0 +1,4 @@
+module RFunk
+  class AttributeType < Struct.new(:name, :type, :options)
+  end
+end

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/rfunk.rb

@@ -2,6 +2,7 @@ require 'singleton'
 require 'ice_nine'
 require 'ice_nine/core_ext/object'
 
+require 'rfunk/attribute_type'
 require 'rfunk/attribute'
 require 'rfunk/option'
 require 'rfunk/none'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Falkowski
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - lib/rfunk.rb
 - lib/rfunk/attribute.rb
+- lib/rfunk/attribute_type.rb
 - lib/rfunk/either.rb
 - lib/rfunk/failure.rb
 - lib/rfunk/lazy.rb