actionview_precompiler 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fadda94921df406ea9a921ae1c2a0ef61cb9a70a5a082ed906ead3a91ca0ab79
-  data.tar.gz: a4eb7f984757e30d29eecdf348dc4ce1456f1f2d51e1092dd1bbc86b50d5511a
+  metadata.gz: 8f61275e9c390cf6a14ce7a3fa9bc4fb4473887547e7da8f07587cd26144b8c7
+  data.tar.gz: c125ff85f50d91ca77b80ee0eef47cb51e70373a17e2fc8c99d3b826e1176348
 SHA512:
-  metadata.gz: c86dcaa26a379be5cb1832c7ea036e0dcca6ea2a26582706aa54fc35ba9abc95cd23507bba329e1f6968b70516878b5b8ea153bf419c7b2b67bf249197e3f430
-  data.tar.gz: f00fd1a1202d766df59977b982c75364dfe350f54a47131f74dde6ba0413c9e19b14818b2bc56f94f26521b3516bf383319fcc7a3663a9dd3bbf8c89f2fae269
+  metadata.gz: 9e6d53ba2a4eb030cff6d57635a7d0e77eec0016e1c1af6255f9f134d438030ec4f45669bcd506dd00b1f8d36a64138b9690c3cd4f17dcfc4fe9e7c7562ec72f
+  data.tar.gz: bcc61e6a911a98886b74bfc8df1c29b6b6b3efabfbc50bf0178b34f3a7948867bfeaa7f2aec79945363fa34146b974909893c3e405033540b2bbcee0024c74cc

data/README.md

@@ -11,7 +11,7 @@ Right now this assumes every template with the same `virtual_path` takes the sam
 A curse/blessing/actually still a curse of this approach is that mis-predicting render calls doesn't cause any issues, it just wastes RAM.
 
 Templates are half-compiled using standard ActionView handlers, so this should work for erb/builder/haml/whatever.
-Parsing is done using Ruby 2.6's `RubyVM::AbstractSyntaxTree`.
+Parsing is done using either Ruby 2.6's `RubyVM::AbstractSyntaxTree` or JRuby's parser.
 
 ## Installation
 

data/lib/actionview_precompiler.rb

@@ -1,4 +1,5 @@
 require "actionview_precompiler/version"
+require "actionview_precompiler/ast_parser"
 require "actionview_precompiler/template_parser"
 require "actionview_precompiler/render_parser"
 require "actionview_precompiler/precompiler"

data/lib/actionview_precompiler/ast_parser.rb

@@ -0,0 +1,5 @@
+if RUBY_ENGINE == 'jruby'
+  require "actionview_precompiler/ast_parser/jruby"
+else
+  require "actionview_precompiler/ast_parser/ruby26"
+end

data/lib/actionview_precompiler/ast_parser/jruby.rb

@@ -0,0 +1,68 @@
+module ActionviewPrecompiler
+  module ASTParser
+    class Node
+      def self.wrap(node)
+        if org::jruby::ast::Node === node
+          new(node)
+        else
+          node
+        end
+      end
+
+      def initialize(node)
+        @node = node
+      end
+
+      def children
+        @children ||= @node.child_nodes.map do |child|
+          self.class.wrap(child)
+        end
+      end
+
+      def array?;  org::jruby::ast::ArrayNode  === @node; end
+      def fcall?;  org::jruby::ast::FCallNode  === @node; end
+      def hash?;   org::jruby::ast::HashNode   === @node; end
+      def string?; org::jruby::ast::StrNode    === @node; end
+      def symbol?; org::jruby::ast::SymbolNode === @node; end
+
+      def argument_nodes
+        @node.args_node.to_a[0...@node.args_node.size].map do |arg|
+          self.class.wrap(arg)
+        end
+      end
+
+      def to_hash
+        @node.pairs.each_with_object({}) do |pair, object|
+          object[self.class.wrap(pair.key)] = self.class.wrap(pair.value)
+        end
+      end
+
+      def to_string
+        @node.value
+      end
+
+      def to_symbol
+        @node.name
+      end
+
+      def fcall_named?(name)
+        fcall? &&
+          @node.name == name &&
+          @node.args_node &&
+          org::jruby::ast::ArrayNode === @node.args_node
+      end
+    end
+
+    def parse(code)
+      Node.wrap(JRuby.parse(code))
+    end
+
+    def node?(node)
+      Node === node
+    end
+
+    def fcall?(node, name)
+      node.fcall_named?(name)
+    end
+  end
+end

data/lib/actionview_precompiler/ast_parser/ruby26.rb

@@ -0,0 +1,88 @@
+module ActionviewPrecompiler
+  module ASTParser
+    class Node
+      def self.wrap(node)
+        if RubyVM::AbstractSyntaxTree::Node === node
+          new(node)
+        else
+          node
+        end
+      end
+
+      def initialize(node)
+        @node = node
+      end
+
+      def children
+        @children ||= @node.children.map do |child|
+          self.class.wrap(child)
+        end
+      end
+
+      def inspect
+        "#<#{self.class} #{@node.inspect}>"
+      end
+
+      def argument_nodes
+        children[1].children[0...-1]
+      end
+
+      def array?
+        type == :ARRAY
+      end
+
+      def fcall?
+        type == :FCALL
+      end
+
+      def hash?
+        type == :HASH
+      end
+
+      def string?
+        type == :STR && String === children[0]
+      end
+
+      def symbol?
+        type == :LIT && Symbol === children[0]
+      end
+
+      def to_hash
+        children[0].children[0..-2].each_slice(2).to_h
+      end
+
+      def to_string
+        children[0]
+      end
+
+      def to_symbol
+        children[0]
+      end
+
+      def fcall_named?(name)
+        fcall? &&
+          children[0] == name &&
+          children[1] &&
+          children[1].array?
+      end
+
+      private
+
+      def type
+        @node.type
+      end
+    end
+
+    def parse(code)
+      Node.wrap(RubyVM::AbstractSyntaxTree.parse(code))
+    end
+
+    def node?(node)
+      Node === node
+    end
+
+    def fcall?(node, name)
+      node.fcall_named?(name)
+    end
+  end
+end

data/lib/actionview_precompiler/render_parser.rb

@@ -10,9 +10,11 @@ module ActionviewPrecompiler
   end
 
   class RenderParser
+    include ASTParser
+
     def initialize(code)
       @code = code
-      @code = RubyVM::AbstractSyntaxTree.parse(code) if code.is_a?(String)
+      @code = parse(code) if code.is_a?(String)
     end
 
     def render_calls
@@ -25,18 +27,17 @@ module ActionviewPrecompiler
     private
 
     def parse_render(node)
-      node = node.children[1]
-      node = node.children
-      if (node.length == 2 || node.length == 3) && node[0].type == :STR
+      node = node.argument_nodes
+      if (node.length == 1 || node.length == 2) && node[0].string?
         # FIXME: from template vs controller
         options = {}
         options[:partial] = node[0]
-        if node.length == 3
-          return unless node[1].type == :HASH
+        if node.length == 2
+          return unless node[1].hash?
           options[:locals] = node[1]
         end
         return parse_render_from_options(options)
-      elsif node.length == 2 && node[0].type == :HASH
+      elsif node.length == 1 && node[0].hash?
         options = parse_hash_to_symbols(node[0])
         return parse_render_from_options(options)
       else
@@ -45,9 +46,7 @@ module ActionviewPrecompiler
     end
 
     def parse_hash(node)
-      return nil unless node.type == :HASH
-
-      node.children[0].children[0..-2].each_slice(2).to_h
+      node.hash? && node.to_hash
     end
 
     def parse_hash_to_symbols(node)
@@ -86,8 +85,8 @@ module ActionviewPrecompiler
         parsed_locals = parse_hash(locals)
         return nil unless parsed_locals
         locals_keys = parsed_locals.keys.map do |local|
-          return nil unless local.type == :LIT
-          local.children[0]
+          return nil unless local.symbol?
+          local.to_symbol
         end
       else
         locals = nil
@@ -98,11 +97,11 @@ module ActionviewPrecompiler
     end
 
     def parse_str(node)
-      node.children[0] if node.type == :STR && String === node.children[0]
+      node.string? && node.to_string
     end
 
     def parse_sym(node)
-      node.children[0] if node.type == :LIT && Symbol === node.children[0]
+      node.symbol? && node.to_symbol
     end
 
     def debug(message)
@@ -110,7 +109,7 @@ module ActionviewPrecompiler
     end
 
     def extract_render_nodes(node)
-      return [] unless RubyVM::AbstractSyntaxTree::Node === node
+      return [] unless node?(node)
       renders = node.children.flat_map { |c| extract_render_nodes(c) }
       if render_call?(node)
         renders << node
@@ -119,10 +118,7 @@ module ActionviewPrecompiler
     end
 
     def render_call?(node)
-      node.type == :FCALL &&
-        node.children[0] == :render &&
-        node.children[1] &&
-        node.children[1].type == :ARRAY
+      fcall?(node, :render)
     end
   end
 end

data/lib/actionview_precompiler/template_parser.rb

@@ -2,6 +2,8 @@ require "action_view"
 
 module ActionviewPrecompiler
   class TemplateParser
+    include ASTParser
+
     attr_reader :filename, :basename, :handler
 
     class FakeTemplate
@@ -27,7 +29,7 @@ module ActionviewPrecompiler
     end
 
     def parsed
-      @parsed ||= RubyVM::AbstractSyntaxTree.parse(compiled_source)
+      @parsed ||= parse(compiled_source)
     end
 
     def compiled_source

data/lib/actionview_precompiler/version.rb

@@ -1,3 +1,3 @@
 module ActionviewPrecompiler
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview_precompiler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,16 +73,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
 - README.md
-- Rakefile
-- actionview_precompiler.gemspec
-- bin/console
-- bin/setup
 - lib/actionview_precompiler.rb
+- lib/actionview_precompiler/ast_parser.rb
+- lib/actionview_precompiler/ast_parser/jruby.rb
+- lib/actionview_precompiler/ast_parser/ruby26.rb
 - lib/actionview_precompiler/parsed_filename.rb
 - lib/actionview_precompiler/precompiler.rb
 - lib/actionview_precompiler/render_parser.rb

data/.gitignore

@@ -1,8 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at john@hawthorn.email. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "pry"
-
-# Specify your gem's dependencies in actionview_precompiler.gemspec
-gemspec

data/Gemfile.lock

@@ -1,62 +0,0 @@
-PATH
-  remote: .
-  specs:
-    actionview_precompiler (0.1.0)
-      actionview (>= 6.0.a)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionview (6.0.0.rc1)
-      activesupport (= 6.0.0.rc1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (6.0.0.rc1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.4)
-    builder (3.2.3)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    erubi (1.8.0)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    rake (12.3.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.1.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionview_precompiler!
-  bundler (~> 2.0)
-  minitest (~> 5.0)
-  pry
-  rake (~> 12.0)
-
-BUNDLED WITH
-   2.0.1

data/Rakefile

@@ -1,10 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task :default => :test

data/actionview_precompiler.gemspec

@@ -1,31 +0,0 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "actionview_precompiler/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "actionview_precompiler"
-  spec.version       = ActionviewPrecompiler::VERSION
-  spec.authors       = ["John Hawthorn"]
-  spec.email         = ["john@hawthorn.email"]
-
-  spec.summary       = %q{Precompiles ActionView templates}
-  spec.description   = %q{Parses templates for render calls and uses them to precompile}
-  spec.homepage      = "https://github.com/jhawthorn/actionview_precompiler"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 2.6"
-
-  spec.add_dependency "actionview", ">= 6.0.a"
-
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-end

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "actionview_precompiler"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here