scopelist 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65a84c44246b2c3a0afd99270ca15a548b7c3f79
-  data.tar.gz: e73c35ca2cea404fd2ce8b51dd74564ec67751c2
+  metadata.gz: 951e59adb473069cf9103b92662591c91d34c649
+  data.tar.gz: 79942a5996950923ac5f337fb452f3df49452f44
 SHA512:
-  metadata.gz: 2d6e54c03dd9bd85dfb6a980fbe62a8fdc9400098f2dcaeea82d46740d4d28b6e3b20783d5b415808d8e95db057f8e4847bfc6b4bfc277282798664b953a07a3
-  data.tar.gz: a3660ed398bf5508f037233eb0f085e31bd72a1c4cfc71d6165dc038faee967b0d1b57fe2144294a3e4b9d8088cc59f592f930fac85ff8c35590c78fd3c44d02
+  metadata.gz: bd5236a517bff93b2c05f2c15688176a3fb2bfeeeed834ed6a7087e9036f8fef290eb5a3e93b3fc8c48a896a407a7b9da2967c8cf7920d0a3f788c30caaa94cc
+  data.tar.gz: 7f7e9b44cba554396208279d982499c6fa5b254b709327ce12894ca50d31f95b7bc2cc374f1a51447f1691e730803327c3dcce57f87da5aa7d05674f20bb42c2

data/.codeclimate.yml

@@ -0,0 +1,16 @@
+---
+engines:
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.rb"
+exclude_paths:
+- test/

data/.rubocop.yml

@@ -0,0 +1,18 @@
+AllCops:
+  Exclude:
+    - test/**/*
+
+Metrics/LineLength:
+  Max: 120
+
+MethodLength:
+  Max: 20
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/PredicateName:
+  Enabled: false

data/.travis.yml

@@ -1,9 +1,20 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3.1
 gemfile:
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile
+  - gemfiles/5.0.gemfile
+matrix:
+  exclude:
+    - rvm: 2.0
+      gemfile: gemfiles/5.0.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/5.0.gemfile
+    - rvm: 2.2
+      gemfile: gemfiles/5.0.gemfile
+sudo: false

data/CHANGELOG.md

@@ -1,5 +1,11 @@
+#### 0.0.4 (2016-09-01)
+* Only support Ruby 2.0 and later
+* Support ActiveRecord 4.2 and 5.0
+* Use `Module.prepend` instead of `alias_method_chain`
+* Scopes are inherited from parent classes
+
 #### 0.0.3 (2014-07-27)
-* Donot allow .available_scopes to be directly mutatable
+* Donot allow `.available_scopes` to be directly mutatable
 
 #### 0.0.2 (2014-07-08)
 * Fixed compatability for Ruby 2.0

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in scope-list.gemspec
 gemspec
+
+gem 'codeclimate-test-reporter', require: nil

data/README.md

@@ -1,10 +1,12 @@
 # Scopelist
 
-A simple way to track scopes in ActiveRecord 4.0 and 4.1.
+A simple way to track scopes in ActiveRecord 4.0, 4.1, 4.2, and 5.0.
 
-NOTE: Only Ruby 1.9.3 and later are supported
+NOTE: Only Ruby 2.0 and later are supported
 
 [![Build Status](https://travis-ci.org/t27duck/scopelist.svg?branch=master)](https://travis-ci.org/t27duck/scopelist)
+[![Code Climate](https://codeclimate.com/github/t27duck/scopelist/badges/gpa.svg)](https://codeclimate.com/github/t27duck/scopelist)
+[![Test Coverage](https://codeclimate.com/github/t27duck/scopelist/badges/coverage.svg)](https://codeclimate.com/github/t27duck/scopelist/coverage)
 
 ## Installation
 

data/Rakefile

@@ -1,16 +1,10 @@
-require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
-RSpec::Core::RakeTask.new('spec')
-
-# If you want to make this the default task
-task :default => :spec
-
-task :console do
-  require 'irb'
-  require 'irb/completion'
-  require 'active_record'
-  require 'scopelist'
-  ARGV.clear
-  IRB.start
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
+
+task default: :test

data/gemfiles/4.0.gemfile

@@ -1,7 +1,7 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "sqlite3", :platforms=>:ruby
-gem "activerecord", "~> 4.0.0"
-gem "activesupport", "~> 4.0.0"
+gem 'activerecord', '~> 4.0.0'
+gem 'activesupport', '~> 4.0.0'
+gem 'codeclimate-test-reporter', require: nil
 
-gemspec :path=>"../"
+gemspec :path=>'../'

data/gemfiles/4.1.gemfile

@@ -1,7 +1,7 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "sqlite3", :platforms=>:ruby
-gem "activerecord", "~> 4.1.0"
-gem "activesupport", "~> 4.1.0"
+gem 'activerecord', '~> 4.1.0'
+gem 'activesupport', '~> 4.1.0'
+gem 'codeclimate-test-reporter', require: nil
 
-gemspec :path=>"../"
+gemspec :path=>'../'

data/gemfiles/4.2.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.2.0'
+gem 'activesupport', '~> 4.2.0'
+gem 'codeclimate-test-reporter', require: nil
+
+gemspec :path=>'../'

data/gemfiles/5.0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'activesupport', '~> 5.0.0'
+gem 'codeclimate-test-reporter', require: nil
+
+gemspec :path=>'../'

data/lib/scopelist.rb

@@ -1,33 +1,40 @@
-require "scopelist/version"
+require 'scopelist/version'
 
 module Scopelist
-
   def self.included(base)
     base.class_eval do
       extend ClassMethods
-      class << self
-        alias_method_chain :scope, :scopelist
-      end
     end
   end
 
-  module ClassMethods
-    def scope_with_scopelist(name, body, &block)
+  def self.prepended(base)
+    class << base
+      prepend PrependedClassMethods
+    end
+  end
+
+  module PrependedClassMethods
+    def scope(name, body, &block)
       additional_available_scope name
-      scope_without_scopelist(name, body, &block)
+      super
     end
+  end
 
+  module ClassMethods
     def available_scopes
       @available_scopes ||= []
-      @available_scopes.dup
+      if superclass.respond_to?(:available_scopes)
+        @available_scopes += superclass.available_scopes
+      end
+      @available_scopes.uniq.dup
     end
 
     def additional_available_scope(name)
       @available_scopes ||= []
       @available_scopes << name.to_sym
     end
-
   end
 end
 
 ActiveRecord::Base.send(:include, Scopelist)
+ActiveRecord::Base.send(:prepend, Scopelist)

data/lib/scopelist/version.rb

@@ -1,3 +1,3 @@
 module Scopelist
-  VERSION = "0.0.3"
+  VERSION = '0.0.4'.freeze
 end

data/scopelist.gemspec

@@ -4,25 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'scopelist/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "scopelist"
+  spec.name          = 'scopelist'
   spec.version       = Scopelist::VERSION
-  spec.authors       = ["Tony Drake"]
-  spec.email         = ["t27duck@gmail.com"]
-  spec.summary       = %q{Adds ability to track scopes on ActiveRecord models}
-  spec.description   = %q{Adds ability to track scopes on ActiveRecord models}
-  spec.homepage      = "https://github.com/t27duck/scopelist"
-  spec.license       = "MIT"
+  spec.authors       = ['Tony Drake']
+  spec.email         = ['t27duck@gmail.com']
+  spec.summary       = 'Adds ability to track scopes on ActiveRecord models'
+  spec.description   = 'Adds ability to track scopes on ActiveRecord models'
+  spec.homepage      = 'https://github.com/t27duck/scopelist'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activerecord", ">= 4.0.0"
-  spec.add_dependency "activesupport", ">= 4.0.0"
-  
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "sqlite3"
+  spec.add_dependency 'activerecord', '>= 4.0.0'
+  spec.add_dependency 'activesupport', '>= 4.0.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopelist
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tony Drake
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,34 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Adds ability to track scopes on ActiveRecord models
 email:
 - t27duck@gmail.com
@@ -101,7 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -110,13 +84,11 @@ files:
 - Rakefile
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/scopelist.rb
 - lib/scopelist/version.rb
 - scopelist.gemspec
-- spec/models.rb
-- spec/schema.rb
-- spec/scopelist_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/t27duck/scopelist
 licenses:
 - MIT
@@ -137,12 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Adds ability to track scopes on ActiveRecord models
-test_files:
-- spec/models.rb
-- spec/schema.rb
-- spec/scopelist_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/models.rb

@@ -1,14 +0,0 @@
-class SomeThing < ActiveRecord::Base
-  scope :scope1, -> {where(nil)}
-end
-
-class SomeOtherThing < ActiveRecord::Base
-end
-
-class OneMoreThing < ActiveRecord::Base
-  scope :scope2, -> {where(nil)}
-
-  def self.class_method_as_a_scope
-  end
-  additional_available_scope :class_method_as_a_scope
-end

data/spec/schema.rb

@@ -1,15 +0,0 @@
-ActiveRecord::Schema.define do
-  self.verbose = false
-
-  create_table :some_things, :force => true do |t|
-    t.timestamps
-  end
-
-  create_table :some_other_things, :force => true do |t|
-    t.timestamps
-  end
-
-  create_table :one_more_things, :force => true do |t|
-    t.timestamps
-  end
-end

data/spec/scopelist_spec.rb

@@ -1,27 +0,0 @@
-require "spec_helper"
-
-describe '.available_scopes' do
-  it 'should be an array' do
-    expect(SomeThing.available_scopes).to be_a_kind_of(Array)
-  end
-
-  it 'should contain an array of scope names' do
-    expect(SomeThing.available_scopes).to eq([:scope1])
-  end
-
-  it 'does not bleed into other models' do
-    expect(SomeOtherThing.available_scopes).to eq([])
-  end
-
-  it 'cannot be mutated' do
-    expected = SomeThing.available_scopes.dup
-    SomeThing.available_scopes << :scope2
-    expect(SomeThing.available_scopes).to eq(expected)
-  end
-end
-
-describe '.additonal_available_scope' do
-  it 'appends to the available scope list' do
-    expect(OneMoreThing.available_scopes).to eq([:scope2, :class_method_as_a_scope])
-  end
-end

data/spec/spec_helper.rb

@@ -1,15 +0,0 @@
-require 'bundler/setup'
-Bundler.setup
-
-require 'active_record'
-require 'active_support'
-require 'scopelist'
-
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
-
-load File.dirname(__FILE__) + '/schema.rb'
-require File.dirname(__FILE__) + '/models.rb'
-
-RSpec.configure do |config|
-  # some (optional) config here
-end