sakuramochi 0.1.0 → 0.2.1

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
-gem "rails", ">= 3.0.0"
+gem "activesupport", ">= 3.0.0"
+gem "activerecord", ">= 3.0.0"
 
 group :development do
   gem "sqlite3", "~> 1.3.4"

data/README.md

@@ -2,10 +2,13 @@
 
 Sakuramochi is a minimal active record extensions for Rails3.
 
+This is similar to the ar-extensions gem.
+
 ## Installation
 
 ```ruby
-gem 'sakuramochi', :git => 'git://github.com/mashiro/sakuramochi.git'
+gem 'sakuramochi'
+# gem 'sakuramochi', :git => 'git://github.com/mashiro/sakuramochi.git'
 ```
 
 ## Getting started
@@ -48,7 +51,7 @@ Sakuramochi.configure do |config|
     :grouping => true,
     :expand => false,
     :converter => proc { |v| "#{v.first}%#{v.last}" },
-    :validator => proc { |v| true || v.is_a?(Enumerable) && v.to_a.size == 2 }
+    :validator => proc { |v| v.is_a?(Enumerable) && v.to_a.size == 2 }
 end
 
 User.where(:name_eq_amamiya => 'rizumu')

data/Rakefile

@@ -17,8 +17,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "sakuramochi"
   gem.homepage = "http://github.com/mashiro/sakuramochi"
   gem.license = "MIT"
-  gem.summary = %Q{Minimal active record extension plugin for Rails 3}
-  gem.description = %Q{Minimal active record extension plugin for Rails 3}
+  gem.summary = %Q{Minimal extensions for active record 3}
+  gem.description = %Q{Minimal extensions for active record 3}
   gem.email = "mail@mashiro.org"
   gem.authors = ["mashiro"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/lib/sakuramochi.rb

@@ -1 +1,10 @@
-require 'sakuramochi/railtie'
+require 'active_support/core_ext'
+require 'active_support'
+require 'active_record'
+require 'sakuramochi/config'
+require 'sakuramochi/predicate'
+require 'sakuramochi/predicate_builder'
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::PredicateBuilder.send(:include, Sakuramochi::PredicateBuilder)
+end

data/sakuramochi.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "sakuramochi"
-  s.version = "0.1.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mashiro"]
-  s.date = "2011-10-13"
-  s.description = "Minimal active record extension plugin for Rails 3"
+  s.date = "2011-10-16"
+  s.description = "Minimal extensions for active record 3"
   s.email = "mail@mashiro.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
     "lib/sakuramochi/config.rb",
     "lib/sakuramochi/predicate.rb",
     "lib/sakuramochi/predicate_builder.rb",
-    "lib/sakuramochi/railtie.rb",
     "sakuramochi.gemspec",
     "spec/sakuramochi/config_spec.rb",
     "spec/sakuramochi/predicate_builder_spec.rb",
@@ -40,20 +39,22 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"
-  s.summary = "Minimal active record extension plugin for Rails 3"
+  s.summary = "Minimal extensions for active record 3"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_development_dependency(%q<sqlite3>, ["~> 1.3.4"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.4"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -61,7 +62,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.4"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/spec/spec_helper.rb

@@ -10,6 +10,5 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   config.before(:suite) do
     CreateTestTables.up
-    Sakuramochi::Railtie.setup
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakuramochi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
+date: 2011-10-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &27264080 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &22941820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *27264080
+  version_requirements: *22941820
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &22941220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *22941220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &27263600 !ruby/object:Gem::Requirement
+  requirement: &22940620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *27263600
+  version_requirements: *22940620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27263040 !ruby/object:Gem::Requirement
+  requirement: &22940020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *27263040
+  version_requirements: *22940020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &27262520 !ruby/object:Gem::Requirement
+  requirement: &22939420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *27262520
+  version_requirements: *22939420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &27261880 !ruby/object:Gem::Requirement
+  requirement: &22938800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *27261880
+  version_requirements: *22938800
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &27261220 !ruby/object:Gem::Requirement
+  requirement: &22918240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,8 +87,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27261220
-description: Minimal active record extension plugin for Rails 3
+  version_requirements: *22918240
+description: Minimal extensions for active record 3
 email: mail@mashiro.org
 executables: []
 extensions: []
@@ -96,7 +107,6 @@ files:
 - lib/sakuramochi/config.rb
 - lib/sakuramochi/predicate.rb
 - lib/sakuramochi/predicate_builder.rb
-- lib/sakuramochi/railtie.rb
 - sakuramochi.gemspec
 - spec/sakuramochi/config_spec.rb
 - spec/sakuramochi/predicate_builder_spec.rb
@@ -118,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4419155070054156166
+      hash: -3547682809614269142
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,5 +140,5 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Minimal active record extension plugin for Rails 3
+summary: Minimal extensions for active record 3
 test_files: []

data/lib/sakuramochi/railtie.rb

@@ -1,18 +0,0 @@
-require 'rails'
-require 'sakuramochi/config'
-require 'sakuramochi/predicate'
-require 'sakuramochi/predicate_builder'
-
-module Sakuramochi
-  class Railtie < Rails::Railtie
-    initializer 'sakuramochi.initialize' do
-      ActiveSupport.on_load(:active_record) do
-        Railtie.setup
-      end
-    end 
-
-    def self.setup
-      ActiveRecord::PredicateBuilder.send(:include, Sakuramochi::PredicateBuilder)
-    end
-  end 
-end