ar_pg_array 0.11.1 → 0.11.2

data/ar_pg_array.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ar_pg_array"
-  s.version = "0.11.1"
+  s.version = "0.11.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sokolov Yura aka funny_falcon"]

data/lib/ar_pg_array/parser.rb

@@ -69,7 +69,7 @@ module PgArrayParser
         values << ar
         if rest =~ /^\}\s*/
           return values, $'
-        elsif rest =~ /^,\s*{\s*/
+        elsif rest =~ /^,\s*\{\s*/
           rest = $'
         else
           raise "Mailformed postgres array"
@@ -97,15 +97,28 @@ module PgArrayParser
     end
   end
 
+  def _remap_array(array, &block)
+    array.map{|v|
+      case v
+      when Array
+        _remap_array(v, &block)
+      when nil
+        nil
+      else
+        yield v
+      end
+    }
+  end
+
   def prepare_pg_integer_array(value)
-    val = value.map{|v| v.nil? ? nil : v.to_i}.inspect
+    val = _remap_array(value){|v| v.to_i}.inspect
     val.gsub!(NIL, NULL)
     val.tr!(SQUARE_BRACKETS, CURLY_BRACKETS)
     val
   end
 
   def prepare_pg_float_array(value)
-    val = value.map{|v| v.nil? ? nil : v.to_f}.inspect
+    val = _remap_array(value){|v| v.to_f}.inspect
     val.gsub!(NIL, NULL)
     val.tr!(SQUARE_BRACKETS, CURLY_BRACKETS)
     val
@@ -139,11 +152,11 @@ module PgArrayParser
     "{#{value}}"
   end
 
-  def prepare_pg_string_array(value, &block)
+  def _prepare_pg_string_array(value, &block)
     value = value.map{|val|
       case val
       when Array
-        prepare_pg_string_array(val, &block)
+        _prepare_pg_string_array(val, &block)
       when nil
         NULL
       else
@@ -157,4 +170,5 @@ module PgArrayParser
     }.join(',')
     "{#{value}}"
   end
+  alias prepare_pg_string_array _prepare_pg_string_array
 end

data/lib/ar_pg_array/schema.rb

@@ -181,7 +181,7 @@ module ActiveRecord
                      else
                        PostgreSQLColumn::BASE_TYPE_COLUMNS[base_type.to_sym]
                      end
-        super(value){|v| quote_without_postgresql_arrays(v, base_column)}
+        _prepare_pg_string_array(value){|v| quote_without_postgresql_arrays(v, base_column)}
       end
 
       NATIVE_DATABASE_TYPES.keys.each do |key|

data/spec/fixtures/schema.rb

@@ -20,6 +20,7 @@ ActiveRecord::Schema.define do
     t.float_array :floats,     :default => [1.0, 1.2]
     t.decimal_array :decimals, :default => [1.0, 1.2]
     t.text_array :texts, :default => [nil, 'Text', 'NULL', 'Text with nil', 'Text with , nil, !"\\', 'nil']
+    t.integer_array :empty_def, :default => []
   end
 
   create_table "unrelateds", :force => true do |t|

data/spec/pg_array_spec.rb

@@ -82,11 +82,21 @@ describe "PgArray" do
       bulk.texts.should == [nil, 'Text', 'NULL', 'Text with nil', 'Text with , nil, !"\\', 'nil']
       map_times(bulk.times).should == 
           map_times(parse_times(%w{2010-01-01 2010-02-01}))
+      bulk.empty_def.should == []
     end
 
     it "should be able to insert" do
-      bulk = Bulk.new
-      bulk.save
+      bulki = Bulk.new
+      bulki.save
+      bulk = Bulk.find(bulki.id)
+      bulk.ints.should == [1, 2]
+      bulk.strings.should == %w{as so}
+      bulk.floats.should == [1.0, 1.2]
+      bulk.decimals.should == [1.0, 1.2]
+      bulk.texts.should == [nil, 'Text', 'NULL', 'Text with nil', 'Text with , nil, !"\\', 'nil']
+      map_times(bulk.times).should ==
+          map_times(parse_times(%w{2010-01-01 2010-02-01}))
+      bulk.empty_def.should == []
       bulk.destroy
     end
 
@@ -113,11 +123,40 @@ describe "PgArray" do
     
     it "should save right text" do
       bulk = Bulk.find(5)
-      bulk.texts = ['Text with , nil, !\x01\\\'"',"Text with , nil, !\x01\\\'\""]
+      bulk.texts = ['Text with , nil, !\x01\\\'"',"Text with , nil, !\x01\n\\\'\""]
       bulk.save!
       bulk.texts = []
       bulk = Bulk.find(:first, :conditions=>'5 = id')
-      bulk.texts.should == ['Text with , nil, !\x01\\\'"',"Text with , nil, !\x01\\\'\""]
+      bulk.texts.should == ['Text with , nil, !\x01\\\'"',"Text with , nil, !\x01\n\\\'\""]
+    end
+
+    it "should save nested arrays" do
+      Bulk.transaction do
+        bulk = Bulk.find(3)
+        bulk.ints = [[1,2],[3,4]]
+        bulk.floats = [[1.0, 2.3e34],[3.43,6.21]]
+        bulk.times = [parse_times(%w{2010-04-01 2011-04-01}), parse_times(%w{2011-05-01 2010-05-01})]
+        bulk.save!
+        bulk = Bulk.find(:first, :conditions=>'3 = id')
+        bulk.ints.should == [[1,2],[3,4]]
+        bulk.floats.should == [[1.0, 2.3e34],[3.43,6.21]]
+        bulk.times.map{|ts| map_times(ts)}.should == [
+          map_times(parse_times(%w{2010-04-01 2011-04-01})),
+          map_times(parse_times(%w{2011-05-01 2010-05-01}))]
+        raise ActiveRecord::Rollback
+      end
+    end
+
+    it "should save right nested text" do
+      Bulk.transaction do
+        bulk = Bulk.find(5)
+        bulk.texts = [['Text with , nil, !\x01\\\'"',"Text with , nil, !\x01\n\\\'\""], ['asdf', 'fdsa']]
+        bulk.save!
+        bulk.texts = []
+        bulk = Bulk.find(:first, :conditions=>'5 = id')
+        bulk.texts.should == [['Text with , nil, !\x01\\\'"',"Text with , nil, !\x01\n\\\'\""], ['asdf', 'fdsa']]
+        raise ActiveRecord::Rollback
+      end
     end
 
     it "should be safe for eval" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ar_pg_array
 version: !ruby/object:Gem::Version
-  version: 0.11.1
   prerelease: 
+  version: 0.11.2
 platform: ruby
 authors:
 - Sokolov Yura aka funny_falcon
@@ -12,7 +12,7 @@ cert_chain: []
 date: 2012-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -22,7 +22,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.6
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -33,6 +32,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.6
+  name: activerecord
 description: ar_pg_array includes support of PostgreSQL's int[], float[], text[],
   timestamptz[] etc. into ActiveRecord. You could define migrations for array columns,
   query on array columns.