acts_as_defaultable 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -17,37 +17,37 @@ GIT
 PATH
   remote: .
   specs:
-    acts_as_defaultable (0.0.3)
-      rails (= 3.2.0)
+    acts_as_defaultable (0.0.4)
+      rails (~> 3.2.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.0)
-      actionpack (= 3.2.0)
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
       mail (~> 2.4.0)
-    actionpack (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.0)
+      journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-    activesupport (3.2.0)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.0)
@@ -67,7 +67,7 @@ GEM
       guard (>= 0.10.0)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.0)
+    journey (1.0.1)
     json (1.6.5)
     libnotify (0.7.0)
     mail (2.4.1)
@@ -85,17 +85,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.0)
-      actionmailer (= 3.2.0)
-      actionpack (= 3.2.0)
-      activerecord (= 3.2.0)
-      activeresource (= 3.2.0)
-      activesupport (= 3.2.0)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
       bundler (~> 1.0)
-      railties (= 3.2.0)
-    railties (3.2.0)
-      actionpack (= 3.2.0)
-      activesupport (= 3.2.0)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)

data/acts_as_defaultable.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   #s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 
-  s.add_dependency "rails", "3.2.0"
+  s.add_dependency "rails", "~> 3.2.1"
 
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'rspec-rails'

data/lib/acts_as_defaultable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsDefaultable
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/dummy/db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(:version => 20120105110842) do
-=======
-ActiveRecord::Schema.define(:version => 20120104234100) do
->>>>>>> a78d85a48420ac87365e2329405c3644dc18a672
 
   create_table "anothers", :force => true do |t|
     t.string   "test"
@@ -52,7 +48,13 @@ ActiveRecord::Schema.define(:version => 20120104234100) do
     t.datetime "updated_at", :null => false
   end
 
-<<<<<<< HEAD
+  create_table "test_defaults", :force => true do |t|
+    t.string   "name"
+    t.boolean  "default",    :default => false
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+  end
+
   create_table "users", :force => true do |t|
     t.string   "role"
     t.string   "name"
@@ -65,13 +67,6 @@ ActiveRecord::Schema.define(:version => 20120104234100) do
     t.integer  "position"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
-=======
-  create_table "test_defaults", :force => true do |t|
-    t.string   "name"
-    t.boolean  "default",    :default => false
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
->>>>>>> a78d85a48420ac87365e2329405c3644dc18a672
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_defaultable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &22096320 !ruby/object:Gem::Requirement
+  requirement: &19459700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *22096320
+  version_requirements: *19459700
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &22095620 !ruby/object:Gem::Requirement
+  requirement: &19459260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22095620
+  version_requirements: *19459260
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &22094540 !ruby/object:Gem::Requirement
+  requirement: &19458620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22094540
+  version_requirements: *19458620
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &22195660 !ruby/object:Gem::Requirement
+  requirement: &19458080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22195660
+  version_requirements: *19458080
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &22194460 !ruby/object:Gem::Requirement
+  requirement: &19457520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.0.rc9
   type: :development
   prerelease: false
-  version_requirements: *22194460
+  version_requirements: *19457520
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &22193240 !ruby/object:Gem::Requirement
+  requirement: &19234080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22193240
+  version_requirements: *19234080
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &22191380 !ruby/object:Gem::Requirement
+  requirement: &19233360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22191380
+  version_requirements: *19233360
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &22189700 !ruby/object:Gem::Requirement
+  requirement: &19232580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22189700
+  version_requirements: *19232580
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &22188840 !ruby/object:Gem::Requirement
+  requirement: &19232060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22188840
+  version_requirements: *19232060
 description: This 'acts_as' extension provides the capability for having a default
   object. The class that has this specified needs to have a default column defined
   as an integer, string or boolean on the mapped database table
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1161643751702136176
+      hash: 2672945827084935828
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1161643751702136176
+      hash: 2672945827084935828
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10