attrio 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 861576afb99f94868a01b939116bfba6d6276306
+  data.tar.gz: 6a111a94772edb9199b59b095002dfac0f03d88d
+SHA512:
+  metadata.gz: b064f63381b115945464627375774ae37267d965997474af9512eb704d5ba6c4a3028bea7abcce388564f3eb689a08d92e531eb24d0157bd436f7f053010f93a
+  data.tar.gz: 7f907cc9f4db1869b55c8e7d7c1b957d3ef63377905f63f33d9ac99bfc7773dbea8e6a683e67a02f8f0595c73cba8d40acce26bfe71724151088e09a7a5129ca

data/README.md

@@ -77,6 +77,11 @@ class User
     attr :age, Integer
     attr :birthday, DateTime
   end
+  
+  define_attributes :as => 'settings' do
+    attr :receives_notifications, Boolean, :default => true
+  end
+  
 end
 ```
 
@@ -129,6 +134,19 @@ class Page
 end
 ```
 
+You can does your attribute still has default value or not.
+
+```ruby
+p = Page.new
+=> #<Page title: nil, views: 0, published: false, slug: nil, editor_title: "UNPUBLISHED">
+p.attributes[:editor_title].default?
+=> true
+p.editor_title = 'PUBLISHED'
+=> "PUBLISHED" 
+p.attributes[:editor_title].default?
+=> false
+```
+
 ### Embed Value
 You can embed values in Attrio just like you do it in Virtus.
 

data/lib/attrio.rb

@@ -13,44 +13,53 @@ module Attrio
   autoload :Helpers, 'attrio/helpers'
 
   def self.included(base)
-    base.send :include, Attrio::Initialize
-    base.send :include, Attrio::Inspect
     base.send :include, Attrio::Reset
+    base.send :include, Attrio::Inspect
 
+    base.send :extend, Attrio::Initialize
     base.send :extend, Attrio::ClassMethods
   end
 
   module ClassMethods
+    def attrio
+      @attrio ||= {}
+    end
+
     def define_attributes(options = {}, &block)
-      options[:as] ||= :attributes
+      as = options.delete(:as) || :attributes
+      self.attrio[as] = options
 
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        @#{options[:as]} ||= {}
+        @#{as} ||= {}
 
         class << self
-          def #{options[:as]}(attributes = [])
+          def #{as}(attributes = [])
             attributes = Helpers.to_a(attributes).flatten
-            return @#{options[:as]} if attributes.empty?
+            return @#{as} if attributes.empty?
 
-            attributes = @#{options[:as]}.keys & attributes
-            @#{options[:as]}.select{ |k,v| attributes.include?(k) }
+            attributes = @#{as}.keys & attributes
+            @#{as}.select{ |k,v| attributes.include?(k) }
           end
 
           def inherited(subclass)
-            subclass.instance_variable_set("@#{options[:as]}", instance_variable_get("@#{options[:as]}").dup)
+            subclass.instance_variable_set("@#{as}", instance_variable_get("@#{as}").dup)
           end
         end
 
-        def #{options[:as]}(attributes = [])
-          self.class.#{options[:as]}(attributes)
+        def #{as}(attributes = [])
+          # self.class.#{as}(attributes)
+
+          attributes = Helpers.to_a(attributes).flatten
+          return @#{as} if attributes.empty?
+
+          attributes = @#{as}.keys & attributes
+          @#{as}.select{ |k,v| attributes.include?(k) }
         end
       EOS
 
-      self.define_attrio_new(options[:as])
-      self.define_attrio_reset(options[:as])
-      self.define_attrio_inspect(options[:as]) unless options[:inspect] == false
+      self.define_attrio_reset(as)
 
-      Attrio::AttributesParser.new(self, options, &block)
+      Attrio::AttributesParser.new(self, as, &block)
     end
 
     def const_missing(name)

data/lib/attrio/attribute.rb

@@ -2,7 +2,7 @@
 
 module Attrio
   class Attribute
-    attr_reader :name, :type, :options
+    attr_reader :name, :type, :options, :object
 
     def initialize(name, type, options)
       @name = name; @type = type; @options = Helpers.symbolize_hash_keys(options)
@@ -35,6 +35,20 @@ module Attrio
       @default_value
     end
 
+    def reset!
+      raise ArgumentError if self.object.nil?
+
+      value = self.default_value.is_a?(Attrio::DefaultValue::Base) ? self.default_value.call(self.object) : self.default_value
+      self.object.send(self.writer_method_name, value)
+    end
+
+    def default?
+      raise ArgumentError if self.object.nil?
+
+      value = self.default_value.is_a?(Attrio::DefaultValue::Base) ? self.default_value.call(self.object) : self.default_value
+      self.object.send(self.reader_method_name) == value
+    end
+
     def define_writer(klass)
       Attrio::Builders::WriterBuilder.define(klass, self.type,
         self.options.merge({

data/lib/attrio/attributes_parser.rb

@@ -2,13 +2,11 @@
 
 module Attrio
   class AttributesParser
-    attr_reader :klass, :options
+    attr_reader :klass, :as
 
-    def initialize(klass, options, &block)
+    def initialize(klass, as, &block)
       @klass = klass
-      @options = options
-
-      raise ArgumentError.new('Missing options[:as] value' ) if @options[:as].blank?
+      @as = as
 
       self.instance_eval(&block)
     end
@@ -47,9 +45,9 @@ module Attrio
 
   protected
 
-    def as
-      self.options[:as]
-    end
+    # def as
+    #   self.options[:as]
+    # end
 
     def fetch_type(name)
       return if name.nil?

data/lib/attrio/builders/accessor_builder.rb

@@ -17,7 +17,7 @@ module Attrio
           type.send("default_#{self.accessor.to_s}_aliases", options[:method_name]).each do |alias_method_name|
             klass.send(:alias_method, alias_method_name, options[:method_name])
           end
-        end        
+        end
       end
     end
   end

data/lib/attrio/builders/reader_builder.rb

@@ -11,13 +11,13 @@ module Attrio
 
       def self.define_accessor(klass, type, options)
         unless klass.method_defined?(options[:method_name])
-          klass.send :define_method, options[:method_name] do            
+          klass.send :define_method, options[:method_name] do
             self.instance_variable_get(options[:instance_variable_name])
           end
-        
+
           klass.send options[:method_visibility], options[:method_name]
-        end        
-      end      
+        end
+      end
     end
   end
 end

data/lib/attrio/default_value.rb

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

data/lib/attrio/default_value/callable.rb

@@ -17,7 +17,7 @@ module Attrio
       #
       def call(instance)
         self.value.call(instance, self.attribute)
-      end    
+      end
     end
   end
 end

data/lib/attrio/default_value/clonable.rb

@@ -19,10 +19,10 @@ module Attrio
       # Evaluates the value via value#clone
       #
       # @return [Object] evaluated value
-      #        
+      #
       def call(*)
         @value.clone
-      end 
+      end
     end
   end
 end

data/lib/attrio/default_value/symbol.rb

@@ -13,10 +13,10 @@ module Attrio
       # Symbol value is returned if the object doesn't respond to value
       #
       # @param [Object] instance
-      #      
+      #
       def call(instance)
         instance.respond_to?(self.value, true) ? instance.send(self.value) : self.value
-      end     
+      end
     end
   end
 end

data/lib/attrio/initialize.rb

@@ -2,21 +2,20 @@
 
 module Attrio
   module Initialize
-    def self.included(base)
-      base.send(:extend, Attrio::Initialize::ClassMethods)
-    end
+    def new(*args, &block)
+      obj = self.allocate
 
-    module ClassMethods
-      def define_attrio_new(as)
-        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-          def self.new(*args, &block)
-            obj = self.allocate            
-            obj.send :initialize, *args, &block          
-            obj.send "set_#{as}_defaults"
-            obj
-          end
-        EOS
+      obj.class.attrio.each do |group, options|
+        obj.instance_variable_set("@#{group}", {})
+        obj.class.send("#{group}").each do |name, attribute|
+          obj.send("#{group}")[name] = attribute.dup
+          obj.send("#{group}")[name].instance_variable_set(:@object, obj)
+          obj.send("#{group}")[name].reset!
+        end
       end
+
+      obj.send :initialize, *args, &block
+      obj
     end
   end
 end

data/lib/attrio/inspect.rb

@@ -2,31 +2,33 @@
 
 module Attrio
   module Inspect
-    def self.included(base)    
-      base.send(:extend, Attrio::Inspect::ClassMethods)
-    end
+    def inspect
+      inspection = []
 
-    module ClassMethods
-      def define_attrio_inspect(as)
-        define_method(:inspect) do
-          inspection = self.send(as.to_s).map { |key, attribute|              
+      self.class.attrio.each do |group, options|
+        unless options[:inspect] == false
+          inspection << self.send(group).map { |key, attribute|
             self.inspect_attribute(key, attribute.instance_variable_name)
-          }.compact.join(', ')
-
-          "#<#{self.class} #{inspection}>"
+          }
         end
+      end
 
-        define_method(:inspect_attribute) do |attribute_name, instance_variable_name|
-          value = instance_variable_get(instance_variable_name.to_s)
+      unless inspection.size == 0
+        "#<#{self.class} #{inspection.flatten.compact.join(', ')}>"
+      else
+        super
+      end
+    end
 
-          if value.is_a?(String) && value.length > 50
-            "#{attribute_name.to_s}[#{value.size}]: " + "#{value[0..50]}...".inspect
-          elsif value.is_a?(Array) && value.length > 5
-            "#{attribute_name.to_s}[#{value.size}]: " + "#{value[0..5]}...".inspect
-          else
-            "#{attribute_name.to_s}: " + value.inspect
-          end
-        end
+    def inspect_attribute(attribute_name, instance_variable_name)
+      value = instance_variable_get(instance_variable_name.to_s)
+
+      if value.is_a?(String) && value.length > 50
+        "#{attribute_name.to_s}[#{value.size}]: " + "#{value[0..50]}...".inspect
+      elsif value.is_a?(Array) && value.length > 5
+        "#{attribute_name.to_s}[#{value.size}]: " + "#{value[0..5]}...".inspect
+      else
+        "#{attribute_name.to_s}: " + value.inspect
       end
     end
   end

data/lib/attrio/reset.rb

@@ -8,24 +8,25 @@ module Attrio
 
     module ClassMethods
       def define_attrio_reset(as)
-        define_method "reset_#{as.to_s}" do |attributes = []|          
-          self.send(as.to_s, attributes).values.each{ |attribute| self.send(attribute.writer_method_name, nil) }
-          self.send("set_#{as.to_s}_defaults", attributes)
-        end  
-
-        define_method "reset_#{as.to_s}_defaults" do |attributes = []|
-          self.send(as.to_s, attributes).values.select{ |attribute| !attribute.default_value.nil? }.each { |attribute| self.send(attribute.writer_method_name, nil) }
-          self.send("set_#{as.to_s}_defaults", attributes)          
+        define_method "reset_#{as.to_s}" do |attributes = []|
+          # self.send(as.to_s, attributes).values.each{ |attribute| self.send(attribute.writer_method_name, nil) }
+          # self.send("set_#{as.to_s}_defaults", attributes)
+          self.send(as.to_s, attributes).values.each{ |attribute| attribute.reset! }
         end
 
-        define_method "set_#{as.to_s}_defaults" do |attributes = []|
-          self.send(as.to_s, attributes).values.select{ |attribute| !attribute.default_value.nil? }.each do |attribute|
-            next if self.send(attribute.reader_method_name).present?
+        # define_method "reset_#{as.to_s}_defaults" do |attributes = []|
+        #   self.send(as.to_s, attributes).values.select{ |attribute| !attribute.default_value.nil? }.each { |attribute| self.send(attribute.writer_method_name, nil) }
+        #   self.send("set_#{as.to_s}_defaults", attributes)
+        # end
 
-            default_value = attribute.default_value.is_a?(Attrio::DefaultValue::Base) ? attribute.default_value.call(self) : attribute.default_value  
-            self.send(attribute.writer_method_name, default_value)
-          end          
-        end
+        # define_method "set_#{as.to_s}_defaults" do |attributes = []|
+        #   self.send(as.to_s, attributes).values.select{ |attribute| !attribute.default_value.nil? }.each do |attribute|
+        #     next if self.send(attribute.reader_method_name).present?
+
+        #     default_value = attribute.default_value.is_a?(Attrio::DefaultValue::Base) ? attribute.default_value.call(self) : attribute.default_value
+        #     self.send(attribute.writer_method_name, default_value)
+        #   end
+        # end
       end
     end
   end

data/lib/attrio/version.rb

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

data/spec/integration/embedded_value_spec.rb

@@ -14,7 +14,7 @@ describe 'Embedded Value' do
       end
     end
 
-    class City  
+    class City
       include Attrio
       include MassAssignment
 

data/spec/unit/inspect_spec.rb

@@ -17,25 +17,4 @@ describe Attrio::Inspect do
       object.method(:inspect).source_location.first.should match(/lib\/attrio\/inspect.rb/)
     end
   end
-
-  context ':inspect option passed' do
-    let(:model) do
-      Class.new do
-        include Attrio
-
-        define_attributes :inspect => false do
-        end
-      end
-    end
-
-    let(:object) { model.new }
-
-    it 'should not have inspect defined by attrio' do
-      if RUBY_ENGINE == 'rbx'
-        object.method(:inspect).source_location.first.should_not match(/attrio/)
-      else
-        object.method(:inspect).source_location.should be_nil
-      end                
-    end
-  end
 end

data/spec/unit/reset_spec.rb

@@ -12,7 +12,7 @@ describe Attrio::Reset do
     end
   end
 
-  let(:object) do 
+  let(:object) do
     obj = model.new
     obj.first = 'first'
     obj.second = 'second'
@@ -20,7 +20,7 @@ describe Attrio::Reset do
   end
 
   it 'should respond_to reset_attributes' do
-    object.respond_to?(:reset_attributes).should be_true    
+    object.respond_to?(:reset_attributes).should be_true
   end
 
   it 'should reset attributes without :default option to nil' do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attrio
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Igor Alexandrov
@@ -10,28 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,65 +42,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   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'
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: 
@@ -171,33 +158,26 @@ files:
 - spec/unit/types/time_spec.rb
 homepage: https://github.com/jetrockets/attrio
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -10874694009707771
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -10874694009707771
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Attributes for plain old Ruby objects. No dependencies, only simplicity and
   clearness.
 test_files: