schema_plus 2.0.0.pre5 → 2.0.0.pre6

data/spec/spec_helper.rb

@@ -18,18 +18,18 @@ SchemaDev::Rspec.setup
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.include(SchemaPlusMatchers)
-  config.include(SchemaPlusHelpers)
+  config.include(SchemaPlus::Matchers)
+  config.include(SchemaPlus::Helpers)
   config.warnings = true
 end
 
 def with_fk_config(opts, &block)
-  save = Hash[opts.keys.collect{|key| [key, SchemaPlusForeignKeys.config.send(key)]}]
+  save = Hash[opts.keys.collect{|key| [key, SchemaPlus::ForeignKeys.config.send(key)]}]
   begin
-    SchemaPlusForeignKeys.config.update_attributes(opts)
+    SchemaPlus::ForeignKeys.config.update_attributes(opts)
     yield
   ensure
-    SchemaPlusForeignKeys.config.update_attributes(save)
+    SchemaPlus::ForeignKeys.config.update_attributes(save)
   end
 end
 

data/spec/support/helpers.rb

@@ -1,4 +1,4 @@
-module SchemaPlusHelpers
+module SchemaPlus::Helpers
   extend self
 
   def suppress_messages

data/spec/support/matchers/have_index.rb

@@ -1,4 +1,4 @@
-module SchemaPlusMatchers
+module SchemaPlus::Matchers
 
   class HaveIndex
 

data/spec/support/matchers/reference.rb

@@ -1,4 +1,4 @@
-module SchemaPlusMatchers
+module SchemaPlus::Matchers
 
   class Reference
     def initialize(expected)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre5
+  version: 2.0.0.pre6
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -73,6 +73,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: schema_plus_columns
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +96,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +106,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: schema_plus_pg_indexes
   requirement: !ruby/object:Gem::Requirement
@@ -236,48 +250,44 @@ files:
 - gemfiles/activerecord-4.2/Gemfile.postgresql
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
 - lib/schema_plus.rb
+- lib/schema_plus/db_default.rb
+- lib/schema_plus/db_default/active_record/attribute.rb
+- lib/schema_plus/db_default/db_default.rb
+- lib/schema_plus/db_default/middleware.rb
+- lib/schema_plus/default_expr.rb
+- lib/schema_plus/default_expr/active_record/connection_adapters/column.rb
+- lib/schema_plus/default_expr/active_record/connection_adapters/mysql2_adapter.rb
+- lib/schema_plus/default_expr/active_record/connection_adapters/postgresql_adapter.rb
+- lib/schema_plus/default_expr/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/schema_plus/default_expr/middleware.rb
+- lib/schema_plus/enums.rb
+- lib/schema_plus/enums/active_record.rb
+- lib/schema_plus/enums/middleware.rb
+- lib/schema_plus/foreign_keys.rb
+- lib/schema_plus/foreign_keys/active_record/base.rb
+- lib/schema_plus/foreign_keys/active_record/connection_adapters/abstract_adapter.rb
+- lib/schema_plus/foreign_keys/active_record/connection_adapters/foreign_key_definition.rb
+- lib/schema_plus/foreign_keys/active_record/connection_adapters/mysql2_adapter.rb
+- lib/schema_plus/foreign_keys/active_record/connection_adapters/postgresql_adapter.rb
+- lib/schema_plus/foreign_keys/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/schema_plus/foreign_keys/active_record/connection_adapters/table_definition.rb
+- lib/schema_plus/foreign_keys/active_record/migration/command_recorder.rb
+- lib/schema_plus/foreign_keys/active_record/schema.rb
+- lib/schema_plus/foreign_keys/middleware/dumper.rb
+- lib/schema_plus/foreign_keys/middleware/migration.rb
+- lib/schema_plus/foreign_keys/middleware/model.rb
+- lib/schema_plus/foreign_keys/middleware/sql.rb
+- lib/schema_plus/foreign_keys/version.rb
+- lib/schema_plus/tables.rb
+- lib/schema_plus/tables/active_record/connection_adapters/abstract_adapter.rb
+- lib/schema_plus/tables/active_record/connection_adapters/mysql2_adapter.rb
+- lib/schema_plus/tables/active_record/connection_adapters/postgresql_adapter.rb
+- lib/schema_plus/tables/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_plus/version.rb
-- lib/schema_plus_columns.rb
-- lib/schema_plus_columns/active_record/connection_adapters/column.rb
-- lib/schema_plus_columns/middleware/model.rb
-- lib/schema_plus_db_default.rb
-- lib/schema_plus_db_default/active_record/attribute.rb
-- lib/schema_plus_db_default/db_default.rb
-- lib/schema_plus_db_default/middleware.rb
-- lib/schema_plus_default_expr.rb
-- lib/schema_plus_default_expr/active_record/connection_adapters/column.rb
-- lib/schema_plus_default_expr/active_record/connection_adapters/mysql2_adapter.rb
-- lib/schema_plus_default_expr/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_plus_default_expr/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_plus_default_expr/middleware.rb
-- lib/schema_plus_enums.rb
-- lib/schema_plus_enums/active_record.rb
-- lib/schema_plus_enums/middleware.rb
-- lib/schema_plus_foreign_keys.rb
-- lib/schema_plus_foreign_keys/active_record/base.rb
-- lib/schema_plus_foreign_keys/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_plus_foreign_keys/active_record/connection_adapters/foreign_key_definition.rb
-- lib/schema_plus_foreign_keys/active_record/connection_adapters/mysql2_adapter.rb
-- lib/schema_plus_foreign_keys/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_plus_foreign_keys/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_plus_foreign_keys/active_record/connection_adapters/table_definition.rb
-- lib/schema_plus_foreign_keys/active_record/migration/command_recorder.rb
-- lib/schema_plus_foreign_keys/active_record/schema.rb
-- lib/schema_plus_foreign_keys/middleware/dumper.rb
-- lib/schema_plus_foreign_keys/middleware/migration.rb
-- lib/schema_plus_foreign_keys/middleware/model.rb
-- lib/schema_plus_foreign_keys/middleware/sql.rb
-- lib/schema_plus_foreign_keys/version.rb
-- lib/schema_plus_tables.rb
-- lib/schema_plus_tables/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_plus_tables/active_record/connection_adapters/mysql2_adapter.rb
-- lib/schema_plus_tables/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_plus_tables/active_record/connection_adapters/sqlite3_adapter.rb
 - schema_dev.yml
 - schema_plus.gemspec
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
-- spec/schema_plus_columns/column_spec.rb
 - spec/schema_plus_db_default/column_spec.rb
 - spec/schema_plus_default_expr/column_default_spec.rb
 - spec/schema_plus_default_expr/migration_spec.rb
@@ -323,7 +333,6 @@ summary: Enhances ActiveRecord schema mechanism, including more DRY index creati
 test_files:
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
-- spec/schema_plus_columns/column_spec.rb
 - spec/schema_plus_db_default/column_spec.rb
 - spec/schema_plus_default_expr/column_default_spec.rb
 - spec/schema_plus_default_expr/migration_spec.rb

data/lib/schema_plus_columns.rb

@@ -1,7 +0,0 @@
-require 'schema_monkey'
-require 'schema_plus_indexes'
-
-require_relative 'schema_plus_columns/active_record/connection_adapters/column'
-require_relative 'schema_plus_columns/middleware/model'
-
-SchemaMonkey.register(SchemaPlusColumns)

data/lib/schema_plus_columns/active_record/connection_adapters/column.rb

@@ -1,65 +0,0 @@
-module SchemaPlusColumns
-  module ActiveRecord
-    module ConnectionAdapters
-
-      #
-      # SchemaPlusIndex adds several methods to Column
-      #
-      module Column
-
-        attr_writer :model # model assigned set by Middleware::Model::Columns
-
-        # Returns the list of IndexDefinition instances for each index that
-        # refers to this column.  Returns an empty list if there are no
-        # such indexes.
-        def indexes
-          @indexes ||= @model.indexes.select{|index| index.columns.include? self.name}
-        end
-
-        # If the column is in a unique index, returns a list of names of other columns in
-        # the index.  Returns an empty list if it's a single-column index.
-        # Returns nil if the column is not in a unique index.
-        def unique_scope
-          if index = indexes.select{|i| i.unique}.sort_by{|i| i.columns.size}.first
-            index.columns.reject{|name| name == self.name}
-          end
-        end
-
-        # Returns true if the column is in a unique index.  See also
-        # unique_scope
-        def unique?
-          indexes.any?{|i| i.unique}
-        end
-
-        # Returns true if the column is in one or more indexes that are
-        # case sensitive.  Will raise exception if
-        # IndexDefinition#case_sensitive? isn't defined, i.e. if
-        # schema_plus_pg_indexes hasn't been loaded.
-        def case_sensitive?
-          indexes.any?{|i| i.case_sensitive?}
-        end
-
-        # The default as_jon includes all instance variables.  but
-        # @model can't be dumped (it contains circular references)
-        def as_json(options=nil)
-          instance_values.except "model", "adapter"
-        end
-
-        # Returns the circumstance in which the column must have a value:
-        #   nil     if the column may be null
-        #   :save   if the column has no default value
-        #   :update otherwise
-        def required_on
-          if null
-            nil
-          elsif default.nil?
-            :save
-          else
-            :update
-          end
-        end
-      end
-    end
-  end
-end
-

data/lib/schema_plus_columns/middleware/model.rb

@@ -1,16 +0,0 @@
-module SchemaPlusColumns
-  module Middleware
-    module Model
-
-      module Columns
-
-        def after(env)
-          env.columns.each do |column|
-            column.model = env.model
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/schema_plus_db_default.rb

@@ -1,7 +0,0 @@
-require 'schema_monkey'
-
-require_relative 'schema_plus_db_default/active_record/attribute'
-require_relative 'schema_plus_db_default/db_default'
-require_relative 'schema_plus_db_default/middleware'
-
-SchemaMonkey.register(SchemaPlusDbDefault)

data/lib/schema_plus_enums.rb

@@ -1,6 +0,0 @@
-require 'schema_monkey'
-
-require_relative 'schema_plus_enums/active_record'
-require_relative 'schema_plus_enums/middleware'
-
-SchemaMonkey.register(SchemaPlusEnums)

data/lib/schema_plus_foreign_keys/version.rb

@@ -1,3 +0,0 @@
-module SchemaPlusForeignKeys
-  VERSION = "0.1.0"
-end

data/lib/schema_plus_tables.rb

@@ -1,15 +0,0 @@
-require 'schema_monkey'
-
-require_relative 'schema_plus_tables/active_record/connection_adapters/abstract_adapter'
-
-module SchemaPlusTables
-  module ActiveRecord
-    module ConnectionAdapters
-      autoload :Mysql2Adapter, 'schema_plus_tables/active_record/connection_adapters/mysql2_adapter'
-      autoload :PostgresqlAdapter, 'schema_plus_tables/active_record/connection_adapters/postgresql_adapter'
-      autoload :Sqlite3Adapter, 'schema_plus_tables/active_record/connection_adapters/sqlite3_adapter'
-    end
-  end
-end
-
-SchemaMonkey.register(SchemaPlusTables)

data/spec/schema_plus_columns/column_spec.rb

