birddog 0.0.3 → 0.0.4

data/.gitignore

@@ -2,4 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
-test.db
+specs/*.db

data/birddog.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "chronic"
   s.add_runtime_dependency "activerecord"
+  s.add_runtime_dependency "activesupport"
+  s.add_runtime_dependency "squeel"
 end

data/lib/birddog/birddog.rb

@@ -0,0 +1,178 @@
+module Birddog
+
+  def self.included(base)
+    base.extend(::Birddog::Searchable)
+  end
+
+  class Birddog
+    include ::Birddog::FieldConditions
+
+    AREL_KEYS = [:select, :limit, :joins, :includes, :group, :from, :where, :having]
+
+    attr_reader :fields
+
+    def initialize(model)
+      @model = model
+      @fields = {}
+    end
+
+    def field(name, options={}, &mapping)
+      @fields[name] = field = {
+        :attribute       => options.fetch(:attribute, name),
+        :cast            => options.fetch(:cast, false),
+        :type            => options.fetch(:type, :string),
+        :case_sensitive  => options.fetch(:case_sensitive, true),
+        :match_substring => options.fetch(:match_substring, false),
+        :regex           => options.fetch(:regex, false),
+        :wildcard        => options.fetch(:wildcard, false),
+        :aggregate       => options.fetch(:aggregate, false),
+        :options         => options.select { |k,v| AREL_KEYS.include?(k) }, 
+        :mapping         => mapping || lambda{ |v| v }
+      }
+
+      aggregate?(name) ? define_aggregate_field(name, field) : define_field(name, field)
+    end
+
+    def aggregate?(name)
+      @fields[name].fetch(:aggregate, false)
+    end
+
+    def alias_field(name, other_field)
+      @fields[name] = @fields[other_field]
+      aggregate?(name) ? define_aggregate_field(name, @fields[name]) : define_field(name, @fields[name])
+    end
+
+    def keyword(name, &block)
+      define_scope(name, &block)
+    end
+
+    def search(query)
+      tokens = tokenize(query)
+      tokens.inject(@model) do |model, (key,value)|
+        key, value = "text_search", key if value.nil?
+        scope_for(model, key, value)
+      end
+    end
+
+    def text_search(*fields)
+      options = fields.extract_options!
+      fields = fields.map { |f| "LOWER(#{f}) LIKE :value" }.join(" OR ")
+
+      define_scope "text_search" do |value|
+        options.merge(:conditions => [fields, { :value => "%#{value.downcase}%" }])
+      end
+    end
+
+    ################## PRIVATES ####################
+
+    def conditional?(value)
+      value.index(/[<>=]/) != nil   
+    end
+    private :conditional?
+
+    def define_aggregate_field(name, field)
+      field[:options].merge!(:select => field[:aggregate])
+
+      define_scope(name) do |value|
+        if conditional?(value)
+          field[:options].merge(:having => setup_conditions(field, value))
+        else
+          field[:options]
+        end
+      end
+    end
+    private :define_aggregate_field
+
+    def define_field(name, field)
+      define_scope(name) do |value|
+        field[:options].merge(:conditions => setup_conditions(field, value))
+      end
+    end
+    private :define_field
+
+    def scope_name_for(key)
+      "_birddog_scope_#{key}"
+    end
+    private :scope_name_for
+
+    def define_scope(name, &scope)
+      @model.send(:scope, scope_name_for(name), scope)
+    end
+    private :define_scope
+
+
+    def callable_or_cast(field, condition, value)
+      if field[:cast] && field[:cast].respond_to?(:call) 
+        field[:cast].call(value.gsub(condition, ""))
+      else
+        cast_value(value, field[:type])
+      end
+    end
+    private :callable_or_cast
+
+    def cast_value(value, type)
+      case type
+      when :boolean then
+        BooleanExpression.parse(value)
+      when :float, :decimal, :integer then
+        NumericExpression.new(value, type)
+      when :date then
+        DateExpression.new(value)
+      when :time, :datetime then
+        Chronic.parse(value)
+      else
+        value.strip
+      end
+    end
+    private :cast_value
+
+    def parse_condition(value)
+      valid = %w(= == > < <= >= <>)
+      value.gsub!(/\s/, '')
+
+      parts = value.scan(/(?:[=<>]+)/)
+      cond = parts.first
+      valid.include?(cond) ? cond.strip : "="
+    end
+    private :parse_condition
+
+    def setup_conditions(field, value)
+      condition = parse_condition(value)
+      value = callable_or_cast(field, condition, value) 
+      value = field[:mapping].call(value)
+
+      case field[:type]
+      when :string then
+        conditions_for_string_search(field, value)
+      when :float, :decimal, :integer then
+        conditions_for_numeric(field, condition, value)
+      when :date, :datetime, :time then 
+        conditions_for_date(field, condition, value)
+      else
+        { field[:attribute] => value }
+      end
+    end
+    private :setup_conditions
+
+    def tokenize(query)
+      split_tokens = query.split(":")
+      split_tokens.each { |tok| tok.strip! }
+
+      [[split_tokens.shift, split_tokens.join(":")]]
+    end
+    private :tokenize
+
+    def scope_for(model, key, value)
+      scope_name = scope_name_for(key)
+
+      if model.respond_to?(scope_name)
+        model.send(scope_name, value)
+      else
+        model.scoped
+      end
+    end
+    private :scope_for
+
+  end
+
+end

data/lib/birddog/version.rb

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

data/lib/birddog.rb

@@ -14,8 +14,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
 # IN THE SOFTWARE.
 
-require "chronic"
-require "active_record"
+require 'chronic'
+require 'active_support/core_ext'
+require 'active_record'
+require 'squeel'
+
+Squeel.configure do |config|
+  config.load_core_extensions :hash  
+end
 
 require "birddog/version"
 require "birddog/field_conditions"
@@ -23,180 +29,4 @@ require "birddog/boolean_expression"
 require "birddog/date_expression"
 require "birddog/numeric_expression"
 require "birddog/searchable"
-
-module Birddog
-
-  def self.included(base)
-    base.extend(::Birddog::Searchable)
-  end
-
-  class Birddog
-    include ::Birddog::FieldConditions
-
-    attr_reader :fields
-
-    def initialize(model)
-      @model = model
-      @fields = {}
-    end
-
-    def field(name, options={}, &mapping)
-      @fields[name] = field = {
-        :attribute       => options.fetch(:attribute, name),
-        :cast            => options.fetch(:cast, false),
-        :type            => options.fetch(:type, :string),
-        :case_sensitive  => options.fetch(:case_sensitive, true),
-        :match_substring => options.fetch(:match_substring, false),
-        :regex           => options.fetch(:regex, false),
-        :wildcard        => options.fetch(:wildcard, false),
-        :aggregate       => options.fetch(:aggregate, false),
-        :options         => options.except(:attribute, :type, :case_sensitive, :match_substring, :regex, :wildcard, :aggregate, :cast),
-        :mapping         => mapping || lambda{ |v| v }
-      }
-
-      aggregate?(name) ? define_aggregate_field(name, field) : define_field(name, field)
-    end
-
-    def aggregate?(name)
-      @fields[name].fetch(:aggregate, false)
-    end
-
-    def alias_field(name, other_field)
-      @fields[name] = @fields[other_field]
-      aggregate?(name) ? define_aggregate_field(name, @fields[name]) : define_field(name, @fields[name])
-    end
-
-    def keyword(name, &block)
-      define_scope(name, &block)
-    end
-
-    def search(query)
-      tokens = tokenize(query)
-      tokens.inject(@model) do |model, (key,value)|
-        key, value = "text_search", key if value.nil?
-        scope_for(model, key, value)
-      end
-    end
-
-    def text_search(*fields)
-      options = fields.extract_options!
-      fields = fields.map { |f| "LOWER(#{f}) LIKE :value" }.join(" OR ")
-
-      define_scope "text_search" do |value|
-        options.merge(:conditions => [fields, { :value => "%#{value.downcase}%" }])
-      end
-    end
-
-    ################## PRIVATES ####################
-
-    def conditional?(value)
-      value.index(/[<>=]/) != nil   
-    end
-    private :conditional?
-
-    def define_aggregate_field(name, field)
-      field[:options].merge!(:select => field[:aggregate])
-
-      define_scope(name) do |value|
-        if conditional?(value)
-          field[:options].merge(:having => setup_conditions(field, value))
-        else
-          field[:options]
-        end
-      end
-    end
-    private :define_aggregate_field
-
-    def define_field(name, field)
-      define_scope(name) do |value|
-        field[:options].merge(:conditions => setup_conditions(field, value))
-      end
-    end
-    private :define_field
-
-    def scope_name_for(key)
-      "_birddog_scope_#{key}"
-    end
-    private :scope_name_for
-
-    def define_scope(name, &scope)
-      @model.send(:scope, scope_name_for(name), scope)
-    end
-    private :define_scope
-
-
-    def callable_or_cast(field, value)
-      if field[:cast] && field[:cast].respond_to?(:call) 
-        field[:cast].call(value)
-      else
-        cast_value(value, field[:type])
-      end
-    end
-    private :callable_or_cast
-
-    def cast_value(value, type)
-      case type
-      when :boolean then
-        BooleanExpression.parse(value)
-      when :float, :decimal, :integer then
-        NumericExpression.new(value, type)
-      when :date then
-        DateExpression.new(value)
-      when :time, :datetime then
-        Chronic.parse(value)
-      else
-        value.strip
-      end
-    end
-    private :cast_value
-
-    def parse_condition(value)
-      valid = %w(= == > < <= >= <>)
-      value.gsub!(/\s/, '')
-
-      parts = value.scan(/(?:[=<>]+)/)
-      cond = parts.first
-      valid.include?(cond) ? cond.strip : "="
-    end
-    private :parse_condition
-
-    def setup_conditions(field, value)
-      condition = parse_condition(value)
-      value = callable_or_cast(field, value) 
-      value = field[:mapping].call(value)
-
-      case field[:type]
-      when :string then
-        conditions_for_string_search(field, value)
-      when :float, :decimal, :integer then
-        conditions_for_numeric(field, condition, value)
-      when :date, :datetime, :time then 
-        conditions_for_date(field, condition, value)
-      else
-        { field[:attribute] => value }
-      end
-    end
-    private :setup_conditions
-
-    def tokenize(query)
-      split_tokens = query.split(":")
-      split_tokens.each { |tok| tok.strip! }
-
-      [[split_tokens.shift, split_tokens.join(":")]]
-    end
-    private :tokenize
-
-    def scope_for(model, key, value)
-      scope_name = scope_name_for(key)
-
-      if model.respond_to?(scope_name)
-        model.send(scope_name, value)
-      else
-        model.scoped
-      end
-    end
-    private :scope_for
-
-  end
-
-end
+require "birddog/birddog"

data/specs/complex_scope_spec.rb

@@ -13,7 +13,17 @@ describe Birddog::Birddog do
   describe "castable" do 
     it "casts Date when a cast function is provided" do 
       prods = Product.scopes_for_query("cast_val:10")
+      prods.must_include(@ducky)
+    end
+
+    it "casts Date when a cast function is provided and is <=" do 
+      prods = Product.scopes_for_query("cast_val:<=11")
+      prods.must_include(@ducky)
+    end
 
+    it "casts Date when a cast function is provided and is >" do 
+      prods = Product.scopes_for_query("cast_val:>9")
+      debugger
       prods.must_include(@ducky)
     end
   end

data/specs/spec_helper.rb

@@ -44,7 +44,7 @@ class User < ActiveRecord::Base
     search.field :substringed_last_name, :attribute => "last_name", :match_substring => true
     search.field :available_product, :type => :boolean,
                                      :attribute => "products.available",
-                                     :include => :products
+                                     :joins => :products
 
     search.keyword :aggregate_user do 
       select(arel_table[:id]).
@@ -65,7 +65,7 @@ class Product < ActiveRecord::Base
     search.text_search "products.name", "products.value"
 
     search.field :name, :regex => true, :wildcard => true
-    search.field :cast_val, :type => :decimal, :cast => lambda { |v| 10 }, :attribute => :value
+    search.field :cast_val, :type => :decimal, :cast => lambda { |v| v }, :attribute => :value
     search.field :value, :type => :decimal
     search.field :available, :type => :boolean
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birddog
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &22249780 !ruby/object:Gem::Requirement
+  requirement: &24507660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22249780
+  version_requirements: *24507660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22249280 !ruby/object:Gem::Requirement
+  requirement: &24507020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22249280
+  version_requirements: *24507020
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &22248740 !ruby/object:Gem::Requirement
+  requirement: &24506140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22248740
+  version_requirements: *24506140
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &22238660 !ruby/object:Gem::Requirement
+  requirement: &24505460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22238660
+  version_requirements: *24505460
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &22238140 !ruby/object:Gem::Requirement
+  requirement: &24504040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22238140
+  version_requirements: *24504040
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &24503320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *24503320
+- !ruby/object:Gem::Dependency
+  name: squeel
+  requirement: &24502200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *24502200
 description: Seeeeeeeee Readme
 email:
 - brandonsdewitt@gmail.com
@@ -79,6 +101,7 @@ files:
 - Readme.rdoc
 - birddog.gemspec
 - lib/birddog.rb
+- lib/birddog/birddog.rb
 - lib/birddog/boolean_expression.rb
 - lib/birddog/date_expression.rb
 - lib/birddog/field_conditions.rb
@@ -90,7 +113,6 @@ files:
 - specs/field_conditions_spec.rb
 - specs/spec_helper.rb
 - specs/support/minitest_matchers.rb
-- specs/test.db
 homepage: ''
 licenses: []
 post_install_message: 
@@ -105,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2231863976579242335
+      hash: -387631044094105301
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2231863976579242335
+      hash: -387631044094105301
 requirements: []
 rubyforge_project: birddog
 rubygems_version: 1.8.10