hiroeorz-custom-active-record 0.1.3 → 0.1.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 3
+:patch: 7

data/custom-active-record.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{custom-active-record}
-  s.version = "0.1.3"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hiroeorz"]
-  s.date = %q{2009-06-29}
+  s.date = %q{2009-07-03}
   s.email = %q{hiroe.orz@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "lib/custom_active_record.rb",
      "lib/custom_active_record/no_id_base.rb",
      "lib/custom_active_record/plurals_pkeys_base.rb",
+     "lib/custom_active_record/plurals_pkeys_sjis_base.rb",
      "lib/custom_active_record/sjis_base.rb",
      "spec/custom-active-record_spec.rb",
      "spec/spec_helper.rb"

data/lib/custom_active_record/plurals_pkeys_base.rb

@@ -1,40 +1,60 @@
-# -*- coding: utf-8 -*-
-
-require "custom_active_record/sjis_base"
-
 module ActiveRecord
-  class PluralsPKeysBase < ActiveRecord::SJISBase
+  class PluralsPKeysBase < ActiveRecord::Base
 
     @@primary_key_list = {}
 
+
     def self.set_primary_key_list(*keys)
-      @@primary_key_list[self] = keys.to_mssql_encode
+      @@primary_key_list[self] = keys
     end
 
-    def destroy
-      unless new_record?
-        where = ""
-        first = true
+    def self.find_from_ids(ids, options)
+      if ids.kind_of?(Array) and ids.length == 1
+        ids = ids[0]
+      end
+
+      expects_array = ids.first.kind_of?(Array)
+      
+      unless expects_array
+        ids = [ids]
+      end
+      
+      where = ""
+      
+      ids.each_with_index do |id_element, id_i|
+        if id_i.zero?
+          where << "(" 
+        else
+          where << ") or ("
+        end
         
-        primary_key_list.each do |key|
-          value = read_attribute(key)
+        primary_key_list.each_with_index do |key, i|
+          value = id_element[i]
+          
+          where << " and " unless i.zero?
+          where << "#{key} = #{quote_value(value)}"
           
-          where << " and " unless first
-          where << " [#{key}] = #{quote_value(value)}"
-          first = false
         end
-
-        connection.delete <<-end_sql, "#{self.class.name} Destroy"
-            DELETE FROM #{self.class.table_name}
-            WHERE #{where}
-          end_sql
       end
       
-      freeze
+      where << ")"
+      
+      find_mode = expects_array ? :all : :first
+      
+      self.find(find_mode, :conditions => where,
+                :order => primary_key_list.join(","))    
+    end
+    
+    def destroy
+      raise "not supported method"
     end
 
     private
 
+    def self.primary_key_list
+      return @@primary_key_list[self]
+    end
+
     def primary_key_list
       return @@primary_key_list[self.class]
     end
@@ -47,7 +67,7 @@ module ActiveRecord
         value = read_attribute(key)
 
         where << " and " unless first
-        where << "[#{key}] = #{quote_value(value)}"
+        where << "#{key} = #{quote_value(value)}"
         first = false
       end
 

data/lib/custom_active_record/plurals_pkeys_sjis_base.rb

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+
+require "custom_active_record/sjis_base"
+
+module ActiveRecord
+  class PluralsPKeysSJISBase < ActiveRecord::SJISBase
+
+    @@primary_key_list = {}
+
+    def self.set_primary_key_list(*keys)
+      @@primary_key_list[self] = keys.to_mssql_encode
+    end
+
+    def destroy
+      unless new_record?
+        where = ""
+        first = true
+        
+        primary_key_list.each do |key|
+          value = read_attribute(key)
+          
+          where << " and " unless first
+          where << " [#{key}] = #{quote_value(value)}"
+          first = false
+        end
+
+        connection.delete <<-end_sql, "#{self.class.name} Destroy"
+            DELETE FROM #{self.class.table_name}
+            WHERE #{where}
+          end_sql
+      end
+      
+      freeze
+    end
+
+    private
+
+    def primary_key_list
+      return @@primary_key_list[self.class]
+    end
+
+    def update
+      where = ""
+      first = true
+
+      primary_key_list.each do |key|
+        value = read_attribute(key)
+
+        where << " and " unless first
+        where << "[#{key}] = #{quote_value(value)}"
+        first = false
+      end
+
+      connection.update(
+        "UPDATE #{self.class.table_name} " +
+        "SET #{quoted_comma_pair_list(connection, 
+                                      attributes_with_quotes(false))} " +
+                        "WHERE #{where}",
+        "#{self.class.name} Update")
+    end
+  end
+end

data/lib/custom_active_record.rb

@@ -3,3 +3,4 @@ require "active_record"
 require "custom_active_record/sjis_base.rb"
 require "custom_active_record/no_id_base.rb"
 require "custom_active_record/plurals_pkeys_base.rb"
+require "custom_active_record/plurals_pkeys_sjis_base.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hiroeorz-custom-active-record
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors: 
 - hiroeorz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-29 00:00:00 -07:00
+date: 2009-07-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/custom_active_record.rb
 - lib/custom_active_record/no_id_base.rb
 - lib/custom_active_record/plurals_pkeys_base.rb
+- lib/custom_active_record/plurals_pkeys_sjis_base.rb
 - lib/custom_active_record/sjis_base.rb
 - spec/custom-active-record_spec.rb
 - spec/spec_helper.rb