rmap 0.2.2 → 0.2.3

data/lib/rmap/table.rb

@@ -89,7 +89,7 @@ module Rmap
       elsif column?(name.to_s.sub(/=\Z/, "")) && name.match(/\A(.*)=\Z/)
         all.each{|row| row.update($1 => args[0])}
       elsif name.match /\A(.*?)_(#{BINARY_FILTER_METHODS.keys.join('|')})\Z/
-        @binary_filter_methods_args[$2].push([$1,args[0]])
+        @binary_filter_methods_args[$2].push([$1.split(/_or_/),args[0]])
         self
       else
         super
@@ -171,10 +171,10 @@ module Rmap
           "#{table1.name}.#{foreign_key} = #{table2.name}.id"
         end
       else
-        if table2.column? "#{table1.name.to_s.gsub(/ies\Z/, "y").gsub(/s\Z/, "")}_id"
-          "#{table1.name}.id = #{table2.name.to_s.gsub(/ies\Z/, "y").gsub(/s\Z/, "")}.#{table1.name}_id"
+        if table2.column? "#{to_singular(table1.name)}_id"
+          "#{table1.name}.id = #{to_singular(table2.name)}.#{table1.name}_id"
         else
-          "#{table1.name}.#{table2.name.to_s.gsub(/ies\Z/, "y").gsub(/s\Z/, "")}_id = #{table2.name}.id"
+          "#{table1.name}.#{to_singular(table2.name)}_id = #{table2.name}.id"
         end
       end
     end
@@ -318,7 +318,6 @@ module Rmap
       @database.client.query("alter table `#{@name}` drop `#{name}`")
     end
     
-    
     def column_names
       @database.client.query("describe `#{@name}`", :as => :hash).map {|row| row['Field']}
     end
@@ -327,5 +326,17 @@ module Rmap
       all.to_s
     end
     
+    private
+    
+    def to_singular(value)
+      if value.to_s.match /\A(.*)ies\Z/
+        "#{$1}y"
+      elsif value.to_s.match /\A(.*ss)es\Z/
+        $1
+      else
+        value.to_s.gsub(/s\Z/, "")
+      end
+    end
+    
   end
 end

data/lib/rmap/version.rb

@@ -1,3 +1,3 @@
 module Rmap
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmap
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000Z
+date: 2012-05-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &74039820 !ruby/object:Gem::Requirement
+  requirement: &78471470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74039820
+  version_requirements: *78471470
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &74039570 !ruby/object:Gem::Requirement
+  requirement: &78471220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *74039570
+  version_requirements: *78471220
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &74039340 !ruby/object:Gem::Requirement
+  requirement: &78470990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74039340
+  version_requirements: *78470990
 - !ruby/object:Gem::Dependency
   name: ripl-multi_line
-  requirement: &74039110 !ruby/object:Gem::Requirement
+  requirement: &78470760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74039110
+  version_requirements: *78470760
 description: 
 email:
 - jody@jodysalt.com