activerecord-postgres-composite-types 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a85470536d96dca0ff437cd209b5fa9628e7e71
-  data.tar.gz: 3e491337ed3e83cff38da77e50abf2c23883068d
+  metadata.gz: 4d16fab97f447570a87c19162c8f9d4f706c46ab
+  data.tar.gz: 84a4370a599af1d99f6666c6b1b5425382413b97
 SHA512:
-  metadata.gz: 9bb2d3459d1fe690ce2f8e5c17c45d203af9f2cd6df725617a6695b98e4e7edf40c9d496ac9dda9b99eaa0dd5dbabe73a22612dc7f4ee63d59487d45965d09cf
-  data.tar.gz: 5b50e3fa248351d097650a1067168c64f37c48b71781a3e35aacd91f5727c171479fb6987dfede6f43ba340c6b3c51e91a375550e89f51076a8cbd9f986a7986
+  metadata.gz: c1786a5fc1abdcc38aa8427de7089daaaa691edc5f65493ad3a940f9716bddb750e57b7c007d16d1fda0f910b6fd68f028e8a237d9d1a0b75f6bf46984c42ff2
+  data.tar.gz: d8e39544995e95380b6f09a21d08da0128f039082bf3983ef876cf671db45ac29a46e853b571766acae8aa749721428a226014b71f79109e229975bd2709aeb6

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 2.1.6
+  - 2.2.2
 env:
-  - AR_VERSION=3.2.0
-  - AR_VERSION=4.1.9
-  - AR_VERSION=4.2.0
+  - AR_VERSION=3.2.22
+  - AR_VERSION=4.1.12
+  - AR_VERSION=4.2.3
 addons:
   postgresql: "9.3"
 before_script:

data/Gemfile

@@ -7,12 +7,11 @@ gem 'pg', '>= 0.17.0'
 
 group :development do
   gem 'test-unit', '~> 2.1'
-  gem 'shoulda', '>= 0'
   gem 'rdoc', '~> 3.12'
   gem 'rake', '~> 10.3'
   gem 'bundler', '~> 1.0'
   gem 'jeweler', '~> 2.0.1' unless RUBY_PLATFORM =~ /mswin/
   gem 'simplecov', '>= 0'
   gem 'combustion', '~> 0.5.2'
-  gem 'tzinfo-data' if AR_VERSION > '3.2.0'
+  gem 'tzinfo-data' if AR_VERSION >= '4'
 end

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/activerecord-postgres-composite-types.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: activerecord-postgres-composite-types 0.2.7 ruby lib
+# stub: activerecord-postgres-composite-types 0.2.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "activerecord-postgres-composite-types"
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Rafal Bigaj"]
-  s.date = "2015-03-20"
+  s.date = "2015-07-17"
   s.description = "This gem adds support to the ActiveRecord (3.x and 4.x) for composite types."
   s.email = "rafal.bigaj@puzzleflow.com"
   s.extra_rdoc_files = [
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/puzzleflow/activerecord-postgres-composite-types"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.4.8"
   s.summary = "ActiveRecord composite types support"
 
   if s.respond_to? :specification_version then
@@ -58,7 +58,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activerecord>, [">= 3.2"])
       s.add_runtime_dependency(%q<pg>, [">= 0.17.0"])
       s.add_development_dependency(%q<test-unit>, ["~> 2.1"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<rake>, ["~> 10.3"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -69,7 +68,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord>, [">= 3.2"])
       s.add_dependency(%q<pg>, [">= 0.17.0"])
       s.add_dependency(%q<test-unit>, ["~> 2.1"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<rake>, ["~> 10.3"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -81,7 +79,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activerecord>, [">= 3.2"])
     s.add_dependency(%q<pg>, [">= 0.17.0"])
     s.add_dependency(%q<test-unit>, ["~> 2.1"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<rake>, ["~> 10.3"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/lib/activerecord-postgres-composite-types/oid/composite_type_4_2.rb

@@ -28,7 +28,7 @@ module ActiveRecord
 
 					def type_cast_for_database(object)
 						return object if object.is_a?(String) # already quoted by AREL visitor
-						return "NULL" if object == nil
+						return nil if object == nil
 						quoted_values = object.class.columns.collect do |column|
 							value = object.send(column.name)
 							if String === value

data/test/helper.rb

@@ -24,8 +24,6 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require 'shoulda'
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
@@ -40,7 +38,7 @@ Combustion.initialize! :active_record
 
 ActiveRecord::Base.default_timezone = :utc
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   def connection
     ActiveRecord::Base.connection
   end

data/test/test_composite_type_class.rb

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class TestCompositeTypeClass < Test::Unit::TestCase
+class TestCompositeTypeClass < ActiveSupport::TestCase
 
   PostgreSQLColumn = ActiveRecord::ConnectionAdapters::PostgreSQLColumn
 
@@ -8,7 +8,7 @@ class TestCompositeTypeClass < Test::Unit::TestCase
 	  @my_type_column = connection.columns(:my_table).first
   end
 
-  should "define accessors" do
+  test "define accessors" do
     assert MyType.method_defined?(:name)
     assert MyType.method_defined?(:name=)
     assert MyType.method_defined?(:number)
@@ -17,44 +17,44 @@ class TestCompositeTypeClass < Test::Unit::TestCase
     assert MyType.method_defined?(:date=)
   end
 
-  should "be created by adapter from string" do
+  test "be created by adapter from string" do
     value = PostgreSQLColumn.string_to_composite_type(MyType, "(text,5,2014-08-27 00:00:00)")
     assert_equal 'text', value.name
     assert_equal 5, value.number
     assert_equal Time.parse('2014-08-27 00:00:00 UTC'), value.date
   end
 
-  should "accept escaped string" do
+  test "accept escaped string" do
     value = PostgreSQLColumn.string_to_composite_type(MyType, '("text\'s",125,"2014-08-27 10:00:00")')
     assert_equal "text's", value.name
     assert_equal 125, value.number
     assert_equal Time.parse('2014-08-27 10:00:00 UTC'), value.date
   end
 
-  should "initialize with hash" do
+  test "initialize with hash" do
     value = MyType.new(number: 1, name: 'abc', date: Time.parse('2014-08-27 12:00:00 UTC'))
     assert_equal 'abc', value.name
     assert_equal 1, value.number
     assert_equal Time.parse('2014-08-27 12:00:00 UTC'), value.date
   end
 
-  should "cast to qouted string" do
+  test "cast to qouted string" do
     value = MyType.new(number: 1, name: '"\'a\'bc[]*/\"', date: Time.parse('2014-08-27 12:00:00 UTC'))
     quoted = connection.quote(value, @my_type_column).sub(':00.000000', ':00 UTC') # On AR ver < 4.2 time is quoted to format with milliseconds
     assert_equal %Q{'("\\\"''a''bc[]*/\\\\\\\"",1,2014-08-27 12:00:00 UTC)'}, quoted
   end
 
-  should "parse string and return array" do
+  test "parse string and return array" do
     result = PostgreSQLColumn::CompositeTypeParser.parse_data("(text,5,2014-08-27 00:00:00)")
     assert_equal ["text", "5", "2014-08-27 00:00:00"], result
   end
 
-  should "parse string and return array 2" do
+  test "parse string and return array 2" do
     result = PostgreSQLColumn::CompositeTypeParser.parse_data('(text,5,"(titi,tata)",2014-08-27 00:00:00)')
     assert_equal ["text", "5", '(titi,tata)', "2014-08-27 00:00:00"], result
   end
 
-  should "parse string and return array 3" do
+  test "parse string and return array 3" do
     result = PostgreSQLColumn::CompositeTypeParser.parse_data('(text,5,"(titi,tata,""(tutu""""tata,tete)"")",2014-08-27 00:00:00)')
     assert_equal ["text", "5", '(titi,tata,"(tutu""tata,tete)")', "2014-08-27 00:00:00"], result
   end

data/test/test_nested_types.rb

@@ -1,13 +1,13 @@
 require_relative 'helper'
 
-class TestNestedTypes < Test::Unit::TestCase
+class TestNestedTypes < ActiveSupport::TestCase
   class Bar < ActiveRecord::Base
   end
 
   class Bar2 < ActiveRecord::Base
   end
 
-  should "cast value properly" do
+  test "cast value properly" do
     bars = Bar.order('(nested).comp.f1').all
     assert_equal 2, bars.size
     assert_kind_of NestedType, bars[0].nested
@@ -18,46 +18,46 @@ class TestNestedTypes < Test::Unit::TestCase
     assert_equal 'blue', bars[1].nested.color
   end
 
-  should "insert with nested type" do
+  test "insert with nested type" do
     bar = Bar.new(nested: {comp: Compfoo.new([2, 'bac']), color: 'red'})
     bar.save
     assert !bar.new_record?
   end
 
-  should "build nested types from Hash" do
+  test "build nested types from Hash" do
     bar = Bar.new(nested: {comp: {f1: 2, f2: 'bac'}, color: 'red'})
     assert_kind_of NestedType, bar.nested
   end
 
-  should "build nested types from Array" do
+  test "build nested types from Array" do
     bar = Bar.new(nested: [[2, 'bac'], 'red'])
     assert_kind_of NestedType, bar.nested
   end
 
-  should "insert with double nested type" do
+  test "insert with double nested type" do
     bar = Bar2.new(nested: {nested: {comp: [1, 'dca'], color: 'blue'}, color: 'red'})
     assert_kind_of NestedNestedType, bar.nested
   end
 
-  should "select nested type" do
+  test "select nested type" do
     Bar2.create!(nested: {nested: {comp: [1, 'dca'], color: 'blue'}, color: 'red'})
     assert !Bar2.where(nested: NestedNestedType.new(nested: {comp: [1, 'dca'], color: 'red'}, color: 'red')).exists?
     assert Bar2.where(nested: NestedNestedType.new(nested: {comp: [1, 'dca'], color: 'blue'}, color: 'red')).exists?
   end
 
-  should "parser should work when nested attribute contains parenthesis" do
+  test "parser test work when nested attribute contains parenthesis" do
     Bar2.create!(nested: {nested: {comp: [1, 'dc)))a'], color: 'blue'}, color: 'red'})
     assert_equal 'dc)))a', Bar2.all.to_a.last.nested.nested.comp.f2
 	  assert Bar2.where(nested: NestedNestedType.new(nested: {comp: [1, 'dc)))a'], color: 'blue'}, color: 'red')).exists?
   end
 
-  should "parser should work when nested attribute contains double quote" do
+  test "parser test work when nested attribute contains double quote" do
     Bar2.create!(nested: {nested: {comp: [1, "dc\"a"], color: 'blue'}, color: 'blue'})
     assert_equal 'blue', Bar2.all.to_a.last.nested.color
     assert_equal 'dc"a', Bar2.all.to_a.last.nested.nested.comp.f2
   end
 
-  should "parser should work when nested attribute contains backslash" do
+  test "parser test work when nested attribute contains backslash" do
     Bar2.create!(nested: {nested: {comp: [1, "dc\\a"], color: 'blue'}, color: 'green'})
     assert_equal 'green', Bar2.all.to_a.last.nested.color
     assert_equal 'dc\\a', Bar2.all.to_a.last.nested.nested.comp.f2

data/test/test_postgres_composite_types.rb

@@ -1,11 +1,18 @@
 require_relative 'helper'
 
-class TestPostgresCompositeTypes < Test::Unit::TestCase
+class TestPostgresCompositeTypes < ActiveSupport::TestCase
   class Foo < ActiveRecord::Base
+  end
+
+  class MyValue < ActiveRecord::Base
+		self.table_name = 'my_table'
+  end
 
+  teardown do
+	  Foo.delete_all '(comp).f1 NOT IN (0,1)'
   end
 
-  should "cast value properly" do
+  test "cast value properly" do
     foos = Foo.all
     assert_equal 2, foos.size
     assert_equal 0, foos[0].comp.f1
@@ -14,12 +21,12 @@ class TestPostgresCompositeTypes < Test::Unit::TestCase
     assert_equal "a/b'c\\d e f", foos[1].comp.f2
   end
 
-  should "accept composite type in where clausure" do
+  test "accept composite type in where clausure" do
     sql = Foo.where(comp: Compfoo.new([123, 'text 1'])).to_sql
     assert_equal %Q(SELECT "foos".* FROM "foos" WHERE "foos"."comp" = '(123,"text 1")'::compfoo), sql.gsub(/ +/, ' ')
   end
 
-  should "create new record with compound object" do
+  test "create new record with compound object" do
     foo = Foo.create!(comp: Compfoo.new([123, 'text 1']))
 
     assert_kind_of Compfoo, foo.comp
@@ -28,7 +35,7 @@ class TestPostgresCompositeTypes < Test::Unit::TestCase
     assert Foo.where(comp: Compfoo.new([123, 'text 1'])).exists?
   end
 
-  should "create new record with hash" do
+  test "create new record with hash" do
     foo = Foo.create!(comp: {f1: 321, f2: 'text 2'})
 
     assert_kind_of Compfoo, foo.comp
@@ -37,7 +44,7 @@ class TestPostgresCompositeTypes < Test::Unit::TestCase
     assert Foo.where(comp: Compfoo.new({f1: 321, f2: 'text 2'})).exists?
   end
 
-  should "create new record with array" do
+  test "create new record with array" do
     foo = Foo.create!(comp: [111, 'text 3'])
 
     assert_kind_of Compfoo, foo.comp
@@ -46,10 +53,19 @@ class TestPostgresCompositeTypes < Test::Unit::TestCase
     assert Foo.where(comp: Compfoo.new({f1: 111, f2: 'text 3'})).exists?
   end
 
-  should 'make object nil' do
+  test 'make object nil' do
     foo = Foo.create!(comp: [333, 'ala ma kota'])
     foo.comp = nil
 
     assert_nil foo.comp
+
+    Foo.where(comp: Compfoo.new([333, 'ala ma kota'])).delete_all
   end
+
+	test 'accept nil value' do
+		mt = MyValue.create!(value: nil)
+		assert_nil mt.value
+
+		MyValue.where(value: nil).delete_all
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-composite-types
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Rafal Bigaj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ActiveRecord composite types support