hanami-annotate 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f1e577b155812c324b26d125feb30ac2cde08952131431aa20dbf3f7cac847
-  data.tar.gz: e6631c0f8e45ffa02039146e325113fc679fc21dd3c3defaeb159d49228545ec
+  metadata.gz: 1fd9e83cb2481fa586dd19604185e1397e51d1aa4c43700edc0cf7641c450607
+  data.tar.gz: 4ea986b5752d2f61b450e66742ca5ec3da5d31ec4ccf176d6c417def1d6bd171
 SHA512:
-  metadata.gz: 26bc811e851c41c703b6b4561f7af24bd1c07d02ae33afb11fea692ac2d9f59db4a6740e65cccc0a9fe1b4fdee026bbe06701aae21f542a73e41b321c6103ef6
-  data.tar.gz: f7abe6ee820f13190c53b7e68c97e001e87c175f82c56279e3611cae4f0c68cc6bf335473c7ff7190bb2326e4b77bec990c7b8cabd23627d57895b4a9f1593a2
+  metadata.gz: aa45d50cdb4ef48b7a4efcf7007210387a8f85648181b3d540f80b8963fb5a570959086c1c11562149e576d3e39d3ed46ed70cc16d45cddc5f74ec8617ca8685
+  data.tar.gz: ef0a50f5607732b8237dbca41193cf19f559e78e3c0613cd3e08b9053cd06427e2180fdb34081ade8b183eae5d7c609303a7cf8b6fc66e5594a9100ecebf42c5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hanami-annotate (0.1.0)
+    hanami-annotate (0.1.1)
       dry-inflector (~> 0.1.2)
 
 GEM

data/README.md

@@ -29,16 +29,16 @@ $ bundle exec hanami annotate
 and already annotations has added. Just like a below
 
 ```ruby
-#                                     Table "public.users"
-#   Column   |            Type             |                     Modifiers
-#------------+-----------------------------+----------------------------------------------------
-# id         | integer                     | not null default nextval('users_id_seq'::regclass)
-# name       | text                        | not null
-# email      | text                        | not null
-# created_at | timestamp without time zone | not null
-# updated_at | timestamp without time zone | not null
-#Indexes:
-#    "users_pkey" PRIMARY KEY, btree (id)
+#                                      Table "public.users"
+#    Column   |            Type             |                     Modifiers
+# ------------+-----------------------------+----------------------------------------------------
+#  id         | integer                     | not null default nextval('users_id_seq'::regclass)
+#  name       | text                        | not null
+#  email      | text                        | not null
+#  created_at | timestamp without time zone | not null
+#  updated_at | timestamp without time zone | not null
+# Indexes:
+#     "users_pkey" PRIMARY KEY, btree (id)
 #
 class UserRepository < Hanami::Repository
 end

data/lib/hanami/annotate/cli/generate.rb

@@ -3,6 +3,13 @@ require 'dry/inflector'
 module Hanami
   module Annotate
     module CLI
+      # Generate annotation for Hanami entities and repositories
+      #
+      # usage:
+      #   $ bundle exec hanami annotate
+      #
+      # @todo add support for mysql and sqlite3 etc..
+      #
       class Generate < Hanami::CLI::Command
         def call(*)
           postgres
@@ -12,10 +19,7 @@ module Hanami
 
             comment = commentize(table_info)
 
-            files = \
-              Dir[Hanami.root.join('lib', '*', '{entities,repositories}', '*')]
-              .grep(Regexp.new(Dry::Inflector.new.singularize(table)))
-
+            remove_head_comments(entity_and_repository_path(table))
             adds_comments(files, comment)
           end
         end
@@ -30,8 +34,12 @@ module Hanami
           end
         end
 
+        def entity_and_repository_path(table)
+          Dir[Hanami.root.join('lib', '*', '{entities,repositories}', '*')]
+            .grep(Regexp.new(Dry::Inflector.new.singularize(table)))
+        end
+
         def adds_comments(files, comment)
-          remove_head_comment(files)
           files.each do |file|
             content = ''
             File.open(file) { |f| content += f.read }
@@ -45,24 +53,26 @@ module Hanami
           end.join
         end
 
-        def remove_head_comment(files)
+        def remove_head_comments(files)
           files.each do |file|
-            index = 0
             comment_removed_content = ''
             File.open(file) do |f|
               raw_content = f.read
 
               lines = raw_content.each_line.to_a
-              index = lines.index do |line|
-                line.strip[0] != '#'
-              end
-
+              index = non_comment_line_number(lines)
               comment_removed_content = lines[index..-1].join
             end
 
             File.open(file, 'w') { |f| f.puts(comment_removed_content) }
           end
         end
+
+        def non_comment_line_number(lines)
+          lines.index do |line|
+            line.strip[0] != '#'
+          end
+        end
       end
     end
   end

data/lib/hanami/annotate/version.rb

@@ -1,5 +1,5 @@
 module Hanami
   module Annotate
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-annotate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ippachi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector