acfs 0.22.2.b193 → 0.22.2.b194

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWI5YzUzYWUxMTk1ZTgyMjhhZDFiYmIzNTMwYTY4Zjg5ZThlYWM4ZQ==
+    ZDBlODUyYTBjYWJmOTJmYTczYjVjNTc5YTc3OTkzYjc3YTQ5NWE1NA==
   data.tar.gz: !binary |-
-    NDBjYTFiZTg4ZGQ2YjQwNTZiNDE3NGE1ZTU4YmFhODc1ZWRhY2RkNg==
+    NzZiYTA2NGNhZWViZGM2NzY1YTcxYWYzZGNiNmZlYmU3YWM0ZTE1Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2E1ZWFmM2QzMTA0NWM5OWU2ZTgwYzlhNTY0MmIyNDA5MTc0ZTFhNTVmYzU2
-    ZjI3MDA5NmRkYmI3YzNkOWU0N2ZiMTc4OGUzYWEzZWRiNWRhZGI5OWExMGQx
-    YmY0ZjRkMjQ1YjQwZmZjNWY2MzVkZGFjNTEyZjdhMTAwNWY1M2Q=
+    OWUwYjdjMjVkMzMwY2Q4MGY1YWU2YmJiNWMxNDY3MDRkYWFkNWNhYzkwMGMx
+    NjZiZDZkYzg0NWM0ZTk1NWI2ZDg1ZmIwNmZkM2Q0NDUxZDYwMWFhMDM1NjMz
+    ZDdlNzU1ODEzMWI0ZDAxZmM5ZDQ5ZmNlN2M4ODFmYjY2MzlhMzU=
   data.tar.gz: !binary |-
-    ZjcwMzEyYzhlNWQzNDM4MjI1NjQwYTg3YTEyOWU4M2QxZmNlMjM5MGNlMDk1
-    ZWI0MWVhNDE3ZTNhYTcxZmU1ZGM4ODJiNzFiZjE2YjdmNTA0YzYyZWEwZjI3
-    YWQ5MTJiY2FhZDhiNzQyMTM5MjQ2M2ZiYzY1N2Q3NWJjYWU4OTU=
+    YmNlOWU1YzkyNGNjZDRmMmI2ZWIzNDMwN2RhMWU0M2FkNTZmNjFjMjFkNzUy
+    ZWI5MmQ0MWZhM2YwYzY5MmZjYmRhZmViYzViYmI5OWRhN2ExZDc3Njc5NWE5
+    MGRiYmNjYmRkZGQ0YzcxNjljZmY2MzM2ODU1YjdkNDkxYjE5NmY=

data/lib/acfs/model/attributes.rb

@@ -125,11 +125,11 @@ module Acfs::Model
     # @raise [ ArgumentError ] If no attribute with given name is defined.
     #
     def write_attribute(name, value, opts = {})
-      if (type = self.class.attribute_types[name.to_sym]).nil?
+      if (attr = self.class.defined_attributes[name.to_s]).nil?
         raise ArgumentError.new "Unknown attribute `#{name}`."
       end
 
-      write_raw_attribute name, value.nil? ? nil : type.cast(value), opts
+      write_raw_attribute name, attr.cast(value), opts
     end
 
     # @api private
@@ -187,7 +187,15 @@ module Acfs::Model
       # @return [ Hash{ String => Object, Proc } ] Attributes with default values.
       #
       def attributes
-        @attributes ||= {}.merge superclass.respond_to?(:attributes) ? superclass.attributes : {}
+        Hash.new.tap do |attrs|
+          defined_attributes.each do |key, attr|
+            attrs[key] = attr.default_value
+          end
+        end
+      end
+
+      def defined_attributes
+        @attributes ||= {}.merge superclass.respond_to?(:defined_attributes) ? superclass.defined_attributes : {}
       end
 
       # @api public
@@ -211,11 +219,9 @@ module Acfs::Model
       private
       def define_attribute(name, type, opts = {})
         name             = name.to_s
-        default_value    = opts.has_key?(:default) ? opts[:default] : nil
-        default_value    = type.cast default_value unless default_value.is_a? Proc or default_value.nil?
+        attribute        = type.new opts
 
-        attributes[name] = default_value
-        attribute_types[name.to_sym] = type
+        defined_attributes[name] = attribute
         define_attribute_method name
 
         self.send :define_method, name do

data/lib/acfs/model/attributes/base.rb

@@ -0,0 +1,28 @@
+module Acfs::Model::Attributes
+
+  class Base
+    attr_reader :options
+
+    def initialize(opts = {})
+      @options = opts
+      @options.reverse_merge! allow_nil: true
+    end
+
+    def nil_allowed?
+      !!options[:allow_nil]
+    end
+
+    def default_value
+      options[:default].is_a?(Proc) ? options[:default] : cast(options[:default])
+    end
+
+    def cast(obj)
+      return nil if obj.nil? && nil_allowed?
+      cast_type obj
+    end
+
+    def cast_type(obj)
+      raise NotImplementedError
+    end
+  end
+end

data/lib/acfs/model/attributes/boolean.rb

@@ -16,7 +16,7 @@ module Acfs::Model
     #
     #  true, on, yes
     #
-    module Boolean
+    class Boolean < Base
 
       TRUE_VALUES = %w(true on yes)
 
@@ -27,7 +27,7 @@ module Acfs::Model
       # @param [Object] obj Object to cast.
       # @return [TrueClass, FalseClass] Casted boolean.
       #
-      def self.cast(obj)
+      def cast_type(obj)
         return true if obj.is_a? TrueClass
         return false if obj.is_a? FalseClass
 

data/lib/acfs/model/attributes/date_time.rb

@@ -1,31 +1,30 @@
-module Acfs::Model
-  module Attributes
+module Acfs::Model::Attributes
+
+  # @api public
+  #
+  # DateTime attribute type. Use it in your model as an attribute type:
+  #
+  # @example
+  #   class User
+  #     include Acfs::Model
+  #     attribute :name, :date_time
+  #   end
+  #
+  class DateTime < Base
 
     # @api public
     #
-    # DateTime attribute type. Use it in your model as an attribute type:
+    # Cast given object to DateTime.
+    # Expect
     #
-    # @example
-    #   class User
-    #     include Acfs::Model
-    #     attribute :name, :date_time
-    #   end
+    # @param [Object] obj Object to cast.
+    # @return [DateTime] Casted object as DateTime.
     #
-    module DateTime
-
-      # @api public
-      #
-      # Cast given object to DateTime.
-      # Expect
-      #
-      # @param [Object] obj Object to cast.
-      # @return [DateTime] Casted object as DateTime.
-      #
-      def self.cast(obj)
-        return obj if obj.is_a? ::DateTime
-        return ::DateTime.iso8601(obj.iso8601) if obj.is_a? Time or obj.is_a? Date
-        return ::DateTime.iso8601(obj)
-      end
+    def cast_type(obj)
+      return nil if nil_allowed? and obj.blank?
+      return obj if obj.is_a? ::DateTime
+      return ::DateTime.iso8601(obj.iso8601) if obj.is_a? Time or obj.is_a? Date
+      return ::DateTime.iso8601(obj)
     end
   end
 end

data/lib/acfs/model/attributes/float.rb

@@ -1,28 +1,26 @@
-module Acfs::Model
-  module Attributes
+module Acfs::Model::Attributes
+
+  # @api public
+  #
+  # Float attribute type. Use it in your model as an attribute type:
+  #
+  # @example
+  #   class User
+  #     include Acfs::Model
+  #     attribute :name, :float
+  #   end
+  #
+  class Float < Base
 
     # @api public
     #
-    # Float attribute type. Use it in your model as an attribute type:
+    # Cast given object to float.
     #
-    # @example
-    #   class User
-    #     include Acfs::Model
-    #     attribute :name, :float
-    #   end
+    # @param [Object] obj Object to cast.
+    # @return [Float] Casted object as float.
     #
-    module Float
-
-      # @api public
-      #
-      # Cast given object to float.
-      #
-      # @param [Object] obj Object to cast.
-      # @return [Float] Casted object as float.
-      #
-      def self.cast(obj)
-        obj.to_f
-      end
+    def cast_type(obj)
+      obj.to_f
     end
   end
 end

data/lib/acfs/model/attributes/integer.rb

@@ -1,28 +1,26 @@
-module Acfs::Model
-  module Attributes
+module Acfs::Model::Attributes
+
+  # @api public
+  #
+  # Integer attribute type. Use it in your model as an attribute type:
+  #
+  # @example
+  #   class User
+  #     include Acfs::Model
+  #     attribute :name, :integer
+  #   end
+  #
+  class Integer < Base
 
     # @api public
     #
-    # Integer attribute type. Use it in your model as an attribute type:
+    # Cast given object to integer.
     #
-    # @example
-    #   class User
-    #     include Acfs::Model
-    #     attribute :name, :integer
-    #   end
+    # @param [Object] obj Object to cast.
+    # @return [Fixnum] Casted object as fixnum.
     #
-    module Integer
-
-      # @api public
-      #
-      # Cast given object to integer.
-      #
-      # @param [Object] obj Object to cast.
-      # @return [Fixnum] Casted object as fixnum.
-      #
-      def self.cast(obj)
-        obj.to_i
-      end
+    def cast_type(obj)
+      obj.to_i
     end
   end
 end

data/lib/acfs/model/attributes/list.rb

@@ -1,30 +1,28 @@
-module Acfs::Model
-  module Attributes
+module Acfs::Model::Attributes
+
+  # @api public
+  #
+  # List attribute type. Use it in your model as an attribute type:
+  #
+  # @example
+  #   class User
+  #     include Acfs::Model
+  #     attribute :name, :list
+  #   end
+  #
+  class List < Base
 
     # @api public
     #
-    # List attribute type. Use it in your model as an attribute type:
+    # Cast given object to a list.
     #
-    # @example
-    #   class User
-    #     include Acfs::Model
-    #     attribute :name, :list
-    #   end
+    # @param [Object] obj Object to cast.
+    # @return [Fixnum] Casted object as list.
+    # @raise [TypeError] If object cannot be casted to a list.
     #
-    module List
-
-      # @api public
-      #
-      # Cast given object to a list.
-      #
-      # @param [Object] obj Object to cast.
-      # @return [Fixnum] Casted object as list.
-      # @raise [TypeError] If object cannot be casted to a list.
-      #
-      def self.cast(obj)
-        return obj.to_a if obj.respond_to? :to_a
-        raise TypeError.new "Cannot cast #{obj.inspect} to array."
-      end
+    def cast_type(obj)
+      return obj.to_a if obj.respond_to? :to_a
+      raise TypeError.new "Cannot cast #{obj.inspect} to array."
     end
   end
 end

data/lib/acfs/model/attributes/string.rb

@@ -1,28 +1,26 @@
-module Acfs::Model
-  module Attributes
+module Acfs::Model::Attributes
+
+  # @api public
+  #
+  # String attribute type. Use it in your model as an attribute type:
+  #
+  # @example
+  #   class User
+  #     include Acfs::Model
+  #     attribute :name, :string
+  #   end
+  #
+  class String < Base
 
     # @api public
     #
-    # String attribute type. Use it in your model as an attribute type:
+    # Cast given object to string.
     #
-    # @example
-    #   class User
-    #     include Acfs::Model
-    #     attribute :name, :string
-    #   end
+    # @param [Object] obj Object to cast.
+    # @return [String] Casted string.
     #
-    module String
-
-      # @api public
-      #
-      # Cast given object to string.
-      #
-      # @param [Object] obj Object to cast.
-      # @return [String] Casted string.
-      #
-      def self.cast(obj)
-        obj.to_s
-      end
+    def cast_type(obj)
+      obj.to_s
     end
   end
 end

data/spec/acfs/model/attributes/date_time_spec.rb

@@ -2,44 +2,54 @@ require 'spec_helper'
 
 describe Acfs::Model::Attributes::DateTime do
   let(:model) { Class.new.tap { |c| c.send :include, Acfs::Model }}
+  let(:params) { {} }
+  subject { Acfs::Model::Attributes::DateTime.new params }
 
   describe 'cast' do
     it 'should return same object, if obj is already of DateTime class' do
       date_time = DateTime.now
-      retval = Acfs::Model::Attributes::DateTime.cast(date_time)
+      retval = subject.cast(date_time)
       expect(retval).to be == date_time
     end
 
     it 'should return parsed object, if obj is of Time class' do
       time = Time.now
-      retval = Acfs::Model::Attributes::DateTime.cast(time)
+      retval = subject.cast(time)
       expect(retval).to be == DateTime.iso8601(time.iso8601)
     end
 
     it 'should return parsed object, if obj is of Date class' do
       date = Date.today
-      retval = Acfs::Model::Attributes::DateTime.cast(date)
+      retval = subject.cast(date)
       expect(retval).to be == DateTime.iso8601(date.iso8601)
     end
 
     it 'should return parsed object, if obj is of String class in ISO-8601 format' do
       date_time_string = DateTime.now.iso8601
-      retval = Acfs::Model::Attributes::DateTime.cast(date_time_string)
+      retval = subject.cast(date_time_string)
       expect(retval).to be == DateTime.iso8601(date_time_string)
     end
 
     it 'should raise an error if obj is of String class not in valid ISO-8601 format' do
       malformed_string = 'qwe123'
       expect {
-        Acfs::Model::Attributes::DateTime.cast(malformed_string)
+        subject.cast(malformed_string)
       }.to raise_error ArgumentError
     end
 
     it 'should raise an error if obj is of wrong class (Fixnum)' do
       fixnum = 12
       expect {
-        Acfs::Model::Attributes::DateTime.cast(fixnum)
+        subject.cast(fixnum)
       }.to raise_error TypeError
     end
+
+    context 'with allow_nil option' do
+      let(:params) { {allow_nil: true} }
+
+      it 'should accept empty string as nil' do
+        expect(subject.cast('')).to eq nil
+      end
+    end
   end
 end

data/spec/acfs/model/attributes/float_spec.rb

@@ -2,21 +2,19 @@ require 'spec_helper'
 
 describe Acfs::Model::Attributes::Float do
   let(:model) { Class.new.tap { |c| c.send :include, Acfs::Model }}
+  subject { Acfs::Model::Attributes::Float.new }
 
   describe 'cast' do
     it 'should return same object, if obj is already of float class' do
-      retval = Acfs::Model::Attributes::Float.cast(1.3)
-      expect(retval).to be == 1.3
+      expect(subject.cast(1.3)).to be == 1.3
     end
 
     it 'should return parsed object, if obj is of Fixnum class' do
-      retval = Acfs::Model::Attributes::Float.cast(7)
-      expect(retval).to be == 7.0
+      expect(subject.cast(7)).to be == 7.0
     end
 
     it 'should return parsed object, if obj is of String class containing a float' do
-      retval = Acfs::Model::Attributes::Float.cast('1.7')
-      expect(retval).to be == 1.7
+      expect(subject.cast('1.7')).to be == 1.7
     end
   end
 end

data/spec/acfs/model/attributes/list_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Acfs::Model::Attributes::List do
   let(:model) { Class.new.tap { |c| c.send :include, Acfs::Model }}
-  subject { Acfs::Model::Attributes::List }
+  subject { Acfs::Model::Attributes::List.new }
 
   describe '.cast' do
     context 'with array' do

data/spec/acfs/model/attributes_spec.rb

@@ -115,29 +115,42 @@ describe Acfs::Model::Attributes do
     end
   end
 
-  describe '.attribute' do
-    it 'should add an attribute to model attribute list' do
-      model.send :attribute, :name, :string
+  describe 'class' do
+    describe '#attribute' do
+      it 'should add an attribute to model attribute list' do
+        model.send :attribute, :name, :string
 
-      expect(model.attributes).to be == { :name => nil }.stringify_keys
-    end
+        expect(model.attributes).to be == { :name => nil }.stringify_keys
+      end
 
-    it 'should accept a default value' do
-      model.send :attribute, :name, :string, default: 'John'
+      it 'should accept a default value' do
+        model.send :attribute, :name, :string, default: 'John'
 
-      expect(model.attributes).to be == { :name => 'John' }.stringify_keys
-    end
+        expect(model.attributes).to be == { :name => 'John' }.stringify_keys
+      end
 
-    it 'should accept an symbolic type' do
-      model.send :attribute, :age, :integer, default: '12'
+      it 'should accept an symbolic type' do
+        model.send :attribute, :age, :integer, default: '12'
 
-      expect(model.attributes).to be == { :age => 12 }.stringify_keys
-    end
+        expect(model.attributes).to be == { :age => 12 }.stringify_keys
+      end
+
+      it 'should accept an class type' do
+        model.send :attribute, :age, Acfs::Model::Attributes::Integer, default: '12'
 
-    it 'should accept an class type' do
-      model.send :attribute, :age, Acfs::Model::Attributes::Integer, default: '12'
+        expect(model.attributes).to be == { :age => 12 }.stringify_keys
+      end
 
-      expect(model.attributes).to be == { :age => 12 }.stringify_keys
+      context 'allow nil option' do
+        it 'should allow nil as value' do
+          model.send :attribute, :updated_at, Acfs::Model::Attributes::DateTime, default: DateTime.new, allow_nil: true
+          resource = model.new
+          expect(resource.updated_at).to eq DateTime.new
+
+          resource.updated_at = ''
+          expect(resource.updated_at).to eq nil
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.22.2.b193
+  version: 0.22.2.b194
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,6 +145,7 @@ files:
 - lib/acfs/middleware/print.rb
 - lib/acfs/model.rb
 - lib/acfs/model/attributes.rb
+- lib/acfs/model/attributes/base.rb
 - lib/acfs/model/attributes/boolean.rb
 - lib/acfs/model/attributes/date_time.rb
 - lib/acfs/model/attributes/float.rb