ridgepole 0.6.6.beta → 0.6.6.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43b2e1e6fe82bc1adaecdf2e03682a3bd1756e2d
-  data.tar.gz: 30ca92eea9cd6296e88293671a04d2511a4b3141
+  metadata.gz: 0df6fb1b72b3ab0c234c0f8b72c216dcff83b8c8
+  data.tar.gz: bf7df0782ede514d34dfaa0338b208b25b70005c
 SHA512:
-  metadata.gz: 6eef1346bb2cbd9884ebe22728fbb22456e393fb2fdc39b44d274f6bad03d5bffed364131216fa37500e2498ce87760786adb6e4e1141b288fe0e9327d5f9936
-  data.tar.gz: 073a3053fd3a2a2932d34cb03fc7122f13a283d50d7e73bca56c0bea03b7035f6d494d62d6724d1224163eadbfa53faa84c94357a428b1d6129517cea135b55e
+  metadata.gz: dc45bcdfc390d0f8fb556ca0e3fd8c3825cfea3de88acf76e5436fc96288aea717e141b97a4afd1ff61a17655b9636bf5e57aecef5f2f90cb14460e674610c64
+  data.tar.gz: '088b3823dcdd796f3f8b1d49b78135f37a0afe8c479552ca63ddd33983fe37c9f5697e38b85cb7024e0d7ee773e8c32bafc20a850674046c584f818f770fb4a8'

data/lib/ridgepole.rb

@@ -18,6 +18,8 @@ require 'ridgepole/default_limit'
 require 'ridgepole/delta'
 require 'ridgepole/diff'
 require 'ridgepole/dsl_parser'
+require 'ridgepole/dsl_parser/context'
+require 'ridgepole/dsl_parser/table_definition'
 require 'ridgepole/dumper'
 require 'ridgepole/execute_expander'
 require 'ridgepole/external_sql_executer'

data/lib/ridgepole/dsl_parser.rb

@@ -1,255 +1,4 @@
 class Ridgepole::DSLParser
-  class Context
-    class TableDefinition
-      attr_reader :__definition
-
-      def initialize(table_name, base)
-        @__definition = {}
-        @table_name = table_name
-        @base = base
-      end
-
-      def column(name, type, options = {})
-        name = name.to_s
-
-        @__definition[name] = {
-          :type => type,
-          :options => options,
-        }
-      end
-
-      TYPES = [
-        # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L274
-        :string,
-        :text,
-        :integer,
-        :bigint,
-        :float,
-        :decimal,
-        :datetime,
-        :timestamp,
-        :time,
-        :date,
-        :binary,
-        :boolean,
-
-        # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79
-        :daterange,
-        :numrange,
-        :tsrange,
-        :tstzrange,
-        :int4range,
-        :int8range,
-        :binary,
-        :boolean,
-        :bigint,
-        :xml,
-        :tsvector,
-        :hstore,
-        :inet,
-        :cidr,
-        :macaddr,
-        :uuid,
-        :json,
-        :jsonb,
-        :ltree,
-        :citext,
-        :point,
-        :bit,
-        :bit_varying,
-        :money,
-      ].uniq
-
-      TYPES.each do |column_type|
-        define_method column_type do |*args|
-          options = args.extract_options!
-          column_names = args
-          column_names.each {|name| column(name, column_type, options) }
-        end
-      end
-
-      ALIAS_TYPES = {
-        # https://github.com/rails/rails/blob/v5.0.0.rc1/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
-        tinyblob: [:blob, {limit: 255}],
-        mediumblob: [:binary, {limit: 16777215}],
-        longblob: [:binary, {limit: 4294967295}],
-        tinytext: [:text, {limit: 255}],
-        mediumtext: [:text, {limit: 16777215}],
-        longtext: [:text, {limit: 4294967295}],
-        unsigned_integer: [:integer, {unsigned: true}],
-        unsigned_bigint: [:bigint, {unsigned: true}],
-        unsigned_float: [:float, {limit: 24, unsigned: true}],
-        unsigned_decimal: [:decimal, {precision: 10, unsigned: true}],
-      }
-
-      # XXX:
-      def blob(*args)
-        options = args.extract_options!
-        options = {limit: 65535}.merge(options)
-        column_names = args
-
-        column_names.each do |name|
-          column_type = (0..0xff).include?(options[:limit]) ? :blob : :binary
-          column(name, column_type, options)
-        end
-      end
-
-      ALIAS_TYPES.each do |alias_type, (column_type, default_options)|
-        define_method alias_type do |*args|
-          options = args.extract_options!
-          options = default_options.merge(options)
-          column_names = args
-          column_names.each {|name| column(name, column_type, options) }
-        end
-      end
-
-      def index(name, options = {})
-        @base.add_index(@table_name, name, options)
-      end
-
-      def timestamps(*args)
-        options = {:null => false}.merge(args.extract_options!)
-        column(:created_at, :datetime, options)
-        column(:updated_at, :datetime, options)
-      end
-
-      def references(*args)
-        options = args.extract_options!
-        polymorphic = options.delete(:polymorphic)
-        index_options = options.delete(:index)
-        type = options.delete(:type) || :integer
-
-        args.each do |col|
-          column("#{col}_id", type, options)
-          column("#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) if polymorphic
-          if index_options
-            index("#{col}_id", index_options.is_a?(Hash) ? index_options : {})
-            index("#{col}_type", index_options.is_a?(Hash) ? index_options : {}) if polymorphic
-          end
-        end
-      end
-      alias :belongs_to :references
-    end
-
-    attr_reader :__definition
-    attr_reader :__execute
-
-    def initialize(opts = {})
-      @__working_dir = File.expand_path(opts[:path] ? File.dirname(opts[:path]) : Dir.pwd)
-      @__definition = {}
-      @__execute = []
-    end
-
-    def self.eval(dsl, opts = {})
-      ctx = self.new(opts)
-
-      if opts[:path]
-        ctx.instance_eval(dsl, opts[:path])
-      else
-        ctx.instance_eval(dsl)
-      end
-
-      [ctx.__definition, ctx.__execute]
-    end
-
-    def create_table(table_name, options = {})
-      table_name = table_name.to_s
-      table_definition = TableDefinition.new(table_name, self)
-
-      if options[:primary_key] and options[:primary_key].is_a?(Symbol)
-        options[:primary_key] = options[:primary_key].to_s
-      end
-
-      yield(table_definition)
-      @__definition[table_name] ||= {}
-
-      if @__definition[table_name][:definition]
-        raise "Table `#{table_name}` already defined"
-      end
-
-      @__definition[table_name][:definition] = table_definition.__definition
-      options.delete(:force)
-      @__definition[table_name][:options] = options
-    end
-
-    def add_index(table_name, column_name, options = {})
-      table_name = table_name.to_s
-      # Keep column_name for expression index support
-      # https://github.com/rails/rails/pull/23393
-      unless column_name.is_a?(String) && /\W/ === column_name
-        column_name = [column_name].flatten.map {|i| i.to_s }
-      end
-      options[:name] = options[:name].to_s if options[:name]
-      @__definition[table_name] ||= {}
-      @__definition[table_name][:indices] ||= {}
-      idx = options[:name] || column_name
-
-      if @__definition[table_name][:indices][idx]
-        raise "Index `#{table_name}(#{idx})` already defined"
-      end
-
-      if options[:length].is_a?(Numeric)
-        index_length = options[:length]
-        options[:length] = {}
-
-        column_name.each do |col|
-          options[:length][col] = index_length
-        end
-
-        # XXX: fix for https://github.com/rails/rails/commit/5025fd3a99c68f95bdd6fd43f382c62e9653236b
-        if ActiveRecord::VERSION::MAJOR >= 6 or (ActiveRecord::VERSION::MAJOR == 5 and (ActiveRecord::VERSION::MINOR >= 1 or ActiveRecord::VERSION::TINY >= 1))
-          options[:length] = options[:length].symbolize_keys
-        end
-      end
-
-      @__definition[table_name][:indices][idx] = {
-        :column_name => column_name,
-        :options => options,
-      }
-    end
-
-    def add_foreign_key(from_table, to_table, options = {})
-      unless options[:name]
-        raise "Foreign key name in `#{from_table}` is undefined"
-      end
-
-      from_table = from_table.to_s
-      to_table = to_table.to_s
-      options[:name] = options[:name].to_s
-      @__definition[from_table] ||= {}
-      @__definition[from_table][:foreign_keys] ||= {}
-      idx = options[:name]
-
-      if @__definition[from_table][:foreign_keys][idx]
-        raise "Foreign Key `#{from_table}(#{idx})` already defined"
-      end
-
-      @__definition[from_table][:foreign_keys][idx] = {
-        :to_table => to_table,
-        :options => options,
-      }
-    end
-
-    def require(file)
-      schemafile = (file =~ %r|\A/|) ? file : File.join(@__working_dir, file)
-
-      if File.exist?(schemafile)
-        instance_eval(File.read(schemafile), schemafile)
-      elsif File.exist?(schemafile + '.rb')
-        instance_eval(File.read(schemafile + '.rb'), schemafile + '.rb')
-      else
-        Kernel.require(file)
-      end
-    end
-
-    def execute(sql, name = nil, &cond)
-      @__execute << {
-        :sql => sql,
-        :condition => cond,
-      }
-    end
-  end
-
   def initialize(options = {})
     @options = options
   end

data/lib/ridgepole/dsl_parser/context.rb

@@ -0,0 +1,121 @@
+class Ridgepole::DSLParser
+  class Context
+    attr_reader :__definition
+    attr_reader :__execute
+
+    def initialize(opts = {})
+      @__working_dir = File.expand_path(opts[:path] ? File.dirname(opts[:path]) : Dir.pwd)
+      @__definition = {}
+      @__execute = []
+    end
+
+    def self.eval(dsl, opts = {})
+      ctx = self.new(opts)
+
+      if opts[:path]
+        ctx.instance_eval(dsl, opts[:path])
+      else
+        ctx.instance_eval(dsl)
+      end
+
+      [ctx.__definition, ctx.__execute]
+    end
+
+    def create_table(table_name, options = {})
+      table_name = table_name.to_s
+      table_definition = TableDefinition.new(table_name, self)
+
+      if options[:primary_key] and options[:primary_key].is_a?(Symbol)
+        options[:primary_key] = options[:primary_key].to_s
+      end
+
+      yield(table_definition)
+      @__definition[table_name] ||= {}
+
+      if @__definition[table_name][:definition]
+        raise "Table `#{table_name}` already defined"
+      end
+
+      @__definition[table_name][:definition] = table_definition.__definition
+      options.delete(:force)
+      @__definition[table_name][:options] = options
+    end
+
+    def add_index(table_name, column_name, options = {})
+      table_name = table_name.to_s
+      # Keep column_name for expression index support
+      # https://github.com/rails/rails/pull/23393
+      unless column_name.is_a?(String) && /\W/ === column_name
+        column_name = [column_name].flatten.map {|i| i.to_s }
+      end
+      options[:name] = options[:name].to_s if options[:name]
+      @__definition[table_name] ||= {}
+      @__definition[table_name][:indices] ||= {}
+      idx = options[:name] || column_name
+
+      if @__definition[table_name][:indices][idx]
+        raise "Index `#{table_name}(#{idx})` already defined"
+      end
+
+      if options[:length].is_a?(Numeric)
+        index_length = options[:length]
+        options[:length] = {}
+
+        column_name.each do |col|
+          options[:length][col] = index_length
+        end
+
+        # XXX: fix for https://github.com/rails/rails/commit/5025fd3a99c68f95bdd6fd43f382c62e9653236b
+        if ActiveRecord::VERSION::MAJOR >= 6 or (ActiveRecord::VERSION::MAJOR == 5 and (ActiveRecord::VERSION::MINOR >= 1 or ActiveRecord::VERSION::TINY >= 1))
+          options[:length] = options[:length].symbolize_keys
+        end
+      end
+
+      @__definition[table_name][:indices][idx] = {
+        :column_name => column_name,
+        :options => options,
+      }
+    end
+
+    def add_foreign_key(from_table, to_table, options = {})
+      unless options[:name]
+        raise "Foreign key name in `#{from_table}` is undefined"
+      end
+
+      from_table = from_table.to_s
+      to_table = to_table.to_s
+      options[:name] = options[:name].to_s
+      @__definition[from_table] ||= {}
+      @__definition[from_table][:foreign_keys] ||= {}
+      idx = options[:name]
+
+      if @__definition[from_table][:foreign_keys][idx]
+        raise "Foreign Key `#{from_table}(#{idx})` already defined"
+      end
+
+      @__definition[from_table][:foreign_keys][idx] = {
+        :to_table => to_table,
+        :options => options,
+      }
+    end
+
+    def require(file)
+      schemafile = (file =~ %r|\A/|) ? file : File.join(@__working_dir, file)
+
+      if File.exist?(schemafile)
+        instance_eval(File.read(schemafile), schemafile)
+      elsif File.exist?(schemafile + '.rb')
+        instance_eval(File.read(schemafile + '.rb'), schemafile + '.rb')
+      else
+        Kernel.require(file)
+      end
+    end
+
+    def execute(sql, name = nil, &cond)
+      @__execute << {
+        :sql => sql,
+        :condition => cond,
+      }
+    end
+  end
+end

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -0,0 +1,132 @@
+class Ridgepole::DSLParser
+  class TableDefinition
+    attr_reader :__definition
+
+    def initialize(table_name, base)
+      @__definition = {}
+      @table_name = table_name
+      @base = base
+    end
+
+    def column(name, type, options = {})
+      name = name.to_s
+
+      @__definition[name] = {
+        :type => type,
+        :options => options,
+      }
+    end
+
+    TYPES = [
+      # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L274
+      :string,
+      :text,
+      :integer,
+      :bigint,
+      :float,
+      :decimal,
+      :datetime,
+      :timestamp,
+      :time,
+      :date,
+      :binary,
+      :boolean,
+
+      # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79
+      :daterange,
+      :numrange,
+      :tsrange,
+      :tstzrange,
+      :int4range,
+      :int8range,
+      :binary,
+      :boolean,
+      :bigint,
+      :xml,
+      :tsvector,
+      :hstore,
+      :inet,
+      :cidr,
+      :macaddr,
+      :uuid,
+      :json,
+      :jsonb,
+      :ltree,
+      :citext,
+      :point,
+      :bit,
+      :bit_varying,
+      :money,
+    ].uniq
+
+    TYPES.each do |column_type|
+      define_method column_type do |*args|
+        options = args.extract_options!
+        column_names = args
+        column_names.each {|name| column(name, column_type, options) }
+      end
+    end
+
+    ALIAS_TYPES = {
+      # https://github.com/rails/rails/blob/v5.0.0.rc1/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
+      tinyblob: [:blob, {limit: 255}],
+      mediumblob: [:binary, {limit: 16777215}],
+      longblob: [:binary, {limit: 4294967295}],
+      tinytext: [:text, {limit: 255}],
+      mediumtext: [:text, {limit: 16777215}],
+      longtext: [:text, {limit: 4294967295}],
+      unsigned_integer: [:integer, {unsigned: true}],
+      unsigned_bigint: [:bigint, {unsigned: true}],
+      unsigned_float: [:float, {limit: 24, unsigned: true}],
+      unsigned_decimal: [:decimal, {precision: 10, unsigned: true}],
+    }
+
+    # XXX:
+    def blob(*args)
+      options = args.extract_options!
+      options = {limit: 65535}.merge(options)
+      column_names = args
+
+      column_names.each do |name|
+        column_type = (0..0xff).include?(options[:limit]) ? :blob : :binary
+        column(name, column_type, options)
+      end
+    end
+
+    ALIAS_TYPES.each do |alias_type, (column_type, default_options)|
+      define_method alias_type do |*args|
+        options = args.extract_options!
+        options = default_options.merge(options)
+        column_names = args
+        column_names.each {|name| column(name, column_type, options) }
+      end
+    end
+
+    def index(name, options = {})
+      @base.add_index(@table_name, name, options)
+    end
+
+    def timestamps(*args)
+      options = {:null => false}.merge(args.extract_options!)
+      column(:created_at, :datetime, options)
+      column(:updated_at, :datetime, options)
+    end
+
+    def references(*args)
+      options = args.extract_options!
+      polymorphic = options.delete(:polymorphic)
+      index_options = options.delete(:index)
+      type = options.delete(:type) || :integer
+
+      args.each do |col|
+        column("#{col}_id", type, options)
+        column("#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) if polymorphic
+        if index_options
+          index("#{col}_id", index_options.is_a?(Hash) ? index_options : {})
+          index("#{col}_type", index_options.is_a?(Hash) ? index_options : {}) if polymorphic
+        end
+      end
+    end
+    alias :belongs_to :references
+  end
+end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.6.beta'
+  VERSION = '0.6.6.beta2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.6.beta
+  version: 0.6.6.beta2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -226,6 +226,8 @@ files:
 - lib/ridgepole/delta.rb
 - lib/ridgepole/diff.rb
 - lib/ridgepole/dsl_parser.rb
+- lib/ridgepole/dsl_parser/context.rb
+- lib/ridgepole/dsl_parser/table_definition.rb
 - lib/ridgepole/dumper.rb
 - lib/ridgepole/execute_expander.rb
 - lib/ridgepole/ext/abstract_mysql_adapter/disable_table_options.rb