@@ -1,156 +0,0 @@
-require 'spec_helper'
-
-describe "Column" do
-
-  before(:all) do
-      class User < ::ActiveRecord::Base ; end
-  end
-
-  let(:migration) { ::ActiveRecord::Migration }
-
-  context "JSON serialization" do
-    before(:each) do
-      create_table(User, :login => { :index => true})
-      @login = User.columns.find{|column| column.name == "login"}
-    end
-    it "works properly" do
-      type = case
-             when SchemaDev::Rspec::Helpers.mysql?
-               { "sql_type" => "varchar(255)" }
-             when SchemaDev::Rspec::Helpers.postgresql?
-               { "sql_type" => "character varying" }
-             when SchemaDev::Rspec::Helpers.sqlite3?
-               { "sql_type" => "varchar" }
-             end
-      expect(JSON.parse(@login.to_json)).to include(type.merge("name" => "login"))
-    end
-  end
-
-  context "regarding indexes" do
-
-    context "if not unique" do
-
-      before(:each) do
-        create_table(User, :login => { :index => true})
-        @login = User.columns.find{|column| column.name == "login"}
-      end
-
-      it "should report not unique" do
-        expect(@login).not_to be_unique
-      end
-
-      it "should report nil unique scope" do
-        create_table(User, :login => { :index => true})
-        expect(@login.unique_scope).to be_nil
-      end
-    end
-
-    context "if unique single column" do
-      before(:each) do
-        create_table(User, :login => { :index => :unique})
-        @login = User.columns.find{|column| column.name == "login"}
-      end
-
-      it "should report unique" do
-        expect(@login).to be_unique
-      end
-
-      it "should report an empty unique scope" do
-        expect(@login.unique_scope).to eq([])
-      end
-    end
-
-    context "if unique multicolumn" do
-
-      before(:each) do
-        create_table(User, :first => {}, :middle => {}, :last => { :index => {:with => [:first, :middle], :unique => true}})
-        @first = User.columns.find{|column| column.name == "first"}
-        @middle = User.columns.find{|column| column.name == "middle"}
-        @last = User.columns.find{|column| column.name == "last"}
-      end
-
-      it "should report unique for each" do
-        expect(@first).to be_unique
-        expect(@middle).to be_unique
-        expect(@last).to be_unique
-      end
-
-      it "should report unique scope for each" do
-        expect(@first.unique_scope).to match_array(%W[middle last])
-        expect(@middle.unique_scope).to match_array(%W[first last])
-        expect(@last.unique_scope).to match_array(%W[first middle])
-      end
-    end
-
-    context "with case insensitive" do
-      before(:each) do
-        create_table(User, :login => { :index => {}})
-        User.reset_column_information
-        @column = User.columns.find(&its.name == "login")
-      end
-
-      context "index", :mysql => :skip do
-
-        it "reports column as case insensitive" do
-          allow(User.indexes.first).to receive(:case_sensitive?).and_return(false);
-          expect(@column).not_to be_case_sensitive
-        end
-      end
-
-      context "database", :mysql => :only do
-
-        # make sure we haven't broken mysql's method
-        it "reports column as case insensitive" do
-          allow(migration).to receive(:collation).and_return("utf8_unicode_ci") # mysql determines case insensitivity its own way
-          expect(@column).not_to be_case_sensitive
-        end
-      end
-    end
-
-  end
-
-  context "regarding when it requires a value" do
-
-    it "not required if the column can be null" do
-      create_table(User, :login => { :null => true})
-      expect(User.columns.find{|column| column.name == "login"}.required_on).to be_nil
-    end
-
-    it "must have a value on :save if there's no default" do
-      create_table(User, :login => { :null => false })
-      expect(User.columns.find{|column| column.name == "login"}.required_on).to eq(:save)
-    end
-
-    it "must have a value on :update if there's default" do
-      create_table(User, :login => { :null => false, :default => "foo" })
-      expect(User.columns.find{|column| column.name == "login"}.required_on).to eq(:update)
-    end
-
-  end
-
-  context "Postgresql array", :postgresql => :only do
-
-    before(:each) do
-      create_table(User, :alpha => { :default => [], :array => true })
-    end
-
-    it "respects array: true" do
-      column = User.columns.find(&its.name == "alpha")
-      expect(column.array).to be_truthy
-    end
-  end
-
-  protected
-
-  def create_table(model, columns_with_options)
-    migration.suppress_messages do
-      migration.create_table model.table_name, :force => true do |t|
-        columns_with_options.each_pair do |column, options|
-          t.send :string, column, options
-        end
-      end
-      model.reset_column_information
-    end
-  end
-
-end