attribrutal 0.0.6 → 0.0.10

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'activesupport'

data/lib/attribrutal.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/hash"
+
 require "attribrutal/version"
 require "attribrutal/model.rb"
 require "attribrutal/coercion.rb"

data/lib/attribrutal/coercion.rb

@@ -1,33 +1,47 @@
-module Coercer
+module Attribrutal
+  module Type
 
-  class Boolean
-    def self.coerce(arg, default = nil)
-      if arg == true
-        true
-      else
-        false
+    class Boolean
+      def self.coerce(arg, default = nil)
+        if arg == true
+          true
+        else
+          false
+        end
       end
     end
-  end
 
-  class Integer
-    def self.coerce(arg, default = nil)
-      if arg.nil?
-        default
-      else
-        Integer(arg)
+    class Integer
+      def self.coerce(arg, default = nil)
+        if arg.nil?
+          default
+        else
+          Integer(arg)
+        end
       end
     end
-  end
 
-  class String
-    def self.coerce(arg, default = nil)
-      if arg.nil?
-        default
-      else
-        String(arg)
+    class String
+      def self.coerce(arg, default = nil)
+        if arg.nil?
+          default
+        else
+          String(arg)
+        end
       end
     end
-  end
 
+    class Array
+      def self.coerce(arg, default = nil)
+        return default unless arg
+        arg.collect {|member| @subtype.coerce(member) }
+      end
+
+      def self.[] (subtype)
+        @subtype = subtype
+        self
+      end
+    end
+
+  end
 end

data/lib/attribrutal/model.rb

@@ -7,18 +7,14 @@ module Attribrutal
     end
 
     def initialize( attrs = {} )
-      all_attributes = attrs.symbolize_keys
-      attribrutal_attributes = all_attributes.select {|k,v| attribute_keys.include? k }
-      other_attributes = all_attributes.reject {|k,v| attribute_keys.include? k }
-      @attributes = attribrutal_attributes
+      all_attributes         = attrs.symbolize_keys
+      @raw_attributes        = all_attributes.select {|k,v| attribute_keys.include? k }
+      other_attributes       = all_attributes.reject {|k,v| attribute_keys.include? k }
       other_attributes.map {|key, val| self.send("#{key}=", val) if respond_to?("#{key}=") }
     end
 
     def raw_attributes
-      attribute_keys.inject(Hash.new) do |attributes, attribute|
-        attributes[attribute] = @attributes[attribute]
-        attributes
-      end
+      @raw_attributes
     end
 
     def attributes
@@ -37,15 +33,23 @@ module Attribrutal
       def attribute (sym, coercer=nil, attrs = {})
 
         define_method(sym) do
+          default_value = case attrs[:default].class.name
+                          when "NilClass", "TrueClass", "FalseClass", "Numeric", "Fixnum", "Symbol"
+                            attrs[:default]
+                          when "Proc"
+                            attrs[:default].call
+                          else
+                            attrs[:default].clone
+                          end
           if coercer && coercer.respond_to?(:coerce)
-            coercer.send(:coerce, @attributes[sym], attrs[:default])
+            coercer.send(:coerce, raw_attributes[sym], default_value)
           else
-            @attributes[sym] || default
+            raw_attributes[sym] ||= default_value
           end
         end
 
         define_method("#{sym}=".to_sym) do |value|
-          @attributes[sym] = value
+          raw_attributes[sym] = value
         end
 
         if @attributes

data/lib/attribrutal/version.rb

@@ -1,3 +1,3 @@
 module Attribrutal
-  VERSION = "0.0.6"
+  VERSION = "0.0.10"
 end

data/spec/attribrutal_spec.rb

@@ -10,7 +10,7 @@ describe "Attribrutal#attributes" do
   end
 
   it "records defined attribute types" do
-    Bar.attributes.values.should == [Coercer::Boolean, Coercer::String, Coercer::Baz]
+    Bar.attributes.values.should == [Attribrutal::Type::Boolean, Attribrutal::Type::String, Coercer::Baz]
   end
 
   it "supports mass assignment" do
@@ -42,14 +42,14 @@ describe "Attribrutal#attributes" do
 
   it "is fast enough" do
     initialization_time = 1000 * Benchmark.realtime do
-      10_000.times { Bar.new }
+      1000.times { Bar.new }
     end
     initialization_time.should < 5
 
     coercion_time = 1000 * Benchmark.realtime do
-      10_000.times { Bar.new foo: nil, bar: 10, baz: { alpha: "1", beta: "2" } }
+      1000.times { Bar.new(foo: nil, bar: 10, baz: { alpha: "1", beta: "2" }).attributes }
     end
-    coercion_time.should < 50
+    coercion_time.should < 25
   end
 
 end

data/spec/support/models/bar.rb

@@ -1,6 +1,6 @@
 class Bar
   include Attribrutal::Model
-  attribute :foo, Coercer::Boolean
-  attribute :bar, Coercer::String, default: "bar"
+  attribute :foo, Attribrutal::Type::Boolean
+  attribute :bar, Attribrutal::Type::String, default: "bar"
   attribute :baz, Coercer::Baz, default: lambda { ::Baz.new alpha: 50, beta: 100 }
 end

data/spec/support/models/baz.rb

@@ -1,5 +1,5 @@
 class Baz
   include Attribrutal::Model
-  attribute :alpha, Coercer::Integer, default: 1
-  attribute :beta, Coercer::Integer, default: 2
+  attribute :alpha, Attribrutal::Type::Integer, default: 1
+  attribute :beta, Attribrutal::Type::Integer, default: 2
 end

data/spec/support/models/coercer.rb

@@ -3,7 +3,7 @@ module Coercer
   class Baz
     def self.coerce(arg, default = nil)
       if arg.nil?
-        default.lambda? ? default.call : default
+        default
       else
         ::Baz.new(arg)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribrutal
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2151528194976546338
+      hash: 4418677033310836668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2151528194976546338
+      hash: 4418677033310836668
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23