rmap 0.1.1 → 0.2.0

data/lib/rmap/table.rb

@@ -88,6 +88,9 @@ module Rmap
         all.map{|row| row.fetch(name).first}
       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]])
+        self
       else
         super
       end
@@ -168,10 +171,10 @@ module Rmap
           "#{table1.name}.#{foreign_key} = #{table2.name}.id"
         end
       else
-        if table2.column? "#{table1.name}_id"
-          "#{table1.name}.id = #{table2.name}.#{table1.name}_id"
+        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"
         else
-          "#{table1.name}.#{table2.name}_id = #{table2.name}.id"
+          "#{table1.name}.#{table2.name.to_s.gsub(/ies\Z/, "y").gsub(/s\Z/, "")}_id = #{table2.name}.id"
         end
       end
     end

data/lib/rmap/version.rb

@@ -1,3 +1,3 @@
 module Rmap
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/rmap.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "mysql2", "~> 0.3"
-  s.add_dependency "json", "~> 1.7"
-  s.add_dependency "ripl", "~> 0.6"
-  s.add_dependency "ripl-multi_line", "~> 0.3"
+  s.add_dependency "mysql2", "~> 0"
+  s.add_dependency "json", "~> 1"
+  s.add_dependency "ripl", "~> 0"
+  s.add_dependency "ripl-multi_line", "~> 0"
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,48 +13,48 @@ date: 2012-05-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &85842190 !ruby/object:Gem::Requirement
+  requirement: &82818880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85842190
+  version_requirements: *82818880
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &85841940 !ruby/object:Gem::Requirement
+  requirement: &82818630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *85841940
+  version_requirements: *82818630
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &85901530 !ruby/object:Gem::Requirement
+  requirement: &82818400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85901530
+  version_requirements: *82818400
 - !ruby/object:Gem::Dependency
   name: ripl-multi_line
-  requirement: &85901300 !ruby/object:Gem::Requirement
+  requirement: &82818170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85901300
+  version_requirements: *82818170
 description: 
 email:
 - jody@jodysalt.com