surus 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.4.1 (February 27, 2013)
+
+* Fix array_has and array_has_any with varchar[]
+
+# 0.4.0 (February 22, 2013)
+
+* Added JSON generation with find_json and all_json
+
 # 0.3.2 (March 10, 2012)
 
 * No changes. Had to bump version to get around partially failed upload to RubyGems.org.

data/lib/surus/array/scope.rb

@@ -8,9 +8,9 @@ module Surus
       #   User.array_has(:permissions, "manage_users", "manage_roles")
       #   User.array_has(:permissions, ["manage_users", "manage_roles"])
       def array_has(column, *values)
-        where("#{connection.quote_column_name(column)} @> ARRAY[?]", values.flatten)
+        where("#{connection.quote_column_name(column)} @> ARRAY[?]#{array_cast(column)}", values.flatten)
       end
-      
+
       # Adds where condition that requires column to contain any values
       #
       # Examples:
@@ -18,7 +18,13 @@ module Surus
       #   User.array_has_any(:permissions, "manage_users", "manage_roles")
       #   User.array_has_any(:permissions, ["manage_users", "manage_roles"])
       def array_has_any(column, *values)
-        where("#{connection.quote_column_name(column)} && ARRAY[?]", values.flatten)    
+        where("#{connection.quote_column_name(column)} && ARRAY[?]#{array_cast(column)}", values.flatten)
+      end
+
+      private
+      def array_cast(column_name)
+        column = columns_hash[column_name.to_s]
+        "::#{column.sql_type}"
       end
     end
   end

data/lib/surus/version.rb

@@ -1,3 +1,3 @@
 module Surus
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/array/scope_spec.rb

@@ -6,52 +6,60 @@ describe Surus::Array::Scope do
   context "array_has" do
     let!(:match) { TextArrayRecord.create! :texts => %w{a b} }
     let!(:missing_element) { TextArrayRecord.create! :texts => %w{a} }
-    
+
     def self.shared_examples
       it { should include(match) }
       it { should_not include(missing_element) }
       it { should_not include(empty) }
     end
-    
+
     context "with one element" do
       subject { TextArrayRecord.array_has(:texts, "b").all }
       shared_examples
     end
-    
+
     context "with array of elements" do
       subject { TextArrayRecord.array_has(:texts, ["a", "b"]).all }
       shared_examples
     end
-    
+
     context "with multiple elements" do
       subject { TextArrayRecord.array_has(:texts, "a", "b").all }
       shared_examples
     end
   end
-  
+
   context "array_has_any" do
     let!(:match) { TextArrayRecord.create! :texts => %w{a b} }
     let!(:missing_element) { TextArrayRecord.create! :texts => %w{a} }
-    
+
     def self.shared_examples
       it { should include(match) }
       it { should_not include(missing_element) }
       it { should_not include(empty) }
     end
-    
+
     context "with one element" do
       subject { TextArrayRecord.array_has_any(:texts, "b").all }
       shared_examples
     end
-    
+
     context "with array of elements" do
       subject { TextArrayRecord.array_has_any(:texts, ["b", "c"]).all }
       shared_examples
     end
-    
+
     context "with multiple elements" do
       subject { TextArrayRecord.array_has_any(:texts, "b", "c").all }
       shared_examples
     end
-  end  
+  end
+
+  it "casts between varchar[] and text[]" do
+    record = VarcharArrayRecord.create! :varchars => %w{a b}
+    expect(VarcharArrayRecord.array_has_any(:varchars, "a")).to include(record)
+    expect(VarcharArrayRecord.array_has_any(:varchars, "c")).to_not include(record)
+    expect(VarcharArrayRecord.array_has_any(:varchars, "b", "c")).to include(record)
+    expect(VarcharArrayRecord.array_has_any(:varchars, "c")).to_not include(record)
+  end
 end

data/spec/database_structure.sql

@@ -17,6 +17,13 @@ CREATE TABLE text_array_records(
 );
 
 
+DROP TABLE IF EXISTS varchar_array_records;
+
+CREATE TABLE varchar_array_records(
+  id serial PRIMARY KEY,
+  varchars varchar[]
+);
+
 
 DROP TABLE IF EXISTS integer_array_records;
 

data/spec/spec_helper.rb

@@ -15,6 +15,10 @@ class TextArrayRecord < ActiveRecord::Base
   serialize :texts, Surus::Array::TextSerializer.new
 end
 
+class VarcharArrayRecord < ActiveRecord::Base
+  serialize :varchars, Surus::Array::TextSerializer.new
+end
+
 class IntegerArrayRecord < ActiveRecord::Base
   serialize :integers, Surus::Array::IntegerSerializer.new
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg