synvert-core 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf1187899f9eb743b73e0295ebac08014131dae4acd6e4d17475f9eb3cc71657
-  data.tar.gz: fcafcb32987582fc9f52e2735ee3001fc9bc7110aeea9da3b7f91cd307ddb064
+  metadata.gz: 82066eb2fad44d4ca47831672a31195bba96aa07206aa23e449d5c519b94b23d
+  data.tar.gz: 70a8566412fc3cf9004441a07e706c79807820003155b4bafdc03cf4c62042cc
 SHA512:
-  metadata.gz: 623cc353b1d7e4963de14dfee389ad6044711c8f9284e55e24c83e7d652dc65c236cf32c1acc2cb40a615b549cd418fcf5f8b290bb3f87bd6f90bbc9b2341161
-  data.tar.gz: 98ba68a0638b04d2d21405c194117c7cc98ca8159d362cf847e6f39fe78a865939f179798db6f76305571dd01fd53253ee8ffd29d4f822e9cb56d239ad86408e
+  metadata.gz: b33e55196d7d3e13097e7b101ee693111e5a49ad6d93015eba85886214abb125b5a938908ca0feadef772ef6eecdaa8874fc2d8d6ecff044d5506f685db8bc8d
+  data.tar.gz: aa7f05784e6e8710903c47e6616dac0a18bca66b0f04fc6b7089ff8d47f8c5c6d073bdb45fccb04b25765feed6b28313ea08dd80d166e0283cd931e2d9482229

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # CHANGELOG
 
+## 1.15.0 (2022-11-30)
+
+* Load snippet from github
+
+## 1.14.2 (2022-11-19)
+
+* Specify `node_query`, `node_mutation` and `parser_node_ext` versions
+
 ## 1.14.1 (2022-10-26)
 
-* Abstract AnyValue to NodeQuery
+* Abstract `AnyValue` to NodeQuery
 
 ## 1.14.0 (2022-10-25)
 

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.14.1)
+    synvert-core (1.15.0)
       activesupport (< 7.0.0)
       erubis
-      node_mutation
-      node_query
+      node_mutation (>= 1.7.1)
+      node_query (>= 1.10.0)
       parallel
       parser
-      parser_node_ext
+      parser_node_ext (>= 0.4.1)
 
 GEM
   remote: https://rubygems.org/
@@ -59,7 +59,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     parser_node_ext (0.4.1)
       parser
@@ -87,7 +87,7 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

data/lib/synvert/core/node_ext.rb

@@ -27,7 +27,7 @@ module Parser::AST
   # +type: 'send', receiver: { type: 'send', receiver: { type: 'send', message: 'config' }, message: 'active_record' }, message: 'identity_map='+
   #
   # Source Code to Ast Node
-  # {https://synvert-playground.xinminlabs.com/ruby}
+  # {https://playground.synvert.net/ruby}
   class Node
     # Get the file name of node.
     #

data/lib/synvert/core/snippet_not_found_error.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SnippetNotFoundError < StandardError
+end

data/lib/synvert/core/utils.rb

@@ -1,18 +1,29 @@
 # frozen_string_literal: true
 
+require 'net/http'
 require 'uri'
+require 'open-uri'
 
 module Synvert::Core
   class Utils
     class << self
       def eval_snippet(snippet_name)
+        eval(load_snippet(snippet_name))
+      end
+
+      def load_snippet(snippet_name)
         if is_valid_url?(snippet_name)
           uri = URI.parse(format_url(snippet_name))
-          eval(uri.open.read)
+          return uri.open.read if remote_snippet_exists?(uri)
+          raise SnippetNotFoundError.new("#{snippet_name} nout found")
         elsif is_valid_file?(snippet_name)
-          eval(File.read(snippet_name))
+          return File.read(snippet_name)
         else
-          eval(File.read(File.join(default_snippets_home, 'lib', "#{snippet_name}.rb")))
+          snippet_path = snippet_expand_path(snippet_name)
+          return File.read(snippet_path) if File.exist?(snippet_path)
+          snippet_uri = URI.parse(format_url(remote_snippet_url(snippet_name)))
+          return snippet_uri.open.read if remote_snippet_exists?(snippet_uri)
+          raise SnippetNotFoundError.new("#{snippet_name} nout found")
         end
       end
 
@@ -26,10 +37,25 @@ module Synvert::Core
         File.exist?(path)
       end
 
+      def remote_snippet_exists?(uri)
+        req = Net::HTTP.new(uri.host, uri.port)
+        req.use_ssl = uri.scheme == 'https'
+        res = req.request_head(uri.path)
+        res.code == "200"
+      end
+
+      def snippet_expand_path(snippet_name)
+        File.join(default_snippets_home(), 'lib', "#{snippet_name}.rb")
+      end
+
       def default_snippets_home
         ENV['SYNVERT_SNIPPETS_HOME'] || File.join(ENV['HOME'], '.synvert-ruby')
       end
 
+      def remote_snippet_url(snippet_name)
+        "https://github.com/xinminlabs/synvert-snippets-ruby/blob/main/lib/#{snippet_name}.rb"
+      end
+
       def format_url(url)
         convert_to_github_raw_url(url)
       end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.14.1'
+    VERSION = '1.15.0'
   end
 end

data/lib/synvert/core.rb

@@ -19,6 +19,7 @@ module Synvert
     autoload :Engine, 'synvert/core/engine'
     autoload :Utils, 'synvert/core/utils'
     autoload :Strategy, 'synvert/core/strategy'
+    autoload :SnippetNotFoundError, 'synvert/core/snippet_not_found_error'
   end
 end
 

data/spec/synvert/core/utils_spec.rb

@@ -3,27 +3,54 @@ require 'spec_helper'
 module Synvert::Core
   RSpec.describe Utils do
     describe '.eval_snippet' do
-      it 'evals snippet by http url' do
-        expect_any_instance_of(URI).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'name' do\nend"))
-        rewriter = described_class.eval_snippet('http://example.com/rewriter.rb')
-        expect(rewriter.group).to eq 'group'
-        expect(rewriter.name).to eq 'name'
+      context "by http url" do
+        it 'evals snippet' do
+          expect(described_class).to receive(:remote_snippet_exists?).with(URI.parse('http://example.com/rewriter.rb')).and_return(true)
+          expect_any_instance_of(URI::HTTP).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'name' do\nend"))
+          rewriter = described_class.eval_snippet('http://example.com/rewriter.rb')
+          expect(rewriter.group).to eq 'group'
+          expect(rewriter.name).to eq 'name'
+        end
+
+        it 'raises error' do
+          expect(described_class).to receive(:remote_snippet_exists?).and_return(false)
+          expect do
+            described_class.eval_snippet('http://example.com/rewriter.rb')
+          end.to raise_error(SnippetNotFoundError)
+        end
       end
 
-      it 'adds snippet by file path' do
-        expect(File).to receive(:exist?).and_return(true)
-        expect(File).to receive(:read).and_return("Rewriter.new 'group', 'name' do\nend")
-        rewriter = described_class.eval_snippet('/home/richard/foo/bar.rb')
-        expect(rewriter.group).to eq 'group'
-        expect(rewriter.name).to eq 'name'
+      context 'by file path' do
+        it 'evals snippet' do
+          expect(File).to receive(:exist?).and_return(true)
+          expect(File).to receive(:read).and_return("Rewriter.new 'group', 'name' do\nend")
+          rewriter = described_class.eval_snippet('/home/richard/foo/bar.rb')
+          expect(rewriter.group).to eq 'group'
+          expect(rewriter.name).to eq 'name'
+        end
       end
 
-      it 'adds snippet by snippet name' do
-        expect(File).to receive(:exist?).and_return(false)
-        expect(File).to receive(:read).and_return("Rewriter.new 'group', 'name' do\nend")
-        rewriter = described_class.eval_snippet('/home/richard/foo/bar.rb')
-        expect(rewriter.group).to eq 'group'
-        expect(rewriter.name).to eq 'name'
+      context 'by snippet name' do
+        it 'evals snippet as file' do
+          expect(File).to receive(:exist?).with("group/name").and_return(false)
+          expect(described_class).to receive(:default_snippets_home).and_return('/home/richard/.synvert-ruby')
+          expect(File).to receive(:exist?).with("/home/richard/.synvert-ruby/lib/group/name.rb").and_return(true)
+          expect(File).to receive(:read).and_return("Rewriter.new 'group', 'name' do\nend")
+          rewriter = described_class.eval_snippet('group/name')
+          expect(rewriter.group).to eq 'group'
+          expect(rewriter.name).to eq 'name'
+        end
+
+        it 'evals snippet as github url' do
+          expect(File).to receive(:exist?).with("group/name").and_return(false)
+          expect(described_class).to receive(:default_snippets_home).and_return('/home/richard/.synvert-ruby')
+          expect(File).to receive(:exist?).with("/home/richard/.synvert-ruby/lib/group/name.rb").and_return(false)
+          expect(described_class).to receive(:remote_snippet_exists?).with(URI.parse("https://raw.githubusercontent.com/xinminlabs/synvert-snippets-ruby/main/lib/group/name.rb")).and_return(true)
+          expect_any_instance_of(URI::HTTP).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'name' do\nend"))
+          rewriter = described_class.eval_snippet('group/name')
+          expect(rewriter.group).to eq 'group'
+          expect(rewriter.name).to eq 'name'
+        end
       end
     end
   end

data/synvert-core-ruby.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport", "< 7.0.0"
   spec.add_runtime_dependency "erubis"
-  spec.add_runtime_dependency "node_query"
-  spec.add_runtime_dependency "node_mutation"
+  spec.add_runtime_dependency "node_query", ">= 1.10.0"
+  spec.add_runtime_dependency "node_mutation", ">= 1.7.1"
   spec.add_runtime_dependency "parser"
-  spec.add_runtime_dependency "parser_node_ext"
+  spec.add_runtime_dependency "parser_node_ext", ">= 0.4.1"
   spec.add_runtime_dependency "parallel"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ files:
 - lib/synvert/core/rewriter/scope/goto_scope.rb
 - lib/synvert/core/rewriter/scope/within_scope.rb
 - lib/synvert/core/rewriter/warning.rb
+- lib/synvert/core/snippet_not_found_error.rb
 - lib/synvert/core/strategy.rb
 - lib/synvert/core/utils.rb
 - lib/synvert/core/version.rb
@@ -187,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.