sakuramochi 0.2.1 → 0.5.0

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format documentation
+--format d

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,13 +1,13 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "activesupport", ">= 3.0.0"
-gem "activerecord", ">= 3.0.0"
+gem 'activesupport', '~> 3.0'
+gem 'activerecord', '~> 3.0'
 
 group :development do
-  gem "sqlite3", "~> 1.3.4"
-  gem "rspec", "~> 2.6.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem 'sqlite3'
+  gem 'rspec'
+  gem 'rdoc'
+  gem 'bundler'
+  gem 'jeweler'
 end
 

data/README.md

@@ -1,6 +1,8 @@
 # Sakuramochi
 
-Sakuramochi is a minimal active record extensions for Rails3.
+[![Build Status](https://secure.travis-ci.org/mashiro/sakuramochi.png)](http://travis-ci.org/mashiro/sakuramochi)
+
+Sakuramochi is a minimal extensions for Active Record 3.
 
 This is similar to the ar-extensions gem.
 
@@ -15,13 +17,13 @@ gem 'sakuramochi'
 
 ```ruby
 User.where(:name_contains => 'ai')
-# => "SELECT \"users\".* FROM \"users\"  WHERE (\"users\".\"name\" LIKE '%ai%')"
+# => "SELECT "users".* FROM "users"  WHERE ("users"."name" LIKE '%ai%')"
 
 User.where(:name_contains_any => ['ru', 'ai'])
-# => "SELECT \"users\".* FROM \"users\"  WHERE ((\"users\".\"name\" LIKE '%ru%' OR \"users\".\"name\" LIKE '%ai%'))"
+# => "SELECT "users".* FROM "users"  WHERE (("users"."name" LIKE '%ru%' OR "users"."name" LIKE '%ai%'))"
 
 User.where(:name_contains_all => ['ru', 'ai'])
-# => "SELECT \"users\".* FROM \"users\"  WHERE ((\"users\".\"name\" LIKE '%ru%' AND \"users\".\"name\" LIKE '%ai%'))"
+# => "SELECT "users".* FROM "users"  WHERE (("users"."name" LIKE '%ru%' AND "users"."name" LIKE '%ai%'))"
 ```
 
 ## Predicates
@@ -36,6 +38,24 @@ User.where(:name_contains_all => ['ru', 'ai'])
 * lt
 * lte, lteq
 
+## Conditions
+```
+expression = term {("and"|"or") term}
+term = ["not"] factor
+factor = array | hash | "(" expression ")"
+```
+
+``` ruby
+User.where([{:name_contains => 'harune'}, :and, {:name_contains => 'aira'}]) 
+# => "SELECT "users".* FROM "users"  WHERE (("users"."name" LIKE '%harune%') AND ("users"."name" LIKE '%aira%'))"
+
+User.where([:not, {:name_end_with => "mion"}])
+# => SELECT "users".* FROM "users" WHERE (NOT (("users"."name" LIKE '%mion')))
+
+User.where([:not, :'(', {:name_contains => 'aira'}, :or, {:name_contains => 'rizumu'}, :')', :and, {:age_gte => 14}])
+# => SELECT "users".* FROM "users" WHERE (NOT ((("users"."name" LIKE '%aira%') OR ("users"."name" LIKE '%rizumu%'))) AND ("users"."age" >= 14))
+```
+
 ## Configration
 
 ```ruby
@@ -55,10 +75,10 @@ Sakuramochi.configure do |config|
 end
 
 User.where(:name_eq_amamiya => 'rizumu')
-# => "SELECT \"users\".* FROM \"users\"  WHERE \"users\".\"name\" = 'amamiya rizumu'"
+# => "SELECT "users".* FROM "users"  WHERE "users"."name" = 'amamiya rizumu'"
 
 User.where(:name_surrounds_with => ["ama", "umu"])
-# => "SELECT \"users\".* FROM \"users\"  WHERE (\"users\".\"name\" LIKE 'ama%umu')"
+# => "SELECT "users".* FROM "users"  WHERE ("users"."name" LIKE 'ama%umu')"
 ```
 
 ## Copyright

data/Rakefile

@@ -38,8 +38,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.5.0

data/lib/sakuramochi.rb

@@ -4,7 +4,10 @@ require 'active_record'
 require 'sakuramochi/config'
 require 'sakuramochi/predicate'
 require 'sakuramochi/predicate_builder'
+require 'sakuramochi/condition'
+require 'sakuramochi/relation'
 
 ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Relation.send(:include, Sakuramochi::Relation)
   ActiveRecord::PredicateBuilder.send(:include, Sakuramochi::PredicateBuilder)
 end

data/lib/sakuramochi/condition.rb

@@ -0,0 +1,139 @@
+module Sakuramochi
+  module Condition
+    class UnexpectedError < StandardError; end
+    class SyntaxError < StandardError; end
+
+    module Nodes
+      class Node
+      end
+
+      class Expression < Node
+        attr_reader :operator, :left, :right
+        def initialize(operator, left, right)
+          @operator = operator
+          @left = left
+          @right = right
+        end
+
+        def inspect
+          "(#{@operator} #{@left.inspect} #{@right.inspect})"
+        end
+      end
+
+      class Term < Node
+        attr_reader :operator, :value
+        def initialize(operator, value)
+          @operator = operator
+          @value = value
+        end
+
+        def inspect
+          "(#{@operator} #{@value.inspect})"
+        end
+      end
+
+      class Factor < Node
+        attr_reader :value
+        def initialize(value)
+          @value = value
+        end
+
+        def inspect
+          "#{@value}"
+        end
+      end
+
+      class Group < Node
+        attr_reader :expression
+        def initialize(expression)
+          @expression = expression
+        end
+
+        def inspect
+          "(#{@expression.inspect})"
+        end
+      end
+    end
+
+    # expression = term {("and"|"or") term}
+    # term = ["not"] factor
+    # factor = array | hash | "(" expression ")"
+    class Parser
+      EXPRESSIONS = ['and', 'or']
+      TERMS = ['not']
+      PARENTHESES = {'(' => ')'}
+
+      def initialize(tokens)
+        @tokens = tokens.dup
+        @tokens = @tokens.split(/\s+/) if @tokens.is_a?(String) # debug
+      end
+
+      def parse
+        expression
+      end
+
+      private
+
+      def self.indifferenct_key(token)
+        if token.is_a?(String) || token.is_a?(Symbol)
+          token.to_s.downcase
+        else
+          token
+        end
+      end
+
+      def peek
+        token = @tokens.first
+        self.class.indifferenct_key token
+      end
+
+      def shift
+        token = @tokens.shift
+        self.class.indifferenct_key token
+      end
+
+      def accept(*args)
+        if args.include?(peek)
+          shift
+        else
+          nil
+        end
+      end
+
+      def expect(*args)
+        if token = accept(*args)
+          token
+        else
+          raise UnexpectedError
+        end
+      end
+
+      def expression
+        node = term
+        while token = accept(*EXPRESSIONS)
+          node = Nodes::Expression.new(token, node, term)
+        end
+        node
+      end
+
+      def term
+        if token = accept(*TERMS)
+          Nodes::Term.new(token, factor)
+        else
+          factor
+        end
+      end
+
+      def factor
+        if token = accept(*PARENTHESES.keys)
+          node = expression
+          expect PARENTHESES[token]
+          Nodes::Group.new(node)
+        else
+          Nodes::Factor.new(shift)
+        end
+      end
+    end
+
+  end
+end

data/lib/sakuramochi/predicate_builder.rb

@@ -19,7 +19,7 @@ module Sakuramochi
 
           if value.is_a?(Hash)
             table = Arel::Table.new(column, engine)
-            build_from_hash(engine, value, table)
+            build_from_hash_with_predicate(engine, value, table)
           else
             column = column.to_s
 
@@ -42,6 +42,8 @@ module Sakuramochi
         predicates.flatten.compact
       end
 
+      private
+
       def build_attribute_with_predicate(attribute, value, predicate)
         if predicate.validate(value)
           if predicate.converter
@@ -61,21 +63,24 @@ module Sakuramochi
           value = value.select(value.klass.arel_table[value.klass.primary_key]) if value.select_values.empty?
           attribute.in(value.arel.ast)
         when Array, ActiveRecord::Associations::CollectionProxy
-          values = value.to_a.map { |x|
-            x.is_a?(ActiveRecord::Base) ? x.id : x
-          }
+        when Array, ActiveRecord::Associations::CollectionProxy
+          values = value.to_a.map {|x| x.is_a?(ActiveRecord::Base) ? x.id : x}
+          ranges, values = values.partition {|v| v.is_a?(Range) || v.is_a?(Arel::Relation)}
+
+          array_predicates = ranges.map {|range| attribute.in(range)}
 
           if values.include?(nil)
             values = values.compact
             if values.empty?
-              attribute.eq nil
+              array_predicates << attribute.eq(nil)
             else
-              attribute.in(values.compact).or attribute.eq(nil)
+              array_predicates << attribute.in(values.compact).or(attribute.eq(nil))
             end
           else
-            attribute.in(values)
+            array_predicates << attribute.in(values)
           end
 
+          array_predicates.inject {|composite, predicate| composite.or(predicate)}
         when Range, Arel::Relation
           attribute.in(value)
         when ActiveRecord::Base

data/lib/sakuramochi/relation.rb

@@ -0,0 +1,58 @@
+require 'active_support/concern'
+require 'sakuramochi/condition'
+
+module Sakuramochi
+  module Relation
+    extend ActiveSupport::Concern
+
+    included do
+      alias :build_where_without_condition :build_where
+      alias :build_where :build_where_with_condition
+    end
+
+    module InstanceMethods
+      def collapse_conditions(node, other)
+        case node
+        when Sakuramochi::Condition::Nodes::Expression
+          case node.operator.to_s
+          when 'and'
+            left = collapse_conditions(node.left, other)
+            right = collapse_conditions(node.right, other)
+            Arel::Nodes::And.new([left, right])
+          when 'or'
+            left = collapse_conditions(node.left, other)
+            right = collapse_conditions(node.right, other)
+            Arel::Nodes::Or.new(left, right)
+          end
+
+        when Sakuramochi::Condition::Nodes::Term
+          case node.operator.to_s
+          when 'not'
+            right = collapse_conditions(node.value, other)
+            Arel::Nodes::Not.new(right)
+          end
+
+        when Sakuramochi::Condition::Nodes::Factor
+          wheres = build_where_without_condition(node.value, other)
+          arel = table.from(table)
+          collapse_wheres(arel, (wheres - ['']).uniq)
+          arel.constraints.inject { |left, right| left.and(right) }
+
+        when Sakuramochi::Condition::Nodes::Group
+          expression = collapse_conditions(node.expression, other)
+          Arel::Nodes::Grouping.new(expression)
+        end
+      end
+
+      def build_where_with_condition(opts, other = [])
+        if opts.is_a?(Array) && !opts.first.is_a?(String)
+          ast = Sakuramochi::Condition::Parser.new(opts.dup).parse
+          [collapse_conditions(ast, other)]
+        else
+          build_where_without_condition(opts, other)
+        end
+      end
+    end
+
+  end
+end

data/sakuramochi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sakuramochi"
-  s.version = "0.2.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mashiro"]
-  s.date = "2011-10-16"
+  s.date = "2011-11-28"
   s.description = "Minimal extensions for active record 3"
   s.email = "mail@mashiro.org"
   s.extra_rdoc_files = [
@@ -19,20 +19,26 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
     "lib/sakuramochi.rb",
+    "lib/sakuramochi/condition.rb",
     "lib/sakuramochi/config.rb",
     "lib/sakuramochi/predicate.rb",
     "lib/sakuramochi/predicate_builder.rb",
+    "lib/sakuramochi/relation.rb",
     "sakuramochi.gemspec",
+    "spec/sakuramochi/condition_spec.rb",
     "spec/sakuramochi/config_spec.rb",
     "spec/sakuramochi/predicate_builder_spec.rb",
     "spec/sakuramochi/predicate_spec.rb",
+    "spec/sakuramochi/relation_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/matcher.rb",
     "spec/support/schema.rb"
   ]
   s.homepage = "http://github.com/mashiro/sakuramochi"
@@ -45,30 +51,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      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"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    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"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/spec/sakuramochi/condition_spec.rb

@@ -0,0 +1,108 @@
+# encoding: utf-8
+require 'spec_helper'
+
+shared_examples_for 'expression node' do |operator, left, right, &block|
+  it { should be_instance_of Sakuramochi::Condition::Nodes::Expression }
+  its(:operator) { should eq operator }
+  its(:left) { should be_instance_of left }
+  its(:right) { should be_instance_of right }
+end
+
+shared_examples_for 'term node' do |operator, value|
+  it { should be_instance_of Sakuramochi::Condition::Nodes::Term }
+  its(:operator) { should eq operator }
+  its(:value) { should be_instance_of value }
+end
+
+shared_examples_for 'factor node' do |value|
+  it { should be_instance_of Sakuramochi::Condition::Nodes::Factor }
+  its(:value) { should eq value }
+end
+
+shared_examples_for 'group node' do |expression|
+  it { should be_instance_of Sakuramochi::Condition::Nodes::Group }
+  its(:expression) { should be_instance_of expression }
+end
+
+include Sakuramochi::Condition::Nodes
+
+describe Sakuramochi::Condition::Parser do
+  context '1 and 2' do
+    before { @node = Sakuramochi::Condition::Parser.new('1 and 2').parse }
+    subject { @node }
+
+    it_should_behave_like 'expression node', 'and', Factor, Factor
+  end
+
+  context 'not 1 or not 2' do
+    before { @node = Sakuramochi::Condition::Parser.new('not 1 or not 2').parse }
+    subject { @node }
+    it_should_behave_like 'expression node', 'or', Term, Term
+
+    context 'left' do
+      before { @node = @node.left }
+      it_should_behave_like 'term node', 'not', Factor
+
+      context 'value' do
+        before { @node = @node.value }
+        it_should_behave_like 'factor node', '1'
+      end
+    end
+
+    context 'right' do
+      before { @node = @node.right }
+      it_should_behave_like 'term node', 'not', Factor
+
+      context 'value' do
+        before { @node = @node.value }
+        it_should_behave_like 'factor node', '2'
+      end
+    end
+  end
+
+  context '( 3 and not ( ( 4 ) or 5 ) )' do
+    before { @node = Sakuramochi::Condition::Parser.new('( 3 and not ( ( 4 ) or 5 ) )').parse }
+    subject { @node }
+    it_should_behave_like 'group node', Expression
+
+    context 'expression' do
+      before { @node = @node.expression }
+      it_should_behave_like 'expression node', 'and', Factor, Term
+
+      context 'left' do
+        before { @node = @node.left }
+        it_should_behave_like 'factor node', '3'
+      end
+
+      context 'right' do
+        before { @node = @node.right }
+        it_should_behave_like 'term node', 'not', Group
+
+        context 'value' do
+          before { @node = @node.value }
+          it_should_behave_like 'group node', Expression
+
+          context 'expression' do
+            before { @node = @node.expression }
+            it_should_behave_like 'expression node', 'or', Group, Factor
+
+            context 'left' do
+              before { @node = @node.left }
+              it_should_behave_like 'group node', Factor
+
+              context 'expression' do
+                before { @node = @node.expression }
+                it_should_behave_like 'factor node', '4'
+              end
+            end
+
+            context 'right' do
+              before { @node = @node.right }
+              it_should_behave_like 'factor node', '5'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/sakuramochi/predicate_builder_spec.rb

@@ -1,28 +1,7 @@
+# encoding: utf-8
 require 'spec_helper'
 
-RSpec::Matchers.define :be_match_all do |expected|
-  match do |actuals|
-    actuals.all? { |actual| !!(actual =~ expected) }
-  end
-end
-
 describe Sakuramochi::PredicateBuilder do
-  before(:all) do
-    @aira = User.create! :name => 'harune aira'
-    ['fresh fruit basket', 'munekyun taiken', 'heartful splash',
-     'lovely rainbow', 'hirahira hiraku koi no hana', 'crystal splash'
-    ].each do |jump|
-      Status.create! :text => jump, :user => @aira
-    end
-
-    @rizumu = User.create! :name => 'amamiya rizumu'
-    ['heartful splash', 'colorful choco parade', 'fun fun heart dive',
-     'stardust shower', 'happy macaron spin', 'pop\'n candy rocket'
-    ].each do |jump|
-      Status.create! :text => jump, :user => @rizumu
-    end
-  end
-
   describe 'matches' do
     before do
       Sakuramochi.configure do |config|
@@ -40,43 +19,43 @@ describe Sakuramochi::PredicateBuilder do
 
     context 'contains' do
       let(:key) { :text_contains }
-      context 'with "macaron"' do
-        let(:value) { 'macaron' }
+      context 'with "マカロン"' do
+        let(:value) { 'マカロン' }
 
         it_should_behave_like :never_match
         it { should have(1).items }
-        it { subject.map(&:text).should be_match_all /macaron/ }
+        it { subject.map(&:text).should be_match_all /マカロン/ }
       end
 
-      context 'with "splash"' do
-        let(:value) { 'splash' }
+      context 'with "スプラッシュ"' do
+        let(:value) { 'スプラッシュ' }
 
         it_should_behave_like :never_match
         it { should have(3).items }
-        it { subject.map(&:text).should be_match_all /splash/ }
+        it { subject.map(&:text).should be_match_all /スプラッシュ/ }
       end
     end
 
     context 'contains_any' do
       let(:key) { :text_contains_any }
-      context 'with ["heart", "splash"]' do
-        let(:value) { ['heart', 'splash'] }
+      context 'with ["ハート", "スプラッシュ"]' do
+        let(:value) { ['ハート', 'スプラッシュ'] }
 
         it_should_behave_like :never_match
-        it { should have(4).items }
-        it { subject.map(&:text).should be_match_all /(heart|splash)/ }
+        it { should have(7).items }
+        it { subject.map(&:text).should be_match_all /(ハート|スプラッシュ)/ }
       end
     end
 
     context 'contains_all' do
       let(:key) { :text_contains_all }
-      context 'with ["heart", "splash"]' do
-        let(:value) { ['heart', 'splash'] }
+      context 'with ["ハート", "スプラッシュ"]' do
+        let(:value) { ['ハート', 'スプラッシュ'] }
 
         it_should_behave_like :never_match
         it { should have(2).items }
-        it { subject.map(&:text).should be_match_all /heart/ }
-        it { subject.map(&:text).should be_match_all /splash/ }
+        it { subject.map(&:text).should be_match_all /ハート/ }
+        it { subject.map(&:text).should be_match_all /スプラッシュ/ }
       end
     end
   end

data/spec/sakuramochi/predicate_spec.rb

@@ -86,6 +86,7 @@ describe Sakuramochi::Predicate do
     context 'config.add :test' do
       before do
         Sakuramochi.configure do |config|
+          config.clear
           config.add :test
         end
       end

data/spec/sakuramochi/relation_spec.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Sakuramochi::Relation do
+  describe '#build_where_with_condition' do
+    describe 'not' do
+      before { @users = User.where([:not, {:name_contains => 'あいら'}]) }
+      subject { @users }
+
+      it { subject.map(&:name).should_not be_match_all /あいら/ }
+    end
+
+    describe 'and' do
+      before { @users = User.where([{:name_contains => '春音'}, :and, {:name_contains => 'あいら'}]) }
+      subject { @users }
+
+      it { subject.map(&:name).should be_match_all /春音/ }
+      it { subject.map(&:name).should be_match_all /あいら/ }
+      it { subject.map(&:name).should_not be_match_all /うる|える/ }
+    end
+
+    describe 'or' do
+      before { @users = User.where([{:name_contains => 'あいら'}, :or, {:name_contains => 'りずむ'}]) }
+      subject { @users }
+
+      it { subject.map(&:name).should_not be_match_all /みおん/ }
+    end
+  end
+end

data/spec/spec_helper.rb

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

data/spec/support/matcher.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :be_match_all do |expected|
+  match do |actuals|
+    actuals.all? { |actual| !!(actual =~ expected) }
+  end
+end

data/spec/support/schema.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'active_record'
 
 ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
@@ -23,4 +24,66 @@ class CreateTestTables < ActiveRecord::Migration
       t.string :text
     end
   end
+
+  def self.seed
+    items = {
+      '春音あいら' => [
+        'フレッシュフルーツバスケット',
+        'ハートフルスプラッシュ',
+        'カラフルチョコパレード',
+        '胸キュン体験',
+        'スターダストシャワー',
+        'ラブリーレインボー',
+        'ヒラヒラヒラク恋の花',
+        'ドレミファスライダー',
+        'クリスタルスプラッシュ',
+        'ポップンキャンディロケット',
+        'チカラ合わせて！ワンダースイーツShow',
+        'ココロ重ねて！ハートアーチファンタジー',
+        'フライハイチアガール',
+        'チアフルHip Hop Win!',
+        'ドキドキハロウィンナイト',
+        'ビタミンガーデンサンシャイン',
+      ],
+      '天宮りずむ' => [
+        'ハートフルスプラッシュ',
+        'カラフルチョコパレード',
+        'FUNFUNハートダイブ',
+        'スターダストシャワー',
+        'ハッピーマカロンスピン',
+        'ドレミファスライダー',
+        'ポップンキャンディロケット',
+        'ドルフィンビーナル',
+        'チカラ合わせて！ワンダースイーツShow',
+        'ココロ重ねて！ハートアーチファンタジー',
+        'フライハイチアガール',
+        'チアフルHip Hop Win!',
+        'ドキドキハロウィンナイト',
+        'ビタミンガーデンサンシャイン',
+      ],
+      '高峰みおん' => [
+        'スターダストシャワー',
+        'ヒラヒラヒラク恋の花',
+        'ドレミファスライダー',
+        'ゴールデンスターマジック',
+        'ときめきメモリーリーフ',
+        'はちみつキッス',
+        'ココロ重ねて！ハートアーチファンタジー',
+        'フライハイチアガール',
+        'チアフルHip Hop Win!',
+        'ドキドキハロウィンナイト',
+        'ビタミンガーデンサンシャイン',
+      ],
+      '春音うる' => [],
+      '春音える' => [],
+    }
+
+    items.each do |name, jumps|
+      User.create! :name => name do |user|
+        jumps.each do |jump|
+          Status.create! :user => user, :text => jump
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakuramochi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,77 +9,77 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000Z
+date: 2011-11-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &22941820 !ruby/object:Gem::Requirement
+  requirement: &21741100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *22941820
+  version_requirements: *21741100
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &22941220 !ruby/object:Gem::Requirement
+  requirement: &21740560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *22941220
+  version_requirements: *21740560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &22940620 !ruby/object:Gem::Requirement
+  requirement: &21736720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22940620
+  version_requirements: *21736720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22940020 !ruby/object:Gem::Requirement
+  requirement: &21736180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22940020
+  version_requirements: *21736180
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &22939420 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &21735640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22939420
+  version_requirements: *21735640
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &22938800 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &21735140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22938800
+  version_requirements: *21735140
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &22918240 !ruby/object:Gem::Requirement
+  name: jeweler
+  requirement: &21734540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22918240
+  version_requirements: *21734540
 description: Minimal extensions for active record 3
 email: mail@mashiro.org
 executables: []
@@ -98,20 +98,26 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
 - lib/sakuramochi.rb
+- lib/sakuramochi/condition.rb
 - lib/sakuramochi/config.rb
 - lib/sakuramochi/predicate.rb
 - lib/sakuramochi/predicate_builder.rb
+- lib/sakuramochi/relation.rb
 - sakuramochi.gemspec
+- spec/sakuramochi/condition_spec.rb
 - spec/sakuramochi/config_spec.rb
 - spec/sakuramochi/predicate_builder_spec.rb
 - spec/sakuramochi/predicate_spec.rb
+- spec/sakuramochi/relation_spec.rb
 - spec/spec_helper.rb
+- spec/support/matcher.rb
 - spec/support/schema.rb
 homepage: http://github.com/mashiro/sakuramochi
 licenses:
@@ -128,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3547682809614269142
+      hash: 493135335537982085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: