synvert 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263f00fa376f7527f7915d2239c759f134ef5749
-  data.tar.gz: f7f14d873285dfc5092e48a959e2e199186b504a
+  metadata.gz: 86cf9cff8facbc13e13dca8fe4399f734a9c0601
+  data.tar.gz: 0b2ac36a7bb59335b7026519e9e7428c45edc696
 SHA512:
-  metadata.gz: 9d294b839f70a0f8a8243dbba1e6fa8735322016d9292db89992933129065dcffcee790becee77218eaaa47bfc85b14191f8df1b04616403f7649f47c38de54d
-  data.tar.gz: 1a3654f5b903b1398bfedf7078381505b69c83cbac8600bd0f3c57251240c343a2ea061b7b71339af39dd1c44826327d0a3b879075d958de5a72f40149eeb0da
+  metadata.gz: 3be12c7d6461d5586e5fd83c7001685a15af73dac62e23034226e64c458d4588062cf00f948421bda51c5bae79c8a241afd5894978843bf4973708350229e56d
+  data.tar.gz: 2f121ff75f6c9c206720ffe28c5d7d6b4e11f91449a9799e32461a63c8e9a5495d24dacdbf166dc38a1be96cdbfd029cdc7ac5396b54475b1c6501c13acf0cae

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.0.15
+
+* Support attr_protected for strong_parameters snippet.
+
 ## 0.0.14
 
 * Complement code comments.

data/lib/synvert.rb

@@ -13,4 +13,5 @@ module Synvert
   autoload :Rewriter, 'synvert/rewriter'
   autoload :RewriterNotFound, 'synvert/exceptions'
   autoload :GemfileLockNotFound, 'synvert/exceptions'
+  autoload :MethodNotSupported, 'synvert/exceptions'
 end

data/lib/synvert/snippets/rails/strong_parameters.rb

@@ -7,7 +7,7 @@ It uses string_parameters to replace attr_accessible.
     config.active_record.whitelist_attributes = ...
     config.active_record.mass_assignment_sanitizer = ...
 
-2. it removes attr_accessible code in models.
+2. it removes attr_accessible and attr_protected code in models.
 
 3. it adds xxx_params in controllers
 
@@ -32,13 +32,34 @@ It uses string_parameters to replace attr_accessible.
     end
   end
 
+  attributes = {}
+  within_file 'db/schema.rb' do
+    within_node type: 'block', caller: {type: 'send', message: 'create_table'} do
+      object_name = eval(node.caller.arguments.first.source(self)).singularize
+      attributes[object_name] = []
+      with_node type: 'send', receiver: 't' do
+        attribute_name = eval(node.arguments.first.source(self)).to_sym
+        attributes[object_name] << attribute_name
+      end
+    end
+  end
+
   parameters = {}
   within_files 'app/models/**/*.rb' do
     # assign and remove attr_accessible ...
     within_node type: 'class' do
       object_name = node.name.source(self).underscore
       with_node type: 'send', message: 'attr_accessible' do
-        parameters[object_name] = node.arguments.map { |key| key.source(self) }.join(', ')
+        parameters[object_name] = node.arguments.map { |key| eval(key.source(self)) }
+        remove
+      end
+    end
+
+    # assign and remove attr_protected ...
+    within_node type: 'class' do
+      object_name = node.name.source(self).underscore
+      with_node type: 'send', message: 'attr_protected' do
+        parameters[object_name] = attributes[object_name] - node.arguments.map { |key| eval(key.source(self)) }
         remove
       end
     end
@@ -50,9 +71,10 @@ It uses string_parameters to replace attr_accessible.
       if_exist_node type: 'send', receiver: 'params', message: '[]', arguments: [object_name.to_sym] do
         if parameters[object_name]
           # append def xxx_params; ...; end
+          permit_params = ":" + parameters[object_name].join(", :")
           unless_exist_node type: 'def', name: "#{object_name}_params" do
             new_code =  "def #{object_name}_params\n"
-            new_code << "  params.require(:#{object_name}).permit(#{parameters[object_name]})\n"
+            new_code << "  params.require(:#{object_name}).permit(#{permit_params})\n"
             new_code << "end"
             append new_code
           end

data/lib/synvert/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Synvert
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/synvert/snippets/rails/strong_parameters_spec.rb

@@ -30,6 +30,27 @@ end
     '''}
     let(:post_model_rewritten_content) {'''
 class Post < ActiveRecord::Base
+end
+    '''}
+    let(:user_model_content) {'''
+class User < ActiveRecord::Base
+  attr_protected :role, :admin
+end
+    '''}
+    let(:user_model_rewritten_content) {'''
+class User < ActiveRecord::Base
+end
+    '''}
+    let(:schema_content) {'''
+ActiveRecord::Schema.define(version: 20140211112752) do
+  create_table "users", force: true do |t|
+    t.string   "login"
+    t.string   "email"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "role",                      default: 0,     null: false
+    t.boolean  "admin",                     default: false, null: false
+  end
 end
     '''}
     let(:posts_controller_content) {'''
@@ -60,18 +81,52 @@ class PostsController < ApplicationController
   end
 end
     '''}
+    let(:users_controller_content) {'''
+class UsersController < ApplicationController
+  def update
+    @user = User.find(params[:id])
+    if @user.update_attributes params[:user]
+      redirect_to user_path(@user)
+    else
+      render :action => :edit
+    end
+  end
+end
+    '''}
+    let(:users_controller_rewritten_content) {'''
+class UsersController < ApplicationController
+  def update
+    @user = User.find(params[:id])
+    if @user.update_attributes user_params
+      redirect_to user_path(@user)
+    else
+      render :action => :edit
+    end
+  end
+
+  def user_params
+    params.require(:user).permit(:login, :email, :created_at, :updated_at)
+  end
+end
+    '''}
 
     it 'process' do
       FileUtils.mkdir_p 'config'
+      FileUtils.mkdir_p 'db'
       FileUtils.mkdir_p 'app/models'
       FileUtils.mkdir_p 'app/controllers'
       File.write 'config/application.rb', application_content
+      File.write 'db/schema.rb', schema_content
       File.write 'app/models/post.rb', post_model_content
+      File.write 'app/models/user.rb', user_model_content
       File.write 'app/controllers/posts_controller.rb', posts_controller_content
+      File.write 'app/controllers/users_controller.rb', users_controller_content
       @rewriter.process
       expect(File.read 'config/application.rb').to eq application_rewritten_content
       expect(File.read 'app/models/post.rb').to eq post_model_rewritten_content
+      expect(File.read 'app/models/user.rb').to eq user_model_rewritten_content
       expect(File.read 'app/controllers/posts_controller.rb').to eq posts_controller_rewritten_content
+      expect(File.read 'app/controllers/users_controller.rb').to eq users_controller_rewritten_content
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Richard Huang