archivable 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a581532e3571dad19eb5bb88dc17e41172a7fff
-  data.tar.gz: 355cd234b2a7fdb59f66efa7b16f23287b3259fa
+  metadata.gz: eac1946fb18e1f499eb2dc2dfb11c5c93a7e6ce3
+  data.tar.gz: aacbc41a2e6eb4b3550823f2b997442db7000b60
 SHA512:
-  metadata.gz: 13f5da9d6cb18338324e2980b97791ac3052e16a127da3604c82226a0f1ff2c7997fb5098729019ee14e57e73602972bf486fb62e989ba3d41d4b841b9c471e4
-  data.tar.gz: bf2b3328d0877ea513a0360f9c673f16a34f0a435a2db668037ff5eca30ee07094e28778868b8861a620bf010956102731a3ccbb65d53913300dc8de5b64abe8
+  metadata.gz: 72cecb92c850fbeac422cdfc54594b4c7e744e6852f73bf6ba2977611e209bab5dfd4f1d88ea0c1c9970f09e7d1342048d4184cc588ec04a4983ee9e418d8769
+  data.tar.gz: d9ba31b75168145f46b92daa721e6ca16d6790f145009eed2577aa5d007a19a43a75435f240574215e6d81b9a885c9ba2dce583c18622b9f915b20d7e858b791

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format=documentation

data/.travis.yml

@@ -1,10 +1,11 @@
+sudo: false
 language: ruby
-rvm:
-  - 1.9
-  - 2.0
-  - 2.1
-  - 2.2
 
-notifications:
-  email:
-    - johnotander@gmail.com
+before_install:
+  - gem install bundler
+
+rvm:
+  - '1.9'
+  - '2.0'
+  - '2.1'
+  - '2.2'

data/README.md

