attrio 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a48e9858e6427010ea2fd9a3eed6bbce23ec937
-  data.tar.gz: a12796dd65e3629247a51b3d98934bdf5eda6a8f
+  metadata.gz: c26804a67602226869134d4830cd56bb002e6fa1
+  data.tar.gz: c51a28f44ef045e5025f83ba2881730b7a8d076c
 SHA512:
-  metadata.gz: c39c375f692678255881a6dbd488e9a45cafb931e0a83b745a8fe214a75c5d1d76a62d95efc730af924966998d134990e29469ef43270072c10a99f303cb349f
-  data.tar.gz: 5c403918f66223d3c3d3eddf19379ac115505fcf31b2a5fd69185db2d93d1a6adc9444235c58c3ca07fc722f6668bc1d29d7da68b8ed626edb4e4eb3f225843b
+  metadata.gz: 13b609a39fc2baa89f90baa88745d8445c65752e80e81e9459063841cc38908110d868678b8e2127d6269460e8538b16829d57df39c9da2e1c91bca4bd2ad187
+  data.tar.gz: f6c218f0f6bb04c43216b6e378bd66cb14426c652e7929162a7f42160198fdd61c21983da5133e99f6ecf4e23fb084b89952c61aa24c8b0147d1330bd04d69b4

data/attrio.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'webmock', '~> 1.9.0'
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'json'
   gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'bundler'

data/lib/attrio/core_ext/object.rb

@@ -2,7 +2,7 @@
 
 class Object
   def blank?
-    !self     
+    !self
   end unless method_defined? :blank?
 
   def present?

data/lib/attrio/default_value/base.rb

@@ -19,9 +19,9 @@ module Attrio
         @attribute = attribute; @value = value;
       end
 
-      # Evaluates the value      
+      # Evaluates the value
       # @return [Object] evaluated value
-      #      
+      #
       def call(instance)
         raise NotImplementedError
       end

data/lib/attrio/initialize.rb

@@ -5,16 +5,17 @@ module Attrio
     def new(*args, &block)
       obj = self.allocate
 
+      obj.send :initialize, *args, &block
+
       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!
+          obj.send("#{group}")[name].reset! if obj.send(name).blank?
         end
       end
 
-      obj.send :initialize, *args, &block
       obj
     end
   end

data/lib/attrio/reset.rb

@@ -9,24 +9,8 @@ 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)
           self.send(as.to_s, attributes).values.each{ |attribute| attribute.reset! }
         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)
-        # 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,8 +3,8 @@
 module Attrio
   module Version
     MAJOR = 0
-    MINOR = 6
-    PATCH = 2
+    MINOR = 7
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/integration/inheritance_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-describe 'Attributes inheritance' do  
+describe 'Attributes inheritance' do
   before(:all) do
     class Parent
       include Attrio
 
       define_attributes do
         attr :email, String
-        attr :name, String    
+        attr :name, String
         attr :created_at, DateTime, :default => proc{ Time.now }
       end
     end
 
-    class ChildWithoutAttributes < Parent      
+    class ChildWithoutAttributes < Parent
     end
 
     class ChildWithNewAttributes < Parent

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 require 'attrio'
 require 'rspec'
 require 'webmock/rspec'
-
+require 'json'
 require 'coveralls'
 Coveralls.wear!
 

data/spec/unit/attrio_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Attrio do  
+describe Attrio do
   let(:model) do
     attributes_name = self.respond_to?(:attributes_name) ? self.attributes_name : 'attributes'
-    
-    Class.new do 
+
+    Class.new do
       include Attrio
 
       define_attributes :as => attributes_name do
@@ -28,7 +28,7 @@ describe Attrio do
       it { should respond_to(:reset_attributes) }
       it { should respond_to(:attributes) }
 
-      context '#attributes' do      
+      context '#attributes' do
         it 'should be a kind of Hash' do
           subject.attributes.should be_a_kind_of Hash
         end
@@ -46,7 +46,7 @@ describe Attrio do
           subject.attributes([:name]).keys.should match_array([:name])
         end
 
-        it 'should return a blank set of attributes for not existing filter' do          
+        it 'should return a blank set of attributes for not existing filter' do
           subject.attributes([:not_existing_attribute]).keys.should match_array([])
         end
       end

data/spec/unit/default_value/callable_spec.rb

@@ -7,17 +7,17 @@ describe Attrio::DefaultValue::Callable do
     Class.new do
       include Attrio
 
-      define_attributes do        
-        attr :attribute, DateTime, :default => proc{ DateTime.now }        
+      define_attributes do
+        attr :attribute, DateTime, :default => proc{ DateTime.now }
       end
     end
   end
 
   let(:object){ model.new }
 
-  let(:attribute){ mock('attribute')}
-  let(:default_value){ mock('default_value')}
-  let(:response)  { stub('response') }
+  let(:attribute){ double('attribute')}
+  let(:default_value){ double('default_value')}
+  let(:response)  { double('response') }
 
   before { default_value.stub(:call => response) }
   it 'should call the value with the object and attribute' do
@@ -25,12 +25,12 @@ describe Attrio::DefaultValue::Callable do
     subject.call(object)
   end
 
-  it "should set attribute value to appropriate type" do    
-    object.attribute.should be_instance_of(DateTime)  
+  it "should set attribute value to appropriate type" do
+    object.attribute.should be_instance_of(DateTime)
   end
 
   it "should be evaluate attribute value every time" do
-    another_object = model.new    
+    another_object = model.new
 
     object.attribute.should_not be_equal(another_object.attribute)
   end

data/spec/unit/default_value/clonable_spec.rb

@@ -7,18 +7,18 @@ describe Attrio::DefaultValue::Clonable do
     Class.new do
       include Attrio
 
-      define_attributes do        
-        attr :attribute, Date, :default => Date.today        
-      end      
+      define_attributes do
+        attr :attribute, Date, :default => Date.today
+      end
     end
   end
 
   let(:object){ model.new }
 
-  let(:attribute){ mock('attribute')}
-  let(:default_value){ mock('default_value')}
-  let(:instance)  { mock('instance') }
-  let(:clone)     { mock('clone') }
+  let(:attribute){ double('attribute')}
+  let(:default_value){ double('default_value')}
+  let(:instance)  { double('instance') }
+  let(:clone)     { double('clone') }
 
   before { default_value.stub(:clone => clone) }
 
@@ -32,7 +32,7 @@ describe Attrio::DefaultValue::Clonable do
   end
 
   it "should set attribute value to appropriate type" do
-    object.attribute.should be_instance_of(Date)  
+    object.attribute.should be_instance_of(Date)
   end
 
   it "should not be equal to clonable object" do
@@ -41,5 +41,5 @@ describe Attrio::DefaultValue::Clonable do
 
   it "should have the same value as clonable object" do
     object.attribute.should == Date.today
-  end  
+  end
 end

data/spec/unit/default_value/handle_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attrio
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Igor Alexandrov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,6 +53,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -202,4 +216,3 @@ test_files:
 - spec/unit/types/integer_spec.rb
 - spec/unit/types/symbol_spec.rb
 - spec/unit/types/time_spec.rb
-has_rdoc: