merb_param_protection 0.9.7 → 0.9.8

data/Rakefile

@@ -18,7 +18,7 @@ GEM_EMAIL  = "lancecarlson@gmail.com"
 
 GEM_NAME    = "merb_param_protection"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -36,7 +36,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.7')
+  s.add_dependency('merb-core', '>= 0.9.8')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{lib,specs}/**/*")
 end
@@ -45,43 +45,34 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
+desc "Install the gem"
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-##############################################################################
-# Installation
-##############################################################################
-
-desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
-"Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
 end
 
-##############################################################################
-# Specs
-##############################################################################
-desc "Run all specs"
-Spec::Rake::SpecTask.new("specs") do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir["spec/**/*_spec.rb"].sort
+desc "Run all examples (or a specific spec with TASK=xxxx)"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts  = ["-cfs"]
+  t.spec_files = begin
+    if ENV["TASK"] 
+      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
+    else
+      FileList['spec/**/*_spec.rb']
+    end
+  end
 end
 
-desc "Run all specs and generate an rcov report"
-Spec::Rake::SpecTask.new('rcov') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.rcov = true
-  t.rcov_dir = 'coverage'
-  t.rcov_opts = ['--exclude', 'gems', '--exclude', 'spec']
-end
+desc 'Default: run spec examples'
+task :default => 'spec'

data/lib/merb_param_protection.rb

@@ -40,6 +40,9 @@ if defined?(Merb::Plugins)
           base.send(:class_inheritable_accessor, :accessible_params_args)
           base.send(:class_inheritable_accessor, :protected_params_args)
           base.send(:class_inheritable_accessor, :log_params_args)
+          # Don't expose these as public methods - otherwise they'll become controller actions
+          base.send(:protected, :accessible_params_args, :protected_params_args, :log_params_args)
+          base.send(:protected, :accessible_params_args=, :protected_params_args=, :log_params_args=)
 
           base.send(:before, :initialize_params_filter)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_param_protection
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Lance Carlson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +03:00
+date: 2008-10-07 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 description: Merb plugin that provides params_accessible and params_protected class methods
 email: lancecarlson@gmail.com