@@ -1,10 +1,8 @@
-# Archivable
-
-[![Build Status](https://travis-ci.org/johnotander/archivable.svg?branch=master)](https://travis-ci.org/johnotander/archivable)
+# archivable [![Build Status](https://travis-ci.org/johnotander/archivable.svg?branch=master)](https://travis-ci.org/johnotander/archivable)
 
 Archive your Rails models rather than delete them. This provides the archiving functionality app so you can do the following:
 
-##### In your models:
+##### In your models
 
 ```ruby
 user.archived?  #=> false
@@ -12,15 +10,9 @@ user.archive!   #=> true
 user.archived?  #=> true
 user.unarchive! #=> true
 user.archived?  #=> false
-
-# With scopes available:
-User.archived 
-User.unarchived
 ```
 
-##### In your views:
-
-_This would typically be added to a view helper._
+##### In your views
 
 ```html+erb
 <% if user.archived? %>

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
 task test: :spec

data/archivable.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["johnotander@gmail.com"]
   spec.summary       = %q{Archive your Rails models rather than delete them.}
   spec.description   = %q{Archive your Rails models rather than delete them, with model and controller concerns.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/johnotander/archivable"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -19,10 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'activesupport'
+  spec.add_dependency 'activerecord'
   spec.add_dependency 'meta_magic'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'actionpack'
+  spec.add_development_dependency 'sqlite3'
 end

data/lib/archivable/model.rb

@@ -1,17 +1,13 @@
 require 'active_support/concern'
+require 'active_record'
 
 module Archivable
   module Model
     extend ActiveSupport::Concern
 
-    module ClassMethods
-      def archived
-        scoped(conditions: { archived: true })
-      end
-
-      def unarchived
-        scoped(conditions: { archived: false })
-      end
+    included do
+      scope :archived, -> { where(archived: true) }
+      scope :unarchived, -> { where(archived: false) }
     end
 
     def archived?

data/lib/archivable/version.rb

@@ -1,3 +1,3 @@
 module Archivable
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/spec/archivable_controller_spec.rb

@@ -6,18 +6,18 @@ describe Archivable::Controller do
 
   subject { controller }
 
-  it { should respond_to(:archive) }
+  it { is_expected.to respond_to(:archive) }
 
-  describe '.archive' do
+  describe '#archive' do
 
-    it 'should set the instance variable' do
+    it 'sets the instance variable' do
       subject.archive
       expect(subject.get_model_instance_variable).to eq(subject.fake)
     end
 
     context 'when successfully archived' do
 
-      it 'should render the :show action' do
+      it 'renders the :show action' do
         expect(subject).to receive(:redirect_to).with(action: :show)
         subject.archive
       end
@@ -25,7 +25,7 @@ describe Archivable::Controller do
 
     context 'when unsuccessfully archived' do
 
-      it 'should render the :show action' do
+      it 'renders the :show action' do
         allow_any_instance_of(Fake).to receive(:save).and_return(false)
         expect(subject).to receive(:render).with(:edit)
         subject.archive

data/spec/archivable_model_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Archivable::Model do
+
+  let(:model) { Fake.new }
+
+  subject { model }
+
+  it { is_expected.to respond_to(:archive!) }
+  it { is_expected.to respond_to(:unarchive!) }
+  it { is_expected.to respond_to(:is_archivable?) }
+
+  describe '#archive!' do
+
+    before { subject.archive! }
+
+    it 'sets archived to true' do
+      expect(model.archived?).to be_truthy
+    end
+
+    it 'saves' do
+      expect(subject).to receive(:save)
+      subject.archive!
+    end
+  end
+
+  describe '#unarchive!' do
+    let(:model) { Fake.new(archived: true) }
+
+    before { model.unarchive! }
+
+    it 'sets archived to false' do
+      expect(model.archived?).to be_falsey
+    end
+
+    it 'saves' do
+      expect(subject).to receive(:save)
+      subject.archive!
+    end
+  end
+
+  describe '.archived' do
+    let!(:archived_fake) { Fake.create(archived: true) }
+    let!(:unarchived_fake) { Fake.create(archived: false) }
+    it 'returns the archived object' do
+      expect(Fake.archived).to include(archived_fake)
+    end
+    it 'does not return the unarchievd object' do
+      expect(Fake.archived).to_not include(unarchived_fake)
+    end
+  end
+
+  describe '.unarchived' do
+    let!(:archived_fake) { Fake.create(archived: true) }
+    let!(:unarchived_fake) { Fake.create(archived: false) }
+    it 'does not return the archived object' do
+      expect(Fake.unarchived).to_not include(archived_fake)
+    end
+    it 'returns the unarchievd object' do
+      expect(Fake.unarchived).to include(unarchived_fake)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,18 +3,30 @@ require 'bundler/setup'
 require 'rspec'
 
 require 'action_controller'
+require 'active_record'
 
 require 'archivable'
 
-class Fake
-  attr_accessor :archived
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3',
+                                        database: ':memory:')
+
+ActiveRecord::Schema.define do
+ self.verbose = false
+
+   create_table :fakes, cascade: true do |t|
+     t.boolean :archived
+   end
+end
+
+class Fake < ActiveRecord::Base
+  include Archivable::Model
 
   def toggle(dont_care)
     self.archived = archived ? false : true
   end
 
-  def save
-    true
+  def archived?
+    !!archived
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archivable
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - John Otander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: meta_magic
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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'
 description: Archive your Rails models rather than delete them, with model and controller
   concerns.
 email:
@@ -103,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -116,7 +145,7 @@ files:
 - spec/archivable_controller_spec.rb
 - spec/archivable_model_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/johnotander/archivable
 licenses:
 - MIT
 metadata: {}
@@ -136,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Archive your Rails models rather than delete them.
@@ -144,4 +173,3 @@ test_files:
 - spec/archivable_controller_spec.rb
 - spec/archivable_model_spec.rb
 - spec/spec_helper.rb
-has_rdoc: