postgres_ext 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.1
+
+ * Fixes issue with array -> string code - Dan McClain
+ * Adds support for ISN types - Ezekiel Templin
+ * Fix for Squeel compatibility - Alexander Borovsky
+
 ## 0.3.0
 
  * Adds support to create indexes concurrently  -  Dan McClain

data/lib/postgres_ext/active_record/connection_adapters/postgres_adapter.rb

@@ -119,6 +119,8 @@ module ActiveRecord
           :cidr
         when 'macaddr'
           :macaddr
+        when 'ean13'
+          :ean13
         else
           simplified_type_without_extended_types field_type
         end
@@ -131,7 +133,7 @@ module ActiveRecord
       class UnsupportedFeature < Exception; end
 
       EXTENDED_TYPES = { :inet => {:name => 'inet'}, :cidr => {:name => 'cidr'}, :macaddr => {:name => 'macaddr'},
-                         :uuid => {:name => 'uuid'}, :citext => {:name => 'citext'} }
+                         :uuid => {:name => 'uuid'}, :citext => {:name => 'citext'}, :ean13 => {:name => 'ean13'} }
 
       class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
         attr_accessor :array
@@ -383,7 +385,7 @@ module ActiveRecord
 
         casted_value = type_cast_extended(value, column, true)
 
-        if casted_value.is_a? String
+        if casted_value.is_a?(String) && value.is_a?(String)
           casted_value = casted_value.dup
           # Encode backslashes.  One backslash becomes 4 in the resulting SQL.
           # (why 4, and not 2?  Trial and error shows 4 works, 2 fails to parse.)

data/lib/postgres_ext/active_record/relation/query_methods.rb

@@ -71,11 +71,11 @@ module ActiveRecord
       end
     end
 
-    def where_with_chaining(opts = :chaining, *rest)
-      if opts == :chaining
+    def where_with_chaining(*opts, &block)
+      if opts.empty? && !block_given?
         WhereChain.new(self)
       else
-        where_without_chaining(opts, *rest)
+        where_without_chaining(*opts, &block)
       end
     end
 

data/lib/postgres_ext/version.rb

@@ -1,3 +1,3 @@
 module PostgresExt
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/columns/array_spec.rb

@@ -61,6 +61,9 @@ describe 'Array column' do
       end
 
       context 'corner cases, strings with commas and quotations' do
+        it 'converts one element, 2 dimensional arrays' do
+          adapter.type_cast([['one','two']], text_array_column).should eq '{{"one","two"}}'
+        end
         it 'converts the PostgreSQL value containing escaped " to an array' do
           text_array_column.type_cast('{"has \" quote",another value}').should eq ['has " quote', 'another value']
         end

data/spec/migrations/ean13_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'ean13 migrations' do
+  let!(:connection) { ActiveRecord::Base.connection }
+  before(:all) { ActiveRecord::Base.connection.add_extension('isn') if ActiveRecord::Base.connection.supports_extensions? }
+  after { connection.drop_table :data_types }
+  it 'creates an ean13 column' do
+    lambda do
+      connection.create_table :data_types do |t|
+        t.ean13 :ean13_1
+        t.ean13 :ean13_2, :ean13_3
+        t.column :ean13_4, :ean13
+      end
+    end.should_not raise_exception
+
+    columns = connection.columns(:data_types)
+    ean13_1 = columns.detect { |c| c.name == 'ean13_1'}
+    ean13_2 = columns.detect { |c| c.name == 'ean13_2'}
+    ean13_3 = columns.detect { |c| c.name == 'ean13_3'}
+    ean13_4 = columns.detect { |c| c.name == 'ean13_4'}
+
+    ean13_1.sql_type.should eq 'ean13'
+    ean13_2.sql_type.should eq 'ean13'
+    ean13_3.sql_type.should eq 'ean13'
+    ean13_4.sql_type.should eq 'ean13'
+  end
+end

data/spec/models/array_spec.rb

@@ -57,17 +57,26 @@ describe 'Models with array columns' do
     end
 
     context 'Setting values' do
-      describe 'setting a new value' do
-        it 'returns the value set when the record is retrieved' do
-          u = User.create(:nick_names => ['some', 'things'])
-          u.reload
+      it 'returns the value set when the record is retrieved' do
+        u = User.create(:nick_names => ['some', 'things'])
+        u.reload
 
-          u.nick_names = ['different', 'values']
-          u.save
+        u.nick_names = ['different', 'values']
+        u.save
 
-          u.reload
-          u.nick_names.should eq ['different', 'values']
-        end
+        u.reload
+        u.nick_names.should eq ['different', 'values']
+      end
+
+      it 'creates a user with an int array of some values' do
+        u = User.create(:favorite_numbers => [2,3,5])
+        u.reload
+
+        u.favorite_numbers = [1,2,3]
+        u.save
+
+        u.reload
+        u.favorite_numbers.should eq [1,2,3]
       end
     end
 

