ar_pg_array 0.10.1 → 0.10.2

data/Gemfile

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+
+gem "activerecord", ">= 2.3.5", "< 3.0"
+group :development, :test do
+  gem "fake_arel"
+  gem "cancan"
+  gem "pg"
+  gem "rspec"
+end

data/Rakefile

@@ -1,15 +1,15 @@
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
+require 'rdoc/task'
 
 desc 'Test the postgres_arrays plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+task :test do
+  Dir.chdir(File.dirname(__FILE__)) do
+    Process.wait2 spawn('rspec spec')
+  end
+end
+
+task :default do
+  # nothing
 end
 
 desc 'Generate documentation for the postgres_arrays plugin.'
@@ -20,24 +20,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "ar_pg_array"
-    gemspec.summary = "Use power of PostgreSQL Arrays in ActiveRecord"
-    gemspec.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."
-    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', '>= 2.3.5', '<3.0')
-    gemspec.rubyforge_project = 'ar-pg-array'
-  end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-

data/ar_pg_array.gemspec

@@ -0,0 +1,34 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "ar_pg_array"
+  s.version = "0.10.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sokolov Yura aka funny_falcon"]
+  s.date = "2012-06-03"
+  s.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."
+  s.email = "funny.falcon@gmail.com"
+  s.extra_rdoc_files = [ "README" ]
+  s.files = (Dir['lib/**/*']+Dir['spec/**/*']+%w{Gemfile init.rb MIT_LICENSE README Rakefile ar_pg_array.gemspec}).find_all{|f| File.file?(f)}
+  s.homepage = "http://github.com/funny-falcon/activerecord-postgresql-arrays"
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "ar-pg-array"
+  s.summary = "Use power of PostgreSQL Arrays in ActiveRecord"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, ["< 4.0", ">= 3.0.6"])
+    else
+      s.add_dependency(%q<activerecord>, ["< 4.0", ">= 3.0.6"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, ["< 4.0", ">= 3.0.6"])
+  end
+end
+

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/bulk.rb

@@ -1,2 +1,5 @@
 class Bulk < ActiveRecord::Base
 end
+
+class Bulk1 < Bulk
+end

data/spec/fixtures/bulks.yml

@@ -28,6 +28,7 @@ fourth:
   decimals: [ ]
 fifth:
   id: 5
+  type: "Bulk1"
   ints: [ 10 ]
   strings: [ "#{1+1}", "\\#{1+1}\"'\\z\x01", "\t\n" ]
   times: [ ]

data/spec/fixtures/schema.rb

@@ -12,6 +12,7 @@ ActiveRecord::Schema.define do
   end
 
   create_table "bulks", :force => true do |t|
+    t.string :type, :default => "Bulk"
     t.string :value, :default => "'"
     t.integer_array :ints,  :default => [1, 2]
     t.string_array :strings, :default => %w{as so}
@@ -19,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

@@ -72,7 +72,7 @@ describe "PgArray" do
       bulk.floats.should == [1.0, 2.3]
       bulk.decimals.should == [1.0, 2.3]
     end
-    
+
     it "should be created with defaults" do
       bulk = Bulk.new
       bulk.ints.should == [1, 2]
@@ -82,6 +82,22 @@ 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
+      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
 
     it "should not alter defaults" do
@@ -107,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
@@ -192,6 +237,19 @@ describe "PgArray" do
       model2.for_custom_serialize.to_yaml.should == obj.to_yaml
     end
 
+    it 'should be workable with sti' do
+      obj = Bulk1.where(:ints => [10].pg).first
+      obj.should be_instance_of Bulk1
+      obj.floats = [1.1, 2.2]
+      obj.save
+      obj1 = Bulk.find(obj.id)
+      obj1.should be_instance_of Bulk1
+      obj1.floats.should == [1.1, 2.2]
+      obj2 = Bulk1.new
+      obj2.save
+      obj2.destroy
+    end
+
     def map_times(times)
       times.map{|t| t.strftime("%F %T")}
     end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ar_pg_array
 version: !ruby/object:Gem::Version
-  version: 0.10.1
   prerelease: 
+  version: 0.10.2
 platform: ruby
 authors:
 - Sokolov Yura aka funny_falcon
@@ -12,27 +12,27 @@ 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:
     - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.5
-  type: :runtime
+        version: 3.0.6
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        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.
@@ -42,31 +42,31 @@ extensions: []
 extra_rdoc_files:
 - README
 files:
-- MIT-LICENSE
-- README
-- Rakefile
-- VERSION
-- init.rb
 - lib/ar_pg_array.rb
+- lib/ar_pg_array/schema_cacheable.rb
+- lib/ar_pg_array/references_by.rb
+- lib/ar_pg_array/querying.rb
 - lib/ar_pg_array/allways_save.rb
+- lib/ar_pg_array/schema_fix_will_change.rb
 - lib/ar_pg_array/parser.rb
-- lib/ar_pg_array/querying.rb
-- lib/ar_pg_array/references_by.rb
 - lib/ar_pg_array/schema.rb
-- lib/ar_pg_array/schema_cacheable.rb
-- lib/ar_pg_array/schema_fix_will_change.rb
-- spec/fixtures/bulk.rb
+- spec/spec_helper.rb
+- spec/spec.opts
 - spec/fixtures/bulks.yml
-- spec/fixtures/item.rb
+- spec/fixtures/tags.yml
+- spec/fixtures/unrelateds.yml
+- spec/fixtures/tag.rb
 - spec/fixtures/items.yml
+- spec/fixtures/item.rb
 - spec/fixtures/schema.rb
-- spec/fixtures/tag.rb
-- spec/fixtures/tags.yml
+- spec/fixtures/bulk.rb
 - spec/fixtures/unrelated.rb
-- spec/fixtures/unrelateds.yml
 - spec/pg_array_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+- Gemfile
+- init.rb
+- README
+- Rakefile
+- ar_pg_array.gemspec
 homepage: http://github.com/funny-falcon/activerecord-postgresql-arrays
 licenses: []
 post_install_message: 

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Sokolov Yura aka funny_falcon
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +0,0 @@
-0.10.0