export_strings 0.1.1.dev → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e21380cd54e9dc9ae6e6997e81fa6cd42d906d85a04cdf3fb36acee14c528c5d
-  data.tar.gz: 30cc394113e1930dfa50e041613185fff8299c498a733f7d2e27a5cc3551825d
+  metadata.gz: 01ab06d2a7a05856a986c9fd06628dfa632ff7459c2c3c64e71080eb9cdb3d4d
+  data.tar.gz: 247cb0c82d133169ed5af2d410b2a4dfcd1bf2a564a2957284159b8facaa2dc8
 SHA512:
-  metadata.gz: 0463f6e011828bc681e5949b8c49ed068d49874666b929600d7b45b813bc2caa92ad68ea7836fd22b06a7cc2e466aa502625dd4e1e32c037e5009b33c4826714
-  data.tar.gz: 83b2bb92b4d376ee065f9b56f78fe50af3383a373e45042a9d1dc14dded25dcb8d666079158cc6dc53041d5558e98c3ee2e91a9b5c07f96d50b756d1abe08a37
+  metadata.gz: 931b2c46ccf51b73a41da64f4883a9e945babd11998a7db02137f0a6a04d4d0af02d19d40c2edeacf3979cf88d055a4f7092ac7ed6b2c2587f75e307c36c3d01
+  data.tar.gz: 61dc2265e7c793f7c571bea68a28b9765e7755b6f82edaf1f3ad1bcb5269d3ec74edacd52727496a8e7d6a62585091720eae81023cd795dcb0fd1e4d60ce68b5

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 # export_strings chagelogs
 ## 0.1.1.dev
  - Implement 60%
