acts_as_restful_list 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/acts_as_restful_list.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_restful_list}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["'Trey Bean'"]
-  s.date = %q{2010-03-24}
+  s.date = %q{2010-11-11}
   s.description = %q{Just like acts_as_list, but allows updating through standard restful methods.}
   s.email = %q{trey@12spokes.com}
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/12spokes/acts_as_restful_list}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Restful acts_as_list}
   s.test_files = [
     "spec/acts_as_restful_list_spec.rb",
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/lib/acts_as_restful_list.rb

@@ -28,9 +28,9 @@ module ActsAsRestfulList
           nil
         else
           scopes = Array(configuration[:scope]).collect do |scope|
-            column = scope.to_s.match(/_id$/) ? scope.to_s : "#{scope}_id"
+            column = self.class.column_names.include?(scope.to_s) ? scope.to_s : "#{scope}_id"
             value = self.send(column)
-            value.nil? ? "#{column} IS NULL" : "#{column} = #{value}"
+            value.nil? ? "#{column} IS NULL" : "#{column} = #{value.is_a?(String) ? "'#{value}'" : value}"
           end
           scopes.join(' AND ')
         end

data/spec/acts_as_restful_list_spec.rb

@@ -307,6 +307,40 @@ describe "ActsAsRestfulList" do
   end
   
   
+  describe 'declaring acts_as_restful_list and setting the scope on a column that is not an _id column' do
+    before(:all) do
+      ActiveRecord::Schema.define(:version => 1) do
+        create_table :mixins do |t|
+          t.column :position, :integer
+          t.column :parent_name, :string
+          t.column :created_at, :datetime      
+          t.column :updated_at, :datetime
+        end
+      end
+      
+      class Mixin < ActiveRecord::Base
+        acts_as_restful_list :scope => :parent_name
+      end
+    end
+    
+    after(:all) do
+      Object.send(:remove_const, :Mixin)
+      
+      ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Base.connection.drop_table(table)
+      end
+    end
+    
+    it 'should define scope_condition as an instance method' do
+      Mixin.new.should respond_to(:scope_condition)
+    end
+    
+    it 'should return a scope condition that limits based on the parent_id' do
+      Mixin.new(:parent_name => 'Brandy').scope_condition.should == "parent_name = 'Brandy'"
+    end
+  end
+  
+  
   describe 'declaring acts_as_restful_list and setting the scope to multiple columns' do
     before(:all) do
       ActiveRecord::Schema.define(:version => 1) do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_restful_list
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "'Trey Bean'"
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 -06:00
+date: 2010-11-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -64,23 +67,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Restful acts_as_list