synvert 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e71f6d2ec94cc4ddd36ac3f7846470de30b7f3c
-  data.tar.gz: 58734771cffacfec52f683051cc529b7017a47ad
+  metadata.gz: 15b18499a48bc225d4ae1c3bda5b9cb1c1040a49
+  data.tar.gz: 378b683c0d0844c5c7d6b6b00ad4be92abf5da25
 SHA512:
-  metadata.gz: 8498f24ec5e31dae6d36a20d25289f83144b1ae79f8e805a19c009f3e5fd42d96073c62d8177a80fcb4796538595d56dbbca1388b407525c7bbdbb058ab7dc2b
-  data.tar.gz: be823181b634ddac8a79f63d96c72375f7c15cab97171e203a2b709ada1eaacb02025dbe4d3a62b6f9e9309d074408179bee6c6149f59d974bcc673a39220ed5
+  metadata.gz: 564b0445b50d28b9a14ed805320e68821f3dbaa87923519f6014c1e64bb0c9fdf6576585c9d52c05df38a9312c720393802bce2b365e2867f63aa5cb95be905c
+  data.tar.gz: 3a64f525fec4d10f99fa39243e369373e37e453ce90bc2f81f527b0c4ea62bdd4b41f28859d8275d84fa8ebdd91f2b4e0ce800717586d244cb2c38a008aec834

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.0.9
+
+* Add add_file dsl
+* Upgrade rails 3.0 to 3.1 snippet
+
 ## 0.0.8
 
 * Supports travis-ci and coveralls

data/README.md

@@ -46,6 +46,7 @@ convert_dynamic_finders | Convert dynamic finders
 strong_parameters | Use strong_parameters syntax
 upgrade_rails_3_2_to_4_0 | Upgrade rails from 3.2 to 4.0, it contains convert_dynamic_finder and strong_parameters snippets
 upgrade_rails_3_1_to_3_2 | Upgrade rails from 3.1 to 3.2
+upgrade_rails_3_0_to_3_1 | Upgrade rails from 3.0 to 3.1
 
 ## Documentation
 

data/lib/synvert/node_ext.rb

@@ -119,10 +119,14 @@ private
   def match_value?(instance, actual, expected)
     case expected
     when Symbol
-      actual.to_sym == expected
+      if Parser::AST::Node === actual
+        actual.source(instance) == ":#{expected}"
+      else
+        actual.to_sym == expected
+      end
     when String
       if Parser::AST::Node === actual
-        actual.source(instance) == expected || actual.source(instance) == ':' + expected
+        actual.source(instance) == expected || actual.source(instance)[1...-1] == expected
       else
         actual.to_s == expected
       end

data/lib/synvert/rewriter.rb

@@ -70,6 +70,12 @@ module Synvert
 
     alias within_files within_file
 
+    def add_file(file, content)
+      File.open file, 'w' do |file|
+        file.write content
+      end
+    end
+
     def add_snippet(name)
       self.class.call(name)
     end

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

@@ -28,7 +28,7 @@ Synvert::Rewriter.new "strong_parameters", "Use strong_parameters syntax" do
   within_file 'app/controllers/**/*.rb' do
     within_node type: 'class' do
       object_name = node.name.source(self).sub('Controller', '').singularize.underscore
-      if_exist_node type: 'send', receiver: 'params', message: '[]', arguments: [object_name] do
+      if_exist_node type: 'send', receiver: 'params', message: '[]', arguments: [object_name.to_sym] do
         if parameters[object_name]
           # append def xxx_params; ...; end
           unless_exist_node type: 'def', name: "#{object_name}_params" do

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

@@ -0,0 +1,109 @@
+Synvert::Rewriter.new 'upgrade_rails_3_1_to_3_2', 'Upgrade rails from 3.0 to 3.1' do
+  gem_spec 'rails', '3.0.0'
+
+  within_file 'config/application.rb' do
+    # insert config.assets.version = '1.0'
+    unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'version=' do
+      insert "config.assets.version = '1.0'"
+    end
+  end
+
+  within_file 'config/application.rb' do
+    # insert config.assets.enabled = true
+    unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'enabled=' do
+      insert 'config.assets.enabled = true'
+    end
+  end
+
+  within_file 'config/application.rb' do
+    # config.assets.prefix = '/assets' => config.assets.prefix = '/asset-files'
+    with_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'prefix=', arguments: ['/assets'] do
+      replace_with "config.assets.prefix = '/asset-files'"
+    end
+  end
+
+  within_file 'config/environments/development.rb' do
+    # remove config.action_view.debug_rjs = true
+    with_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'action_view'}, message: 'debug_rjs=' do
+      remove
+    end
+  end
+
+  within_file 'config/environments/development.rb' do
+    # insert config.assets.debug = true
+    unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'debug=' do
+      insert "config.assets.debug = true"
+    end
+  end
+
+  within_file 'config/environments/development.rb' do
+    # insert config.assets.compress = false
+    unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'compress=' do
+      insert "config.assets.compress = false"
+    end
+  end
+
+  within_file 'config/environments/production.rb' do
+    # insert config.assets.digest = true
+    unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'digest=' do
+      insert "config.assets.digest = true"
+    end
+  end
+
+  within_file 'config/environments/production.rb' do
+    # insert config.assets.compile = false
+    unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'compile=' do
+      insert "config.assets.compile = false"
+    end
+  end
+
+  within_file 'config/environments/production.rb' do
+    # insert config.assets.compress = true
+    unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'compress=' do
+      insert "config.assets.compress = true"
+    end
+  end
+
+  within_file 'config/environments/test.rb' do
+    # insert config.static_cache_control = "public, max-age=3600"
+    unless_exist_node type: 'send', receiver: {type: 'send', message: 'config'}, message: 'serve_static_assets=' do
+      insert 'config.static_cache_control = "public, max-age=3600"'
+    end
+  end
+
+  within_file 'config/environments/test.rb' do
+    # insert config.serve_static_assets = true
+    unless_exist_node type: 'send', receiver: {type: 'send', message: 'config'}, message: 'serve_static_assets=' do
+      insert "config.serve_static_assets = true"
+    end
+  end
+
+  add_file 'config/initializers/wrap_parameters.rb', """
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
+
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end
+  """.strip
+
+  within_file 'config/initializers/session_store.rb' do
+    with_node type: 'send', receiver: {type: 'send', message: 'config'}, message: 'session_store', arguments: {first: :cookie_store} do
+      session_store_key = node.receiver.receiver.source(self).split(":").first.underscore
+      replace_with "{{receiver}}.session_store :cookie_store, key: '_#{session_store_key}-session'"
+    end
+  end
+
+  todo <<-EOF
+Make the following changes to your Gemfile.
+
+    group :assets do
+      gem 'sass-rails',   "~> 3.1.5"
+      gem 'coffee-rails', "~> 3.1.1"
+      gem 'uglifier',     ">= 1.0.3"
+    end
+
+    gem 'jquery-rails'
+  EOF
+end

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

@@ -1,22 +1,6 @@
 Synvert::Rewriter.new 'upgrade_rails_3_1_to_3_2', 'Upgrade rails from 3.1 to 3.2' do
   gem_spec 'rails', '3.1.0'
 
-  within_file 'Gemfile' do
-    # append
-    # group :assets do
-    #   gem 'sass-rails', '~> 3.2.3'
-    #   gem 'coffee-rails', '~> 3.2.1'
-    #   gem 'uglifier', '>=1.0.3'
-    # end
-    unless_exist_node type: 'block', caller: {type: 'send', message: 'group', arguments: [:assets]} do
-      append """group :assets do
-  gem 'sass-rails', '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'uglifier', '>=1.0.3'
-end"""
-    end
-  end
-
   within_file 'config/environments/development.rb' do
     # insert config.active_record.auto_explain_threshold_in_seconds = 0.5
     unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'active_record'}, message: 'auto_explain_threshold_in_seconds=' do