data/spec/models/ean13_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe 'Models with ean13 columns' do
+  let!(:adapter) { ActiveRecord::Base.connection }
+
+  context 'no default value, ean' do
+    before do
+      adapter.create_table :books, :force => true do |t|
+        t.ean13 :ean
+      end
+
+      class Book < ActiveRecord::Base
+        attr_accessible :ean
+      end
+    end
+
+    after do
+      adapter.drop_table :books
+      Object.send(:remove_const, :Book)
+    end
+
+    context 'no default value, ean' do
+      describe '#create' do
+        it 'create a book when there is no ean assignment' do
+          book = Book.create()
+          book.reload
+          book.ean.should eq nil
+        end
+
+        it 'creates a book with an ean string' do
+          book = Book.create(:ean => '9780312174910')
+          book.reload
+          book.ean.should eq '978-0-312-17491-0'
+        end
+      end
+
+      describe 'ean assignment' do
+        it 'updates a book with an ean string' do
+          book = Book.create(:ean => '9783037781265')
+          book.ean = '9780312174910'
+          book.save
+
+          book.reload
+          book.ean.should eq '978-0-312-17491-0'
+        end
+      end
+
+      describe 'find_by_ean' do
+        let!(:ean) { Book.create(:ean => '9783037781265') }
+
+        it 'finds book using string value' do
+          Book.find_by_ean('9783037781265').should eq ean
+        end
+      end
+    end
+  end
+end

data/spec/schema_dumper/ean13_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'ean13 schema dump' do
+  let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :testings }
+  it 'correctly generates ean13 column statements' do
+    stream = StringIO.new
+    connection.create_table :testings do |t|
+      t.ean13 :ean13_column
+    end
+
+    ActiveRecord::SchemaDumper.dump(connection, stream)
+    output = stream.string
+
+    output.should match /t\.ean13/
+  end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Dan McClain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -193,11 +206,13 @@ files:
 - spec/migrations/array_spec.rb
 - spec/migrations/cidr_spec.rb
 - spec/migrations/citext_spec.rb
+- spec/migrations/ean13_spec.rb
 - spec/migrations/index_spec.rb
 - spec/migrations/inet_spec.rb
 - spec/migrations/macaddr_spec.rb
 - spec/migrations/uuid_spec.rb
 - spec/models/array_spec.rb
+- spec/models/ean13_spec.rb
 - spec/models/inet_spec.rb
 - spec/queries/array_queries_spec.rb
 - spec/queries/contains_querie_spec.rb
@@ -205,6 +220,7 @@ files:
 - spec/schema_dumper/array_spec.rb
 - spec/schema_dumper/cidr_spec.rb
 - spec/schema_dumper/citext_spec.rb
+- spec/schema_dumper/ean13_spec.rb
 - spec/schema_dumper/extension_spec.rb
 - spec/schema_dumper/index_spec.rb
 - spec/schema_dumper/inet_spec.rb
@@ -213,26 +229,33 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3683941487581046941
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3683941487581046941
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Extends ActiveRecord to handle native PostgreSQL data types
 test_files:
 - spec/arel/arel_spec.rb
@@ -295,11 +318,13 @@ test_files:
 - spec/migrations/array_spec.rb
 - spec/migrations/cidr_spec.rb
 - spec/migrations/citext_spec.rb
+- spec/migrations/ean13_spec.rb
 - spec/migrations/index_spec.rb
 - spec/migrations/inet_spec.rb
 - spec/migrations/macaddr_spec.rb
 - spec/migrations/uuid_spec.rb
 - spec/models/array_spec.rb
+- spec/models/ean13_spec.rb
 - spec/models/inet_spec.rb
 - spec/queries/array_queries_spec.rb
 - spec/queries/contains_querie_spec.rb
@@ -307,6 +332,7 @@ test_files:
 - spec/schema_dumper/array_spec.rb
 - spec/schema_dumper/cidr_spec.rb
 - spec/schema_dumper/citext_spec.rb
+- spec/schema_dumper/ean13_spec.rb
 - spec/schema_dumper/extension_spec.rb
 - spec/schema_dumper/index_spec.rb
 - spec/schema_dumper/inet_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 78f29ab859ad31017d1173ec07e12a0b5603b823
-  data.tar.gz: 3ae3cbc58fc1cdf7018721d01078855cc4fcc089
-SHA512:
-  metadata.gz: 995ffd20fefb645371140742c7742cee1ebb9bc1cdbc9bd9bd7f9b32fa8057ac83fc661daed70bffb311700cb9c5e1b87ad64102008509ddf93ec6a7e2f11d14
-  data.tar.gz: ae873dde5e07a41dee3b5ccccbbdd6f06443f7a0ccb0e65ff3f2678a7a8fcb91d5323afb6bbcbf17be03a30dd9278ff6fee71b96b5e0bc7e863ef9274615d992