- - Export strings from easy .rb file
+ - Export strings from easy .rb file
+
+ ## 0.2.0.dev
+ - Implement 90%
+ - Export strings from nomal .rb file

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    export_strings (0.1.1.dev)
+    export_strings (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -21,12 +21,11 @@ Or install it yourself as:
 ```rb
 require 'export_strings'
 
-ExportString.execute rb_file_path
+ExportStrings.execute rb_file_path
 
 => [String, String, String, String]
 ```
 
-
 ## Example
 
 ```rb
@@ -43,6 +42,14 @@ class Example
   def str2
     "I like gohan. Do you like gohan.Oh Yeah."
   end
+
+  def str3
+    "#{hello} Mikel"
+  end
+
+  def hello
+    'hello world'
+  end
 end
 
 # =======your irb console=======
@@ -51,25 +58,29 @@ require 'export_strings'
 pp ExportStrings.execute 'example.rb'
 
 ["      SELECT *\n" + "      FROM users\n" + "      WHERE id > 100\n",
- "I like gohan. Do you like gohan.Oh Yeah."]
+ "I like gohan. Do you like gohan.Oh Yeah.",
+ "\#{hello} Mikel",
+ "hello world"]
 
-=> ["      SELECT *\n      FROM users\n      WHERE id > 100\n", "I like gohan. Do you like gohan.Oh Yeah."]
+=> ["SELECT *\n      FROM users\n      WHERE id > 100\n", "I like gohan. Do you like gohan.Oh Yeah.", "\#{hello} Mikel", "hello world"]
 
-```
+pp ExportStrings.execute 'example.rb', with_embexpr: false
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+["      SELECT *\n" + "      FROM users\n" + "      WHERE id > 100\n",
+ "I like gohan. Do you like gohan.Oh Yeah.",
+ " Mikel",
+ "hello world"]
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+=> ["SELECT *\n      FROM users\n      WHERE id > 100\n", "I like gohan. Do you like gohan.Oh Yeah.", " Mikel", "hello world"]
+```
 
 ## Schedule
 
 ### I want to develop this to make gem of format or parce.
 
  - Implement to export from singleton_method
- - Implement to export from string interpolation
- - Implement to export from `hoge ? 'page' : 'peke'`
+ - ~~Implement to export from string interpolation~~ fix
+ - ~~Implement to export from `hoge ? 'page' : 'peke'`~~ fix
 
 ## Contributing
 
@@ -78,7 +89,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/tashir
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the ExportStrings project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/export_strings/blob/master/CODE_OF_CONDUCT.md).

data/example/example.rb

@@ -1,4 +1,5 @@
 class Example
+  @pokemon = 'pokemon'
 
   def str
     <<-SQL
@@ -35,7 +36,10 @@ a      asdfasdfasdfasdfsh
     GROUP BY gender
     HAVING 100 > Max(#{hogeo})
     AND HAVING 1000 < Max(#{test})
-    #{!!test ? 'page' : 'hoge'}
+    AND HAVING 1000 < Max(#{String.new})
+    AND HAVING 1000 < Max(#{test; test})
+    AND HAVING 1000 < Max(#{@pokemon})
+    #{!!test ? 'hogeo' : 'hoge'}
     "
   end
 
@@ -53,5 +57,39 @@ a      asdfasdfasdfasdfsh
   def single_auot
     'single_quot_str'
   end
+end
+
+class Example2
+  def hogeo2
+    'test'
+    "test"
+    'test' + "test"
+    'test' << 'test'
+  end
 
+  def test2
+    'hi'
+  end
 end
+
+class Example
+  def str1
+    <<-SQL
+      SELECT *
+      FROM users
+      WHERE id > 100
+    SQL
+  end
+
+  def str2
+    "I like gohan. Do you like gohan.Oh Yeah."
+  end
+
+  def str3
+    "#{hello} Mikel"
+  end
+
+  def hello
+    'hello world'
+  end
+end

data/lib/export_strings/by_lex.rb

@@ -0,0 +1,64 @@
+require 'ripper'
+
+module ExportStrings
+  class ByLex
+    class << self
+      def execute(rb_text)
+        @string_flag = false
+        @embexpr_flag = false
+        @str = ''
+        results = []
+        Ripper.lex(rb_text).each do |ary_code|
+          code_type = ary_code[1]
+          code_content = ary_code[2]
+          if embexpr_flag(code_type)
+            @str << code_content
+            next
+          end
+
+          if string_flag(code_type)
+            next if code_type == :on_tstring_beg || code_type == :on_heredoc_beg
+
+            @str << code_content
+          elsif !string_flag(code_type) && !@str.empty?
+            results.push @str
+            @str = ''
+          end
+        end
+        results
+      end
+
+      private
+
+      # string_flag = trueのときは
+      # on_tstring_beg ~ on_tstring_end || on_heredoc_beg　~ on_heredoc_endまでを
+      # 文字列として扱う
+      def string_flag(code_type)
+        @string_flag = case code_type
+                       when :on_tstring_beg
+                         true
+                       when :on_heredoc_beg
+                         true
+                       when :on_tstring_end
+                         false
+                       when :on_heredoc_end
+                         false
+                       else
+                         @string_flag
+                       end
+      end
+
+      # 文字列展開対応
+      def embexpr_flag(code_type)
+        @embexpr_flag = case code_type
+                        when :on_embexpr_beg
+                          true
+                        when :on_embexpr_end
+                          false
+                        else
+                          @embexpr_flag
+                        end
+      end
+    end
+  end
+end

data/lib/export_strings/by_sexp.rb

@@ -0,0 +1,45 @@
+require 'ripper'
+
+module ExportStrings
+  # 文字列展開は含めない
+  class BySexp
+    class << self
+      def execute(rb_text)
+        str_content_nodes = recursively_push_for_str_content_nodes Ripper.sexp(rb_text), []
+        content_nodes2str_ary str_content_nodes
+      end
+
+      private
+
+      # 再帰的にstring_literal nodeを集めてくる
+      def recursively_push_for_str_content_nodes(tree, nodes)
+        tree.each do |node|
+          if node.class == Array && node[0] == :string_content
+            nodes << node
+          elsif node.class == Array
+            recursively_push_for_str_content_nodes(node, nodes)
+          end
+        end
+        nodes
+      end
+
+      # nodesをstringsに変換して返す
+      def content_nodes2str_ary(nodes)
+        nodes.map { |node| str_content_node2str node, '' }
+      end
+
+      # 各nodeをstringに変換する
+      def str_content_node2str(string_content_node, str)
+        string_content_node.each do |leaf|
+          if leaf.class == Array && leaf[0] == :@tstring_content
+            # 通常のstringが格納される時
+            str << leaf[1]
+          elsif leaf.class == Array
+            str_content_node2str(leaf, str)
+          end
+        end
+        str
+      end
+    end
+  end
+end

data/lib/export_strings/core.rb

@@ -1,42 +1,16 @@
-require 'ripper'
+require 'export_strings/by_lex'
+require 'export_strings/by_sexp'
 
 module ExportStrings
   class Core
     class << self
-      def execute(rb_text)
-        @str_nodes = []
-        recursively_push_str_nodes Ripper.sexp(rb_text)
-        to_strings @str_nodes
+      def execute(rb_text, with_embexpr: true)
+        with_embexpr ? ByLex.execute(rb_text) : BySexp.execute(rb_text)
       end
 
-      private
-
-      def recursively_push_str_nodes(tree)
-        tree.each do |node|
-          if node.class == Array && node[0] == :string_content
-            @str_nodes << node
-          elsif node.class == Array
-            recursively_push_str_nodes(node)
-          end
-        end
-      end
-
-      def to_strings(nodes)
-        nodes.map do |node|
-          @string = ''
-          str_content_node2str node
-        end
-      end
-
-      def str_content_node2str(string_content_node)
-        string_content_node.each do |leaf|
-          if leaf.class == Array && leaf[0] == :@tstring_content
-            @string << leaf[1]
-          elsif leaf.class == Array
-            str_content_node2str(leaf)
-          end
-        end
-        @string
+      # 文字列展開は除外したい時
+      def execute_with_out_embexpr(rb_text)
+        execute rb_text, with_embexpr: false
       end
     end
   end

data/lib/export_strings/version.rb

@@ -1,3 +1,3 @@
 module ExportStrings
-  VERSION = "0.1.1.dev"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: export_strings
 version: !ruby/object:Gem::Version
-  version: 0.1.1.dev
+  version: 0.2.0
 platform: ruby
 authors:
 - Tashiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,8 @@ files:
 - example/example.rb
 - export_strings.gemspec
 - lib/export_strings.rb
+- lib/export_strings/by_lex.rb
+- lib/export_strings/by_sexp.rb
 - lib/export_strings/core.rb
 - lib/export_strings/version.rb
 homepage: https://github.com/tashirosota/ruby-export_strings
@@ -94,9 +96,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: