weak_parameters 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e880b9c7c7a5df3d10f1ca83509d4ac09de2d17
-  data.tar.gz: 9d030f6d391518b29e25da018db0767fff919e2c
+  metadata.gz: ce72b5b0bbcb84e9bb99010f8d173ba34441a15a
+  data.tar.gz: 6b4ae1fff602fd5788c9bcaa757e31026650ce72
 SHA512:
-  metadata.gz: 76e2224bf86280fe5940aa67f19fe96a0d4c41e570c51e3d6164f5c36e4017151455c7d4c11e1f8fb20c31072e9eb6c19fbf33abda479e636011cc51b6825a9d
-  data.tar.gz: 67c683e0f450e7df5b747103d5d74b0db2497bab6db0b1bd899f174ee62939b419890a89e5df9ebb7431aba3e2a42f05cbf90029313d8385511f43f27d8cd0ec
+  metadata.gz: 68fa4f22e20c97547cc4bcf47232e10e26046e56c85ce2fd6572b07b4cd49c40bd74b00d7c6ba87a18274930062a3ad0c1cd971870ce303bd3494a9bc8783bfd
+  data.tar.gz: 874e969e4eefe923012c0c66a7e293c69e65661504bdbc625ed202d1c666a580db2664d97d4102f565f3b9b770d153ce3fe9252ca387fe53a5ac2905b11ae316

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.0
+* Add strong options on validator DSL (Thx @yoshiori)
+
 ## 0.1.7
 * Fix bug on missing `@path` variable (Thx @taka0125)
 

data/lib/weak_parameters/base_validator.rb

@@ -19,6 +19,10 @@ module WeakParameters
       !!options[:required]
     end
 
+    def strong?
+      !!options[:strong]
+    end
+
     def type
       self.class.name.split("::").last.sub(/Validator$/, "").underscore.to_sym
     end
@@ -27,6 +31,11 @@ module WeakParameters
       path[-1]
     end
 
+    def strong_params(*path)
+      @path = path
+      exist? && strong? ? {key => value} : {}
+    end
+
     private
 
     def valid?

data/lib/weak_parameters/controller.rb

@@ -5,7 +5,11 @@ module WeakParameters
         validator = WeakParameters::Validator.new(self, &block)
         WeakParameters.stats[params[:controller]][params[:action]] = validator
         WeakParameters.stats[params[:controller]][params[:action]].validate
+        if Object.const_defined?(:ActionController) && ActionController.const_defined?(:StrongParameters)
+          @permitted_params = validator.strong_params.permit!
+        end
       end
+      define_method(:permitted_params) { @permitted_params }
     end
   end
 end

data/lib/weak_parameters/list_validator.rb

@@ -16,6 +16,16 @@ module WeakParameters
       end
     end
 
+    def strong_params(*args)
+      super
+
+      return {} unless exist?
+      strong_values = value.map.with_index do |_, i|
+        validator.strong_params(*path, i)[i]
+      end.compact
+      strong_values.present? ? { key => strong_values } : {}
+    end
+
     def validators
       [ validator ]
     end

data/lib/weak_parameters/object_validator.rb

@@ -16,6 +16,16 @@ module WeakParameters
       end
     end
 
+    def strong_params(*args)
+      super
+
+      strong_values = validators.map do |validator|
+        validator.strong_params(*path)
+      end.inject(ActionController::Parameters.new, &:merge)
+      return {} if strong_values.blank?
+      { key => strong_values }
+    end
+
     private
 
     def valid?

data/lib/weak_parameters/validator.rb

@@ -15,6 +15,10 @@ module WeakParameters
       @validators ||= []
     end
 
+    def strong_params
+      validators.map(&:strong_params).inject(ActionController::Parameters.new, &:merge)
+    end
+
     private
 
     def with_validators(&block)

data/lib/weak_parameters/version.rb

@@ -1,3 +1,3 @@
 module WeakParameters
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/spec/dummy/app/controllers/strongs_controller.rb

@@ -0,0 +1,57 @@
+class StrongsController < ApplicationController
+  validates :create do
+    any :object
+    any :strong_object, strong: true
+    string :name, required: true, except: %w[invalid wrong]
+    string :strong_name, required: true, strong: true, except: %w[invalid wrong]
+    integer :type, only: 0..3
+    integer :strong_type, strong: true, only: 0..3
+    integer :number, only: [0, 1]
+    integer :strong_number, strong: true, only: [0, 1]
+    boolean :flag
+    boolean :strong_flag, strong: true
+    hash :config
+    hash :strong_config, strong: true
+    array :tags
+    array :strong_tags, strong: true
+    float :rate
+    float :strong_rate, strong: true
+    file :attachment
+    file :strong_attachment, strong: true
+    integer :custom, only: 0..1, handler: :render_error
+    integer :strong_custom, strong: true, only: 0..1, handler: :render_error
+    string :zip_code do |value|
+      value =~ /\A\d{3}-\d{4}\z/
+    end
+    string :strong_zip_code, strong: true do |value|
+      value =~ /\A\d{3}-\d{4}\z/
+    end
+    object :nested, required: true do
+      integer :number, only: [0, 1]
+    end
+    object :strong_nested, required: true do
+      integer :strong_number, strong: true, only: [0, 1]
+    end
+
+    list :numbers, :integer, description: 'some numbers'
+
+    list :strong_numbers, :integer, strong: true, description: 'some numbers'
+
+    object :strong_body do
+      list :items, :object, description: 'some items' do
+        string :name
+        integer :strong_price, strong: true
+      end
+    end
+  end
+
+  def create
+    head 201
+  end
+
+  private
+
+  def render_error
+    head 403
+  end
+end

data/spec/dummy/config/routes.rb

@@ -1,3 +1,4 @@
 Dummy::Application.routes.draw do
   resources :recipes, only: :create
+  resources :strongs, only: :create
 end

data/spec/requests/strong_spec.rb

@@ -0,0 +1,100 @@
+require "spec_helper"
+
+describe "Strong", type: :request do
+  let(:params) do
+    {
+      object: [1],
+      strong_object: [1],
+      name: "name",
+      strong_name: "name",
+      number: 0,
+      strong_number: 0,
+      type: 1,
+      strong_type: 1,
+      flag: true,
+      strong_flag: true,
+      config: { a: 1 },
+      strong_config: { a: 1, b: { c: 2 } },
+      tags: [1],
+      strong_tags: [1],
+      attachment: Rack::Test::UploadedFile.new(__FILE__),
+      strong_attachment: Rack::Test::UploadedFile.new(__FILE__),
+      zip_code: "123-4567",
+      strong_zip_code: "123-4567",
+      custom: 0,
+      strong_custom: 0,
+      nested: {
+        number: 0
+      },
+      strong_nested: {
+        strong_number: 0
+      },
+      numbers: [1, 2, 3],
+      strong_numbers: [1, 2, 3],
+      body: {
+        items: [
+          { name: "foo", price: 100 },
+          { name: "bar", price: 100 }
+        ]
+      },
+      strong_body: {
+        items: [
+          { name: "foo", strong_price: 100 },
+          { name: "bar", strong_price: 100 }
+        ]
+      }
+    }
+  end
+
+  describe "#permitted_params" do
+    it "returns permitted_params" do
+      post "/strongs", params
+      controller.permitted_params.should have_key "strong_object"
+      controller.permitted_params.should_not have_key "object"
+
+      controller.permitted_params.should have_key "strong_name"
+      controller.permitted_params.should_not have_key "name"
+
+      controller.permitted_params.should have_key "strong_number"
+      controller.permitted_params.should_not have_key "number"
+
+      controller.permitted_params.should have_key "strong_type"
+      controller.permitted_params.should_not have_key "type"
+
+      controller.permitted_params.should have_key "strong_flag"
+      controller.permitted_params.should_not have_key "flag"
+
+      controller.permitted_params.should have_key "strong_config"
+      controller.permitted_params.should_not have_key "config"
+
+      controller.permitted_params.should have_key "strong_tags"
+      controller.permitted_params.should_not have_key "tags"
+
+      controller.permitted_params.should_not have_key "strong_rate"
+      controller.permitted_params.should_not have_key "rate"
+
+      controller.permitted_params.should have_key "strong_attachment"
+      controller.permitted_params.should_not have_key "attachment"
+
+      controller.permitted_params.should have_key "strong_zip_code"
+      controller.permitted_params.should_not have_key "zip_code"
+
+      controller.permitted_params.should have_key "strong_custom"
+      controller.permitted_params.should_not have_key "custom"
+
+      controller.permitted_params.should have_key "strong_nested"
+      controller.permitted_params.should_not have_key "nested"
+
+      controller.permitted_params.should have_key "strong_numbers"
+      controller.permitted_params.should_not have_key "numbers"
+
+      controller.permitted_params.should have_key "strong_body"
+      controller.permitted_params.should_not have_key "body"
+
+      controller.permitted_params[:strong_body].should have_key "items"
+
+      controller.permitted_params[:strong_body][:items].first.should have_key "strong_price"
+      controller.permitted_params[:strong_body][:items].first.should_not have_key "name"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weak_parameters
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -100,6 +100,7 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/recipes_controller.rb
+- spec/dummy/app/controllers/strongs_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
@@ -131,6 +132,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/requests/recipes_spec.rb
+- spec/requests/strong_spec.rb
 - spec/spec_helper.rb
 - weak_parameters.gemspec
 homepage: https://github.com/r7kamura/weak_parameters
@@ -163,6 +165,7 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/recipes_controller.rb
+- spec/dummy/app/controllers/strongs_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
@@ -194,5 +197,6 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/requests/recipes_spec.rb
+- spec/requests/strong_spec.rb
 - spec/spec_helper.rb
 has_rdoc: