has_bootstrap 0.1.0 → 0.1.1

data/Gemfile

@@ -3,6 +3,4 @@ source 'http://rubygems.org'
 group :development do
   gem 'yard', '~> 0.8.2.1'
   gem 'jeweler', '~> 1.8.3'
-  gem 'magic_encoding', '~> 0.0.2'
-  gem 'whitespace', '~> 2.0.4'
 end

data/Gemfile.lock

@@ -8,11 +8,9 @@ GEM
       rake
       rdoc
     json (1.7.5)
-    magic_encoding (0.0.2)
     rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    whitespace (2.0.4)
     yard (0.8.2.1)
 
 PLATFORMS
@@ -20,6 +18,4 @@ PLATFORMS
 
 DEPENDENCIES
   jeweler (~> 1.8.3)
-  magic_encoding (~> 0.0.2)
-  whitespace (~> 2.0.4)
   yard (~> 0.8.2.1)

data/has_bootstrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "has_bootstrap"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Boerger"]
-  s.date = "2012-11-28"
+  s.date = "2013-07-08"
   s.email = "tboerger@tbpro.de"
   s.extra_rdoc_files = [
     "LICENSE.md",
@@ -40,19 +40,13 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<yard>, ["~> 0.8.2.1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<magic_encoding>, ["~> 0.0.2"])
-      s.add_development_dependency(%q<whitespace>, ["~> 2.0.4"])
     else
       s.add_dependency(%q<yard>, ["~> 0.8.2.1"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<magic_encoding>, ["~> 0.0.2"])
-      s.add_dependency(%q<whitespace>, ["~> 2.0.4"])
     end
   else
     s.add_dependency(%q<yard>, ["~> 0.8.2.1"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<magic_encoding>, ["~> 0.0.2"])
-    s.add_dependency(%q<whitespace>, ["~> 2.0.4"])
   end
 end
 

data/lib/has_bootstrap/model.rb

@@ -28,9 +28,11 @@ module HasBootstrap
 
           record = if record = existing[attributes[primary_key]]
             if defaults
-              attributes.merge! defaults.delete_if do |attribute, value|
+              available_defaults = defaults.delete_if do |attribute, value|
                 record.send("#{attribute}?")
               end
+
+              attributes.merge! available_defaults
             end
 
             record.attributes = attributes

data/lib/has_bootstrap/version.rb

@@ -6,7 +6,7 @@ module HasBootstrap
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -43,38 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: magic_encoding
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: whitespace
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.4
 description: 
 email: tboerger@tbpro.de
 executables: []
@@ -109,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2672859310885189518
+      hash: 2376138391860766055
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: