active_type 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68b30f74cacafd71c8c3cdeb7a16f0819bbe5826
-  data.tar.gz: 347ebc899df117c5265c505aec13bb6f77a4f82b
+  metadata.gz: 246492245829189c234439a8edd6332010b65cb1
+  data.tar.gz: 8f1067dcb972089bbee267c147b17782513795f3
 SHA512:
-  metadata.gz: c13099db232d67a515d3a2a417d2bf3a95549ca69a9772a27e128fef1dffaa20caae45990b16a16ee3745482c11f7b58a737075ba97284057ea6b476fbdbb4ae
-  data.tar.gz: 23b0da781115e740380532c8092abb3bb74d175e99b56b7d46cdb9fec82e4161568794d95505ce4582822935c1d38d5c5f9a562b25b8ca97258aee7ede110009
+  metadata.gz: 30e1c1b46bbb13e3ea56700c001e756d6f7321ab9148f7aec98875114a49549cefe9bb03a888b3ed137632698aa15c933ddfc690abef9b0e67e36fddfd0ba928
+  data.tar.gz: 6e507ab9b563b8830a031f090cc05a8e1b5b3c4202ed7ce8029eaf61f4fddc183e21414267f6ae3c6fc46e1f58252273ce9396e710a33b2d8317183567fba5a5

data/.gitignore

@@ -4,3 +4,4 @@ tags
 *.gem
 .idea
 tmp
+spec/support/database.yml

data/.travis.yml

@@ -6,13 +6,16 @@ rvm:
   - "2.1.2"
   - "2.2.0"
 gemfile:
-  - gemfiles/Gemfile.3.2
-  - gemfiles/Gemfile.4.0
-  - gemfiles/Gemfile.4.1
-  - gemfiles/Gemfile.4.2.1
+  - gemfiles/Gemfile.3.2.mysql2
+  - gemfiles/Gemfile.3.2.sqlite3
+  - gemfiles/Gemfile.4.0.sqlite3
+  - gemfiles/Gemfile.4.1.sqlite3
+  - gemfiles/Gemfile.4.2.1.mysql2
   - gemfiles/Gemfile.4.2.1.pg
+  - gemfiles/Gemfile.4.2.1.sqlite3
 before_script:
   - psql -c 'create database active_type_test;' -U postgres
+  - mysql -e 'create database IF NOT EXISTS active_type_test;'
 script: bundle exec rspec spec
 notifications:
   email:
@@ -23,24 +26,28 @@ branches:
 matrix:
   exclude:
     - rvm: "1.8.7"
-      gemfile: gemfiles/Gemfile.4.0
+      gemfile: gemfiles/Gemfile.4.0.sqlite3
     - rvm: "1.8.7"
-      gemfile: gemfiles/Gemfile.4.1
+      gemfile: gemfiles/Gemfile.4.1.sqlite3
     - rvm: "1.8.7"
-      gemfile: gemfiles/Gemfile.4.2.1
+      gemfile: gemfiles/Gemfile.4.2.1.sqlite3
+    - rvm: "1.8.7"
+      gemfile: gemfiles/Gemfile.4.2.1.mysql2
     - rvm: "1.8.7"
       gemfile: gemfiles/Gemfile.4.2.1.pg
+    - rvm: "1.9.3"
+      gemfile: gemfiles/Gemfile.4.2.1.mysql2
     - rvm: "1.9.3"
       gemfile: gemfiles/Gemfile.4.2.1.pg
+    - rvm: "2.0.0"
+      gemfile: gemfiles/Gemfile.4.2.1.mysql2
     - rvm: "2.0.0"
       gemfile: gemfiles/Gemfile.4.2.1.pg
-
     - rvm: "2.1.2"
-      gemfile: gemfiles/Gemfile.3.2
-    - rvm: "2.1.2"
-      gemfile: gemfiles/Gemfile.4.0
-
+      gemfile: gemfiles/Gemfile.4.0.sqlite3
+    - rvm: "2.2.0"
+      gemfile: gemfiles/Gemfile.3.2.sqlite3
     - rvm: "2.2.0"
