draftsman 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74e4cf230e28a0fa2b097c33c0a3bb40360b4c3e
-  data.tar.gz: 549d0072468f067a86480273989d6a0b86118c99
+  metadata.gz: 7ecc44a2da54f76db70765c3faf9e515c3aba215
+  data.tar.gz: e54643b21e29a16872f83ca756592c2901220db7
 SHA512:
-  metadata.gz: 5dfed02ea98a99d534b3833327f4927b47e93ee4237899fe7c75e02ccd660195c4d562b5bf1dbdafbddb0343e19280a945eb773ee80a41dfd7625a7e2d237cc2
-  data.tar.gz: c4df9a57b0da2602328d995557a867936560965c6f4897d991107abc019789eea7d74ba4a35274e9777f469d353163b167aa00e5f23630b5cd89b2507377d092
+  metadata.gz: 5ec70e969b6bf40a9a8f69c87e504d2cd1fd0aa215757f022798b53d9d6d55ecc46d4282459058c277467d0eb47f397470432ab7c08e4d0641c7baf21396ec22
+  data.tar.gz: 6bcef513664f7de84d96ec42996a8d4130a37794446b0a8ff8df39866fc556d6dbeb24b2d2f8543c67bd9fdaddb9daadb177c2df475bed0ed7ea6af74a484171

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p247
+ruby-2.1.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v0.2 - June 3, 2014
+
+-  Fixed [#4](https://github.com/live-editor/draftsman/issues/4) - Added `referenced_table_name` argument to scopes.
+
 ## v0.1.1 - March 7, 2014
 
 -  Fixed [#3](https://github.com/minimalorange/draftsman/issues/3) - draft_publication_dependencies not honoring drafts

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    draftsman (0.1.1)
+    draftsman (0.2)
       activerecord (>= 3.0, < 5.0)
 
 GEM

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Minimal Orange, LLC
+Copyright (c) 2013-2014 Minimal Orange, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,4 +1,4 @@
-# Draftsman v0.1.1 (alpha)
+# Draftsman v0.2 (alpha)
 
 Draftsman is a Ruby gem that lets you create draft versions of your database records. If you're developing a system in
 need of simple drafts or a publishing approval queue, then Draftsman just might be what you need.
@@ -50,7 +50,7 @@ Works well with Rails, Sinatra, or any other application that depends on ActiveR
 Add Draftsman to your `Gemfile`.
 
 ```ruby
-gem 'draftsman', '0.1.1'
+gem 'draftsman', '0.2'
 ```
 
 Or if you want to grab the latest from `master`:
@@ -223,6 +223,14 @@ Widget.trashed    # Limits to items that have been drafted for deletion (but not
 Widget.live       # Limits to items that have not been drafted for deletion. Best used in an "admin" area in your application.
 ```
 
+These scopes optionally take a `referenced_table_name` argument for constructing more advanced queries using `includes`
+eager loading or `joins`. This reduces ambiguity both for SQL queries and for your Ruby code.
+
+```ruby
+# Query live widgets and gears without ambiguity.
+Widget.live.includes(:gears, :sprockets).live(:gears)
+```
+
 ### Draft Class Methods
 
 The `Draftsman::Draft` class has the following methods:
@@ -498,6 +506,8 @@ work on features or find bugs!
 
 ## License
 
+Copyright 2013-2014 Minimal Orange, LLC.
+
 Draftsman is released under the [MIT License][9].
 
 

data/draftsman.gemspec

@@ -4,9 +4,9 @@ require 'draftsman/version'
 Gem::Specification.new do |s|
   s.name          = 'draftsman'
   s.version       = Draftsman::VERSION
-  s.summary       = "Create draft versions of your ActiveRecord models' data."
+  s.summary       = "Create draft versions of your ActiveRecord models' data. Works with Ruby on Rails and Sinatra."
   s.description   = s.summary
-  s.homepage      = 'https://github.com/minimalorange/draftsman'
+  s.homepage      = 'https://github.com/live-editor/draftsman'
   s.authors       = ['Chris Peters']
   s.email         = 'chris@minimalorange.com'
   s.license       = 'MIT'

data/lib/draftsman/model.rb

@@ -74,10 +74,40 @@ module Draftsman
         belongs_to self.draft_association_name, :class_name => self.draft_class_name, :dependent => :destroy
 
         # Scopes
-        scope :drafted,   lambda { where("#{self.draft_association_name}_id IS NOT NULL") }
-        scope :published, lambda { where("#{self.published_at_attribute_name} IS NOT NULL") }
-        scope :trashed,   lambda { where("#{self.trashed_at_attribute_name} IS NOT NULL") }
-        scope :live,      lambda { where("#{self.trashed_at_attribute_name} IS NULL") }
+        scope :drafted, (lambda do |referenced_table_name = nil|
+          referenced_table_name = referenced_table_name.present? ? referenced_table_name : table_name
+
+          if where_not?
+            where.not(referenced_table_name => { "#{self.draft_association_name}_id" => nil })
+          else
+            where("#{referenced_table_name}.#{self.draft_association_name}_id IS NOT NULL")
+          end
+        end)
+
+        scope :published, (lambda do |referenced_table_name = nil|
+          referenced_table_name = referenced_table_name.present? ? referenced_table_name : table_name
+
+          if where_not?
+            where.not(referenced_table_name => { self.published_at_attribute_name => nil })
+          else
+            where("#{self.published_at_attribute_name} IS NOT NULL")
+          end
+        end)
+
+        scope :trashed, (lambda do |referenced_table_name = nil|
+          referenced_table_name = referenced_table_name.present? ? referenced_table_name : table_name
+
+          if where_not?
+            where.not(referenced_table_name => { self.trashed_at_attribute_name => nil })
+          else
+            where("#{self.trashed_at_attribute_name} IS NOT NULL")
+          end
+        end)
+
+        scope :live, (lambda do |referenced_table_name = nil|
+          referenced_table_name = referenced_table_name.present? ? referenced_table_name : table_name
+          where(referenced_table_name => { self.trashed_at_attribute_name => nil })
+        end)
       end
 
       # Returns whether or not `has_drafts` has been called on this model.
@@ -85,6 +115,11 @@ module Draftsman
         method_defined?(:draftsman_options)
       end
 
+      # Returns whether or not the included ActiveRecord can do `where.not(...)` style queries.
+      def where_not?
+        ActiveRecord::VERSION::STRING.to_f >= 4.0
+      end
+
       # Serializes attribute changes for `Draft#object_changes` attribute.
       def serialize_draft_attribute_changes(changes)
         serialized_attributes.each do |key, coder|

data/lib/draftsman/version.rb

@@ -1,3 +1,3 @@
 module Draftsman
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/models/vanilla_spec.rb

@@ -159,14 +159,8 @@ describe Vanilla do
     describe :drafted do
       subject { Vanilla.drafted }
       its(:count) { should eql 1 }
-
-      it 'includes the unpublished item' do
-        subject.should include drafted_vanilla
-      end
-
-      it 'does not include the published item' do
-        subject.should_not include published_vanilla
-      end
+      it { should include drafted_vanilla }
+      it { should_not include published_vanilla }
     end
 
     describe :live do
@@ -180,14 +174,8 @@ describe Vanilla do
     describe :published do
       subject { Vanilla.published }
       its(:count) { should eql 1 }
-
-      it 'does not include the unpublished item' do
-        subject.should_not include drafted_vanilla
-      end
-
-      it 'includes the published item' do
-        subject.should include published_vanilla
-      end
+      it { should_not include drafted_vanilla }
+      it { subject.should include published_vanilla }
     end
 
     describe :trashed do

metadata

@@ -1,149 +1,150 @@
 --- !ruby/object:Gem::Specification
 name: draftsman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Peters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: Create draft versions of your ActiveRecord models' data.
+description: Create draft versions of your ActiveRecord models' data. Works with Ruby
+  on Rails and Sinatra.
 email: chris@minimalorange.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -222,7 +223,7 @@ files:
 - spec/models/vanilla_spec.rb
 - spec/models/whitelister_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/minimalorange/draftsman
+homepage: https://github.com/live-editor/draftsman
 licenses:
 - MIT
 metadata: {}
@@ -232,20 +233,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Create draft versions of your ActiveRecord models' data.
+summary: Create draft versions of your ActiveRecord models' data. Works with Ruby
+  on Rails and Sinatra.
 test_files:
 - spec/controllers/informants_controller_spec.rb
 - spec/controllers/users_controller_spec.rb