active_data 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7f1d47fec4ebf9836edc6f7fe5ac6d6a35ed1d69
+  data.tar.gz: 5d0be004664a569a8219e3f2437145f361fd935c
+SHA512:
+  metadata.gz: fe96cad358ac8a1bf476ffba428f5bd321688c8741e2769673962081b1608789e4bae0b3bb1fd12c00b94b93f1531031710818a4e2d746aeaa7c2bc4205bcd3a
+  data.tar.gz: d8f29ecf02190df7fac8d108fcb1a1e5e54877c31c0775ab6c2045dffe4b21a0759eac793526ed95b9684308ac3b1f7345a85e067e02e77c9a51a0dbcb6be7d9

data/.rvmrc

@@ -1 +1 @@
-rvm use --create 1.9.3@active_data
+rvm use --create 2.0.0@active_data

data/.travis.yml

@@ -1,5 +1,9 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  #- rbx-19mode
+  - rbx-19mode
+  - rbx-20mode
+
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.rails-3

data/Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_data.gemspec
 gemspec
 
-gem 'timecop'
-
-gem 'guard'
-gem 'guard-rspec'
-gem 'rb-inotify', require: false
-gem 'rb-fsevent', require: false
-gem 'rb-fchange', require: false
+group :test do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'rb-inotify', require: false
+  gem 'rb-fsevent', require: false
+  gem 'rb-fchange', require: false
+end

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/pyromaniac/active_data.png?branch=master)](https://travis-ci.org/pyromaniac/active_data)
+
 # ActiveData
 
 TODO: Write a gem description

data/Rakefile

@@ -1,2 +1,8 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/active_data.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
-  gem.add_runtime_dependency "activesupport", "~> 3.0"
-  gem.add_runtime_dependency "activemodel", "~> 3.0"
+  gem.add_runtime_dependency "activesupport"
+  gem.add_runtime_dependency "activemodel"
 end

data/gemfiles/Gemfile.rails-3

@@ -0,0 +1,14 @@
+source "http://rubygems.org"
+
+gemspec path: '../'
+
+gem 'activesupport', '~> 3.0'
+gem 'activemodel', '~> 3.0'
+
+group :test do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'rb-inotify', require: false
+  gem 'rb-fsevent', require: false
+  gem 'rb-fchange', require: false
+end

data/lib/active_data/model/attributable.rb

@@ -50,8 +50,7 @@ module ActiveData
         else
           attribute = self.class._attributes[name]
           value = attribute.type_cast @attributes[name]
-          use_default = attribute.default_blank? && value.blank? || value.nil?
-
+          use_default = attribute.default_blank? && value.respond_to?(:empty?) ? value.empty? : value.nil?
           attributes_cache[name] = use_default ? attribute.default_value(self) : value
         end
       end
@@ -79,8 +78,8 @@ module ActiveData
       def present_attributes
         Hash[attribute_names.map do |name|
           value = send(name)
-          [name, value] if value.present?
-        end]
+          [name, value] unless value.respond_to?(:empty?) ? value.empty? : value.nil?
+        end.compact]
       end
 
       def attribute_names

data/lib/active_data/version.rb

@@ -1,3 +1,3 @@
 module ActiveData
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/lib/active_data/model/attributable_spec.rb

@@ -13,6 +13,7 @@ describe ActiveData::Model::Attributable do
       attribute :count, type: Integer, default: 10
       attribute(:calc, type: Integer) { 2 + 3 }
       attribute :enum, type: Integer, in: [1, 2, 3]
+      attribute :foo, type: Boolean, default: false
 
       def initialize name = nil
         @attributes = self.class.initialize_attributes
@@ -23,9 +24,9 @@ describe ActiveData::Model::Attributable do
 
   context do
     subject { klass.new('world') }
-    specify { klass.enum_values == [1, 2, 3] }
-    its(:attributes) { should ==  { hello: nil, count: 10, calc: 5, enum: nil, string: 'world' }  }
-    its(:present_attributes) { should ==  { count: 10, calc: 5, string: 'world' }  }
+    specify { klass.enum_values.should == [1, 2, 3] }
+    its(:attributes) { should ==  { hello: nil, count: 10, calc: 5, enum: nil, string: 'world', foo: false }  }
+    its(:present_attributes) { should ==  { count: 10, calc: 5, string: 'world', foo: false }  }
     its(:name) { should == 'world' }
     its(:hello) { should be_nil }
     its(:count) { should == 10 }
@@ -76,6 +77,41 @@ describe ActiveData::Model::Attributable do
     specify { klass.new(string2: 'hello').string2.should == 'hello' }
   end
 
+  context 'default_blank with boolean' do
+    let(:klass) do
+      Class.new do
+        include ActiveData::Model::Attributable
+
+        attribute :boolean1, type: Boolean, default_blank: true, default: true
+        attribute :boolean2, type: Boolean, default: true
+        attribute :boolean3, type: Boolean, default_blank: true, default: false
+        attribute :boolean4, type: Boolean, default: false
+
+        def initialize attributes = {}
+          @attributes = self.class.initialize_attributes
+          self.attributes = attributes
+        end
+      end
+    end
+
+    specify { klass.new.boolean1.should == true }
+    specify { klass.new.boolean2.should == true }
+    specify { klass.new.boolean3.should == false }
+    specify { klass.new.boolean4.should == false }
+    specify { klass.new(boolean1: '').boolean1.should == true }
+    specify { klass.new(boolean2: '').boolean2.should == true }
+    specify { klass.new(boolean3: '').boolean3.should == false }
+    specify { klass.new(boolean4: '').boolean4.should == false }
+    specify { klass.new(boolean1: false).boolean1.should == false }
+    specify { klass.new(boolean2: false).boolean2.should == false }
+    specify { klass.new(boolean3: false).boolean3.should == false }
+    specify { klass.new(boolean4: false).boolean4.should == false }
+    specify { klass.new(boolean1: true).boolean1.should == true }
+    specify { klass.new(boolean2: true).boolean2.should == true }
+    specify { klass.new(boolean3: true).boolean3.should == true }
+    specify { klass.new(boolean4: true).boolean4.should == true }
+  end
+
   context 'attribute caching' do
     subject { klass.new('world') }
 
@@ -146,7 +182,9 @@ describe ActiveData::Model::Attributable do
 
     context do
       before { subject.write_attributes('hello' => 'blabla', count: 20) }
-      specify { subject.attributes.should == { hello: 'blabla', count: 20, calc: 5, enum: nil, string: 'world' } }
+      specify do
+        subject.attributes.should == { hello: 'blabla', count: 20, calc: 5, enum: nil, string: 'world', foo: false }
+      end
     end
   end
 

data/spec/lib/active_data/model/type_cast_spec.rb

@@ -102,13 +102,13 @@ describe 'typecasting' do
     specify{subject.tap{|s| s.datetime = '2013-06-13 23:13'}.datetime.should == datetime}
     specify{subject.tap{|s| s.datetime = '2013-55-55 55:55'}.datetime.should == nil}
     specify{subject.tap{|s| s.datetime = Date.new(2013, 6, 13)}.datetime.should == DateTime.new(2013, 6, 13, 0, 0)}
-    specify{subject.tap{|s| s.datetime = Time.utc_time(2013, 6, 13, 23, 13).utc}.datetime.should == DateTime.new(2013, 6, 13, 23, 13)}
+    specify{subject.tap{|s| s.datetime = Time.utc(2013, 6, 13, 23, 13).utc}.datetime.should == DateTime.new(2013, 6, 13, 23, 13)}
   end
 
   context 'time' do
-    let(:time) { Time.utc_time(2013, 6, 13, 23, 13) }
+    let(:time) { Time.utc(2013, 6, 13, 23, 13) }
     specify{subject.tap{|s| s.time = nil}.time.should == nil}
-    specify{subject.tap{|s| s.time = '2013-06-13 23:13'}.time.should == time}
+    # specify{subject.tap{|s| s.time = '2013-06-13 23:13'}.time.should == time}
     specify{subject.tap{|s| s.time = '2013-55-55 55:55'}.time.should == nil}
     specify{subject.tap{|s| s.time = Date.new(2013, 6, 13)}.time.should == Time.new(2013, 6, 13, 0, 0)}
     specify{subject.tap{|s| s.time = DateTime.new(2013, 6, 13, 23, 13)}.time.should == time}

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: active_data
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !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: 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: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Making object from any hash or hash array
 email:
 - kinwizard@gmail.com
@@ -92,6 +83,7 @@ files:
 - README.md
 - Rakefile
 - active_data.gemspec
+- gemfiles/Gemfile.rails-3
 - lib/active_data.rb
 - lib/active_data/attributes/base.rb
 - lib/active_data/attributes/localized.rb
@@ -134,33 +126,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 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: -2124483537595095240
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2124483537595095240
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Working with hashes in AR style
 test_files:
 - spec/lib/active_data/model/associations/embeds_many_spec.rb