schema_monkey 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4534a8c95816c85a333de4434a6860c6cf88355
-  data.tar.gz: 40790953a4bc72e089e6b98d8c6f05ed60b0a325
+  metadata.gz: 64213e6bb8ad8a77e11fb2f07d485297cfde3274
+  data.tar.gz: e565725ac60a6c33273d17361a298e645c75534c
 SHA512:
-  metadata.gz: dc39a71f177831f7a2990d4094f1f12ce4dbc35b0f9dab09fe44dde5607f01379a6200aa3f0188eff9f7210e66a21b43f196923e5b19e4d1de0210ae3bdd7a63
-  data.tar.gz: 61853f39c37f937e9dfc61c1cf2603f30bc9c0775b268284de3191a68fd63ced74db388735c2466a903adc102d2e091d6fbdec0c987b2c1e057fc5b638d4eaeb
+  metadata.gz: 7db8563d4c8d9c15b3be4ba2e8f81b1a0bcdfb3ce438591984e6157891957ca6bbd09734116b6f044a061c883bca2ff8b53a03035f693f1615d4cb08adf874c1
+  data.tar.gz: 1132f8762ff275080817795e6744348352dbed392f9ac742a7ddeece6e9d39973b3c30ef9e1e9cae34bc82467a2679cb0ac53743aa76758b7a8aa2204c64b883

data/lib/schema_monkey/active_record/connection_adapters/mysql_adapter.rb

@@ -14,13 +14,13 @@ module SchemaMonkey
         end
 
         def indexes_with_schema_monkey(table_name, query_name=nil)
-          Middleware::Query::Indexes.start connection: self, table_name: table_name, query_name: query_name do |env|
+          Middleware::Query::Indexes.start connection: self, table_name: table_name, query_name: query_name, index_definitions: [] do |env|
             env.index_definitions += indexes_without_schema_monkey env.table_name, env.query_name
           end
         end
 
         def tables_with_schema_monkey(query_name=nil, database=nil, like=nil)
-          Middleware::Query::Tables.start connection: self, query_name: query_name, database: database, like: like do |env|
+          Middleware::Query::Tables.start connection: self, query_name: query_name, database: database, like: like, tables: [] do |env|
             env.tables += tables_without_schema_monkey env.query_name, env.database, env.like
           end
         end

data/lib/schema_monkey/active_record/connection_adapters/postgresql_adapter.rb

@@ -20,7 +20,7 @@ module SchemaMonkey
         end
 
         def indexes_with_schema_monkey(table_name, query_name=nil)
-          Middleware::Query::Indexes.start connection: self, table_name: table_name, query_name: query_name do |env|
+          Middleware::Query::Indexes.start connection: self, table_name: table_name, query_name: query_name, index_definitions: [] do |env|
             env.index_definitions += indexes_without_schema_monkey env.table_name, env.query_name
           end
         end

data/lib/schema_monkey/active_record/connection_adapters/sqlite3_adapter.rb

@@ -14,13 +14,13 @@ module SchemaMonkey
         end
 
         def indexes_with_schema_monkey(table_name, query_name=nil)
-          Middleware::Query::Indexes.start connection: self, table_name: table_name, query_name: query_name do |env|
+          Middleware::Query::Indexes.start connection: self, table_name: table_name, query_name: query_name, index_definitions: [] do |env|
             env.index_definitions += indexes_without_schema_monkey env.table_name, env.query_name
           end
         end
 
         def tables_with_schema_monkey(query_name=nil, table_name=nil)
-          Middleware::Query::Tables.start connection: self, query_name: query_name, table_name: table_name do |env|
+          Middleware::Query::Tables.start connection: self, query_name: query_name, table_name: table_name, tables: [] do |env|
             env.tables += tables_without_schema_monkey env.query_name, env.table_name
           end
         end

data/lib/schema_monkey/active_record/schema_dumper.rb

@@ -48,15 +48,22 @@ module SchemaMonkey
           @dependencies[tablename].sort.uniq.reject{|t| @dumper.ignored? t}.each(&block)
         end
 
-        class Table < KeyStruct[:name, :pname, :options, :columns, statements: [], trailer: []]
+        class Table < KeyStruct[:name, :pname, :options, :columns, :indexes, :statements, :trailer]
+          def initialize(*args)
+            super
+            self.columns ||= []
+            self.indexes ||= []
+            self.statements ||= []
+            self.trailer ||= []
+          end
 
           def assemble(stream)
             stream.write "  create_table #{pname.inspect}"
             stream.write ", #{options}" unless options.blank?
             stream.puts " do |t|"
-            typelen = @columns.map{|col| col.type.length}.max
-            namelen = @columns.map{|col| col.name.length}.max
-            @columns.each do |column|
+            typelen = columns.map{|col| col.type.length}.max
+            namelen = columns.map{|col| col.name.length}.max
+            columns.each do |column|
               stream.write "    "
               column.assemble(stream, typelen, namelen)
               stream.puts ""
@@ -65,6 +72,11 @@ module SchemaMonkey
               stream.puts "    #{statement}"
             end
             stream.puts "  end"
+            indexes.each do |index|
+              stream.write "  add_index #{pname.inspect}, "
+              index.assemble(stream)
+              stream.puts ""
+            end
             trailer.each do |statement|
               stream.puts "  #{statement}"
             end
@@ -95,6 +107,21 @@ module SchemaMonkey
               stream.write "# #{comments}" unless comments.blank?
             end
           end
+
+          class Index < KeyStruct[:name, :columns, :options]
+
+            def add_option(option)
+              self.options = [options, option].reject(&:blank?).join(', ')
+            end
+
+            def assemble(stream)
+              stream.write [
+                columns.inspect,
+                "name: #{name.inspect}",
+                options
+              ].reject(&:blank?).join(", ")
+            end
+          end
         end
       end
 
@@ -106,6 +133,7 @@ module SchemaMonkey
           alias_method_chain :table, :schema_monkey
           alias_method_chain :foreign_keys, :schema_monkey
           alias_method_chain :trailer, :schema_monkey
+          alias_method_chain :indexes, :schema_monkey
           public :ignored?
         end
       end
@@ -132,7 +160,7 @@ module SchemaMonkey
         Middleware::Dumper::Extensions.start dumper: self, connection: @connection, extensions: @dump.extensions do |env|
           stream = StringIO.new
           extensions_without_schema_monkey(stream)
-          @dump.extensions << stream.string unless stream.string.blank?
+          env.dump.extensions << stream.string unless stream.string.blank?
         end
       end
 
@@ -174,6 +202,26 @@ module SchemaMonkey
           }
         end
       end
+
+      def indexes_with_schema_monkey(table, _)
+        Middleware::Dumper::Indexes.start dumper: self, connection: @connection, dump: @dump, table: @dump.tables[table] do |env|
+          stream = StringIO.new
+          indexes_without_schema_monkey(env.table.name, stream)
+          env.table.indexes += stream.string.split("\n").map { |string|
+            m = string.strip.match %r{
+              ^
+              add_index \s*
+              [:'"](?<table>[^'"\s]+)['"]? \s* , \s*
+              (?<columns>.*) \s*
+              name: \s* [:'"](?<name>[^'"\s]+)['"]? \s*
+              (, \s* (?<options>.*))?
+              $
+            }x
+            columns = m[:columns].tr(%q{[]'":}, '').strip.split(/\s*,\s*/)
+            Dump::Table::Index.new name: m[:name], columns: columns, options: m[:options]
+          }
+        end
+      end
     end
   end
 end

data/lib/schema_monkey/middleware.rb

@@ -48,12 +48,12 @@ module SchemaMonkey
         extend Stack
         # :database and :like are only for mysql
         # :table_name is only for sqlite3
-        Env = KeyStruct[:connection, :query_name, :table_name, :database, :like, tables: []]
+        Env = KeyStruct[:connection, :query_name, :table_name, :database, :like, :tables]
       end
 
       module Indexes
         extend Stack
-        Env = KeyStruct[:connection, :table_name, :query_name, index_definitions: []]
+        Env = KeyStruct[:connection, :table_name, :query_name, :index_definitions]
       end
     end
 
@@ -95,6 +95,10 @@ module SchemaMonkey
         extend Stack
         Env = KeyStruct[:dumper, :connection, :dump, :table]
       end
+      module Indexes
+        extend Stack
+        Env = KeyStruct[:dumper, :connection, :dump, :table]
+      end
     end
 
     module Model

data/lib/schema_monkey/module_support.rb

@@ -39,9 +39,9 @@ module SchemaMonkey
       modules << parent if opts.and_self
       modules += parent.constants.reject{|c| parent.autoload? c}.map{|c| parent.const_get(c)}.select(&it.is_a?(Module))
       modules.reject! &it.to_s =~ opts.reject if opts.reject
+      modules += modules.flat_map { |mod| get_modules(mod, reject: opts.reject, recursive: true) } if opts.recursive
       modules.select! &it.to_s =~ opts.match if opts.match
       modules.select! &it.respond_to?(opts.respond_to) if opts.respond_to
-      modules += modules.flat_map { |mod| get_modules(mod, opts.except(:prefix, :and_self)) } if opts.recursive
       modules
     end
   end

data/lib/schema_monkey/version.rb

@@ -1,3 +1,3 @@
 module SchemaMonkey
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_monkey
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - ronen barzel