merb_param_protection 0.9.3 → 0.9.4

data/Rakefile

@@ -1,62 +1,87 @@
 require 'rubygems'
+require 'rubygems/specification'
 require 'rake/gempackagetask'
-require 'spec/rake/spectask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
+require "spec/rake/spectask"
 
-PLUGIN = "merb_param_protection"
-NAME = "merb_param_protection"
-VERSION = "0.9.3"
-AUTHOR = "Lance Carlson"
-EMAIL = "lancecarlson@gmail.com"
-HOMEPAGE = "http://merb.devjavu.com"
-SUMMARY = "Merb plugin that provides params_accessible and params_protected class methods"
+##############################################################################
+# Package && release
+##############################################################################
+RUBY_FORGE_PROJECT  = "merb"
+PROJECT_URL         = "http://merbivore.com"
+PROJECT_SUMMARY     = "Merb plugin that provides params_accessible and params_protected class methods"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY
+
+GEM_AUTHOR = "Lance Carlson"
+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.4") + PKG_BUILD
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+require "extlib/tasks/release"
 
 spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
+  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.name = GEM_NAME
+  s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  #s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.3')
+  s.extra_rdoc_files = ["README", "LICENSE"]
+  s.summary = PROJECT_SUMMARY
+  s.description = PROJECT_DESCRIPTION
+  s.author = GEM_AUTHOR
+  s.email = GEM_EMAIL
+  s.homepage = PROJECT_URL
+  s.add_dependency('merb-core', '>= 0.9.4')
   s.require_path = 'lib'
-  s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
+  s.files = %w(LICENSE README Rakefile) + Dir.glob("{lib,specs}/**/*")
 end
 
-windows = (PLATFORM =~ /win32|cygwin/) rescue nil
-
-SUDO = windows ? "" : "sudo"
-
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-desc "install merb_param_protection"
+desc "create a gemspec file"
+task :make_spec do
+  File.open("#{NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
+end
+
+##############################################################################
+# Installation
+##############################################################################
+
+desc "Install the gem"
 task :install => [:package] do
-  sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri --no-update-sources}
+  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
 end
 
-desc 'Release the current version on rubyforge'
-task :release => :package do
-  sh %{rubyforge add_release merb #{PLUGIN} #{VERSION} pkg/#{NAME}-#{VERSION}.gem}
+namespace :jruby do
+"Run :package and install the resulting .gem with jruby"
+  task :install => :package do
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
+  end
 end
 
+##############################################################################
+# Specs
+##############################################################################
 desc "Run all specs"
-Spec::Rake::SpecTask.new('specs') do |t|
+Spec::Rake::SpecTask.new("specs") do |t|
   t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
+  t.spec_files = Dir["spec/**/*_spec.rb"].sort
 end
 
-desc "RCov"
-Spec::Rake::SpecTask.new("rcov") do |t|
-  t.rcov_opts = ["--exclude", "gems", "--exclude", "spec"]
+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_opts = ["--exclude","gems", "--exclude", "spec"]
-  t.spec_files = Dir["spec/**/*_spec.rb"].sort
-  t.libs = ["lib", "server/lib" ]
   t.rcov = true
+  t.rcov_dir = 'coverage'
+  t.rcov_opts = ['--exclude', 'gems', '--exclude', 'spec']
 end

data/lib/merb_param_protection.rb

@@ -1,7 +1,7 @@
 # This plugin exposes two new controller methods which allow us to simply and flexibly filter the parameters available within the controller.
 
 # Setup:
-# The request sets: 
+# The request sets:
 # params => { :post => { :title => "ello", :body => "Want it", :status => "green", :author_id => 3, :rank => 4 } }
 #
 # Example 1: params_accessable
@@ -28,9 +28,9 @@ if defined?(Merb::Plugins)
   #Merb::Plugins.config[:merb_param_protection] = {
     #:chickens => false
   #}
-  
+
   #Merb::Plugins.add_rakefiles "merb_param_protection/merbtasks"
-  
+
   module Merb
     module ParamsFilter
       module ControllerMixin
@@ -40,23 +40,23 @@ 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)
-          
+
           base.send(:before, :initialize_params_filter)
         end
 
         module ClassMethods
           # Ensures these parameters are sent for the object
-          # 
+          #
           #   params_accessible :post => [:title, :body]
-          # 
+          #
           def params_accessible(args = {})
             assign_filtered_params(:accessible_params_args, args)
           end
 
           # Protects parameters of an object
-          # 
+          #
           #   params_protected :post => [:status, :author_id]
-          # 
+          #
           def params_protected(args = {})
             assign_filtered_params(:protected_params_args, args)
           end
@@ -66,26 +66,26 @@ if defined?(Merb::Plugins)
           #  show up as [FILTERED] in the merb logs.
           #
           # log_params_filtered :password, 'token'
-          # 
+          #
           def log_params_filtered(*args)
             self.log_params_args = args.collect { |arg| arg.to_sym }
           end
-          
+
           private
-          
+
           def assign_filtered_params(method, args)
             validate_filtered_params(method, args)
-            
+
             # If the method is nil, set to initial hash, otherwise merge
             self.send(method).nil? ? self.send(method.to_s + '=', args) : self.send(method).merge!(args)
           end
-          
+
           def validate_filtered_params(method, args)
             # Reversing methods
             params_methods = [:accessible_params_args, :protected_params_args]
             params_methods.delete(method)
             params_method = params_methods.first
-            
+
             # Make sure the opposite method is not nil
             unless self.send(params_method).nil?
               # Loop through arg's keys
@@ -101,7 +101,7 @@ if defined?(Merb::Plugins)
             end
           end
         end
-        
+
         module InstanceMethods
           def initialize_params_filter
             if accessible_params_args.is_a?(Hash)
@@ -109,7 +109,7 @@ if defined?(Merb::Plugins)
                 self.request.restrict_params(obj, accessible_params_args[obj])
               end
             end
-            
+
             if protected_params_args.is_a?(Hash)
               protected_params_args.keys.each do |obj|
                 self.request.remove_params_from_object(obj, protected_params_args[obj])
@@ -117,16 +117,16 @@ if defined?(Merb::Plugins)
             end
           end
         end
-        
+
       end
 
       module RequestMixin
         attr_accessor :trashed_params
 
         # Removes specified parameters of an object
-        # 
+        #
         #   remove_params_from_object(:post, [:status, :author_id])
-        # 
+        #
         def remove_params_from_object(obj, attrs = [])
           unless params[obj].nil?
             filtered = params
@@ -138,22 +138,31 @@ if defined?(Merb::Plugins)
         # Restricts parameters of an object
         #
         #   restrict_params(:post, [:title, :body])
-        # 
+        #
         def restrict_params(obj, attrs = [])
           # Make sure the params for the object exists
           unless params[obj].nil?
             attrs = attrs.collect {|a| a.to_s}
-            @trashed_params = params[obj].keys - attrs
-            remove_params_from_object(obj, trashed_params)
+            trashed_params_keys = params[obj].keys - attrs
+
+            # Store a hash of the key/value pairs we are going
+            # to remove in case we need them later.  Lighthouse Bug # 105
+            @trashed_params = {}
+            trashed_params_keys.each do |key|
+              @trashed_params.merge!({key => params[obj][key]})
+            end
+
+            remove_params_from_object(obj, trashed_params_keys)
           end
         end
+
       end
     end
   end
-  
+
   Merb::Controller.send(:include, Merb::ParamsFilter::ControllerMixin)
   Merb::Request.send(:include, Merb::ParamsFilter::RequestMixin)
-  
+
   class Merb::Controller
     def self._filter_params(params)
       return params if self.log_params_args.nil?

metadata

@@ -1,25 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: merb_param_protection
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Lance Carlson
-autorequire: merb_param_protection
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-03 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 description: Merb plugin that provides params_accessible and params_protected class methods
 email: lancecarlson@gmail.com
@@ -30,17 +31,15 @@ extensions: []
 extra_rdoc_files: 
 - README
 - LICENSE
-- TODO
 files: 
 - LICENSE
 - README
 - Rakefile
-- TODO
 - lib/merb_param_protection
 - lib/merb_param_protection/merbtasks.rb
 - lib/merb_param_protection.rb
 has_rdoc: true
-homepage: 
+homepage: http://merbivore.com
 post_install_message: 
 rdoc_options: []
 
@@ -60,8 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: merb
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Merb plugin that provides params_accessible and params_protected class methods

data/TODO

@@ -1,4 +0,0 @@
-TODO:
-DRY up the code
-Finish spec'ing
-Allow specification of any parameter?