niceql 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f43c7e4d45b26a700c72420b528e162d26814bd
-  data.tar.gz: e634c50d9336928faf6730428098752269ae6de9
+  metadata.gz: c26e1a06c6e958f8464ffc4b07ab1cfb1d74b2a0
+  data.tar.gz: b393a24a91b6eed2a63b74d5ab8fd61e36912d8e
 SHA512:
-  metadata.gz: a6467d75c04de184e7adfd2972753e94237b96e14b7d952f18c8939982dfba353c4f17281492878c9a04edd957d14b60ef8dd2649a91c0fa1a76df0ee1144fec
-  data.tar.gz: dd708fe3bc10676735fb4a9a821366fb3206d04e4f8402bc2433db155a5eff25aa63bd2ffea7b8a71fe509de0c2600f44aa2dc3dbf090ab4723d61796ec22118
+  metadata.gz: 463b0ef4514b12ab300b217592a0dfb613f36ddb87adcee5bc1a31142c4f3998cb041b1d5a0c97dee456a09f730714d4e88f044090975e06e2590377b16a881e
+  data.tar.gz: 1f062cccda0a333b196628db1a2235c144cf105c5398bb36eed92ffb62d776b2d75197a139e58b3269dbf0f772b9d6f6c9e8b800e9bf126aaf64aa2f57c4f064

data/README.md

@@ -39,7 +39,10 @@ Or install it yourself as:
 ### With ActiveRecord
 
 ```ruby
-  # prettify to_sql 
+  # puts prettified to_sql ( you need to call puts otherwise to_niceql looks ugly  )
+  Model.scope.puts_niceql
+  
+  # only formatting without colorization can run as SQL query in connection.execute  
   Model.scope.to_niceql
   
   # prettify PG errors 
@@ -82,20 +85,14 @@ ERR
 ```
 ## Limitations
 
-Right now it detect only uppercase verbs with simple indentation and parsing options. 
-Also if your console support more colors or different schemes, or you prefer different colorization you can override ColorizeString 
-methods. Current color are selected with dark and white console themes in mind, so it works good for dark, and good enough for white.
-
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Right now gem detects only uppercased form of verbs with very simple indentation and parsing options. 
 
-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).
+## Customizing colors
+If your console support more colors or different schemes, or you prefer different colorization, then you can override ColorizeString methods. Current color are selected with dark and white console themes in mind, so niceql colorization works good for dark, and good enough for white.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/niceql.
+Bug reports and pull requests are welcome on GitHub at https://github.com/alekseyl/niceql.
 
 ## License
 

data/lib/niceql/version.rb

@@ -1,3 +1,3 @@
 module Niceql
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/niceql.rb

@@ -19,13 +19,17 @@ module Niceql
   module ArExtentions
     def explain_err
       begin
-        connection.execute( "EXPLAIN #{Prettifier.prettify_sql(to_sql, false)}" )
+        connection.execute( "EXPLAIN #{to_nicesql}" )
       rescue StandardError => e
         puts Prettifier.prettify_err(e )
       end
     end
 
-    def to_niceql( colorize = true )
+    def to_nicesql
+      Prettifier.prettify_sql(to_sql, false)
+    end
+
+    def puts_niceql( colorize = true )
       puts Prettifier.prettify_sql( to_sql, colorize )
     end
   end
@@ -66,13 +70,15 @@ module Niceql
       parentness = []
 
       sql = sql.gsub(STRINGS){ |str| StringColorize.colorize_str(str) } if colorize
+      first_verb  = true
 
       sql.gsub( /(#{VERBS}|#{BRACKETS})/) do |verb|
         add_new_line = false
         if 'SELECT' == verb
           indent += 1
           parentness.last[:nested] = true if parentness.last
-          add_new_line = true
+          add_new_line = !first_verb
+          first_verb = false
         elsif verb == '('
           parentness << { nested: false }
           indent += 1
@@ -90,7 +96,6 @@ module Niceql
           add_new_line = verb[/(#{INLINE_VERBS})/].nil?
         end
         verb = StringColorize.colorize_verb(verb) if !['(', ')'].include?(verb) && colorize
-
         add_new_line ? "\n#{' ' * indent}" + verb : verb
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: niceql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - alekseyl
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: This is simple and nice sql prettifier, it splits, indent and colorize SQL