dm-json-search 0.0.1 → 0.0.2

data/README

@@ -8,15 +8,9 @@ gem install gemcutter          # unless you already have
 gem tumble                     # unless you already have
 gem install dm-json-search
 
-Then, in your model:
-
-class Book
-  include JsonSearch::Searchable
-end
-
 Wala:
 
-Book.search('[{"eql":{"title":"Psycho"}}]')
+Book.all_from_json('[{"eql":{"title":"Psycho"}}]')
 # Should this be mixed in automagically to every model?
 
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/dm-json-search.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-json-search}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Herald"]

data/lib/dm-json-search.rb

@@ -1,3 +1,6 @@
 require 'dm-core'
 require File.dirname(__FILE__) + '/dm-json-search/query_ext'
-require File.dirname(__FILE__) + '/dm-json-search/searchable'
+require File.dirname(__FILE__) + '/dm-json-search/searchable'
+
+DataMapper::Model.append_extensions(JsonSearch::Searchable::ClassMethods)
+# DataMapper::Model.append_inclusions(JsonSearch::Searchable::ClassMethods)

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

@@ -1,12 +1,8 @@
 module JsonSearch
   module Searchable
   
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-  
     module ClassMethods
-      def search(json = {})
+      def all_from_json(json = {})
         json = JSON.parse(json) if json.is_a?(String)
     
         if json.is_a?(Array)
@@ -25,5 +21,4 @@ module JsonSearch
     end
   
   end
-end
-JSONSearch = JsonSearch
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-json-search
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Nathan Herald