mini_record 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a1cc995d7a4bc966d6aa5408ddccf9e69df115
-  data.tar.gz: c6506a687118394b8302ae7791b61e775e3915bf
+  metadata.gz: 3fd46ce5c4e1771383d8c7d957c5ef5e5cf8125b
+  data.tar.gz: 5af6a72b0753880d14aab443a98e8d250785fee1
 SHA512:
-  metadata.gz: 837c811faa4db44c8b8882075b9b0e080d765ee5666cb5075510358e6a71ed43a2431f833e8f04fa4dc60c0b7424ad81a6b727b1f6b9b4d7c1ec57d26e89fa15
-  data.tar.gz: 52747b51587991a9ffb2ee1ea3e50d66309c549536e1285d46d24b50dc1da478b3b47fd9c76c606d1cf47c166f3f05383bfae2d454c2d9c9693696f13c4c8b55
+  metadata.gz: 3281bb6e931815f700f8b1e617797d44566a10e497edfa66c7227326636e3f3d38efc015f939fba2909d48b30fcd85cfcf3fdab27d25480df76a48f010b41a7a
+  data.tar.gz: 122d59cb22ebc304d27cb4f100f94ff6656024071b00fc3ae55b6c2c91750185a753f1454ee65e126bd04add1e8734cad4bfcdecb24df6c6d720b4b832b363a3

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
-before_install: 'gem update --system'
+before_install:
+  - gem update --system
+  - gem update bundler
 rvm:
   - 1.9.3
   - 2.1.0

data/lib/mini_record/auto_schema.rb

@@ -114,7 +114,7 @@ module MiniRecord
           #   t.column :type, "ENUM('EMPLOYEE','CLIENT','SUPERUSER','DEVELOPER')"
           if type.is_a?(String)
             # will be converted in: t.column :type, "ENUM('EMPLOYEE','CLIENT')"
-            options.reverse_merge!(:limit => 0) unless postgresql_range?(type)
+            options.reverse_merge!(:limit => 0) unless postgresql_limitless_column?(type)
             table_definition.column(column_name, type, options)
           else
             # wil be converted in: t.string :name
@@ -139,9 +139,9 @@ module MiniRecord
       alias :property  :field
       alias :col       :field
 
-      def postgresql_range? type
+      def postgresql_limitless_column? type
         return unless connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-        type =~ /range/
+        type =~ /range|json/i
       end
 
       def timestamps
@@ -320,7 +320,14 @@ module MiniRecord
                 table = if name = association.options[:join_table]
                           name.to_s
                         else
-                          [table_name, association.name.to_s].sort.join("_")
+                          association_table_name = association.name.to_s.classify.constantize.table_name
+                          table_name_substrings  = [table_name,association_table_name].collect { |string| string.split('_') }
+                          common_substrings      = Array.new
+                          table_name_substrings.first.each_index { |i| table_name_substrings.first[i] == table_name_substrings.last[i] ? common_substrings.push(table_name_substrings.first[i]) : break }
+                          common_prefix          = common_substrings.join('_')
+                          table_names            = [table_name.clone,association_table_name.clone].sort
+                          table_names.last.gsub!(/^#{common_prefix}_/,'')
+                          table_names.join("_")
                         end
                 unless connection.tables.include?(table.to_s)
                   foreign_key             = association.options[:foreign_key] || association.foreign_key
@@ -411,7 +418,9 @@ module MiniRecord
           # Add indexes
           indexes.each do |name, options|
             options = options.dup
-            index_name = (options[:name] || name).to_s
+            options.delete(:foreign)
+            adjusted_index_name = "index_#{table_name}_on_" + (options[:column].is_a?(Array) ? options[:column].join('_and_') : options[:column]).to_s
+            index_name = (options[:name] || adjusted_index_name).to_s
             unless connection.indexes(table_name).detect { |i| i.name == index_name }
               logger.debug "[MiniRecord] Adding index #{index_name} #{options[:column].inspect} on #{table_name}" if logger
               connection.add_index(table_name, options.delete(:column), options) unless dry_run

data/lib/mini_record/version.rb

@@ -1,3 +1,3 @@
 module MiniRecord
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_record
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Davide D'Agostino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mini_record
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: MiniRecord is a micro gem that allow you to write schema inside your model