mikado 0.0.3 → 0.0.4

data/Gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 gemspec
 
 group :test do
-  gem 'activerecord', '2.3.5', :require => 'active_record'
+  gem 'activerecord', '3.0.3', :require => 'active_record'
   gem 'sqlite3'
 end

data/README

@@ -1,5 +1,7 @@
 Mikado wraps Activerecord validation conditions with a block.
 
+Mikado has been tested with ruby 1.8/1.9 and ActiveRecord >= 2.3.5
+
 Example:
 
 Instead of

data/Rakefile

@@ -10,7 +10,7 @@ task :default do
   end
   
   Dir['test/*_test.rb'].each do |file|
-    require file
+    require File.expand_path("../#{file}", __FILE__)
   end
 end
 
@@ -19,7 +19,7 @@ namespace :db do
     desc "create and prepare test database"
     task :prepare do
       Dir.mkdir('test/db') unless File.directory?('test/db')
-      require 'test/prepare'
+      require File.expand_path("../test/prepare", __FILE__)
     end
     
     desc "delete test database"

data/lib/mikado.rb

@@ -1 +1,2 @@
-require File.expand_path('../mikado/conditional_validation', __FILE__)
+require File.expand_path('../mikado/conditional_validation', __FILE__)
+require File.expand_path('../mikado/utility', __FILE__)

data/lib/mikado/conditional_validation.rb

@@ -36,26 +36,17 @@ module Mikado
     end
     
     def modify_validations
-      methods.map { |m| m if m.starts_with?("validates_") }.compact.each do |method|
-        (class << self; self; end).instance_eval do
-
-          define_method "#{method}_with_mikado" do |*attr_names|
-            attrs = modify_with_mikado(attr_names)
-            return self.send("#{method}_without_mikado", *attrs)
-          end
-          
-          alias_method_chain method, "mikado"
-        end
-      end
+      meths = methods.map { |m| m if m.to_s.starts_with?("validates_") }.compact
+      meths |= %w( validate validate_on_create validate_on_update )
       
-      %w( validate validate_on_create validate_on_update ).each do |method|
+      meths.each do |method|
         (class << self; self; end).instance_eval do
 
           define_method "#{method}_with_mikado" do |*attr_names, &block|
             attrs = modify_with_mikado(attr_names)
             return self.send("#{method}_without_mikado", *attrs, &block)
           end
-
+          
           alias_method_chain method, "mikado"
         end
       end
@@ -65,16 +56,17 @@ module Mikado
       return attr_names unless mikado_validation
       
       options = attr_names.extract_options!
+      options = options.dup if Mikado::Utility.is_ar_3?
+
       options[:if] = [] if options.blank?
       options[:if] = [options[:if]] if !options[:if].is_a?(Array)
-    
+
       options[:if] = options[:if] | mikado_validation
     
       attr_names << options
       
       attr_names
     end
-
     
   end
 end

data/lib/mikado/utility.rb

@@ -0,0 +1,20 @@
+module Mikado
+  class Utility
+    def self.is_ar_3?
+      cmp_ar_version(3)
+    end
+    
+    def self.is_ar_2?
+      cmp_ar_version(2)
+    end
+    
+    def self.ar_version
+      ActiveRecord::VERSION::STRING
+    end
+    
+    # MAJOR (, MINOR, TINY)
+    def self.cmp_ar_version(major)
+      ar_version =~ /#{major}\.\d+\.\d+/
+    end
+  end
+end

data/lib/mikado/version.rb

@@ -1,3 +1,3 @@
 module Mikado
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/helper.rb

@@ -4,7 +4,7 @@ require 'bundler/setup'
 
 Bundler.require :test
 
-require 'test/item'
+require File.expand_path("../item", __FILE__)
 
 ActiveRecord::Base.establish_connection(
   :adapter  => "sqlite3",

data/test/mikado_test.rb

@@ -1,5 +1,5 @@
-require 'test/helper'
 require 'test/unit'
+require File.expand_path("../helper", __FILE__)
 
 class ItemTest < Test::Unit::TestCase
   def setup
@@ -8,7 +8,7 @@ class ItemTest < Test::Unit::TestCase
 
   def reload(klass)
     Object.send(:remove_const, klass.to_s)
-    load "test/#{klass.to_s.downcase}.rb"
+    load File.expand_path("../#{klass.to_s.downcase}.rb", __FILE__)
     yield
   end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mikado
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matthias Zirnstein
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -07:00
-default_executable: 
+date: 2011-05-10 00:00:00 Z
 dependencies: []
 
 description: ""
@@ -35,13 +29,13 @@ files:
 - Rakefile
 - lib/mikado.rb
 - lib/mikado/conditional_validation.rb
+- lib/mikado/utility.rb
 - lib/mikado/version.rb
 - mikado.gemspec
 - test/helper.rb
 - test/item.rb
 - test/mikado_test.rb
 - test/prepare.rb
-has_rdoc: true
 homepage: https://github.com/zirni/mikado
 licenses: []
 
@@ -55,23 +49,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: mikado
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Wrap validation conditions with a single command