attrio 0.3.0 → 0.4.0

data/lib/attrio.rb

@@ -23,16 +23,22 @@ module Attrio
   module ClassMethods
     def define_attributes(options = {}, &block)
       options[:as] ||= :attributes
-
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        @@#{options[:as]} ||= {}
-
-        def self.#{options[:as]}(attributes = [])
-          attributes = Helpers.to_a(attributes).flatten
-          return @@#{options[:as]} if attributes.empty?
-
-          attributes = @@#{options[:as]}.keys & attributes
-          @@#{options[:as]}.select{ |k,v| attributes.include?(k) }          
+      
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)        
+        @#{options[:as]} ||= {}
+
+        class << self
+          def #{options[:as]}(attributes = [])
+            attributes = Helpers.to_a(attributes).flatten
+            return @#{options[:as]} if attributes.empty?
+
+            attributes = @#{options[:as]}.keys & attributes
+            @#{options[:as]}.select{ |k,v| attributes.include?(k) }          
+          end
+
+          def inherited(subclass)          
+            subclass.instance_variable_set("@#{options[:as]}", instance_variable_get("@#{options[:as]}").dup)
+          end
         end
 
         def #{options[:as]}(attributes = [])

data/lib/attrio/attribute.rb

@@ -2,10 +2,10 @@
 
 module Attrio
   class Attribute
-    attr_reader :klass, :name, :type, :options
+    attr_reader :name, :type, :options
 
-    def initialize(klass, name, type, options)
-      @klass = klass; @name = name; @type = type; @options = Helpers.symbolize_hash_keys(options)
+    def initialize(name, type, options)
+      @name = name; @type = type; @options = Helpers.symbolize_hash_keys(options)
     end
 
     def reader_method_name
@@ -30,13 +30,13 @@ module Attrio
 
     def default_value
       if !defined?(@default_value)
-        @default_value = Attrio::DefaultValue.new(self.klass, self.name, self.options[:default])
+        @default_value = Attrio::DefaultValue.new(self.name, self.options[:default])
       end
       @default_value      
     end
 
-    def define_writer
-      Attrio::Builders::WriterBuilder.define(self.klass, self.type,
+    def define_writer(klass)
+      Attrio::Builders::WriterBuilder.define(klass, self.type,
         self.options.merge({
           :method_name => self.writer_method_name,
           :method_visibility => self.writer_visibility,
@@ -46,8 +46,8 @@ module Attrio
       self
     end
 
-    def define_reader
-      Attrio::Builders::ReaderBuilder.define(self.klass, self.type,
+    def define_reader(klass)
+      Attrio::Builders::ReaderBuilder.define(klass, self.type,
         self.options.merge({
           :method_name => self.reader_method_name,
           :method_visibility => self.reader_visibility,

data/lib/attrio/attributes_parser.rb

@@ -4,8 +4,8 @@ module Attrio
   class AttributesParser
     attr_reader :klass, :options
 
-    def initialize(object, options, &block)
-      @object = object
+    def initialize(klass, options, &block)
+      @klass = klass
       @options = options
 
       raise ArgumentError.new('Missing options[:as] value' ) if @options[:as].blank?
@@ -14,16 +14,18 @@ module Attrio
     end
 
     def attr(*args)
-      attribute_options = (args.last.kind_of?(Hash) ? args.pop : Hash.new)
       attribute_name = args[0].to_s
+      attribute_options = (args.last.kind_of?(Hash) ? args.pop : Hash.new)
+      attribute_type = self.fetch_type(attribute_options.delete(:type) || args[1])
 
-      type = self.class.cast_type(attribute_options.delete(:type) || args[1])      
-      self.class.const_missing(attribute_options.delete(:type).to_s || args[1].to_s) if type.blank?
-
-      attribute = Attrio::Attribute.new(@object, attribute_name, type, attribute_options).define_writer.define_reader
+      attribute = self.create_attribute(attribute_name, attribute_type, attribute_options)
       self.add_attribute(attribute_name, attribute)
+
+      self
     end
 
+    alias_method :attribute, :attr
+
     def self.cast_type(constant)
       return constant if constant.is_a?(Class) && !!(constant < Attrio::Types::Base)
 
@@ -49,8 +51,21 @@ module Attrio
       self.options[:as]
     end
 
+    def fetch_type(name)
+      return if name.nil?
+
+      type = self.class.cast_type(name)
+      self.class.const_missing(name.to_s) if type.blank?
+
+      type
+    end
+
+    def create_attribute(name, type, options)
+      Attrio::Attribute.new(name, type, options).define_writer(self.klass).define_reader(self.klass)
+    end
+
     def add_attribute(name, attribute)
-      @object.send(self.as)[name.to_sym] = attribute
+      @klass.send(self.as)[name.to_sym] = attribute
     end        
   end
 end

data/lib/attrio/builders/writer_builder.rb

@@ -11,21 +11,30 @@ module Attrio
 
       def self.define_accessor(klass, type, options)
         unless klass.method_defined?(options[:method_name])
-          klass.send :define_method, options[:method_name] do |value|
-            if !value.nil?
-              value = if type.respond_to?(:typecast) && type.respond_to?(:typecasted?)
-                type.typecasted?(value) ? value : type.typecast(*[value, options])
-              else
-                type.new(value)
-              end
-            end
-            
-            self.instance_variable_set(options[:instance_variable_name], value)
+          if type.present?
+            self.define_typecasted_method(klass, type, options)
+          else
+            klass.send :attr_writer, options[:method_name].chop
           end
         
           klass.send options[:method_visibility], options[:method_name]
         end        
       end      
+
+      def self.define_typecasted_method(klass, type, options)
+        klass.send :define_method, options[:method_name] do |value|
+          if !value.nil?
+            value = if type.respond_to?(:typecast) && type.respond_to?(:typecasted?)
+              type.typecasted?(value) ? value : type.typecast(*[value, options])
+            else
+              type.new(value)
+            end
+          end
+
+          self.instance_variable_set(options[:instance_variable_name], value)
+        end
+      end
     end
+
   end
 end

data/lib/attrio/default_value.rb

@@ -8,8 +8,8 @@ module Attrio
     autoload :Symbol, 'attrio/default_value/symbol'
 
     class << self      
-      def new(object, attribute, value)
-        Attrio::DefaultValue::Base.handle(object, attribute, value) || value
+      def new(attribute, value)
+        Attrio::DefaultValue::Base.handle(attribute, value) || value
       end
     end
   end

data/lib/attrio/default_value/base.rb

@@ -3,20 +3,20 @@
 module Attrio
   module DefaultValue
     class Base
-      attr_reader :klass, :attribute, :value
+      attr_reader :attribute, :value
 
-      def self.handle(klass, attribute, value)
+      def self.handle(attribute, value)
         handler = [
           Attrio::DefaultValue::Callable,
           Attrio::DefaultValue::Clonable,
           Attrio::DefaultValue::Symbol
         ].detect{ |handler| handler.handle?(value) }
 
-        handler.new(klass, attribute, value) if handler.present?
+        handler.new(attribute, value) if handler.present?
       end
 
-      def initialize(klass, attribute, value)
-        @klass = klass; @attribute = attribute; @value = value;
+      def initialize(attribute, value)
+        @attribute = attribute; @value = value;
       end
 
       # Evaluates the value      

data/lib/attrio/version.rb

@@ -3,7 +3,7 @@
 module Attrio  
   module Version
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     BUILD = nil
 

data/spec/integration/inheritance_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe 'Attributes inheritance' do  
+  before(:all) do
+    class Parent
+      include Attrio
+
+      define_attributes do
+        attr :email, String
+        attr :name, String    
+        attr :created_at, DateTime, :default => proc{ Time.now }
+      end
+    end
+
+    class ChildWithoutAttributes < Parent      
+    end
+
+    class ChildWithNewAttributes < Parent
+      define_attributes do
+        attr :age, Integer
+      end
+    end
+
+    class ChildWithOverridenAttributes < Parent
+      define_attributes do
+        attr :name, Symbol
+      end
+    end
+  end
+
+  context 'Classes should inherit attributes' do
+    context "without attributes" do
+      subject { ChildWithoutAttributes.attributes }
+
+      it "should equal to parent's attributes" do
+        should == Parent.attributes
+      end
+    end
+
+    context "with new attributes" do
+      subject { ChildWithNewAttributes.attributes }
+
+      it "should include parent's attributes" do
+        should include(Parent.attributes)
+      end
+    end
+
+    context "with overriden attributes" do
+      subject { ChildWithOverridenAttributes.attributes }
+
+      it "should include not overriden attributes" do
+        should include(Parent.attributes.reject { |k| k == :name })
+      end
+
+      it "should include overriden attributes" do
+        should include(:name)
+      end
+
+      it "should include overriden attributes with corect options" do
+        subject[:name].type.should == Attrio::Types::Symbol
+      end
+    end
+  end
+end

data/spec/{attrio → unit}/attrio_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Attrio do  
   let(:model) do
     attributes_name = self.respond_to?(:attributes_name) ? self.attributes_name : 'attributes'
+    
     Class.new do 
       include Attrio
 

data/spec/{attrio → unit}/default_value/callable_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Attrio::DefaultValue::Callable do
-  subject { described_class.new(object, attribute, default_value) }
+  subject { described_class.new(attribute, default_value) }
 
   let(:model) do
     Class.new do

data/spec/{attrio → unit}/default_value/clonable_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Attrio::DefaultValue::Clonable do
-  subject { described_class.new(object, attribute, default_value) }
+  subject { described_class.new(attribute, default_value) }
 
   let(:model) do
     Class.new do

data/spec/{attrio → unit}/default_value/handle_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Attrio::DefaultValue::Base, '.handle' do
-  subject { described_class.handle(mock('object'), mock('attribute'), default) }
+  subject { described_class.handle(mock('attribute'), default) }
 
   context 'when default is a symbol' do
     let(:default) { :symbol }

data/spec/{attrio → unit}/type_spec.rb

@@ -7,11 +7,11 @@ describe Attrio::Types::Base do
 
       define_attributes do
         attr :type_as_constant, Integer
-        attr :type_in_options_as_constant, Integer
+        attr :type_in_options_as_constant, :type => Integer
         attr :type_as_string, 'integer'
-        attr :type_in_options_as_string, 'integer'
+        attr :type_in_options_as_string, :type => 'integer'
         attr :type_as_symbol, :integer
-        attr :type_in_options_as_symbol, :integer
+        attr :type_in_options_as_symbol, :type => :integer
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attrio
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70339309557080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70339309557080
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70339309556540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -38,15 +33,10 @@ dependencies:
         version: 1.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.9.0
+  version_requirements: *70339309556540
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70339309572460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,15 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70339309572460
 - !ruby/object:Gem::Dependency
   name: coveralls
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70339309572000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,15 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70339309572000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70339309571560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,15 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70339309571560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70339309571120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,12 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70339309571120
 description: 
 email: hello@jetrockets.ru
 executables: []
@@ -148,24 +118,25 @@ files:
 - lib/attrio/types/symbol.rb
 - lib/attrio/types/time.rb
 - lib/attrio/version.rb
-- spec/attrio/attrio_spec.rb
-- spec/attrio/default_value/callable_spec.rb
-- spec/attrio/default_value/clonable_spec.rb
-- spec/attrio/default_value/handle_spec.rb
-- spec/attrio/default_value/symbol_spec.rb
-- spec/attrio/default_value/value_spec.rb
-- spec/attrio/embed_value_spec.rb
-- spec/attrio/inspect_spec.rb
-- spec/attrio/reset_spec.rb
-- spec/attrio/type_spec.rb
-- spec/attrio/types/boolean_spec.rb
-- spec/attrio/types/date_spec.rb
-- spec/attrio/types/date_time_spec.rb
-- spec/attrio/types/float_spec.rb
-- spec/attrio/types/integer_spec.rb
-- spec/attrio/types/symbol_spec.rb
-- spec/attrio/types/time_spec.rb
+- spec/integration/embedded_value_spec.rb
+- spec/integration/inheritance_spec.rb
 - spec/spec_helper.rb
+- spec/unit/attrio_spec.rb
+- spec/unit/default_value/callable_spec.rb
+- spec/unit/default_value/clonable_spec.rb
+- spec/unit/default_value/handle_spec.rb
+- spec/unit/default_value/symbol_spec.rb
+- spec/unit/default_value/value_spec.rb
+- spec/unit/inspect_spec.rb
+- spec/unit/reset_spec.rb
+- spec/unit/type_spec.rb
+- spec/unit/types/boolean_spec.rb
+- spec/unit/types/date_spec.rb
+- spec/unit/types/date_time_spec.rb
+- spec/unit/types/float_spec.rb
+- spec/unit/types/integer_spec.rb
+- spec/unit/types/symbol_spec.rb
+- spec/unit/types/time_spec.rb
 homepage: https://github.com/jetrockets/attrio
 licenses: []
 post_install_message: 
@@ -180,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2263639350992331288
+      hash: 2234961798158657284
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,30 +160,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2263639350992331288
+      hash: 2234961798158657284
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Attributes for plain old Ruby objects. No dependencies, only simplicity and
   clearness.
 test_files:
-- spec/attrio/attrio_spec.rb
-- spec/attrio/default_value/callable_spec.rb
-- spec/attrio/default_value/clonable_spec.rb
-- spec/attrio/default_value/handle_spec.rb
-- spec/attrio/default_value/symbol_spec.rb
-- spec/attrio/default_value/value_spec.rb
-- spec/attrio/embed_value_spec.rb
-- spec/attrio/inspect_spec.rb
-- spec/attrio/reset_spec.rb
-- spec/attrio/type_spec.rb
-- spec/attrio/types/boolean_spec.rb
-- spec/attrio/types/date_spec.rb
-- spec/attrio/types/date_time_spec.rb
-- spec/attrio/types/float_spec.rb
-- spec/attrio/types/integer_spec.rb
-- spec/attrio/types/symbol_spec.rb
-- spec/attrio/types/time_spec.rb
+- spec/integration/embedded_value_spec.rb
+- spec/integration/inheritance_spec.rb
 - spec/spec_helper.rb
+- spec/unit/attrio_spec.rb
+- spec/unit/default_value/callable_spec.rb
+- spec/unit/default_value/clonable_spec.rb
+- spec/unit/default_value/handle_spec.rb
+- spec/unit/default_value/symbol_spec.rb
+- spec/unit/default_value/value_spec.rb
+- spec/unit/inspect_spec.rb
+- spec/unit/reset_spec.rb
+- spec/unit/type_spec.rb
+- spec/unit/types/boolean_spec.rb
+- spec/unit/types/date_spec.rb
+- spec/unit/types/date_time_spec.rb
+- spec/unit/types/float_spec.rb
+- spec/unit/types/integer_spec.rb
+- spec/unit/types/symbol_spec.rb
+- spec/unit/types/time_spec.rb