ar_pg_array 0.9.7 → 0.9.9

data/Rakefile

@@ -30,7 +30,7 @@ begin
     gemspec.email = "funny.falcon@gmail.com"
     gemspec.homepage = "http://github.com/funny-falcon/activerecord-postgresql-arrays"
     gemspec.authors = ["Sokolov Yura aka funny_falcon"]
-    gemspec.add_dependency('activerecord')
+    gemspec.add_dependency('active_record', '>= 2.3.5', '<3.1')
     gemspec.rubyforge_project = 'ar-pg-array'
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.9

data/lib/ar_pg_array/schema.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module ConnectionAdapters
     class PostgreSQLColumn < Column #:nodoc:
       BASE_TYPE_COLUMNS = Hash.new{|h, base_type| 
-        base_column= new(nil, nil, base_type, true)
+        base_column= new(nil, nil, base_type.to_s, true)
         h[base_type] = h[base_column.type]= base_column
       }
       attr_reader :base_column
@@ -98,9 +98,8 @@ module ActiveRecord
         eval(string.tr('{}','[]'))
       end
       
-      SARRAY_QUOTED = /^"(.*[^\\])?"$/m
+      SARRAY_QUOTED = /^"((?:\\.|[^\\])*)"$/m
       SARRAY_PARTIAL = /^".*(\\"|[^"])$/m
-      ESCAPE_ARRAY = Hash.new{|h,k| h[k] = eval("\"#{k}\"") }
       def self.string_to_text_array(value)
         return value unless value.is_a? String
         return nil if value.empty?
@@ -114,7 +113,7 @@ module ActiveRecord
             partial = true
           end
           if s =~ SARRAY_QUOTED
-            s = $1.gsub(/\\([a-z"\\]|\d{3})/){|s| ESCAPE_ARRAY[s]}
+            s = $1.gsub(/\\(.)/,'\1')
             partial = false
           elsif s == 'NULL'
             s = nil
@@ -140,7 +139,7 @@ module ActiveRecord
           :string, :text, :other, :datetime, :timestamp, :time
           quote_array_for_arel_by_base_type( value, base_type )
         else
-          "E'#{ prepare_pg_string_array(value, base_type, column) }'"
+          "'#{ prepare_pg_string_array(value, base_type, column) }'"
         end
       end
 
@@ -150,7 +149,8 @@ module ActiveRecord
             "'#{ prepare_array_for_arel_by_base_type(value, base_type) }'"
           when :string, :text, :other
             pa = prepare_array_for_arel_by_base_type(value, base_type)
-            "E'#{ quote_string( pa ) }'"
+            "'#{ quote_string( pa ) }'"
+            #"'#{ pa.gsub("'","''") }'"
           else
             raise "Unsupported array base type #{base_type} for arel"
         end
@@ -164,6 +164,7 @@ module ActiveRecord
             prepare_pg_float_array(value)
           when :string, :text, :other
             prepare_pg_text_array(value)
+            #prepare_pg_string_array(value, base_type).gsub("''","'")
           when :datetime, :timestamp, :time
             prepare_pg_string_array(value, base_type)
           when :decimal, :boolean, :date, :safe
@@ -185,6 +186,7 @@ module ActiveRecord
         "{#{ value.map{|v| v.nil? ? 'NULL' : v.to_s}.join(',')}}"
       end
       
+      ESCAPE_HASH={'\\'=>'\\\\', '"'=>'\\"'}
       def prepare_pg_string_array(value, base_type, column=nil)
         base_column= if column
                        column.base_column
@@ -192,20 +194,30 @@ module ActiveRecord
                        PostgreSQLColumn::BASE_TYPE_COLUMNS[base_type.to_sym]
                      end
         value = value.map do|v| 
-            v = quote_without_postgresql_arrays(v, base_column)
-            if v=~/^E?'(.+)'$/ then v = $1 end
-            "\"#{v.gsub('"','\"')}\""
+            unless v.nil?
+              v = quote_without_postgresql_arrays(v, base_column)
+              if v=~/^'(.+)'$/m then
+                "\"#{$1.gsub(/\\|"/){|s| ESCAPE_HASH[s]}}\""
+              else
+                v
+              end
+            else
+              'NULL'
+            end
         end
         "{#{ value.join(',')}}"
       end
-      
+
+      class CNULL; def inspect; 'NULL'; end; alias to_s inspect end
+      NULL = CNULL.new
+
+      TESCAPE_HASH={'\\'=>'\\\\', '"'=>'\\"'}
       def prepare_pg_text_array(value)
         value = value.map{|v|
-             v ? v.to_s.gsub('\\','\\\\\\').gsub('"','\"') : '@!$%NULL%$!@'
-          }.inspect.gsub('"@!$%NULL%$!@"','NULL')
-        value.tr!('[]','{}')
+             v ? "\"#{v.to_s.gsub(/\\|"/){|s| TESCAPE_HASH[s]}}\"" : NULL
+        }.join(',')
+        "{#{value}}"
       end
-
       
       NATIVE_DATABASE_TYPES.keys.each do |key|
         unless key==:primary_key

data/spec/fixtures/bulks.yml

@@ -2,7 +2,7 @@ first:
   id: 1
   ints: [ 1 ]
   strings: [ one ]
-  times: [<%= Time.now.at_beginning_of_month.to_s(:db)%>, <%= Time.now.at_beginning_of_day.to_s(:db) %>]
+  times: [2011-03-01, 2011-05-05]
   floats: [1.0, 2.3]
   decimals: [1.0, 2.3]
 second:
@@ -29,7 +29,7 @@ fourth:
 fifth:
   id: 5
   ints: [ 10 ]
-  strings: [ "#{1+1}", "\\#{1+1}\"'\\z", "\t\n" ]
+  strings: [ "#{1+1}", "\\#{1+1}\"'\\z\x01", "\t\n" ]
   times: [ ]
   floats: [ ]
   decimals: [ ]

data/spec/fixtures/schema.rb

@@ -11,12 +11,12 @@ ActiveRecord::Schema.define do
 	end
 	
   create_table "bulks", :force => true do |t|
-	  t.string :value
+	  t.string :value, :default => "'"
 	  t.integer_array :ints,  :default => [1, 2]
 	  t.string_array :strings, :default => %w{as so}
 	  t.timestamp_array :times,  :default => %w{2010-01-01 2010-02-01}
 	  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.text_array :texts, :default => [nil, 'Text', 'NULL', 'Text with nil', 'Text with , nil, !"\\', 'nil']
 	end
 end

data/spec/pg_array_spec.rb

@@ -67,7 +67,8 @@ describe "PgArray" do
       bulk = Bulk.find(1)
       bulk.ints.should == [ 1 ]
       bulk.strings.should == %w{one}
-      bulk.times.should == [Time.now.at_beginning_of_month, Time.now.at_beginning_of_day]
+      map_times(bulk.times).should == 
+          map_times(parse_times(%w{2011-03-01 2011-05-05}))
       bulk.floats.should == [1.0, 2.3]
       bulk.decimals.should == [1.0, 2.3]
     end
@@ -78,7 +79,7 @@ describe "PgArray" do
       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']
+      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}))
     end
@@ -96,10 +97,19 @@ describe "PgArray" do
       bulk.decimals.should == [2.5, 2]
       map_times(bulk.times).should == map_times(parse_times(%w{2010-04-01 2010-03-01}))
     end
+    
+    it "should save right text" do
+      bulk = Bulk.find(5)
+      bulk.texts = ['Text with , nil, !\x01\\\'"',"Text with , nil, !\x01\\\'\""]
+      bulk.save!
+      bulk.texts = []
+      bulk = Bulk.find(:first, :conditions=>'5 = id')
+      bulk.texts.should == ['Text with , nil, !\x01\\\'"',"Text with , nil, !\x01\\\'\""]
+    end
 
     it "should be safe for eval" do
       bulk = Bulk.find(5)
-      bulk.strings.should == ['#{1+1}', '\\#{1+1}"\'\\z', "\t\n"]
+      bulk.strings.should == ["\#{1+1}", "\\\#{1+1}\"'\\z\x01", "\t\n"]
       #$stderr.puts ActiveRecord::ConnectionAdapters::PostgreSQLColumn::ESCAPE_ARRAY.inspect
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_pg_array
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-09-10 00:00:00.000000000Z
+date: 2011-12-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &79833080 !ruby/object:Gem::Requirement
+  name: active_record
+  requirement: &83197980 !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.1'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *79833080
+  version_requirements: *83197980
 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.
@@ -55,8 +58,7 @@ files:
 homepage: http://github.com/funny-falcon/activerecord-postgresql-arrays
 licenses: []
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -77,10 +79,4 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Use power of PostgreSQL Arrays in ActiveRecord
-test_files:
-- spec/fixtures/schema.rb
-- spec/fixtures/item.rb
-- spec/fixtures/bulk.rb
-- spec/fixtures/tag.rb
-- spec/pg_array_spec.rb
-- spec/spec_helper.rb
+test_files: []