@@ -34,6 +18,12 @@ end"""
   end
 
   todo <<-EOF
-Rails 3.2 deprecates vendor/plugins and Rails 4.0 will remove them completely. While it's not strictly necessary as part of a Rails 3.2 upgrade, you can start replacing any plugins by extracting them to gems and adding them to your Gemfile. If you choose not to make them gems, you can move them into, say, lib/my_plugin/* and add an appropriate initializer in config/initializers/my_plugin.rb.
+Make the following changes to your Gemfile.
+
+    group :assets do
+      gem 'sass-rails',   '~> 3.2.3'
+      gem 'coffee-rails', '~> 3.2.1'
+      gem 'uglifier',     '>= 1.0.3'
+    end
   EOF
 end

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

@@ -32,7 +32,7 @@ Synvert::Rewriter.new "upgrade_rails_3_2_to_4_0", "Upgrade rails from 3.2 to 4.0
     # ActiveSupport.on_load(:active_record) do
     #   self.include_root_in_json = false
     # end
-    with_node type: 'block', caller: {receiver: 'ActiveSupport', message: 'on_load', arguments: [':active_record']} do
+    with_node type: 'block', caller: {receiver: 'ActiveSupport', message: 'on_load', arguments: [:active_record]} do
       if_only_exist_node type: 'send', receiver: 'self', message: 'include_root_in_json=', arguments: [false] do
         remove
       end

data/lib/synvert/version.rb

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

data/spec/synvert/node_ext_spec.rb

@@ -108,7 +108,7 @@ describe Parser::AST::Node do
     end
   end
 
-  describe '#match' do
+  describe '#match?' do
     let(:instance) { Synvert::Rewriter::Instance.new('file pattern') }
 
     it 'matches class name' do
@@ -125,6 +125,20 @@ describe Parser::AST::Node do
       expect(node).to be_match(instance, type: 'send', message: /^find_by_/)
     end
 
+    it 'matches arguments with symbol' do
+      source = 'params[:user]'
+      instance.current_source = source
+      node = parse(source)
+      expect(node).to be_match(instance, type: 'send', receiver: 'params', message: '[]', arguments: [:user])
+    end
+
+    it 'matches arguments with string' do
+      source = 'params["user"]'
+      instance.current_source = source
+      node = parse(source)
+      expect(node).to be_match(instance, type: 'send', receiver: 'params', message: '[]', arguments: ['user'])
+    end
+
     it 'matches arguments any' do
       source = 'config.middleware.insert_after ActiveRecord::QueryCache, Lifo::Cache, page_cache: false'
       instance.current_source = source

data/spec/synvert/rewriter_spec.rb

@@ -40,8 +40,19 @@ module Synvert
       end
     end
 
+    describe 'parses add_file' do
+      it 'processes the rewriter' do
+        rewriter = Rewriter.new 'rewriter2', 'description2' do
+          add_file './foo.bar', 'FooBar'
+        end
+        rewriter.process
+        expect(File.read './foo.bar').to eq 'FooBar'
+        FileUtils.rm './foo.bar'
+      end
+    end
+
     describe 'parses add_snippet' do
-      it 'process the rewritter' do
+      it 'processes the rewritter' do
         rewriter1 = Rewriter.new 'rewriter1', 'description1'
         rewriter2 = Rewriter.new 'rewriter2', 'description2' do
           add_snippet :rewriter1

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

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe 'Upgrade rails from 3.0 to 3.1' do
+  before do
+    Synvert::Configuration.instance.set :path, '.'
+    rewriter_path = File.join(File.dirname(__FILE__), '../../../../lib/synvert/snippets/rails/upgrade_3_0_to_3_1.rb')
+    @rewriter = eval(File.read(rewriter_path))
+    allow_any_instance_of(Synvert::Rewriter::GemSpec).to receive(:match?).and_return(true)
+  end
+
+  describe 'with fakefs', fakefs: true do
+    let(:application_content) {"""
+Synvert::Application.configure do
+  config.assets.prefix = '/assets'
+end
+    """}
+    let(:application_rewritten_content) {"""
+Synvert::Application.configure do
+  config.assets.enabled = true
+  config.assets.version = '1.0'
+  config.assets.prefix = '/asset-files'
+end
+    """}
+    let(:development_content) {"""
+Synvert::Application.configure do
+  config.action_view.debug_rjs = true
+end
+    """}
+    let(:development_rewritten_content) {"""
+Synvert::Application.configure do
+  config.assets.compress = false
+  config.assets.debug = true
+end
+    """}
+    let(:production_content) {"""
+Synvert::Application.configure do
+end
+    """}
+    let(:production_rewritten_content) {"""
+Synvert::Application.configure do
+  config.assets.compress = true
+  config.assets.compile = false
+  config.assets.digest = true
+end
+    """}
+    let(:test_content) {"""
+Synvert::Application.configure do
+end
+    """}
+    let(:test_rewritten_content) {'''
+Synvert::Application.configure do
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+end
+    '''}
+    let(:wrap_parameters_rewritten_content) {"""
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
+
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end
+    """.strip}
+    let(:session_store_content) {"""
+Synvert::Application.config.session_store :cookie_store, key: 'somethingold'
+    """}
+    let(:session_store_rewritten_content) {"""
+Synvert::Application.config.session_store :cookie_store, key: '_synvert-session'
+    """}
+
+    it 'process' do
+      FileUtils.mkdir_p 'config/environments'
+      FileUtils.mkdir_p 'config/initializers'
+      File.write 'config/application.rb', application_content
+      File.write 'config/environments/development.rb', development_content
+      File.write 'config/environments/production.rb', production_content
+      File.write 'config/environments/test.rb', test_content
+      File.write 'config/initializers/session_store.rb', session_store_content
+      @rewriter.process
+      expect(File.read 'config/application.rb').to eq application_rewritten_content
+      expect(File.read 'config/environments/production.rb').to eq production_rewritten_content
+      expect(File.read 'config/environments/test.rb').to eq test_rewritten_content
+      expect(File.read 'config/initializers/wrap_parameters.rb').to eq wrap_parameters_rewritten_content
+      expect(File.read 'config/initializers/session_store.rb').to eq session_store_rewritten_content
+    end
+  end
+end

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

@@ -9,30 +9,6 @@ describe 'Upgrade rails from 3.1 to 3.2' do
   end
 
   describe 'with fakefs', fakefs: true do
-    let(:gemfile_content) {"""
-source 'http://rubygems.org'
-
-gem 'rails'
-
-gem 'sqlite3'
-
-gem 'jquery-rails'
-    """}
-    let(:gemfile_rewritten_content) {"""
-source 'http://rubygems.org'
-
-gem 'rails'
-
-gem 'sqlite3'
-
-gem 'jquery-rails'
-
-group :assets do
-  gem 'sass-rails', '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'uglifier', '>=1.0.3'
-end
-    """}
     let(:development_content) {'''
 Synvert::Application.configure do
 end
@@ -55,11 +31,9 @@ end
 
     it 'process' do
       FileUtils.mkdir_p 'config/environments'
-      File.write 'Gemfile', gemfile_content
       File.write 'config/environments/development.rb', development_content
       File.write 'config/environments/test.rb', test_content
       @rewriter.process
-      expect(File.read 'Gemfile').to eq gemfile_rewritten_content
       expect(File.read 'config/environments/development.rb').to eq development_rewritten_content
       expect(File.read 'config/environments/test.rb').to eq test_rewritten_content
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -125,6 +125,7 @@ files:
 - lib/synvert/snippets/factory_girl/syntax_methods.rb
 - lib/synvert/snippets/rails/convert_dynamic_finders.rb
 - lib/synvert/snippets/rails/strong_parameters.rb
+- lib/synvert/snippets/rails/upgrade_3_0_to_3_1.rb
 - lib/synvert/snippets/rails/upgrade_3_1_to_3_2.rb
 - lib/synvert/snippets/rails/upgrade_3_2_to_4_0.rb
 - lib/synvert/version.rb
@@ -140,6 +141,7 @@ files:
 - spec/synvert/snippets/factory_girl/syntax_methods_spec.rb
 - spec/synvert/snippets/rails/convert_dynamic_finders_spec.rb
 - spec/synvert/snippets/rails/strong_parameters_spec.rb
+- spec/synvert/snippets/rails/upgrade_3_0_to_3_1_spec.rb
 - spec/synvert/snippets/rails/upgrade_3_1_to_3_2_spec.rb
 - spec/synvert/snippets/rails/upgrade_3_2_to_4_0_spec.rb
 - synvert.gemspec
@@ -180,5 +182,6 @@ test_files:
 - spec/synvert/snippets/factory_girl/syntax_methods_spec.rb
 - spec/synvert/snippets/rails/convert_dynamic_finders_spec.rb
 - spec/synvert/snippets/rails/strong_parameters_spec.rb
+- spec/synvert/snippets/rails/upgrade_3_0_to_3_1_spec.rb
 - spec/synvert/snippets/rails/upgrade_3_1_to_3_2_spec.rb
 - spec/synvert/snippets/rails/upgrade_3_2_to_4_0_spec.rb