attribute_defaults 0.2 → 0.3

data/Gemfile

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 gemspec
 
 gem "rspec"
-gem "mysql2", "< 0.3"
+gem "mysql2"

data/Gemfile.lock

@@ -2,26 +2,28 @@ PATH
   remote: .
   specs:
     attribute_defaults (0.2)
-      activerecord (>= 3)
+      activerecord (>= 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.9)
-    arel (2.0.10)
-    builder (2.1.2)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
     diff-lcs (1.1.2)
-    i18n (0.5.0)
-    mysql2 (0.2.11)
+    i18n (0.6.0)
+    multi_json (1.0.4)
+    mysql2 (0.3.11)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -30,12 +32,12 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    tzinfo (0.3.29)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   attribute_defaults!
-  mysql2 (< 0.3)
+  mysql2
   rspec

data/attribute_defaults.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.homepage    = "http://github.com/jviney/attribute_defaults"
   
-  s.add_dependency "activerecord", ">= 3"
+  s.add_dependency "activerecord", ">= 3.1.0"
   
   s.add_development_dependency "rspec"
-  s.add_development_dependency "mysql2", "< 0.3"
+  s.add_development_dependency "mysql2"
 end

data/lib/attribute_defaults.rb

@@ -82,51 +82,49 @@ module AttributeDefaults
     
     alias_method :default, :defaults
   end
-  
-  module InstanceMethods
-    if ActiveRecord::VERSION::STRING >= "3.1"
-      def initialize_with_defaults(attributes = nil, options = {})
-        initialize_without_defaults(attributes, options) do |record|
-          record.apply_default_attribute_values(attributes)
-          yield record if block_given?
-        end
+
+  if ActiveRecord::VERSION::STRING >= "3.1"
+    def initialize_with_defaults(attributes = nil, options = {})
+      initialize_without_defaults(attributes, options) do |record|
+        record.apply_default_attribute_values(attributes)
+        yield record if block_given?
       end
-    else
-      def initialize_with_defaults(attributes = nil)
-        initialize_without_defaults(attributes) do |record|
-          record.apply_default_attribute_values(attributes)
-          yield record if block_given?
-        end
+    end
+  else
+    def initialize_with_defaults(attributes = nil)
+      initialize_without_defaults(attributes) do |record|
+        record.apply_default_attribute_values(attributes)
+        yield record if block_given?
       end
     end
-    
-    def apply_default_attribute_values(specific_attributes)
-      specific_attributes = (specific_attributes || {}).stringify_keys
-      
-      # Rails 3.1 deprecates #primary_key_name in favour of :foreign_key
-      foreign_key_method = if ActiveRecord::VERSION::STRING >= "3.1"
-        :foreign_key
-      else
-        :primary_key_name
+  end
+
+  def apply_default_attribute_values(specific_attributes)
+    specific_attributes = (specific_attributes || {}).stringify_keys
+
+    # Rails 3.1 deprecates #primary_key_name in favour of :foreign_key
+    foreign_key_method = if ActiveRecord::VERSION::STRING >= "3.1"
+      :foreign_key
+    else
+      :primary_key_name
+    end
+
+    self.class.attribute_defaults.each do |default|
+      next if specific_attributes.include?(default.attribute)
+
+      # Ignore a default value for association_id if association has been specified
+      reflection = self.class.reflections[default.attribute.to_sym]
+      if reflection and reflection.macro == :belongs_to and specific_attributes.include?(reflection.send(foreign_key_method).to_s)
+        next
       end
-      
-      self.class.attribute_defaults.each do |default|
-        next if specific_attributes.include?(default.attribute)
-        
-        # Ignore a default value for association_id if association has been specified
-        reflection = self.class.reflections[default.attribute.to_sym]
-        if reflection and reflection.macro == :belongs_to and specific_attributes.include?(reflection.send(foreign_key_method).to_s)
-          next
-        end
-        
-        # Ignore a default value for association if association_id has been specified
-        reflection = self.class.reflections.values.find { |r| r.macro == :belongs_to && r.send(foreign_key_method).to_s == default.attribute }
-        if reflection and specific_attributes.include?(reflection.name.to_s)
-          next
-        end
-        
-        send("#{default.attribute}=", default.value(self))
+
+      # Ignore a default value for association if association_id has been specified
+      reflection = self.class.reflections.values.find { |r| r.macro == :belongs_to && r.send(foreign_key_method).to_s == default.attribute }
+      if reflection and specific_attributes.include?(reflection.name.to_s)
+        next
       end
+
+      send("#{default.attribute}=", default.value(self))
     end
   end
 end

data/lib/attribute_defaults/version.rb

@@ -1,3 +1,3 @@
 module AttributeDefaults
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require "rubygems"
 require "bundler/setup"
+#gem "activerecord", "3.1.3"
 require "rspec"
 
 require "active_record"

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: attribute_defaults
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Jonathan Viney
@@ -14,8 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-03 00:00:00 +12:00
-default_executable: 
+date: 2012-01-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -25,10 +24,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 3
-        version: "3"
+        - 1
+        - 0
+        version: 3.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -51,13 +52,12 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 0
-        - 3
-        version: "0.3"
+        version: "0"
   type: :development
   version_requirements: *id003
 description: Add default attribute values when creating models.
@@ -82,7 +82,6 @@ files:
 - spec/database.yml
 - spec/schema.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/jviney/attribute_defaults
 licenses: []
 
@@ -112,9 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: attribute_defaults-0.2
+summary: attribute_defaults-0.3
 test_files: []