dm-json-search 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/dm-json-search.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-json-search}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Herald"]
@@ -23,13 +23,22 @@ Gem::Specification.new do |s|
      "dm-json-search.gemspec",
      "lib/dm-json-search.rb",
      "lib/dm-json-search/query_ext.rb",
-     "lib/dm-json-search/searchable.rb"
+     "lib/dm-json-search/searchable.rb",
+     "spec/.bacon",
+     "spec/dm-json-search_spec.rb",
+     "spec/spec_fixtures.rb",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/myobie/dm-json-search}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Search your models with JSON!}
+  s.test_files = [
+    "spec/dm-json-search_spec.rb",
+     "spec/spec_fixtures.rb",
+     "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/dm-json-search.rb

@@ -1,4 +1,5 @@
 require 'dm-core'
+require 'json'
 require File.dirname(__FILE__) + '/dm-json-search/query_ext'
 require File.dirname(__FILE__) + '/dm-json-search/searchable'
 

data/lib/dm-json-search/query_ext.rb

@@ -110,6 +110,11 @@ class DataMapper::Query
       compare = comparison.values.first
       subject = string_to_subject(compare.keys.first)
       value = compare.values.first
+      
+      if value.is_a?(Hash) && value.keys.length == 1 && value.keys.first == "collection"
+        value = DataMapper::Collection.new(DataMapper::Query.from_hash(value.values.first))
+      end
+      
       DataMapper::Query::Conditions::Comparison.new(slug, subject, value)
     end
 
@@ -125,6 +130,8 @@ class DataMapper::Query
   
 private
   def operation_to_hash(operation)
+    return {} if operation.slug == :null # just forget null's, they don't exist
+    
     {
       operation.slug => operation.operands.collect { |o| operand_to_hash(o) }
     }
@@ -143,9 +150,12 @@ private
   end
   
   def comparison_to_hash(comparison)
+    value = comparison.value
+    value = { "collection" => value.query.to_hash } if value.class == DataMapper::Collection
+    
     {
       comparison.slug => {
-        subject_to_hash(comparison.subject) => comparison.value
+        subject_to_hash(comparison.subject) => value
       }
     }
   end

data/spec/dm-json-search_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "dm-json-search" do
+  
+  before do
+    DataMapper.auto_migrate!
+  end
+  
+  should "produce the same json it wants to consume" do
+    j = Book.all(:author => Author.all(:place => Place.all)).query.to_json
+    k = Book.all_from_json(j).query.to_json
+    j.should == k
+    
+    j = Book.all(:title.like => "foo").query.to_json
+    k = Book.all_from_json(j).query.to_json
+    j.should == k
+  end
+  
+end

data/spec/spec_fixtures.rb

@@ -0,0 +1,37 @@
+include DataMapper::Sweatshop::Unique
+
+class Book
+  include DataMapper::Resource
+  property :id, Serial
+  property :title, String
+  belongs_to :author
+end
+
+class Author
+  include DataMapper::Resource
+  property :id, Serial
+  property :name, String
+  has n, :books
+  belongs_to :place
+end
+
+class Place
+  include DataMapper::Resource
+  property :id, Serial
+  property :name, String
+  has n, :authors
+end
+
+Book.fixture {{
+  :title => ((/\w{10}/.gen+' ')*2).strip,
+  :author => Author.make
+}}
+
+Author.fixture {{
+  :name => ((/\w{10}/.gen+' ')*2).strip,
+  :place => Place.make
+}}
+
+Place.fixture {{
+  :name => ((/\w{10}/.gen+' ')*2).strip
+}}

data/spec/spec_helper.rb

@@ -0,0 +1,74 @@
+require "bacon"
+require "mocha"
+require File.dirname(__FILE__) + "/../lib/dm-json-search"
+
+require 'dm-sweatshop'
+require File.join(File.dirname(__FILE__), 'spec_fixtures')
+
+DataMapper.setup(:default, "sqlite3::memory:")
+DataMapper.auto_migrate!
+
+class Proc
+  def increase?
+    pre_result = yield
+    called = call
+    post_result = yield
+    pre_result < post_result
+  end
+  
+  def decrease?
+    pre_result = yield
+    called = call
+    post_result = yield
+    pre_result > post_result
+  end
+end
+
+# from 1 to 10 how likely, 1 being not very likely and 10 being all the time
+def do_i?(i = 5)
+  rand(500) < 50 * i
+end
+
+
+
+
+##
+# Hash additions.
+#
+# From 
+#   * http://wincent.com/knowledge-base/Fixtures_considered_harmful%3F
+#   * Neil Rahilly
+
+class Hash
+
+  ##
+  # Filter keys out of a Hash.
+  #
+  #   { :a => 1, :b => 2, :c => 3 }.except(:a)
+  #   => { :b => 2, :c => 3 }
+
+  def except(*keys)
+    self.reject { |k,v| keys.include?(k || k.to_sym) }
+  end
+
+  ##
+  # Override some keys.
+  #
+  #   { :a => 1, :b => 2, :c => 3 }.with(:a => 4)
+  #   => { :a => 4, :b => 2, :c => 3 }
+  
+  def with(overrides = {})
+    self.merge overrides
+  end
+
+  ##
+  # Returns a Hash with only the pairs identified by +keys+.
+  #
+  #   { :a => 1, :b => 2, :c => 3 }.only(:a)
+  #   => { :a => 1 }
+  
+  def only(*keys)
+    self.reject { |k,v| !keys.include?(k || k.to_sym) }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-json-search
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nathan Herald
@@ -30,6 +30,10 @@ files:
 - lib/dm-json-search.rb
 - lib/dm-json-search/query_ext.rb
 - lib/dm-json-search/searchable.rb
+- spec/.bacon
+- spec/dm-json-search_spec.rb
+- spec/spec_fixtures.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/myobie/dm-json-search
 licenses: []
@@ -58,5 +62,7 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Search your models with JSON!
-test_files: []
-
+test_files: 
+- spec/dm-json-search_spec.rb
+- spec/spec_fixtures.rb
+- spec/spec_helper.rb