attrio 0.2.0 → 0.3.0

data/README.md

@@ -37,7 +37,7 @@ class User
   end
 end
 ```
-
+### Accessing attributes
 By default Attrio defines `#attributes` accessor which contains `Hash` with attributes names as keys and instances of `Attrio::Attribute` as values. Each instance of `Attrio::Attribute` contains following information:
  * type
  * writer method name
@@ -55,6 +55,15 @@ user.attributes
 #	:age => #<Attrio::Attribute:0x007fc44e8d4c98 @object=#<User:0x007fc44e8b2b48>, @name="age", @type=Attrio::Types::Integer, @options={}, @writer_method_name="age=", @writer_visibility=:public, @instance_variable_name="@age", @reader_method_name="age", @reader_visibility=:public>,
 #	:birthday = >#<Attrio::Attribute:0x007fc44e8e2e38 @object=#<User:0x007fc44e8b2b48>, @name="birthday", @type=Attrio::Types::DateTime, @options={}, @writer_method_name="birthday=", @writer_visibility=:public, @instance_variable_name="@birthday", @reader_method_name="birthday", @reader_visibility=:public>
 # }
+user.attributes.keys
+# => [:name, :age, :birthday]
+```
+
+Attributes can be filtered.
+
+```ruby
+user.attributes([:name, :age, :not_existing_attribute]).keys
+# => [:name, :age]
 ```
 
 Accessor name can be easily overridden by passing `:as` option to `define_attributes` block.

data/attrio.gemspec

@@ -23,5 +23,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'bundler'
-  gem.add_development_dependency "rake"
 end

data/lib/attrio.rb

@@ -2,21 +2,17 @@
 
 require 'attrio/version'
 
-require 'attrio/core_ext/array'
-require 'attrio/core_ext/class'
-require 'attrio/core_ext/hash'
-require 'attrio/core_ext/nil_object'
 require 'attrio/core_ext/object'
 require 'attrio/core_ext/string'
-require 'attrio/core_ext/time'
 
 module Attrio
-  autoload :AttributesParser, 'attrio/attributes_parser'  
+  autoload :AttributesParser, 'attrio/attributes_parser'
   autoload :Initialize, 'attrio/initialize'
   autoload :Inspect, 'attrio/inspect'
   autoload :Reset, 'attrio/reset'
+  autoload :Helpers, 'attrio/helpers'
 
-  def self.included(base)    
+  def self.included(base)
     base.send :include, Attrio::Initialize
     base.send :include, Attrio::Inspect
     base.send :include, Attrio::Reset
@@ -27,16 +23,16 @@ module Attrio
   module ClassMethods
     def define_attributes(options = {}, &block)
       options[:as] ||= :attributes
-      
-      # cattr_accessor options[:as].to_sym
+
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         @@#{options[:as]} ||= {}
 
         def self.#{options[:as]}(attributes = [])
-          attributes = Array.wrap(attributes).flatten
+          attributes = Helpers.to_a(attributes).flatten
           return @@#{options[:as]} if attributes.empty?
 
-          @@#{options[:as]}.slice(attributes.map { |attr| attr.to_sym })                    
+          attributes = @@#{options[:as]}.keys & attributes
+          @@#{options[:as]}.select{ |k,v| attributes.include?(k) }          
         end
 
         def #{options[:as]}(attributes = [])
@@ -53,7 +49,7 @@ module Attrio
 
     def const_missing(name)
       Attrio::AttributesParser.cast_type(name) || super
-    end    
+    end
   end
 
   autoload :Attribute, 'attrio/attribute'
@@ -74,4 +70,4 @@ module Attrio
     autoload :Symbol, 'attrio/types/symbol'
     autoload :Time, 'attrio/types/time'
   end
-end
+end

data/lib/attrio/attribute.rb

@@ -5,7 +5,7 @@ module Attrio
     attr_reader :klass, :name, :type, :options
 
     def initialize(klass, name, type, options)
-      @klass = klass; @name = name; @type = type; @options = options.symbolize_keys   
+      @klass = klass; @name = name; @type = type; @options = Helpers.symbolize_hash_keys(options)
     end
 
     def reader_method_name

data/lib/attrio/attributes_parser.rb

@@ -14,7 +14,7 @@ module Attrio
     end
 
     def attr(*args)
-      attribute_options = args.extract_options!
+      attribute_options = (args.last.kind_of?(Hash) ? args.pop : Hash.new)
       attribute_name = args[0].to_s
 
       type = self.class.cast_type(attribute_options.delete(:type) || args[1])      

data/lib/attrio/core_ext/object.rb

@@ -8,12 +8,4 @@ class Object
   def present?
     !blank?
   end unless method_defined? :present?
-
-  def try(*a, &b)
-    if a.empty? && block_given?
-      yield self
-    else
-      __send__(*a, &b)
-    end
-  end unless method_defined? :try?
 end

data/lib/attrio/helpers.rb

@@ -0,0 +1,26 @@
+module Attrio
+  module Helpers
+    extend self
+
+    def to_a(object)
+      if object.nil?
+        []
+      elsif object.respond_to?(:to_ary)
+        object.to_ary || [object]
+      else
+        [object]
+      end
+    end
+
+    # note that returning hash without symbolizing anything
+    # does not cause this to fail
+    def symbolize_hash_keys(hash)
+      hash.inject({}) do |new_hash, (key, value)|
+        new_hash[(key.to_sym rescue key) || key] = value
+        new_hash
+      end
+      hash
+    end
+
+  end
+end

data/lib/attrio/types/boolean.rb

@@ -8,10 +8,10 @@ module Attrio
         false_values = options[:false] || options[:false_values]
 
         if false_values.present?
-          return Array.wrap(false_values).flatten.include?(value) ? false : true
+          return Helpers.to_a(false_values).flatten.include?(value) ? false : true
         else
-          return Array.wrap(true_values).flatten.include?(value) ? true : false
-        end        
+          return Helpers.to_a(true_values).flatten.include?(value) ? true : false
+        end
       end
 
       def self.typecasted?(value)

data/lib/attrio/version.rb

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

data/spec/attrio/attrio_spec.rb

@@ -1,59 +1,75 @@
 require 'spec_helper'
 
-describe Attrio do
-  describe 'model' do
-    let(:model) do
-      Class.new { include Attrio }
-    end
+describe Attrio do  
+  let(:model) do
+    attributes_name = self.respond_to?(:attributes_name) ? self.attributes_name : 'attributes'
+    Class.new do 
+      include Attrio
 
-    it 'should respond_to define_attributes' do
-      model.respond_to?(:define_attributes).should be_true
+      define_attributes :as => attributes_name do
+        attr :name, String
+        attr :age, Integer
+        attr :created_at, DateTime, :default => proc{ Time.now }
+      end
     end
+  end
+
+  context 'Attrio included with default parameters' do
+    subject { model }
+
+    it { should respond_to(:define_attributes) }
+    it { should respond_to(:attributes) }
 
-    context 'without options' do
-      let(:model) do
-        Class.new do
-          include Attrio
+    context 'instance' do
+      subject { model.new }
 
-          define_attributes do
-          end
+      it { should be }
+      it { should respond_to(:reset_attributes) }
+      it { should respond_to(:attributes) }
+
+      context '#attributes' do      
+        it 'should be a kind of Hash' do
+          subject.attributes.should be_a_kind_of Hash
         end
-      end
 
-      it 'should respond_to attributes' do
-        model.respond_to?(:attributes).should be_true
-      end
+        it 'should be present' do
+          subject.attributes.should be_present
+        end
+
+        it 'should return a full set of attributes' do
+          subject.attributes.keys.should match_array([:name, :age, :created_at])
+        end
 
-      describe 'object' do
-        let(:object) { model.new }
+        it 'should return a filtered set of attributes' do
+          subject.attributes(:name).keys.should match_array([:name])
+          subject.attributes([:name]).keys.should match_array([:name])
+        end
 
-        it 'should respond_to reset_attributes' do
-          object.respond_to?(:reset_attributes).should be_true
+        it 'should return a blank set of attributes for not existing filter' do          
+          subject.attributes([:not_existing_attribute]).keys.should match_array([])
         end
       end
     end
+  end
 
-    context 'with option :as' do
-      let(:model) do
-        Class.new do
-          include Attrio
+  context 'Attrio included with :as parameter' do
+    let(:attributes_name) do
+      'api_attributes'
+    end
 
-          define_attributes :as => :model_attributes do
-          end
-        end
-      end
+    subject { model }
 
-      it 'should respond_to model_attributes' do
-        model.respond_to?(:model_attributes).should be_true
-      end
+    it { should respond_to(:define_attributes) }
+    it { should respond_to(:api_attributes) }
 
-      describe 'object' do
-        let(:object) { model.new }
+    context 'instance' do
+      subject { model.new }
 
-        it 'should respond_to reset_model_attributes' do
-          object.respond_to?(:reset_model_attributes).should be_true          
-        end
-      end
+      it { should be }
+      it { should respond_to(:reset_api_attributes) }
+      it { should respond_to(:api_attributes) }
+
+      its(:api_attributes){ should be_present }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attrio
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,22 +108,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: hello@jetrockets.ru
 executables: []
@@ -144,18 +128,14 @@ files:
 - lib/attrio/builders/accessor_builder.rb
 - lib/attrio/builders/reader_builder.rb
 - lib/attrio/builders/writer_builder.rb
-- lib/attrio/core_ext/array.rb
-- lib/attrio/core_ext/class.rb
-- lib/attrio/core_ext/hash.rb
-- lib/attrio/core_ext/nil_object.rb
 - lib/attrio/core_ext/object.rb
 - lib/attrio/core_ext/string.rb
-- lib/attrio/core_ext/time.rb
 - lib/attrio/default_value.rb
 - lib/attrio/default_value/base.rb
 - lib/attrio/default_value/callable.rb
 - lib/attrio/default_value/clonable.rb
 - lib/attrio/default_value/symbol.rb
+- lib/attrio/helpers.rb
 - lib/attrio/initialize.rb
 - lib/attrio/inspect.rb
 - lib/attrio/reset.rb
@@ -200,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2070292704708193097
+      hash: -2263639350992331288
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2070292704708193097
+      hash: -2263639350992331288
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/attrio/core_ext/array.rb

@@ -1,23 +0,0 @@
-# encoding: utf-8
-
-class Array # :nodoc:
-  def extract_options!
-    if last.is_a?(Hash) && last.extractable_options?
-      pop
-    else
-      {}
-    end
-  end unless method_defined?(:extract_options!)
-
-  class << self
-    def wrap(object)
-      if object.nil?
-        []
-      elsif object.respond_to?(:to_ary)
-        object.to_ary || [object]
-      else
-        [object]
-      end
-    end unless method_defined?(:wrap)
-  end
-end

data/lib/attrio/core_ext/class.rb

@@ -1,55 +0,0 @@
-# encoding: utf-8
-
-class Class
-  def cattr_reader(*syms)
-    options = syms.extract_options!
-    syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-
-        def self.#{sym}
-          @@#{sym}
-        end
-      EOS
-
-      unless options[:instance_reader] == false || options[:instance_accessor] == false
-        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-          def #{sym}
-            @@#{sym}
-          end
-        EOS
-      end
-    end
-  end unless method_defined?(:cattr_reader)
-
-  def cattr_writer(*syms)
-    options = syms.extract_options!
-    syms.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
-      EOS
-
-      unless options[:instance_writer] == false || options[:instance_accessor] == false
-        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-          def #{sym}=(obj)
-            @@#{sym} = obj
-          end
-        EOS
-      end
-      self.send("#{sym}=", yield) if block_given?
-    end
-  end unless method_defined?(:cattr_writer)
-
-  def cattr_accessor(*syms, &blk)
-    cattr_reader(*syms)
-    cattr_writer(*syms, &blk)
-  end unless method_defined?(:cattr_accessor) 
-end

data/lib/attrio/core_ext/hash.rb

@@ -1,38 +0,0 @@
-# encoding: utf-8
-
-class Hash # :nodoc:
-  def symbolize_keys  # :nodoc:
-    inject({}) do |hash, (key, value)|
-      hash[(key.to_sym rescue key) || key] = value
-      hash
-    end
-  end unless method_defined?(:symbolize_keys)
-
-  def symbolize_keys! # :nodoc:
-    hash = symbolize_keys
-    hash.each do |key, val|
-      hash[key] = case val
-        when Hash
-          val.symbolize_keys!
-        when Array
-          val.map do |item|
-            item.is_a?(Hash) ? item.symbolize_keys! : item
-          end
-        else
-          val
-        end
-    end
-    return hash
-  end unless method_defined?(:symbolize_keys!)
-
-  def extractable_options?
-    instance_of?(Hash)
-  end unless method_defined?(:extractable_options?)
-
-  def slice(*keys)
-    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
-    hash = self.class.new
-    keys.each { |k| hash[k] = self[k] if has_key?(k) }
-    hash
-  end unless method_defined?(:slice?)
-end # Hash

data/lib/attrio/core_ext/nil_object.rb

@@ -1,7 +0,0 @@
-# encoding: utf-8
-
-class NilClass
-  def try(*args)
-    nil
-  end
-end

data/lib/attrio/core_ext/time.rb

@@ -1,17 +0,0 @@
-# encoding: utf-8
-
-class Time # :nodoc:
-  class << self
-    def strptime(date, format, now=self.now)
-      d = Date._strptime(date, format)
-      raise ArgumentError, "invalid strptime format - `#{format}'" unless d
-      if seconds = d[:seconds]
-        Time.at(seconds)
-      else
-        year = d[:year]
-        year = yield(year) if year && block_given?
-        make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
-      end
-    end unless method_defined?(:strptime)
-  end
-end