sakuramochi 0.5.5 → 0.5.6

data/.gitignore

@@ -1,4 +1,18 @@
 *.gem
+*.rbc
 .bundle
+.config
+.yardoc
 Gemfile.lock
-pkg/*
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+vendor

data/.travis.yml

@@ -1,3 +1,6 @@
+language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+notifications:
+  irc: "irc.freenode.org#mashiro-dev"

data/README.md

@@ -1,6 +1,6 @@
 # Sakuramochi
-
 [![Build Status](https://secure.travis-ci.org/mashiro/sakuramochi.png)](http://travis-ci.org/mashiro/sakuramochi)
+[![Dependency Status](https://gemnasium.com/mashiro/sakuramochi.png)](https://gemnasium.com/mashiro/sakuramochi)
 
 Sakuramochi is a minimal extensions for Active Record 3.
 
@@ -84,4 +84,3 @@ User.where(:name_surrounds_with => ["ama", "umu"])
 ## Copyright
 
 Copyright (c) 2011 mashiro
-

data/lib/sakuramochi.rb

@@ -1,14 +1,53 @@
-require 'active_support/core_ext/hash'
 require 'active_support'
+require 'active_support/core_ext/hash'
 require 'active_record'
-require "sakuramochi/version"
-require 'sakuramochi/config'
-require 'sakuramochi/predicate'
-require 'sakuramochi/predicate_builder'
-require 'sakuramochi/condition'
-require 'sakuramochi/relation'
+require 'sakuramochi/version'
 
 module Sakuramochi
+  autoload :Configuration,    'sakuramochi/configuration'
+  autoload :Predicate,        'sakuramochi/predicate'
+  autoload :PredicateBuilder, 'sakuramochi/predicate_builder'
+  autoload :Condition,        'sakuramochi/condition'
+  autoload :Relation,         'sakuramochi/relation'
+
+  def self.configure(&block)
+    yield @config ||= Sakuramochi::Configuration.new
+  end
+
+  def self.config
+    @config
+  end
+
+  configure do |config|
+    predicates = {
+      :contains =>    [:contains],
+      :starts_with => [:starts_with, :start_with],
+      :ends_with =>   [:ends_with, :end_with],
+      :in =>          [:in],
+      :eq =>          [:eq, :equal, :equals],
+      :gt =>          [:gt],
+      :gte =>         [:gte, :gteq],
+      :lt =>          [:lt],
+      :lte =>         [:lte, :lteq],
+    }
+    negative = proc { |p| "not_#{p}" }
+
+    config.add predicates[:contains],                   :arel_predicate => :matches,        :converter => proc { |v| "%#{v}%" }
+    config.add predicates[:contains].map(&negative),    :arel_predicate => :does_not_match, :converter => proc { |v| "%#{v}%" }
+    config.add predicates[:starts_with],                :arel_predicate => :matches,        :converter => proc { |v| "#{v}%" }
+    config.add predicates[:starts_with].map(&negative), :arel_predicate => :does_not_match, :converter => proc { |v| "#{v}%" }
+    config.add predicates[:ends_with],                  :arel_predicate => :matches,        :converter => proc { |v| "%#{v}" }
+    config.add predicates[:ends_with].map(&negative),   :arel_predicate => :does_not_match, :converter => proc { |v| "%#{v}" }
+    config.add predicates[:in],                         :arel_predicate => :in
+    config.add predicates[:in].map(&negative),          :arel_predicate => :not_in
+    config.add predicates[:eq],                         :arel_predicate => :eq
+    config.add predicates[:eq].map(&negative), :ne,     :arel_predicate => :not_eq
+    config.add predicates[:gt],                         :arel_predicate => :gt
+    config.add predicates[:gte],                        :arel_predicate => :gteq
+    config.add predicates[:lt],                         :arel_predicate => :lt
+    config.add predicates[:lte],                        :arel_predicate => :lteq
+  end 
+
   ActiveSupport.on_load(:active_record) do
     ActiveRecord::Relation.send(:include, Sakuramochi::Relation)
     ActiveRecord::PredicateBuilder.send(:include, Sakuramochi::PredicateBuilder)

data/lib/sakuramochi/configuration.rb

@@ -0,0 +1,30 @@
+require 'sakuramochi/predicate'
+
+module Sakuramochi
+  class Configuration
+    attr_accessor :predicates
+
+    def initialize
+      @predicates = {}
+    end 
+
+    def add(*args)
+      options = args.extract_options!
+      options.reverse_merge!(:grouping => true)
+
+      suffixes = [nil]
+      suffixes += ['any', 'all'] if options[:grouping]
+
+      args.flatten.each do |name|
+        name = name.to_s
+        suffixes.each do |suffix|
+          predicate_name = [name, suffix].compact.join('_')
+          @predicates[predicate_name] = Predicate.new(options.merge({
+            :name => predicate_name,
+            :arel_predicate => [options[:arel_predicate], suffix].compact.join('_')
+          }))
+        end
+      end 
+    end 
+  end 
+end

data/lib/sakuramochi/predicate.rb

@@ -1,5 +1,3 @@
-require 'sakuramochi/config'
-
 module Sakuramochi
   class Predicate
     attr_reader :name, :arel_predicate, :expand, :converter, :validator
@@ -16,7 +14,7 @@ module Sakuramochi
     def convert(value)
       return value unless @converter
       if @expand
-        Predicate.as_a(value).map { |v| @converter.call(v) }
+        Array(value).map { |v| @converter.call(v) }
       else
         @converter.call(value)
       end
@@ -24,16 +22,12 @@ module Sakuramochi
 
     def validate(value)
       if @expand
-        Predicate.as_a(value).select { |v| @validator.call(v) }.any?
+        Array(value).select { |v| @validator.call(v) }.any?
       else
         @validator.call(value)
       end
     end 
 
-    def self.as_a(value)
-      value.is_a?(Enumerable) ? value.to_a : [value]
-    end
-
     def self.names
       Sakuramochi.config.predicates.keys
     end 

data/lib/sakuramochi/predicate_builder.rb

@@ -6,6 +6,49 @@ module Sakuramochi
     extend ActiveSupport::Concern
 
     included do
+      unless respond_to? :build
+        model_class = defined?(ActiveRecord::Model) ? ActiveRecord::Model : ActiveRecord::Base
+
+        def self.build(attribute, value)
+          case value
+          when ActiveRecord::Relation
+            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?(model_class) ? x.id : x}
+            ranges, values = values.partition {|v| v.is_a?(Range)}
+
+            values_predicate = if values.include?(nil)
+              values = values.compact
+
+              case values.length
+              when 0
+                attribute.eq(nil)
+              when 1
+                attribute.eq(values.first).or(attribute.eq(nil))
+              else
+                attribute.in(values).or(attribute.eq(nil))
+              end
+            else
+              attribute.in(values)
+            end
+
+            array_predicates = ranges.map { |range| attribute.in(range) }
+            array_predicates << values_predicate
+            array_predicates.inject { |composite, predicate| composite.or(predicate) }
+          when Range
+            attribute.in(value)
+          when model_class
+            attribute.eq(value.id)
+          when Class
+            # FIXME: I think we need to deprecate this behavior
+            attribute.eq(value.name)
+          else
+            attribute.eq(value)
+          end
+        end
+      end
+
       instance_eval do
         alias :build_from_hash_without_predicate :build_from_hash
         alias :build_from_hash :build_from_hash_with_predicate
@@ -14,7 +57,7 @@ module Sakuramochi
 
     module ClassMethods
       def build_from_hash_with_predicate(engine, attributes, default_table)
-        predicates = attributes.map do |column, value|
+        attributes.map do |column, value|
           table = default_table
 
           if value.is_a?(Hash)
@@ -28,69 +71,32 @@ module Sakuramochi
               table = Arel::Table.new(table_name, engine)
             end 
 
-            column_name, predicate = Predicate.detect(column.to_s)
+            column_name, predicate = Sakuramochi::Predicate.detect(column.to_s)
             attribute = table[column_name.to_sym]
 
             if predicate
-              build_attribute_with_predicate(attribute, value, predicate)
+              build_with_predicate(attribute, value, predicate)
             else
-              build_attribute(attribute, value)
+              build(attribute, value)
             end
           end
-        end
-
-        predicates.flatten.compact
+        end.flatten
       end
 
       private
 
-      def build_attribute_with_predicate(attribute, value, predicate)
+      def build_with_predicate(attribute, value, predicate)
         if predicate.validate(value)
           if predicate.converter
             attribute.send(predicate.arel_predicate, predicate.convert(value))
           else
-            relation = build_attribute(attribute, value)
+            relation = build(attribute, value)
             attribute.send(predicate.arel_predicate, relation.right)
           end
         else
           ''
         end
       end
-
-      def build_attribute(attribute, value)
-        case value
-        when ActiveRecord::Relation
-          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}
-          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?
-              array_predicates << attribute.eq(nil)
-            else
-              array_predicates << attribute.in(values.compact).or(attribute.eq(nil))
-            end
-          else
-            array_predicates << attribute.in(values)
-          end
-
-          array_predicates.inject {|composite, predicate| composite.or(predicate)}
-        when Range, Arel::Relation
-          attribute.in(value)
-        when ActiveRecord::Base
-          attribute.eq(value.id)
-        when Class
-          # FIXME: I think we need to deprecate this behavior
-          attribute.eq(value.name)
-        else
-          attribute.eq(value)
-        end
-      end
     end
 
   end

data/lib/sakuramochi/version.rb

@@ -1,3 +1,3 @@
 module Sakuramochi
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/spec/sakuramochi/config_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Sakuramochi::Configuration do
   before do
     Sakuramochi.configure do |config|
-      config.clear
       @config = config
     end
   end
@@ -14,18 +13,6 @@ describe Sakuramochi::Configuration do
     its(:object_id) { should eq Sakuramochi.config.object_id }
   end
 
-  describe '#clear' do
-    before do
-      @config.add :test1
-      @config.add :test2
-      @config.add :test3, :test4
-      @config.clear
-    end
-    subject { @config.predicates }
-
-    it { should be_empty }
-  end
-
   describe '#add' do
     before do
       @config.add :test1, :grouping => true

data/spec/sakuramochi/predicate_builder_spec.rb

@@ -5,7 +5,6 @@ describe Sakuramochi::PredicateBuilder do
   describe 'matches' do
     before do
       Sakuramochi.configure do |config|
-        config.clear
         config.add :contains, :arel_predicate => :matches, :converter => proc { |v| "%#{v}%" }
       end
       @statuses = Status.where(key => value)

data/spec/sakuramochi/predicate_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakuramochi
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &22523360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *22523360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &22522740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *22522740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22461240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22461240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22460780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22460780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &22460360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22460360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Predicates and conditions that extends to the ActiveRecord 3
 email:
 - mail@mashiro.org
@@ -82,7 +107,7 @@ files:
 - Rakefile
 - lib/sakuramochi.rb
 - lib/sakuramochi/condition.rb
-- lib/sakuramochi/config.rb
+- lib/sakuramochi/configuration.rb
 - lib/sakuramochi/predicate.rb
 - lib/sakuramochi/predicate_builder.rb
 - lib/sakuramochi/relation.rb
@@ -108,15 +133,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1227588817688317651
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1227588817688317651
 requirements: []
 rubyforge_project: sakuramochi
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Minimal extensions for ActiveRecord 3

data/lib/sakuramochi/config.rb

@@ -1,73 +0,0 @@
-require 'sakuramochi/predicate'
-
-module Sakuramochi
-  def self.configure(&block)
-    yield @config ||= Sakuramochi::Configuration.new
-  end 
-
-  def self.config
-    @config
-  end 
-
-  class Configuration
-    attr_reader :predicates
-
-    def initialize
-      @predicates = {}
-    end 
-
-    def add(*args)
-      options = args.extract_options!
-      options.reverse_merge!(:grouping => true)
-      args.flatten.each do |name|
-        name = name.to_s
-
-        suffixes = [nil]
-        suffixes += ['any', 'all'] if options[:grouping]
-
-        suffixes.each do |suffix|
-          predicate_name = [name, suffix].compact.join('_')
-          @predicates[predicate_name] = Predicate.new(options.merge({
-            :name => predicate_name,
-            :arel_predicate => [options[:arel_predicate], suffix].compact.join('_')
-          }))
-        end
-      end 
-    end 
-
-    def clear
-      @predicates.clear
-    end
-  end 
-
-  configure do |config|
-    # default predicates
-    PREDICATES = {
-      :contains =>    [:contains],
-      :starts_with => [:starts_with, :start_with],
-      :ends_with =>   [:ends_with, :end_with],
-      :in =>          [:in],
-      :eq =>          [:eq, :equal, :equals],
-      :gt =>          [:gt],
-      :gte =>         [:gte, :gteq],
-      :lt =>          [:lt],
-      :lte =>         [:lte, :lteq],
-    }
-    _not = proc { |p| "not_#{p}" }
-
-    config.add PREDICATES[:contains],               :arel_predicate => :matches,        :converter => proc { |v| "%#{v}%" }
-    config.add PREDICATES[:contains].map(&_not),    :arel_predicate => :does_not_match, :converter => proc { |v| "%#{v}%" }
-    config.add PREDICATES[:starts_with],            :arel_predicate => :matches,        :converter => proc { |v| "#{v}%" }
-    config.add PREDICATES[:starts_with].map(&_not), :arel_predicate => :does_not_match, :converter => proc { |v| "#{v}%" }
-    config.add PREDICATES[:ends_with],              :arel_predicate => :matches,        :converter => proc { |v| "%#{v}" }
-    config.add PREDICATES[:ends_with].map(&_not),   :arel_predicate => :does_not_match, :converter => proc { |v| "%#{v}" }
-    config.add PREDICATES[:in],                     :arel_predicate => :in
-    config.add PREDICATES[:in].map(&_not),          :arel_predicate => :not_in
-    config.add PREDICATES[:eq],                     :arel_predicate => :eq
-    config.add PREDICATES[:eq].map(&_not), :ne,     :arel_predicate => :not_eq
-    config.add PREDICATES[:gt],                     :arel_predicate => :gt
-    config.add PREDICATES[:gte],                    :arel_predicate => :gteq
-    config.add PREDICATES[:lt],                     :arel_predicate => :lt
-    config.add PREDICATES[:lte],                    :arel_predicate => :lteq
-  end 
-end