liquigen 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2433fd78a6dc212be0dcf5f17d9a1fe33808b751ec33c01d3b1b29c34109b7c8
-  data.tar.gz: 30b685955ba69659665e28d7e31ca6ca1d940b9b52b47b09f16e51983603200b
+  metadata.gz: 7c2773ea35aa9555f6b68b5ef319621381b3f0305f1ca0df85d9e7fbd42e623c
+  data.tar.gz: 1c4f07d4ff42bf55e59ef731884a399cc2c7801c9aa5c101754c459729c2ccf8
 SHA512:
-  metadata.gz: 3a0d91c8d8a9cc7a2c2f437808b996f95929aa915cde1b5c775700a0d23bb4a9cd86b9cb72eafa1f0dab67cf3478a2d3860c74b5a341b0717a818f0101e502b8
-  data.tar.gz: 5708efd946052a012ecdcc5f3d63fa9a42ee49bed8c66b63699bb373a5710f431f6aac2a59b5f60c5074cc600818d79488036409e233e17ad4593b38f6c0f669
+  metadata.gz: 2dc5eb7267abb2ce4ce5bdff6b1676c39651b8e1c47006b982b14859833c241780b4577b9af0081e851c05a3e32e7967573ba19fa0cd1ca230bae4b2bfebfae4
+  data.tar.gz: e295be52897d817da9df062d3909d02af3feb4a8c74a2f874043cfc5af469764f4450e5ce7de48e9c527a5ef4c38c23c5cd506c8cbcf661d3a25e80e50da1424

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liquigen (0.0.1)
+    liquigen (0.0.2)
       activesupport
       gli (= 2.18.0)
 

data/README.md

@@ -18,10 +18,10 @@ liquigen help
 ## create_table
 
 ```bash
-liquigen create_table -t table_name prop1:type prop2:type
+liquigen add_table -t table_name prop1:type prop2:type
 
 # Example
-liquigen create_table -t user id:integer name:string email:string created_time:datetime updated_time:datetime
+liquigen add_table -t user id:integer name:string email:string created_time:datetime updated_time:datetime
 ```
 The result file:
 ```yaml
@@ -49,6 +49,14 @@ databaseChangeLog:
 
 ```
 
+## modify_table
+
+ToDo.
+
+## drop table
+
+ToDo.
+
 ## Contributing
 Bug reports and pull requests are welcome on GitHub at https://github.com/jerecui/liquigen.
 

data/bin/liquigen

@@ -37,20 +37,20 @@ class App
   desc 'Describe modify_table here'
   arg_name 'Describe arguments to modify_table here'
   command :modify_table do |c|
-    c.action do |global_options,options,args|
-      puts "modify_table command ran"
+    c.action do |global_options, options,args|
+      puts 'waiting for the implementation'
     end
   end
 
   desc 'Describe drop_table here'
   arg_name 'Describe arguments to drop_table here'
   command :drop_table do |c|
-    c.action do |global_options,options,args|
-      puts "drop_table command ran"
+    c.action do |global_options, options,args|
+      puts 'waiting for the implementation'
     end
   end
 
-  pre do |global,command,options,args|
+  pre do |global, command, options, args|
     # Pre logic here
     # Return true to proceed; false to abort and not call the
     # chosen command
@@ -59,7 +59,7 @@ class App
     true
   end
 
-  post do |global,command,options,args|
+  post do |global, command, options, args|
     # Post logic here
     # Use skips_post before a command to skip this
     # block on that command only

data/lib/liquigen/change_set.rb

@@ -1,13 +1,13 @@
 module Liquigen
   class ChangeSet
     attr_accessor :id
-    attr_accessor :name
+    attr_accessor :author
     attr_accessor :changes
 
     def initialize
       self.id = Time.new.strftime('%Y%m%d%H%M%S')
       # todo Get the current git config name
-      self.name = 'Jeremy'
+      self.author = 'Jeremy'
       self.changes = []
     end
   end

data/lib/liquigen/column.rb

@@ -12,7 +12,7 @@ module Liquigen
       self.name = attributes[:name]
       self.type = TypeMap.new(attributes[:type]).db_type
 
-      self.constraints = []
+      self.constraints = Constraint.new
     end
   end
 end

data/lib/liquigen/handlers/base.rb

@@ -53,8 +53,12 @@ module Liquigen::Handlers
       lines = []
       File.readlines(file_path).each do |line|
         if line.include?('!ruby/object:Liquigen::')
-          line = line.gsub '!ruby/object:Liquigen::', ''
-          line = line.rstrip + ":\n"
+          if line.include?('-')
+            line = line.gsub '!ruby/object:Liquigen::', ''
+          else
+            line = line.split(':')[0]
+          end
+          line = line.rstrip + ':'
         end
         lines << line.rstrip
       end
@@ -72,7 +76,14 @@ module Liquigen::Handlers
         next if line.strip.size.zero?
         next if lines[index + 1].nil?
 
-        empty_marks << index unless lines[index + 1].include?('-')
+        current_blank = line.gsub(/^(\s+).*$/, '\1')
+        next_blank = lines[index + 1].gsub(/^(\s+).*$/, '\1')
+
+        valid = false
+        valid = true if lines[index + 1].include?('-')
+        valid = true if current_blank.size < next_blank.size
+
+        empty_marks << index unless valid
       end
 
       lines.select.with_index { |_, i| !empty_marks.include?(i) }

data/lib/liquigen/handlers/create_table.rb

@@ -18,15 +18,13 @@ module Liquigen::Handlers
       kv = name_and_type.split(':')
       column = Liquigen::Column.new(name: kv[0], type: kv[1])
 
-      constraint = Liquigen::Constraint.new
       if column.name == 'id'
         column.auto_increment = true
-        constraint.primary_key = true
+        column.constraints.primary_key = true
       else
-        constraint.nullable = false
+        column.constraints.nullable = false
       end
 
-      column.constraints << constraint
       column
     end
   end

data/lib/liquigen/type_map.rb

@@ -8,6 +8,7 @@ module Liquigen
       # http://blog.ifyouseewendy.com/blog/2015/08/10/data-types-in-rails/
       self.map = {
         integer: 'bigint',
+        long: 'bigint',
         string: 'varchar(255)',
         text: 'text',
         float: 'float',

data/lib/liquigen/version.rb

@@ -1,3 +1,3 @@
 module Liquigen
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/liquigen/handler_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-RSpec.describe Liquigen::Handler, type: :model do
-  let(:handler) { Liquigen::Handler.new 'User', 'id: integer' }
+RSpec.describe Liquigen::Handlers::Base, type: :model do
+  let(:handler) { described_class.new 'User', 'id: integer' }
 
   let(:source) {
     'databaseChangeLog:
@@ -16,20 +16,19 @@ RSpec.describe Liquigen::Handler, type: :model do
             name: id
             type:
             constraints:
-            - Constraint:
-                nullable: false
                 primary_key:
+                nullable: false
 
       '
     }
   describe '#remove_empty' do
     let(:lines) { source.split("\n") }
-    subject { handler.send(:remove_empty, lines) }
+    subject { handler.send(:remove_lines_with_empty_value, lines) }
 
     it 'should remove the lines which contains empty value' do
       ret = subject
 
-      expect(ret.size).to eq 15
+      expect(ret.size).to eq 14
     end
   end
 
@@ -47,7 +46,7 @@ RSpec.describe Liquigen::Handler, type: :model do
     let(:lines) { source.split("\n") }
 
     it 'should camelize the lines' do
-      ret = handler.send(:camelize_lines, lines)
+      ret = handler.send(:camelize_words, lines)
       expect(ret[ret.size - 1]).to eq '      tableName: user'
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquigen
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeremy Cui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-04 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport