whitelist_scope 0.1.2 → 0.1.3

data/.travis.yml

@@ -3,15 +3,30 @@ cache: bundler
 sudo: false
 script: bundle exec rspec
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - 2.0
+  - 2.1
+  - 2.2.2
+  - 2.3.0
+
+before_install:
+  - gem install bundler
+
 gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
+  - gemfiles/5.0.gemfile
+
+matrix:
+  exclude:
+  - rvm: 1.9
+    gemfile: gemfiles/5.0.gemfile
+  - rvm: 2.0
+    gemfile: gemfiles/5.0.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/5.0.gemfile
+
 branches:
   only:
     - stable

data/Appraisals

@@ -13,3 +13,7 @@ end
 appraise "4.2" do
   gem "activerecord", "~> 4.2.0"
 end
+
+appraise "5.0" do
+  gem "activerecord", "~> 5.0.0"
+end

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Declare your gem's dependencies in whitelist_scope.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and

data/Gemfile.lock

@@ -1,86 +1,83 @@
 PATH
   remote: .
   specs:
-    whitelist_scope (0.1.0)
+    whitelist_scope (0.1.2)
       activerecord (>= 3.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
-      arel (~> 6.0)
-    activesupport (4.2.4)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.3)
-    builder (3.2.2)
-    coveralls (0.8.2)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+    arel (7.1.2)
+    ast (2.3.0)
+    concurrent-ruby (1.0.2)
+    coveralls (0.8.15)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+      tins (>= 1.6.0, < 2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
-    fuubar (2.0.0)
-      rspec (~> 3.0)
+    fuubar (2.2.0)
+      rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     i18n (0.7.0)
-    json (1.8.3)
-    mime-types (2.6.2)
-    minitest (5.8.1)
-    netrc (0.10.3)
-    rake (10.4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    json (2.0.2)
+    minitest (5.9.0)
+    parser (2.3.1.2)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.1.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    ruby-progressbar (1.7.5)
-    simplecov (0.10.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tins (1.6.0)
+    tins (1.12.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
+    unicode-display_width (1.1.0)
 
 PLATFORMS
   ruby
@@ -90,8 +87,9 @@ DEPENDENCIES
   coveralls
   fuubar
   rspec
+  rubocop (~> 0.42.0)
   sqlite3
   whitelist_scope!
 
 BUNDLED WITH
-   1.10.6
+   1.12.5

data/Rakefile

@@ -1,22 +1,17 @@
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Whitelist Scope'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "Whitelist Scope"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-
-
-
-
-
 Bundler::GemHelper.install_tasks

data/gemfiles/5.0.gemfile

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

data/lib/whitelist_scope/version.rb

@@ -1,3 +1,3 @@
 module WhitelistScope
-  VERSION = "0.1.2"
+  VERSION = "0.1.3".freeze
 end

data/lib/whitelist_scope.rb

@@ -7,7 +7,7 @@ module WhitelistScope
     @whitelist ||= []
     name = name.to_sym
 
-    if self.respond_to?(name)
+    if respond_to?(name)
       raise ArgumentError, "Could not create scope, There is an existing method with this name."
     end
 
@@ -16,21 +16,27 @@ module WhitelistScope
   end
 
   def call_whitelisted_scope(*scope_names)
-    scope_results = nil
+    existing_scope = nil
 
     scope_names.flatten.each do |scope_name|
-      scope_name = scope_name.to_sym unless scope_name == nil
-
-      if @whitelist.include? scope_name
-        if scope_results
-          scope_results = scope_results.send(scope_name)
-        else
-          scope_results = self.send(scope_name)
-        end
+      existing_scope = call_scope_by_name(existing_scope, scope_name)
+    end
+    existing_scope
+  end
+
+  private
+
+  def call_scope_by_name(existing_scope, scope_name)
+    scope_name = scope_name.to_sym unless scope_name.nil?
+
+    if @whitelist.include? scope_name
+      if existing_scope
+        existing_scope.send(scope_name)
       else
-        raise NoMethodError, "The scope you provided, '#{scope_name}', does not exist."
+        send(scope_name)
       end
+    else
+      raise NoMethodError, "The scope you provided, '#{scope_name}', does not exist."
     end
-    scope_results
   end
 end

data/whitelist_scope.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'whitelist_scope/version'
+require "whitelist_scope/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "whitelist_scope"
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop", "~> 0.42.0"
   spec.add_development_dependency "fuubar"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "appraisal"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whitelist_scope
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Melody
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.42.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +133,7 @@ files:
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/whitelist_scope.rb
 - lib/whitelist_scope/version.rb
 - whitelist_scope.gemspec
@@ -142,10 +157,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: whitelist_scope provides a safe way to register and call scopes inside rails
   apps
 test_files: []
-has_rdoc: