millstone 0.0.2 → 0.0.3

data/lib/millstone/active_record/relation_methods.rb

@@ -72,6 +72,11 @@ module Millstone
 
       def except(*skips)
         result = super
+
+        if ::ActiveRecord::VERSION::TINY < 6
+          result.send :apply_modules, extensions
+        end
+
         ([:with_deleted, :only_deleted] - skips).each do |method|
           result.send(:"#{method}_value=", send(:"#{method}_value"))
         end
@@ -80,6 +85,11 @@ module Millstone
 
       def only(*onlies)
         result = super
+
+        if ::ActiveRecord::VERSION::TINY < 6
+          result.send :apply_modules, extensions
+        end
+
         ([:with_deleted, :only_deleted] & onlies).each do |method|
           result.send(:"#{method}_value=", send(:"#{method}_value"))
         end
@@ -115,6 +125,16 @@ module Millstone
 
           arel
         end
+
+        if ::ActiveRecord::VERSION::TINY < 4
+          def collapse_wheres(arel, wheres)
+            wheres.each do |where|
+              where = Arel.sql(where) if String === where
+              arel = arel.where(Arel::Nodes::Grouping.new(where))
+            end
+            arel
+          end
+        end
     end
   end
 end

data/lib/millstone/version.rb

@@ -0,0 +1,3 @@
+module Millstone
+  VERSION = "0.0.3"
+end

data/millstone.gemspec

@@ -1,9 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+require 'millstone/version'
 
 Gem::Specification.new do |s|
   s.name        = 'millstone'
-  s.version     = '0.0.2'
+  s.version     = Millstone::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Yoshikazu Ozawa']
   s.email       = ['yoshikazu.ozawa@gmail.com']
@@ -18,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.licenses = ['MIT']
 
-  s.add_dependency 'rails', ['>= 3.0.6']
+  s.add_dependency 'rails', ['>= 3.0.3']
   s.add_development_dependency 'bundler', ['>= 1.0.0']
   s.add_development_dependency 'sqlite3', ['>= 0']
   s.add_development_dependency 'rspec', ['>= 2.0.0']

metadata

@@ -1,125 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: millstone
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Yoshikazu Ozawa
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-09 00:00:00 +09:00
+date: 2011-08-21 00:00:00.000000000 +09:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156820920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 0
-        - 6
-        version: 3.0.6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156820920
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2156820240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156820240
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2156819640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156819640
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156819040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156819040
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &2156818240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: delorean
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156818240
+- !ruby/object:Gem::Dependency
+  name: delorean
+  requirement: &2156817620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: ActiveRecord plugin which allows you to hide without actually deleting them for Rails3. Millstone is extending ActiveRecord::Relation
-email: 
+  prerelease: false
+  version_requirements: *2156817620
+description: ActiveRecord plugin which allows you to hide without actually deleting
+  them for Rails3. Millstone is extending ActiveRecord::Relation
+email:
 - yoshikazu.ozawa@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -134,6 +100,7 @@ files:
 - lib/millstone/active_record/extension.rb
 - lib/millstone/active_record/relation_methods.rb
 - lib/millstone/active_record/validations/uniqueness_with_deleted.rb
+- lib/millstone/version.rb
 - millstone.gemspec
 - spec/models/associations/belongs_to_association_spec.rb
 - spec/models/associations/belongs_to_polymorphic_association_spec.rb
@@ -149,39 +116,32 @@ files:
 - spec/support/migration.rb
 has_rdoc: true
 homepage: https://github.com/relax4u/millstone
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: ActiveRecord plugin which allows you to hide without actually deleting them for Rails3.
-test_files: 
+summary: ActiveRecord plugin which allows you to hide without actually deleting them
+  for Rails3.
+test_files:
 - spec/models/associations/belongs_to_association_spec.rb
 - spec/models/associations/belongs_to_polymorphic_association_spec.rb
 - spec/models/associations/has_many_through_without_deleted_association_spec.rb