typed_fields 0.0.1 → 0.0.2

data/lib/typed_fields/version.rb

@@ -1,3 +1,3 @@
 module TypedFields
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/typed_fields.rb

@@ -46,6 +46,18 @@ module TypedFields
       obj.map{|o| @type.parse o}
     end
   end
+
+  class ProcType
+    def initialize proc
+      @proc = proc
+    end
+
+    def parse obj
+      @proc.call obj
+    end
+  end
+
+  TypeInfo = Struct.new(:field_name, :type, :default)
   
   module ClassMethods
     { :object => ObjectType.new,
@@ -70,45 +82,65 @@ module TypedFields
       if class_variable_defined?(name)
         class_variable_get(name)
       else
-        class_variable_set(name, {})
+        class_variable_set(name, [])
       end
     end
     
     private
     def declare_fields params, type
       options = params.last.is_a?(Hash) ? params.pop : {}
-      options[:type] ||= type
+      type = extract_type(options, type)
+      default = extract_default(options)
       
       params.each do |field_name|
-        saved_type_info[field_name] = options
+        saved_type_info << TypeInfo.new(field_name, type, default)
       end
     end
+
+    def extract_type options, type
+      t = options[:type] || type
+      t.respond_to?(:call) ? ProcType.new(t) : t
+    end
+
+    def extract_default options
+      options[:default]
+    end
   end
 
   module InstanceMethods
     def initialize_fields params
-      set_default_values
-      params.each do |field_name, value|
-        set_value field_name, value
+      self.class.saved_type_info.each do |type_info|
+        value = value_for params, type_info
+        set_value type_info.field_name, value
       end
     end
     
     private
+
+    def value_for params, type_info
+      if passed_value_for? params, type_info
+        value = parse_passed_value params, type_info
+      else
+        value = default_value type_info
+      end
+    end
+
+    def passed_value_for? params, type_info
+       params.has_key?(type_info.field_name)
+    end
+
+    def default_value type_info
+      d = type_info.default
+      d.respond_to?(:call) ? d.call(self) : d
+    end
+
+    def parse_passed_value params, type_info
+      passed_value = params[type_info.field_name]
+      type_info.type.parse(passed_value) 
+    end
     
     def set_value field_name, value
-      type_info = self.class.saved_type_info[field_name]
-      return unless type_info 
-      type = type_info[:type]
-      parsed_value = type.parse(value)
-      instance_variable_set "@#{field_name.to_s}", parsed_value
-    end
-
-    def set_default_values
-      self.class.saved_type_info.each do |field_name, options|
-        default_value = options[:default]
-        default_value = default_value.call(self) if default_value.respond_to? :call
-        set_value field_name, default_value
-      end
+      instance_variable_set "@#{field_name.to_s}", value
     end
   end
        

data/spec/typed_fields_spec.rb

@@ -99,12 +99,18 @@ describe TypedFields do
       f(:field).should == [1,2]
     end
     
-    it "should use custom type" do
+    it "should use a custom type" do
       type = stub(:parse => "parsed")
       clazz.custom :field, :type => type
       object.initialize_fields(:field => nil)
       f(:field).should == "parsed"
     end
+
+    it "should use Proc as a custom type" do
+      clazz.custom :field, :type => Proc.new{|s| s.upcase}
+      object.initialize_fields(:field => "abc")
+      f(:field).should == "ABC"
+    end
   end
 
   context "inheritance" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typed_fields
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-25 00:00:00.000000000Z
+date: 2011-12-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156932540 !ruby/object:Gem::Requirement
+  requirement: &2157005440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156932540
+  version_requirements: *2157005440
 description: ''
 email:
 - vic.savkin@gmail.com