has_draft 1.0.1 → 1.0.2

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,51 @@
+PATH
+  remote: .
+  specs:
+    has_draft (1.0.1)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.6)
+    arel (2.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    factory_girl (1.3.3)
+    faker (0.9.5)
+      i18n (~> 0.4)
+    i18n (0.5.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    tzinfo (0.3.26)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 3.0.0)
+  activesupport (>= 3.0.0)
+  factory_girl (~> 1.3.1)
+  faker (~> 0.9.1)
+  has_draft!
+  rspec (~> 2.0)
+  sqlite3-ruby (~> 1.3.1)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 [name of plugin creator]
+Copyright (c) 2010 Ben Hughes
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/has_draft/version.rb

@@ -1,3 +1,3 @@
 module HasDraft
-  VERSION = "1.0.1"
-end
+  VERSION = "1.0.2"
+end

data/lib/has_draft.rb

@@ -20,8 +20,8 @@ module HasDraft
                         :foreign_key => draft_foreign_key,
                         :dependent => :destroy
         
-        named_scope :with_draft, :include => [:draft], :conditions => "#{draft_table_name}.id IS NOT NULL"
-        named_scope :without_draft, :include => [:draft], :conditions => "#{draft_table_name}.id IS NULL"
+        scope :with_draft, includes(:draft).where("#{draft_table_name}.id IS NOT NULL")
+        scope :without_draft, includes(:draft).where("#{draft_table_name}.id IS NULL")
       end
       
       # Dynamically Create Model::Draft Class
@@ -62,16 +62,16 @@ module HasDraft
     end
     
     def instantiate_draft
-      self.draft = self.build_draft
+      self.build_draft
       
       copy_attributes_to_draft
       before_instantiate_draft
       
-      self.draft
+      self.draft.tap(&:save)
     end
     
     def instantiate_draft!
-      returning instantiate_draft do |draft|
+      instantiate_draft do |draft|
         draft.save unless self.new_record?
       end
     end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require "rubygems"
 require "rspec"
 require "factory_girl"
 require "faker"
-require "rails"
 require "active_record"
 require "active_support"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_draft
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ben Hughes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +08:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,69 @@ dependencies:
         version: 3.0.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: faker
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
+        version: 0.9.1
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  version_requirements: *id006
 description: Allows for your ActiveRecord models to have drafts which are stored in a separate duplicate table.
 email: ben@railsgarden.com
 executables: []
@@ -68,7 +131,8 @@ files:
 - spec/factories/article.rb
 - spec/has_draft_spec.rb
 - spec/spec_helper.rb
-- CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - Rakefile
 - README.rdoc

data/CHANGELOG.rdoc

@@ -1,10 +0,0 @@
-== [2010-10-15] 1.0.1 Minor fix to homepage URL
-
-== [2010-10-15] 1.0.0 Major Updates
-
-* Finally updated to be a Gem
-* Internal refactoring
-* Converted tests to RSpec
-* Added support for Rails 3.0
-
-== 0.1.0 Initial Version