activerecord-postgres-composite-types 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f1180c2f69bc0bcff969b4d5a0a8fc62ff6c2fd
-  data.tar.gz: 6a94bec2dccd909fa613e66a50eee379dea61298
+  metadata.gz: fab1ca82523eece0cf8b9e0c64fd7cc0903b76ff
+  data.tar.gz: 218877b1a29bce9e891c450b989be9442c223333
 SHA512:
-  metadata.gz: e87be224bc26e25a18ba0a641b2f764da2ff7708c1b17f667f1977cc17f1f75e19dff6996e6e9f6279490b1c8a79b14949af23f5d44cddf528ceaf5bbb455e3b
-  data.tar.gz: cd42315a520c43ea636876e796d99730d848de9069adb0b22beadb0ebf64a6e53bb73ad0fab52f4ce380423762d8ca4459f464026a6d482d1893e9eb4605fb9f
+  metadata.gz: f98e1e96acfdd9607f918c7db4c47a8f2625ccb0769e8c6a0416008840f24dfec6a136c82aa4c18800d2be6fa8b9c0f3ff1e8b154e9f8e94150b4a5a3103d43b
+  data.tar.gz: df68e9973ecfb0d47906f5a1ac22e3f0bbe0dd7b3b2929c36c2363abbf3d7840df3de8304b0240b6e8513fadf4afdfb772fdacfa8a53f2c5a5ce795dc2de005e

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/activerecord-postgres-composite-types.gemspec

@@ -2,14 +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.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "activerecord-postgres-composite-types"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   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 = "2014-09-12"
+  s.date = "2014-11-28"
   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 = [
@@ -43,8 +45,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/puzzleflow/activerecord-postgres-composite-types"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.4.2"
   s.summary = "ActiveRecord composite types support"
 
   if s.respond_to? :specification_version then

data/lib/activerecord-postgres-composite-types/active_record.rb

@@ -30,9 +30,9 @@ module ActiveRecord
 				end
 
 				def register_arel_visitor(klass)
-					Arel::Visitors::ToSql.class_eval <<-RUBY
+					Arel::Visitors::Visitor.class_eval <<-RUBY
 						def visit_#{klass.name.gsub('::', '_')}(o, a=nil)
-							@connection.quote(o) + '::#{klass.type}'
+              "'" + ActiveRecord::ConnectionAdapters::PostgreSQLColumn::composite_type_to_string(o, o.class.connection) + "'" + '::#{klass.type}'
 						end
 					RUBY
 				end
@@ -167,4 +167,4 @@ module ActiveRecord
 
 end
 
-require_relative "active_record_#{ActiveRecord::VERSION::MAJOR}"
+require_relative "active_record_#{ActiveRecord::VERSION::MAJOR}"

data/lib/activerecord-postgres-composite-types/active_record_3.rb

@@ -86,7 +86,7 @@ module ActiveRecord
 			extend ActiveSupport::Concern
 
 			def type_cast_attribute_for_write(column, value)
-				if klass = column.composite_type_class
+				if column && klass = column.composite_type_class
 					# Cast Hash and Array to composite type klass
 					if value.is_a?(klass)
 						value

data/lib/activerecord-postgres-composite-types/active_record_4.rb

@@ -91,7 +91,12 @@ module ActiveRecord
 							quote_and_escape(adapter.type_cast(value, column, true))
 						end
 					else
-						adapter.type_cast(value, column, true)
+						res = adapter.type_cast(value, column, true)
+						if value.class < PostgresCompositeType
+							quote_and_escape(res)
+						else
+							res
+						end
 					end
 				end
 				"(#{quoted_values.join(',')})"

data/lib/postgres_composite_type.rb

@@ -84,6 +84,10 @@ class PostgresCompositeType
 
 	def set_attributes(values)
 		values.each do |name, value|
+			if Hash === value || Array === value
+				klass = self.class.columns.find(name).first.try(:composite_type_class)
+				value = klass.new(value) if klass
+			end
 			send "#{name}=", value
 		end
 	end
@@ -91,8 +95,12 @@ class PostgresCompositeType
 	def set_values(values)
 		raise "Invalid values count: #{values.size}, expected: #{self.class.columns.size}" if values.size != self.class.columns.size
 		self.class.columns.each.with_index do |column, i|
+			if Hash === values[i] || Array === values[i]
+				klass = column.composite_type_class
+				values[i] = klass.new(values[i]) if klass
+			end
 			send "#{column.name}=", values[i]
 		end
 	end
 
-end
+end

data/test/composite_types.rb

@@ -15,3 +15,7 @@ end
 class NestedType < PostgresCompositeType
 	register_type :nested_type
 end
+
+class NestedNestedType < PostgresCompositeType
+	register_type :nested_nested_type
+end

data/test/internal/db/schema.rb

@@ -5,6 +5,7 @@ ActiveRecord::Schema.define do
 	execute "CREATE TYPE my_type AS (name varchar, number int, date timestamp)"
 	execute "CREATE DOMAIN rgb_color AS TEXT CHECK(VALUE IN ('red', 'green', 'blue'))"
 	execute "CREATE TYPE nested_type AS (comp compfoo, color rgb_color)"
+	execute "CREATE TYPE nested_nested_type AS (nested nested_type, color rgb_color)"
 
 	create_table :foos, :id => false do |t|
 		t.column :comp, :compfoo, default: "(0,\"\")"
@@ -14,6 +15,10 @@ ActiveRecord::Schema.define do
 		t.column :nested, :nested_type
 	end
 
+	create_table :bar2s, :id => false do |t|
+		t.column :nested, :nested_nested_type
+	end
+
 	execute "INSERT INTO foos VALUES ((0,'abc')), ((1,'a/b''c\\d e f'))"
 	execute "INSERT INTO bars VALUES (((0,'abc'),'red')), (((1,'cba'),'blue'))"
 end

data/test/test_nested_types.rb

@@ -2,7 +2,9 @@ require_relative 'helper'
 
 class TestNestedTypes < Test::Unit::TestCase
 	class Bar < ActiveRecord::Base
+	end
 
+	class Bar2 < ActiveRecord::Base
 	end
 
 	should "cast value properly" do
@@ -15,4 +17,31 @@ class TestNestedTypes < Test::Unit::TestCase
 		assert_equal Compfoo.new([1,'cba']), bars[1].nested.comp
 		assert_equal 'blue', bars[1].nested.color
 	end
-end
+
+  should "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
+    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
+    bar = Bar.new(nested: [[2, 'bac'], 'red'])
+    assert_kind_of NestedType, bar.nested
+  end
+
+  should "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
+    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
+end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-composite-types
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Rafal Bigaj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
 description: This gem adds support to the ActiveRecord (3.x and 4.x) for composite
@@ -159,8 +159,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .document
-- .travis.yml
+- ".document"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -192,17 +192,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord composite types support