storage_unit 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b686097ab6166d0cd66e90befe241fe8e0d256
-  data.tar.gz: 0ffecafa0a2ed6be9eea6c9df9458ae4b6955158
+  metadata.gz: 123c75a0205796eeee95d8d58416b98d74e51609
+  data.tar.gz: 31a15c73833dd74c5e9b4ed73ae28616db136950
 SHA512:
-  metadata.gz: e3dce4c8c63d991a29fb95b81b55e76c4471fd4414b195af8429cf0eee6326d688ef80b5325895c659c0b0fa9c6dc9fb94c73b9e3c9553632e44f18c7522bf8c
-  data.tar.gz: 21d4d67daffd46dc445769bd42781a512cff16a959b5591fc1727ce46a607680a2ccbbb78293d98424f78f2dfeb8014c63661c66410386857208da52de14f6ff
+  metadata.gz: 2b1dbf907e0ea28b62168cb73c829657b78f468757c52e2e405fbcccf1aa7b5197cc4d49598f6f80db6524545d0ae0b82d22b4ad2a7f4f1705f2e8499484248a
+  data.tar.gz: 5b2ea9c50b74b8a58741f6273d09d19ca955d12f7f1df46cc0b429a997055453f8dab5601b5904a9d317021352bdd25c3ff655870727f3639e98966c3e3188f4

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

data/.travis.yml

@@ -3,3 +3,6 @@ cache: bundler
 script: bundle exec rspec
 notifications:
   email: false
+gemfile:
+  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_4.gemfile

data/Appraisals

@@ -0,0 +1,7 @@
+appraise 'rails_5' do
+  gem 'rails', '5.0.0'
+end
+
+appraise 'rails_4' do
+  gem 'rails', '4.2.6'
+end

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.2.6"
+
+gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.0.0"
+
+gemspec :path => "../"

data/lib/storage_unit/core.rb

@@ -3,30 +3,22 @@ module StorageUnit
     extend ActiveSupport::Concern
 
     included do
-      default_scope { where(with_deleted_scope_sql) }
+      default_scope { where(default_scope_hash) }
       define_model_callbacks :trash
       define_model_callbacks :recover
     end
 
     module ClassMethods
-      def with_deleted_scope_sql
-        all.table[storage_unit_opts[:column]].eq(nil).to_sql
+      def default_scope_hash
+        { storage_unit_opts[:column] => nil }
       end
 
-      def deleted_only_scope_sql
-        all.table[storage_unit_opts[:column]].not_eq(nil).to_sql
-      end
-
-      # lifted from acts_as_paranoid, works around https://github.com/rails/rails/issues/4306
-      # with this in place Post.limit(10).with_deleted, will work as expected
       def with_deleted
-        scope = self.all
-        scope.where_values.delete(with_deleted_scope_sql)
-        scope
+        self.all.unscope(where: storage_unit_opts[:column])
       end
 
       def deleted_only
-        with_deleted.where(deleted_only_scope_sql)
+        with_deleted.where.not(default_scope_hash)
       end
     end
 

data/lib/storage_unit/version.rb

@@ -1,3 +1,3 @@
 module StorageUnit
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/storage_unit.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
 
   s.homepage = 'http://github.com/dobtco/storage_unit'
 
-  s.add_dependency 'rails', '~> 4.1', '>= 4.1.0'
+  s.add_dependency 'rails', '>= 4.1.0'
 
+  s.add_development_dependency 'appraisal'
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'rspec-rails'

metadata

@@ -1,22 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: storage_unit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Adam Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
@@ -24,12 +21,23 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -96,10 +104,13 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - Guardfile
 - LICENSE.md
 - README.md
+- gemfiles/rails_4.gemfile
+- gemfiles/rails_5.gemfile
 - lib/storage_unit.rb
 - lib/storage_unit/core.rb
 - lib/storage_unit/setup.rb