-      gemfile: gemfiles/Gemfile.3.2
+      gemfile: gemfiles/Gemfile.3.2.mysql2
     - rvm: "2.2.0"
-      gemfile: gemfiles/Gemfile.4.0
+      gemfile: gemfiles/Gemfile.4.0.sqlite3

data/README.md

@@ -193,7 +193,7 @@ end
 
 - You have to say `nests_many :records`
 - `records` will be validated and saved automatically
-- The generated `.records_attributes =` expects parameters like `ActiveRecord`'s nested attributes, and words together with the `fields_for` helper:
+- The generated `.records_attributes =` expects parameters like `ActiveRecord`'s nested attributes, and works together with the `fields_for` helper:
 
   - either as a hash (where the keys are meaningless)
 
@@ -335,6 +335,9 @@ Development
 - You can run specs against all versions with `rake all:spec`.
 - You can run specs against a single version with `VERSION=4.0 rake`.
 
+If you are getting testing failures due to Mysql trying to connect as `root` user, you can put your Mysql credentials into `spec/support/database.yml`.
+See `spec/support/database.sample.yml` for an example.
+
 If you would like to contribute:
 
 - Fork the repository.

data/gemfiles/Gemfile.3.2.mysql2

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '=3.2.22'
+gem 'rspec', '<2.99'
+gem 'mysql2', '= 0.3.11'
+
+gem 'active_type', :path => '..'
+gem 'i18n', '=0.6.11' # 0.7 no longer builds for Ruby 1.8.7

data/gemfiles/Gemfile.3.2.mysql2.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.4.2)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
+      builder (~> 3.0.0)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.22)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    diff-lcs (1.2.5)
+    i18n (0.6.11)
+    multi_json (1.11.2)
+    mysql2 (0.3.11)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    tzinfo (0.3.45)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (= 3.2.22)
+  i18n (= 0.6.11)
+  mysql2 (= 0.3.11)
+  rspec (< 2.99)
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/{Gemfile.3.2 → Gemfile.3.2.sqlite3}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~>3.2.0'
+gem 'activerecord', '=3.2.22'
 gem 'rspec', '<2.99'
 gem 'sqlite3'
 

data/gemfiles/{Gemfile.3.2.lock → Gemfile.3.2.sqlite3.lock}

@@ -7,15 +7,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.21)
+    activesupport (3.2.22)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
@@ -39,7 +39,10 @@ PLATFORMS
 
 DEPENDENCIES
   active_type!
-  activerecord (~> 3.2.0)
+  activerecord (= 3.2.22)
   i18n (= 0.6.11)
   rspec (< 2.99)
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/Gemfile.4.2.1.mysql2

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>4.2.1'
+gem 'rspec', '<2.99'
+gem 'mysql2', '~> 0.3.17'
+
+gem 'active_type', :path => '..'

data/gemfiles/Gemfile.4.2.1.mysql2.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.4.2)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.7.0)
+    mysql2 (0.3.20)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 4.2.1)
+  mysql2 (~> 0.3.17)
+  rspec (< 2.99)
+
+BUNDLED WITH
+   1.10.6

data/lib/active_type/type_caster.rb

@@ -68,8 +68,8 @@ module ActiveType
           # The specified type (e.g. "string") may not necessary match the
           # native type ("varchar") expected by the connection adapter.
           # PostgreSQL is one of these. Perform a translation if the adapter
-          # supports it.
-          if !type.nil? && connection.respond_to?(:native_database_types)
+          # supports it (but don't turn a mysql boolean into a tinyint).
+          if !type.nil? && !(type == :boolean) && connection.respond_to?(:native_database_types)
             native_type = connection.native_database_types[type.to_sym]
             if native_type && native_type[:name]
               type = native_type[:name]

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/spec_helper.rb

@@ -6,8 +6,8 @@ require 'active_type'
 
 ActiveRecord::Base.default_timezone = :local
 
-Dir["#{File.dirname(__FILE__)}/support/*"].each {|f| require f}
-Dir["#{File.dirname(__FILE__)}/shared_examples/*"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/shared_examples/*.rb"].each {|f| require f}
 
 
 RSpec.configure do |config|

data/spec/support/database.rb

@@ -1,18 +1,32 @@
-begin
-  # sqlite?
-  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-rescue Gem::LoadError
-  # pg?
+require 'yaml'
+
+# pg?
+case ENV['BUNDLE_GEMFILE']
+when /pg/
   if ENV['TRAVIS']
     ActiveRecord::Base.establish_connection(:adapter => 'postgresql', :database => 'active_type_test', :username => 'postgres')
   else
     ActiveRecord::Base.establish_connection(:adapter => 'postgresql', :database => 'active_type_test')
   end
-
-  connection = ::ActiveRecord::Base.connection
-  connection.tables.each do |table|
-    connection.drop_table table
+# mysql2?
+when /mysql2/
+  config = { :adapter => 'mysql2', :encoding => 'utf8', :database => 'active_type_test' }
+  custom_config_path = File.join(File.dirname(__FILE__), 'database.yml')
+  if File.exists?(custom_config_path)
+    custom_config = YAML.load_file(custom_config_path)
+    config.merge!(custom_config)
   end
+  ActiveRecord::Base.establish_connection(config)
+when /sqlite3/
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+else
+  raise "Unknown database type in Gemfile suffix: #{ENV['BUNDLE_GEMFILE']}"
+end
+
+
+connection = ::ActiveRecord::Base.connection
+connection.tables.each do |table|
+  connection.drop_table table
 end
 
 ActiveRecord::Migration.class_eval do

data/spec/support/database.sample.yml

@@ -0,0 +1,3 @@
+host: localhost
+username: joe
+password: secret

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,16 +67,20 @@ files:
 - README.md
 - Rakefile
 - active_type.gemspec
-- gemfiles/Gemfile.3.2
-- gemfiles/Gemfile.3.2.lock
-- gemfiles/Gemfile.4.0
-- gemfiles/Gemfile.4.0.lock
-- gemfiles/Gemfile.4.1
-- gemfiles/Gemfile.4.1.lock
-- gemfiles/Gemfile.4.2.1
-- gemfiles/Gemfile.4.2.1.lock
+- gemfiles/Gemfile.3.2.mysql2
+- gemfiles/Gemfile.3.2.mysql2.lock
+- gemfiles/Gemfile.3.2.sqlite3
+- gemfiles/Gemfile.3.2.sqlite3.lock
+- gemfiles/Gemfile.4.0.sqlite3
+- gemfiles/Gemfile.4.0.sqlite3.lock
+- gemfiles/Gemfile.4.1.sqlite3
+- gemfiles/Gemfile.4.1.sqlite3.lock
+- gemfiles/Gemfile.4.2.1.mysql2
+- gemfiles/Gemfile.4.2.1.mysql2.lock
 - gemfiles/Gemfile.4.2.1.pg
 - gemfiles/Gemfile.4.2.1.pg.lock
+- gemfiles/Gemfile.4.2.1.sqlite3
+- gemfiles/Gemfile.4.2.1.sqlite3.lock
 - lib/active_type.rb
 - lib/active_type/extended_record.rb
 - lib/active_type/extended_record/inheritance.rb
@@ -112,6 +116,7 @@ files:
 - spec/shared_examples/mass_assignment.rb
 - spec/spec_helper.rb
 - spec/support/database.rb
+- spec/support/database.sample.yml
 - spec/support/error_on.rb
 - spec/support/i18n.rb
 - spec/support/protected_params.rb
@@ -161,6 +166,7 @@ test_files:
 - spec/shared_examples/mass_assignment.rb
 - spec/spec_helper.rb
 - spec/support/database.rb
+- spec/support/database.sample.yml
 - spec/support/error_on.rb
 - spec/support/i18n.rb
 - spec/support/protected_params.rb