synvert 0.0.1 → 0.0.2

data/synvert.gemspec

@@ -23,5 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "mocha"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: synvert is used to convert ruby code to better syntax.
 email:
 - flyerhzm@gmail.com
@@ -90,23 +76,31 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/synvert
 - lib/synvert.rb
-- lib/synvert/base_converter.rb
-- lib/synvert/checking_visitor.rb
 - lib/synvert/cli.rb
-- lib/synvert/factory_girl/syntax_methods_converter.rb
-- lib/synvert/sexp_helper.rb
+- lib/synvert/configuration.rb
+- lib/synvert/factory_girl/syntax_methods.rb
+- lib/synvert/node_ext.rb
+- lib/synvert/rewriter.rb
+- lib/synvert/rewriter/action.rb
+- lib/synvert/rewriter/conditions.rb
+- lib/synvert/rewriter/instances.rb
+- lib/synvert/rewriter/scopes.rb
 - lib/synvert/version.rb
 - spec/spec_helper.rb
-- spec/support/shared_context.rb
-- spec/synvert/base_converter_spec.rb
-- spec/synvert/checking_visitor_spec.rb
-- spec/synvert/factory_girl/syntax_methods_converter_spec.rb
+- spec/support/parser_helper.rb
+- spec/synvert/node_ext_spec.rb
+- spec/synvert/rewriter/action_spec.rb
+- spec/synvert/rewriter/conditions_spec.rb
+- spec/synvert/rewriter/instances_spec.rb
+- spec/synvert/rewriter/scopes_spec.rb
+- spec/synvert/rewriter_spec.rb
 - synvert.gemspec
 homepage: ''
 licenses:
@@ -134,7 +128,10 @@ specification_version: 4
 summary: synvert = syntax + convert.
 test_files:
 - spec/spec_helper.rb
-- spec/support/shared_context.rb
-- spec/synvert/base_converter_spec.rb
-- spec/synvert/checking_visitor_spec.rb
-- spec/synvert/factory_girl/syntax_methods_converter_spec.rb
+- spec/support/parser_helper.rb
+- spec/synvert/node_ext_spec.rb
+- spec/synvert/rewriter/action_spec.rb
+- spec/synvert/rewriter/conditions_spec.rb
+- spec/synvert/rewriter/instances_spec.rb
+- spec/synvert/rewriter/scopes_spec.rb
+- spec/synvert/rewriter_spec.rb

data/lib/synvert/base_converter.rb

@@ -1,36 +0,0 @@
-# coding: utf-8
-
-module Synvert
-  class BaseConverter < Parser::Rewriter
-    include AST::Sexp
-    include SexpHelper
-
-    attr_reader :filename
-
-    def rewrite(source_buffer, ast)
-      @filename = source_buffer.name
-
-      new_ast = AST::Node.new(:program, [ast])
-      super(source_buffer, new_ast)
-    end
-
-    def append_to(node, content)
-      if node.children.last
-        indent = indent(node.children.last)
-        insert_after node.children.last.loc.expression, "\n#{' '*indent}#{content}"
-      else
-        indent = indent(node) + 2
-        insert_after node.children.first.loc.expression, "\n#{' '*indent}#{content}"
-      end
-    end
-
-    def append_after(node, content)
-      indent = indent(node)
-      insert_after node.loc.expression, "\n#{' '*indent}#{content}"
-    end
-
-    def indent(node)
-      node.loc.expression.column
-    end
-  end
-end

data/lib/synvert/checking_visitor.rb

@@ -1,37 +0,0 @@
-# coding: utf-8
-module Synvert
-  class CheckingVisitor
-    attr_reader :converters
-
-    def initialize(options={})
-      @converters = options[:converters] || [
-        Synvert::FactoryGirl::SyntaxMethodsConverter.new
-      ]
-    end
-
-    def convert_file(filename)
-      source = File.read filename
-      converted_source = convert(filename, source)
-      if source != converted_source
-        File.write(filename, converted_source)
-      end
-    end
-
-    def convert(filename, source)
-      source_buffer = Parser::Source::Buffer.new filename
-      source_buffer.source = source
-
-      parser = Parser::CurrentRuby.new
-      ast = parser.parse source_buffer
-
-      converted_source = source
-      @converters.each do |converter|
-        if Array(converter.interesting_files).any? { |file_pattern| filename =~ file_pattern }
-          converted_source = converter.rewrite(source_buffer, ast)
-        end
-      end
-
-      converted_source
-    end
-  end
-end

data/lib/synvert/factory_girl/syntax_methods_converter.rb

@@ -1,49 +0,0 @@
-# coding: utf-8
-
-module Synvert
-  module FactoryGirl
-    class SyntaxMethodsConverter < BaseConverter
-      def interesting_files
-        [/spec\/spec_helper\.rb/, /spec\/support\/.*\.rb/, /spec\/.*_spec\.rb/] +
-          [/test\/test_helper\.rb/, /test\/support\/.*\.rb/, /test\/.*_test\.rb/] +
-          [/features\/support\/env\.rb/, /features\/.*\.rb/]
-      end
-
-      def on_class(node)
-        if (name(node) == to_ast("ActiveSupport::TestCase") || name(node) == to_ast("Test::Unit::TestCase")) &&
-           !contains_statement?(body(node), "include FactoryGirl::Syntax::Methods")
-          append_to node, "include FactoryGirl::Syntax::Methods"
-        end
-
-        super
-      end
-
-      def on_block(node)
-        if receiver(node) == to_ast("RSpec") &&
-           message(node) == :configure &&
-           !contains_statement?(body(node), "config.include FactoryGirl::Syntax::Methods")
-          append_to node, "config.include FactoryGirl::Syntax::Methods"
-        end
-
-        super
-      end
-
-      def on_send(node)
-        if receiver(node) == to_ast("FactoryGirl") &&
-           [:create, :build, :attributes_for, :build_stubbed, :create_list, :build_list, :create_pair, :build_pair].include?(message(node))
-          replace node.loc.expression.resize("FactoryGirl.".size), ''
-        end
-
-        super
-      end
-
-      def on_program(node)
-        if filename == "features/support/env.rb" && !contains_statement?(node, "World(FactoryGirl::Syntax::Methods)")
-          append_after node.children[0], "World(FactoryGirl::Syntax::Methods)"
-        end
-
-        node.updated(nil, process_all(node))
-      end
-    end
-  end
-end

data/lib/synvert/sexp_helper.rb

@@ -1,51 +0,0 @@
-module Synvert
-  module SexpHelper
-    def name(node)
-      case node.type
-      when :class
-        node.children[0]
-      else
-      end
-    end
-
-    def body(node)
-      case node.type
-      when :class
-        node.children[1]
-      when :block
-        node.children[2]
-      else
-      end
-    end
-
-    def receiver(node)
-      case node.type
-      when :send
-        node.children[0]
-      when :block
-        receiver(node.children[0])
-      else
-      end
-    end
-
-    def message(node)
-      case node.type
-      when :send
-        node.children[1]
-      when :block
-        message(node.children[0])
-      else
-      end
-    end
-
-    def contains_statement?(node, statement)
-      node && (node.type == :begin ? node.children : [node]).any? { |child_node|
-        child_node == to_ast(statement)
-      }
-    end
-
-    def to_ast(str)
-      Parser::CurrentRuby.parse(str)
-    end
-  end
-end

data/spec/support/shared_context.rb

@@ -1,41 +0,0 @@
-# coding: utf-8
-
-shared_context "expect to convert" do
-  it "expects to convert" do
-    converter = described_class.new
-    source_buffer = Parser::Source::Buffer.new filename
-    source_buffer.source = source
-
-    parser = Parser::CurrentRuby.new
-    ast = parser.parse source_buffer
-
-    expect(converter.rewrite(source_buffer, ast)).to eq expected_source
-  end
-end
-
-shared_context "not expect to convert" do
-  it "does not expect to convert" do
-    converter = described_class.new
-    source_buffer = Parser::Source::Buffer.new filename
-    source_buffer.source = source
-
-    parser = Parser::CurrentRuby.new
-    ast = parser.parse source_buffer
-
-    expect(converter.rewrite(source_buffer, ast)).to eq source
-  end
-end
-
-shared_context "interesting file" do
-  it "interests file" do
-    converter = described_class.new
-    expect(converter.interesting_files.any? { |file_pattern| filename =~ file_pattern }).to eq true
-  end
-end
-
-shared_context "not interesting file" do
-  it "does not interest file" do
-    converter = described_class.new
-    expect(converter.interesting_files.none? { |file_pattern| filename =~ file_pattern }).to eq true
-  end
-end

data/spec/synvert/checking_visitor_spec.rb

@@ -1,42 +0,0 @@
-# coding: utf-8
-require 'spec_helper'
-
-module Synvert
-  describe CheckingVisitor do
-    subject { CheckingVisitor.new }
-
-    context "initialize" do
-      it "factory_girl syntax methods converter is one of default converts" do
-        expect(subject.converters.first).is_a? FactoryGirl::SyntaxMethodsConverter
-      end
-    end
-
-    context "#convert_file" do
-      it "writes converted source" do
-        File.expects(:read).with('test.rb').returns('source')
-        subject.expects(:convert).with('test.rb', 'source').returns('converted source')
-        File.expects(:write).with('test.rb', 'converted source')
-        subject.convert_file 'test.rb'
-      end
-
-      it "doesn't write if converted source is same to source" do
-        File.expects(:read).with('test.rb').returns('source')
-        subject.expects(:convert).with('test.rb', 'source').returns('source')
-        File.expects(:write).never
-        subject.convert_file 'test.rb'
-      end
-    end
-
-    context "#convert" do
-      it "gets converted source" do
-        subject.converters.first.stubs(:rewrite).returns("converted source")
-        expect(subject.convert("spec/spec_helper.rb", "source")).to eq "converted source"
-      end
-
-      it "gets source if none of converter works" do
-        subject.converters.first.stubs(:rewrite).returns("converted source")
-        expect(subject.convert("(string)", "source")).to eq "source"
-      end
-    end
-  end
-end

data/spec/synvert/factory_girl/syntax_methods_converter_spec.rb

@@ -1,148 +0,0 @@
-# coding: utf-8
-require 'spec_helper'
-
-describe Synvert::FactoryGirl::SyntaxMethodsConverter do
-  describe "#interesting_files" do
-    ["spec/spec_helper.rb", "test/test_helper.rb", "features/support/env.rb",
-    "spec/support/shared_context.rb", "test/support/shared_context.rb",
-    "spec/models/post_spec.rb", "test/unit/post_test.rb", "features/step_definitions/post_steps.rb"].each do |file_path|
-      context file_path do
-        let(:filename) { file_path }
-        include_context "interesting file"
-      end
-    end
-
-    context "app/models/post.rb" do
-      let(:filename) { "app/models/post.rb" }
-      include_context "not interesting file"
-    end
-  end
-
-  context "spec_helper.rb" do
-    let(:filename) { "spec/spec_helper.rb" }
-    let(:source) {
-      <<-EOF
-      RSpec.configure do |config|
-        config.include EmailSpec::Helpers
-      end
-      EOF
-    }
-    let(:expected_source) {
-      <<-EOF
-      RSpec.configure do |config|
-        config.include EmailSpec::Helpers
-        config.include FactoryGirl::Syntax::Methods
-      end
-      EOF
-    }
-    include_context "expect to convert"
-  end
-
-  context "test_helper.rb" do
-    context "Test::Unit::TestCase" do
-      let(:filename) { "test/test_helper.rb" }
-      let(:source) {
-        <<-EOF
-        class Test::Unit::TestCase
-        end
-        EOF
-      }
-      let(:expected_source) {
-        <<-EOF
-        class Test::Unit::TestCase
-          include FactoryGirl::Syntax::Methods
-        end
-        EOF
-      }
-      include_context "expect to convert"
-    end
-
-    context "ActiveSupport::TestCase" do
-      let(:filename) { "test/test_helper.rb" }
-      let(:source) {
-        <<-EOF
-        class ActiveSupport::TestCase
-          include EmailSpec::Helpers
-        end
-        EOF
-      }
-      let(:expected_source) {
-        <<-EOF
-        class ActiveSupport::TestCase
-          include EmailSpec::Helpers
-          include FactoryGirl::Syntax::Methods
-        end
-        EOF
-      }
-      include_context "expect to convert"
-    end
-  end
-
-  context "features/support/env.rb" do
-    let(:filename) { "features/support/env.rb" }
-    let(:source) {
-      <<-EOF
-      require 'cucumber/rails'
-      EOF
-    }
-    let(:expected_source) {
-      <<-EOF
-      require 'cucumber/rails'
-      World(FactoryGirl::Syntax::Methods)
-      EOF
-    }
-    include_context "expect to convert"
-  end
-
-  [:create, :build, :attributes_for, :build_stubbed].each do |method|
-    class_eval do
-      context "FactoryGirl.#{method}" do
-        let(:filename) { "spec/models/post_spec.rb" }
-        let(:source) {
-          <<-EOF
-          it "valids post" do
-            post = FactoryGirl.#{method}(:post)
-            expect(post).to be_valid
-          end
-          EOF
-        }
-        let(:expected_source) {
-          <<-EOF
-          it "valids post" do
-            post = #{method}(:post)
-            expect(post).to be_valid
-          end
-          EOF
-        }
-
-        include_context "expect to convert"
-      end
-    end
-  end
-
-  [:create_list, :build_list, :create_pair, :build_pair].each do |method|
-    class_eval do
-      context "FactoryGirl.#{method}" do
-        let(:filename) { "spec/models/post_spec.rb" }
-        let(:source) {
-          <<-EOF
-          it "valids posts" do
-            posts = FactoryGirl.#{method}(:post)
-            expect(posts).to be_valid
-          end
-          EOF
-        }
-        let(:expected_source) {
-          <<-EOF
-          it "valids posts" do
-            posts = #{method}(:post)
-            expect(posts).to be_valid
-          end
-          EOF
-        }
-
-        include_context "expect to convert"
-      end
-    end
-  end
-end