fume-cancan 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a44cc9b04b6d1dce0cb5e99fa29d73b93dfc1a8f
-  data.tar.gz: 7d62ff91b18c8cf9da74e6c381fb56c5ebceb538
+  metadata.gz: 49048bf3e95080da8b9a522ba0f5e6fe9808c82e
+  data.tar.gz: 95622c50b92c2a5f4196a72dfefd6c9060af8e75
 SHA512:
-  metadata.gz: a56a4a62973747c678f2207665a2ccf3c2ce3d0b2f280a80e08fdd8d90cf2f8f6b03e86935bd71f4f25a4dd9df213e8d5b01907113b548bccbe55a7d43b96ddb
-  data.tar.gz: 38e1776396e523a9124bc002a986d88aed19e09237ed4c88ac941307f1ebb3996560a8fc68d62005d07ae759fe03507ba3f6f6a039f72b9cf4171bedbd5dd5c2
+  metadata.gz: 78ba7d9f003ebd9847add1f13c2fc7bda6423edb4602fa6f83e88fd262aa6de5a5f60ec2f3e58e28e6b4d61771a7b14f7384f0263433f99bc4f3257742f3efa9
+  data.tar.gz: 4fc64c2553bfcd534aabbe9e90f28b2f441594bcfcaf82b39b87ce426e133ebb3bc81a0e26b476ee45a9a68a84dfcc98a8ba6906e4a909756159848c8a34cdbd

data/.gitignore

@@ -3,7 +3,6 @@
 /.bundle
 /.config
 /.yardoc
-/Gemfile.lock
 /InstalledFiles
 /_yardoc
 /coverage
@@ -15,3 +14,8 @@
 /tmp
 /tags
 /spec/internal/log/
+/vendor/bundler/
+/.rubocop_todo.yml
+/Gemfile.lock
+/gemfiles/*.gemfile.lock
+/spec/internal/db/*.sqlite

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,35 @@
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Style/BlockComments:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/EmptyLinesAroundAccessModifier:
+  Enabled: false
+
+Style/FileName:
+  Enabled: false
+
+Style/EmptyLines:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/SpaceInsideBrackets:
+  Enabled: false
+
+Style/Semicolon:
+  Enabled: false
+
+Style/UnneededPercentQ:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120

data/.travis.yml

@@ -1,4 +1,7 @@
 rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
+  - 2.2.5
+  - 2.3.1
+
+gemfile:
+  - Gemfile
+  - gemfiles/rails4_2.gemfile

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem "rails", "~> 5.0.0"
+
 # Specify your gem's dependencies in fume-cancan.gemspec
 gemspec

data/README.md

@@ -13,15 +13,26 @@ Add this line to your application's Gemfile:
 
 ## Usage
 
-Ability:
-
-	can :manage, :admin
-
-Controller:
-
-	class Admin::BaseController < ApplicationController
-	  authorize_object :admin
-	end
+### authorize_object
+
+~~~~ruby
+# Ability:
+can :manage, :admin
+
+# Controller:
+class Admin::BaseController < ApplicationController
+  authorize_object :admin
+end
+~~~~
+
+### with_scope
+
+~~~~ruby
+# Controller:
+class Topics < ApplicationController
+  load_and_authorize_resource with_scope: -> (base) { base.where(online: true) }
+end
+~~~~
 
 ## Contributing
 

data/Rakefile

@@ -2,4 +2,4 @@ require "bundler/gem_tasks"
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task default: :spec

data/config.ru

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

data/fume-cancan.gemspec

@@ -27,7 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "cancancan"
 
-  spec.add_development_dependency "rspec-rails", "3.1.0"
-  spec.add_development_dependency "combustion", "0.5.2"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rspec-rails", "3.5.2"
+  spec.add_development_dependency "combustion", "0.5.5"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rspec-do_action", "0.0.4"
 end

data/gemfiles/rails4_2.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 4.2.7"
+
+# Specify your gem's dependencies in fume-cancan.gemspec
+gemspec path: ".."

data/lib/fume-cancan.rb

@@ -1,4 +1,5 @@
 require "cancan"
 
 require "fume/cancan/version"
-require "fume/cancan/controller_extensions"
+require "fume/cancan/with_scope"
+require "fume/cancan/controller_extensions"

data/lib/fume/cancan/controller_extensions.rb

@@ -11,7 +11,7 @@ module Fume
           object = args.shift || options[:object]
 
           filter_options = options.slice(:only, :except)
-          before_filter(filter_options || {}) do |controller|
+          before_action(filter_options || {}) do |controller|
             controller.send :authorize_object!, object, options
           end
         end

data/lib/fume/cancan/version.rb

@@ -1,5 +1,5 @@
 module Fume
   module Cancan
-    VERSION = "0.0.4"
+    VERSION = "0.1.0".freeze
   end
-end
+end

data/lib/fume/cancan/with_scope.rb

@@ -0,0 +1,17 @@
+module Fume
+  module Cancan
+    module WithScope
+      def resource_base
+        base = super
+
+        if (with_scope = @options[:with_scope])
+          @controller.instance_exec(super, &with_scope)
+        else
+          base
+        end
+      end
+    end
+  end
+end
+
+CanCan::ControllerResource.send :prepend, ::Fume::Cancan::WithScope

data/spec/internal/app/controllers/application_controller.rb

@@ -1,9 +1,13 @@
 class ApplicationController < ActionController::Base
   def index
-    render text: "OK"
+    render plain: "OK"
+  end
+
+  def show
+    render plain: "FOUND"
   end
 
   def current_ability
     @current_ability ||= Ability.new
   end
-end
+end

data/spec/internal/app/models/ability.rb

@@ -1,3 +1,7 @@
 class Ability
   include CanCan::Ability
-end
+
+  def initialize
+    can :manage, Topic
+  end
+end

data/spec/internal/app/models/topic.rb

@@ -0,0 +1,3 @@
+class Topic < ActiveRecord::Base
+  scope :online, -> { where(online: true) }
+end

data/spec/internal/db/schema.rb

@@ -1,3 +1,6 @@
 ActiveRecord::Schema.define do
-  #
+  create_table(:topics, force: true) do |t|
+    t.string  :title
+    t.boolean :online, default: false
+  end
 end

data/spec/{fume → lib/fume}/cancan/controller_extensions_spec.rb

@@ -46,4 +46,4 @@ RSpec.describe Fume::Cancan::ControllerExtensions, type: :controller do
     define_method :is_expected_access_denied, -> { expect { do_action }.to raise_error CanCan::AccessDenied }
     define_method :is_expected_response_ok, -> { do_action; expect(response.body).to eq "OK" }
   end
-end
+end

data/spec/lib/fume/cancan/with_scope_spec.rb

@@ -0,0 +1,22 @@
+require "rails_helper"
+
+RSpec.describe Fume::Cancan::WithScope, type: :controller do
+  describe "#with_scope" do
+    controller(ApplicationController) {}
+    let!(:topic) { Topic.create!(title: "TITLE", online: false) }
+    let(:params) { { id: topic.id } }
+
+    action { get :show, Rails.version.start_with?("4.") ? params : { params: params } }
+
+    context "when undefine with_scope option" do
+      controller { load_and_authorize_resource :topic, parent: false }
+      it { expect(response.body).to eq "FOUND" }
+    end
+
+    context "when define with_scope option" do
+      controller { load_and_authorize_resource :topic, parent: false, with_scope: -> (base) { base.online } }
+      skip_do_action
+      it { expect { do_action }.to raise_error(ActiveRecord::RecordNotFound) }
+    end
+  end
+end

data/spec/rails_helper.rb

@@ -7,7 +7,7 @@ Coveralls.wear!
 
 require "pry-nav"
 require 'combustion'
-Combustion.initialize! :action_controller
+Combustion.initialize! :active_record, :action_controller
 require "rspec/rails"
 require "rspec-do_action"
 

data/spec/spec_helper.rb

@@ -1,14 +1,16 @@
-# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
 #
 # Given that it is always loaded, you are encouraged to keep this file as
 # light-weight as possible. Requiring heavyweight dependencies from this file
 # will add to the boot time of your test suite on EVERY test run, even for an
 # individual file that may not need all of that loaded. Instead, consider making
 # a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need it.
+# the additional setup, and require it from the spec files that actually need
+# it.
 #
 # The `.rspec` file also contains a few flags that are not defaults but that
 # users commonly want.
@@ -22,10 +24,10 @@ RSpec.configure do |config|
     # This option will default to `true` in RSpec 4. It makes the `description`
     # and `failure_message` of custom matchers include text for helper methods
     # defined using `chain`, e.g.:
-    # be_bigger_than(2).and_smaller_than(4).description
-    #   # => "be bigger than 2 and smaller than 4"
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
     # ...rather than:
-    #   # => "be bigger than 2"
+    #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
@@ -38,23 +40,39 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
 
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
 
-  # Limits the available syntax to the non-monkey patched syntax that is recommended.
-  # For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
   config.disable_monkey_patching!
 
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
   # individual spec file.
@@ -81,4 +99,5 @@ RSpec.configure do |config|
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
+=end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fume-cancan
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - sunteya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,34 +94,62 @@ 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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.5
+- !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'
 - !ruby/object:Gem::Dependency
   name: rspec-do_action
   requirement: !ruby/object:Gem::Requirement
@@ -145,21 +173,28 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- config.ru
 - fume-cancan.gemspec
+- gemfiles/rails4_2.gemfile
 - lib/fume-cancan.rb
 - lib/fume/cancan/controller_extensions.rb
 - lib/fume/cancan/version.rb
-- spec/fume/cancan/controller_extensions_spec.rb
+- lib/fume/cancan/with_scope.rb
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/models/ability.rb
+- spec/internal/app/models/topic.rb
 - spec/internal/config/database.yml
 - spec/internal/config/routes.rb
 - spec/internal/db/schema.rb
+- spec/internal/public/favicon.ico
+- spec/lib/fume/cancan/controller_extensions_spec.rb
+- spec/lib/fume/cancan/with_scope_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sunteya/fume-cancan
@@ -182,16 +217,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: fume helper methods for CanCan
 test_files:
-- spec/fume/cancan/controller_extensions_spec.rb
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/models/ability.rb
+- spec/internal/app/models/topic.rb
 - spec/internal/config/database.yml
 - spec/internal/config/routes.rb
 - spec/internal/db/schema.rb
+- spec/internal/public/favicon.ico
+- spec/lib/fume/cancan/controller_extensions_spec.rb
+- spec/lib/fume/cancan/with_scope_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+has_rdoc: