activeadmin 0.4.2 → 0.4.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Master (unreleased)
 
+## 0.4.3
+
+### Bug Fixes
+
+* [#1063][]: Fix comment issues when using postgres ([@jancel][])
+
 ## 0.4.2
 
 ### Enhancements
@@ -515,6 +521,7 @@ of the highlights. 250 commits. Enough said.
 [#1032]: https://github.com/gregbell/active_admin/issues/1032
 [#1033]: https://github.com/gregbell/active_admin/issues/1033
 [#1041]: https://github.com/gregbell/active_admin/issues/1041
+[#1063]: https://github.com/gregbell/active_admin/issues/1063
 [@BoboFraggins]: https://github.com/BoboFraggins
 [@DMajrekar]: https://github.com/DMajrekar
 [@ZequeZ]: https://github.com/ZequeZ

data/lib/active_admin/comments/comment.rb

@@ -19,13 +19,27 @@ module ActiveAdmin
     def self.resource_type(record)
       record.class.base_class.name.to_s
     end
+    
+    def self.resource_id_cast(record)
+      # Postgres adapters won't compare strings to numbers (issue 34)
+      if resource_id_type == :string
+        record.id.to_s
+      else
+        record.id
+      end
+    end
 
     def self.find_for_resource_in_namespace(resource, namespace)
       where(:resource_type => resource_type(resource),
-            :resource_id => resource.id, 
+            :resource_id => resource_id_cast(resource), 
             :namespace => namespace.to_s)
     end
 
+  
+    def self.resource_id_type
+      columns.select { |i| i.name == "resource_id" }.first.type
+    end
+
   end
 
 end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/unit/comments_spec.rb

@@ -37,6 +37,24 @@ describe "Comments" do
       end
     end
     
+    describe ".resource_id_cast" do
+      let(:post) { Post.create!(:title => "Testing.") }
+      let(:namespace_name) { "admin" }
+      
+      it "should cast resource_id as string" do
+        comment = ActiveAdmin::Comment.create! :resource => post,
+                                                :body => "Another Comment",
+                                                :namespace => namespace_name
+        ActiveAdmin::Comment.resource_id_cast(comment).class.should eql String
+      end
+    end
+
+    describe ".resource_id_type" do
+      it "should be :string" do
+        ActiveAdmin::Comment.resource_id_type.should eql :string
+      end
+    end
+    
     describe "Commenting on resource with string id" do
       let(:tag){ Tag.create!(:name => "cooltags") }
       let(:namespace_name){ "admin" }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activeadmin
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Greg Bell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-21 00:00:00 Z
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement