has_scope 0.5.0 → 0.5.1

data/.gitignore

@@ -0,0 +1,2 @@
+.bundle
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+gemspec
+
+gem "rails", "~> 3.0.3"
+
+if RUBY_VERSION < "1.9"
+	gem "ruby-debug"
+else
+  gem "test-unit"
+end
+
+gem "mocha"

data/README.rdoc

@@ -35,12 +35,12 @@ Then for each request:
   /graduations?featured=true
   #=> calls the named scope and bring featured graduations
 
-  /graduations?featured=true&by_degree=phd
-  #=> brings featured graduations with phd degree
-
   /graduations?params[by_period][started_at]=20100701&params[by_period][ended_at]=20101013
   #=> brings graduations in the given period
 
+  /graduations?featured=true&by_degree=phd
+  #=> brings featured graduations with phd degree
+
 You can retrieve all the scopes applied in one action with <tt>current_scopes</tt> method.
 In the last case, it would return: { :featured => true, :by_degree => "phd" }.
 

data/Rakefile

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -21,22 +21,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "has_scope"
-    s.version = "0.5.0"
-    s.summary = "Maps controller filters to your resource scopes"
-    s.email = "contact@plataformatec.com.br"
-    s.homepage = "http://github.com/plataformatec/has_scope"
-    s.description = "Maps controller filters to your resource scopes"
-    s.authors = ['José Valim']
-    s.files =  FileList["[A-Z]*", "lib/**/*", "init.rb"]
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
-end
+end

data/has_scope.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "has_scope/version"
+
+Gem::Specification.new do |s|
+  s.name        = "has_scope"
+  s.version     = HasScope::VERSION.dup
+  s.platform    = Gem::Platform::RUBY
+  s.summary     = "Maps controller filters to your resource scopes."
+  s.email       = "developers@plataformatec.com.br"
+  s.homepage    = "http://github.com/plataformatec/has_scope"
+  s.description = "Maps controller filters to your resource scopes"
+  s.authors     = ['José Valim']
+
+  s.rubyforge_project = "has_scope"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+end

data/lib/has_scope.rb

@@ -12,7 +12,7 @@ module HasScope
     base.class_eval do
       extend ClassMethods
       helper_method :current_scopes
-      class_inheritable_hash :scopes_configuration, :instance_writer => false
+      class_attribute :scopes_configuration, :instance_writer => false
     end
   end
 
@@ -58,7 +58,7 @@ module HasScope
     #   end
     #
     #   has_scope :not_voted_by_me, :type => :boolean do |controller, scope|
-    #     scope.not_voted_by(controller.current_user.id) 
+    #     scope.not_voted_by(controller.current_user.id)
     #   end
     #
     def has_scope(*scopes, &block)
@@ -79,11 +79,11 @@ module HasScope
       options[:only]   = Array(options[:only])
       options[:except] = Array(options[:except])
 
-      self.scopes_configuration ||= {}
+      self.scopes_configuration = (self.scopes_configuration || {}).dup
 
       scopes.each do |scope|
         self.scopes_configuration[scope] ||= { :as => scope, :type => :default, :block => block }
-        self.scopes_configuration[scope].merge!(options)
+        self.scopes_configuration[scope] = self.scopes_configuration[scope].merge(options)
       end
     end
   end

data/lib/has_scope/version.rb

@@ -0,0 +1,3 @@
+module HasScope
+  VERSION = "0.5.1"
+end

data/test/has_scope_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class Tree
 end
@@ -42,12 +42,21 @@ class TreesController < ApplicationController
     def show_all_colors?
       false
     end
-    
+
     def default_render
       render :text => action_name
     end
 end
 
+class BonsaisController < TreesController
+  has_scope :categories, :if => :categories?
+
+  protected
+    def categories?
+      false
+    end
+end
+
 class HasScopeTest < ActionController::TestCase
   tests TreesController
 
@@ -222,6 +231,11 @@ class HasScopeTest < ActionController::TestCase
      assert_equal({ :by_category => 'for' }, current_scopes)
    end
 
+   def test_overwritten_scope
+     assert_nil(TreesController.scopes_configuration[:categories][:if])
+     assert_equal(:categories?, BonsaisController.scopes_configuration[:categories][:if])
+   end
+
   protected
 
     def mock_tree(stubs={})

data/test/test_helper.rb

@@ -1,39 +1,31 @@
 require 'rubygems'
+require 'bundler'
 
-begin
-  gem "test-unit"
-rescue LoadError
-end
-
-begin
-  gem "ruby-debug"
-  require 'ruby-debug'
-rescue LoadError
-end
-
+Bundler.setup
 require 'test/unit'
 require 'mocha'
 
+# Configure Rails
 ENV["RAILS_ENV"] = "test"
-RAILS_ROOT = "anywhere"
 
 require 'active_support'
 require 'action_controller'
 require 'action_dispatch/middleware/flash'
 
-class ApplicationController < ActionController::Base; end
-
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'has_scope'
 
-HasScope::Router = ActionDispatch::Routing::RouteSet.new
-HasScope::Router.draw do |map|
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action'
+HasScope::Routes = ActionDispatch::Routing::RouteSet.new
+HasScope::Routes.draw do
+  match '/:controller(/:action(/:id))'
+end
+
+class ApplicationController < ActionController::Base
+  include HasScope::Routes.url_helpers
 end
 
 class ActiveSupport::TestCase
   setup do
-    @router = HasScope::Router
+    @routes = HasScope::Routes
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_scope
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -14,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 +01:00
+date: 2011-08-02 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: Maps controller filters to your resource scopes
-email: contact@plataformatec.com.br
+email: developers@plataformatec.com.br
 executables: []
 
 extensions: []
@@ -27,11 +28,17 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- has_scope.gemspec
 - init.rb
 - lib/has_scope.rb
+- lib/has_scope/version.rb
+- test/has_scope_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/plataformatec/has_scope
 licenses: []
@@ -42,26 +49,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: has_scope
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Maps controller filters to your resource scopes
+summary: Maps controller filters to your resource scopes.
 test_files: 
 - test/has_scope_test.rb
 - test/test_helper.rb