has_draft 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTU4ZWMwNzY0M2I5NzhlMDUxNWE2ZGQ4NDkyZThhZGYwYzQ5MTQ0NQ==
+  data.tar.gz: !binary |-
+    YTVhZTQ1ZTc5MWQ1MDRmZmE0ZGU0ODlkMmM1NTY4OTZmYzBlMGViMg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NTUzNzRkMjkyMWIyYzBkOWFjYTFlZTMzZjkxNWI4ZjYzMTE0MTM5NDc2NGE0
+    NWNiYTUwOWZkYjViOTFmOTQxYzQyYjY0YmMxYmM0MTBkMTRhN2QzYzJjNTQ2
+    YjhlMWFiM2VjMzhiMzI3Mzk3MTA5YWYxZTJmODRhZjgzYzU4NDM=
+  data.tar.gz: !binary |-
+    Y2JkNDE3ZTZiZmU5M2EzMmVjNTE2MDc5MTVmZjFiOTc0OTU2YTk4Mjg4YjY0
+    NzgxZmMwODIxMmMyMzNiNjk1OTI5NWU5NDQxZDMzYjFmNDYzYjdhMjdmMDNj
+    NDA1ZTdmY2NhOTlmNTdlNWFjYjIwOGMwOGQ4OGRiOTFjOWY0ZDM=

data/Appraisals

@@ -11,5 +11,5 @@ appraise "3.2" do
 end
 
 appraise "4.0" do
-  gem "rails", "~> 4.0.0.beta1"
+  gem "rails", "~> 4.0.0"
 end

data/Gemfile

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

data/Gemfile.lock

@@ -1,44 +1,54 @@
 PATH
   remote: .
   specs:
-    has_draft (1.1.0)
+    has_draft (1.2.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.20)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     appraisal (0.4.1)
       bundler
       rake
-    arel (2.0.10)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
+    arel (4.0.0)
+    atomic (1.1.14)
+    builder (3.1.4)
+    diff-lcs (1.2.4)
     factory_girl (1.3.3)
     faker (0.9.5)
       i18n (~> 0.4)
-    i18n (0.5.0)
-    rake (0.9.2.2)
-    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.5)
-    tzinfo (0.3.35)
+    i18n (0.6.5)
+    minitest (4.7.5)
+    multi_json (1.8.0)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    sqlite3 (1.3.8)
+    thread_safe (0.1.3)
+      atomic
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -115,6 +115,64 @@ In your Gemfile:
   class Article < ActiveRecord::Base
     has_draft :class_name => 'Copy', :foreign_key => :news_article_id, :table_name => 'article_copies'
   end
+  
+  ## Single Table Inheritance Example
+  class InitialSchema < ActiveRecord::Migration
+  
+    [:elements, :element_drafts].each do |table_name|
+      create_table table_name, :force => true do |t|
+        t.integer :element_id if table_name == :element_drafts
+      
+        t.string :title
+        t.text :content
+        t.string :type
+      end
+    end
+    
+  end
+  
+  class Element < ActiveRecord::Base
+    class Draft < ActiveRecord::Base
+      def element_icon_path
+        'assets/images/default.png'
+      end
+    end
+    
+    module HasDraftCallbacks
+      def before_instantiate_draft
+        # Need to append ::Draft so that it knows to use the Draft class
+        self.draft.type = self.type + '::Draft'
+      end
+  		
+      def before_replace_with_draft
+        # We are storing drafts with the ::Draft on the end so we have to strip it
+        self.type = self.draft.type.split(':')[0]
+      end
+    end
+  end
+  
+  class BlueElement < Element
+    has_draft :belongs_to => :element, :extends => Element::Draft do
+      def element_icon_path
+        'assets/images/blue.png'
+      end
+    end
+    
+    include Element::HasDraftCallbacks
+  end
+  
+  class UnknownElement < Element
+    has_draft :belongs_to => :element, :extends => Element::Draft
+    
+    include Element::HasDraftCallbacks
+  end
+  
+  This allows us to call element_draft.element on any subclass of Element::Draft
+  instead of needing to know to call element_draft.blue_element or element_draft.unknown_element.
+  
+  Note: calling has_draft will have no effect if the parent class has already executed has_draft. 
+    
+  
 
 == Method Callbacks
 

data/lib/has_draft.rb

@@ -23,16 +23,22 @@ module HasDraft
         scope :with_draft, lambda { includes(:draft).where("#{draft_table_name}.id IS NOT NULL") }
         scope :without_draft, lambda { includes(:draft).where("#{draft_table_name}.id IS NULL") }
       end
-      
+
+      # Default parent class to ActiveRecord::Base
+      options[:extends] = ActiveRecord::Base if options[:extends].nil?
+
       # Dynamically Create Model::Draft Class
-      const_set(draft_class_name, Class.new(ActiveRecord::Base))
+      const_set(draft_class_name, Class.new(options[:extends]))
       
       draft_class.cattr_accessor :original_class
       draft_class.original_class = self
       draft_class.table_name = draft_table_name
-      
+
+      # Default parent association
+      options[:belongs_to] = self.to_s.demodulize.underscore.to_sym if options[:belongs_to].nil?
+
       # Draft Parent Association
-      draft_class.belongs_to self.to_s.demodulize.underscore.to_sym, :class_name  => "::#{self.to_s}", :foreign_key => draft_foreign_key
+      draft_class.belongs_to options[:belongs_to], :class_name  => "::#{self.to_s}", :foreign_key => draft_foreign_key
       
       # Block extension
       draft_class.class_eval(&block) if block_given?

data/lib/has_draft/version.rb

@@ -1,3 +1,3 @@
 module HasDraft
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/db/schema.rb

@@ -10,5 +10,23 @@ ActiveRecord::Schema.define(:version => 0) do
       t.date :post_date
     end
   end
+
+  [:posts, :post_drafts].each do |table_name|
+    create_table table_name, :force => true do |t|
+      t.references :post if table_name == :post_drafts
+
+      t.string :title
+      t.text :body
+    end
+  end
+
+  [:pages, :page_drafts].each do |table_name|
+    create_table table_name, :force => true do |t|
+      t.references :page if table_name == :page_drafts
+
+      t.string :title
+      t.text :body
+    end
+  end
   
 end

data/spec/has_draft_spec.rb

@@ -79,5 +79,27 @@ describe HasDraft do
       end
     end
   end
+
+  context "Draft class extends" do
+
+    it "ActiveRecord::Base when no options are passed" do
+      Article::Draft.superclass.should == ActiveRecord::Base
+    end
+
+    it "the class passed in with the :extends option" do
+      BlogPost::Draft.superclass.should == Post
+    end
+  end
+
+  context "Draft class belongs to" do
+
+    it "self when :belongs_to is not specified" do
+      Article::Draft.reflect_on_association(:article).macro.should == :belongs_to
+    end
+
+    it "the model passed in with the :belongs_to option" do
+      BlogPost::Draft.reflect_on_association(:post).macro.should == :belongs_to
+    end
+  end
   
 end

data/spec/spec_helper.rb

@@ -20,5 +20,15 @@ class Article < ActiveRecord::Base
   has_draft
 end
 
+# Empty class to test ability of Draft class to extend other classes
+class Post < ActiveRecord::Base
+
+end
+
+# Model for testing ability to have the draft extend a different class
+class BlogPost < Post
+  has_draft :extends => Post, :belongs_to => :post
+end
+
 # Load Factories:
 Dir[File.join(File.dirname(__FILE__), "factories/**/*.rb")].each {|f| require f}

metadata

@@ -1,104 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: has_draft
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70326605361340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70326605361340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70326605360140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70326605360140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70326605359500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70326605359500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70326605358820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70326605358820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70326605357720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70326605357720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70326605356960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70326605356960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70326605356220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70326605356220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70326605355540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326605355540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows for your ActiveRecord models to have drafts which are stored in
   a separate duplicate table.
 email: ben@railsgarden.com
@@ -124,27 +147,26 @@ files:
 - init.rb
 homepage: http://github.com/rubiety/has_draft
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
 rubyforge_project: has_draft
-rubygems_version: 1.8.16
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Attached draft model to your ActiveRecord models.
 test_files: []
 has_rdoc: