es_searchable 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb43d18c820180b2f727faa7bd5438b0c700ed47
-  data.tar.gz: b26088eac28c5da9feebe4eeb191a3640720ab44
+  metadata.gz: 271ed4bb64592a8216c4d11c3e7927bb8c1a9374
+  data.tar.gz: 49f89ac1a1af9ab8a045b01e8bb149ed24e8c67e
 SHA512:
-  metadata.gz: 21192fc7a0f1fe59aea51f36d8de27abe14e7c0293105dcfae5933f0398fbbdf2fa676f1d6d53b62a777c7ae4d5131f1fadc3a6ec7d3996b482d636c69d8c646
-  data.tar.gz: 51007ee5bb2508902500d6acc6d938c310920c1ebfe070494098b8ca9297498b3a5b611e5897173a356d95c292f5c0466ec7c48090564ff607e6169d6149b11a
+  metadata.gz: 9910ffbe366e39f168fe340b3b9b43874ea29ead0be18bc7d9eb2caa5c9acd451bb20ecc4129a50e62a4f05d5e94175f6211381ace853892a8567bd8a9e8d924
+  data.tar.gz: be4514f125ba36c8f77b38e57f3f18500fe17d05bba8d47f820188b08d470fa3482ff0b435938c04a735b01c74958811019d6ab046835b4b0f27edad3141a9e8

data/Gemfile.lock

@@ -1,134 +1,48 @@
 PATH
   remote: .
   specs:
-    es_searchable (0.1.0)
+    es_searchable (0.1.1)
+      activesupport (>= 4.0.3, < 5.1)
       bundler (~> 1.6)
       elasticsearch
-      elasticsearch-model (~> 0.1.8)
-      elasticsearch-rails (~> 0.1.7)
       rake
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.2)
-      actionview (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
-      activesupport (= 4.2.5.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.2)
-      activesupport (= 4.2.5.2)
-      globalid (>= 0.3.0)
-    activemodel (4.2.5.2)
-      activesupport (= 4.2.5.2)
-      builder (~> 3.1)
-    activerecord (4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
-      arel (~> 6.0)
-    activesupport (4.2.5.2)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
     coderay (1.1.0)
-    concurrent-ruby (1.0.1)
-    elasticsearch (1.0.14)
-      elasticsearch-api (= 1.0.14)
-      elasticsearch-transport (= 1.0.14)
-    elasticsearch-api (1.0.14)
+    elasticsearch (1.0.17)
+      elasticsearch-api (= 1.0.17)
+      elasticsearch-transport (= 1.0.17)
+    elasticsearch-api (1.0.17)
       multi_json
-    elasticsearch-model (0.1.8)
-      activesupport (> 3)
-      elasticsearch (> 0.4)
-      hashie
-    elasticsearch-rails (0.1.8)
-    elasticsearch-transport (1.0.14)
+    elasticsearch-transport (1.0.17)
       faraday
       multi_json
-    erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffaker (2.2.0)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
-    hashie (3.4.3)
     i18n (0.7.0)
     json (1.8.3)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.99.1)
-    mini_portile2 (2.0.0)
     minitest (5.8.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
     multipart-post (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.5.2)
-      actionmailer (= 4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activerecord (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.2)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.1.2)
     slop (3.6.0)
-    sprockets (3.5.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.0.3)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
-    thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -139,7 +53,9 @@ PLATFORMS
 DEPENDENCIES
   es_searchable!
   ffaker
+  minitest
   mocha
   pry
-  rails
-  sqlite3
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -1,3 +1,4 @@
+
 # es_searchable 
 es_searchable implemented an ActiveRecord like search api for Elasticsearch. 
 

data/Rakefile

@@ -15,10 +15,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 
-
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'

data/es_searchable.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bundler", "~> 1.6"
 	spec.add_dependency "rake"
 	spec.add_dependency "elasticsearch"
-	spec.add_dependency "elasticsearch-rails", "~> 0.1.7"
-	spec.add_dependency "elasticsearch-model", "~> 0.1.8"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "rails"
+	spec.add_dependency "activesupport", ">= 4.0.3", "< 5.1"
+
   spec.add_development_dependency "mocha"
+	spec.add_development_dependency 'minitest'
+	spec.add_development_dependency 'pry'
 end

data/lib/es_searchable.rb

@@ -1,3 +1,4 @@
+require "active_support/all"
 require "es_searchable/version"
 require "es_searchable/configurable"
 
@@ -7,13 +8,16 @@ module EsSearchable
 
 	included do
     class << self
-			delegate *SearchMethods, to: :es_collection, prefix: :es
+			extend Forwardable
+			SearchMethods.each do |meth|
+				def_delegator :es_collection, meth, "es_#{meth}"
+			end
 		end
 	end
 
 	module ClassMethods
 		def es_collection
-			SearchCollection.new(self)
+			@es_collection = SearchCollection.new(self)
 		end
 
 		def handle_es_response(es_coll)

data/lib/es_searchable/search_collection.rb

@@ -1,13 +1,12 @@
-require 'es_searchable'
-require 'elasticsearch/rails'
-require 'elasticsearch/model'
-require 'elasticsearch-api'
+require 'elasticsearch'
 
 module EsSearchable
 	class SearchCollection
+		extend Forwardable
 
 		def initialize(klass)
 			@klass = klass
+			@time, @response, @count, @collections = nil, nil, nil, nil
 		end
 
 		SearchName = {
@@ -95,7 +94,7 @@ module EsSearchable
 			self.search_params == coll.search_params
 		end
 
-		delegate :first, :last, :[], :length, to: :collections
+		def_delegators :@collections, :first, :last, :[], :length
 
 		private
 

data/lib/es_searchable/version.rb

@@ -1,3 +1,3 @@
 module EsSearchable
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/es_searchable/search_collection_test.rb

@@ -1,12 +1,13 @@
 require 'test_helper'
 
-class SearchCollectionTest < ActiveSupport::TestCase
-	setup	do
-	  class Foo
-			include EsSearchable
-		end
+class Foo
+	include EsSearchable
+end
 
+class SearchCollectionTest < ActiveSupport::TestCase
+	def setup
 		@coll = EsSearchable::SearchCollection.new(Foo)
+
 		@full_response = {
 			"took"=>1,
 			"timed_out"=>false,

data/test/test_helper.rb

@@ -1,11 +1,10 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
-require "rails/test_help"
+require 'pry'
+require 'es_searchable'
+require 'minitest/autorun'
+require 'minitest/pride'
 require 'minitest/mock'
-require "mocha/mini_test"
+require 'mocha/mini_test'
+require 'active_support/all'
 
 # Filter out Minitest backtrace while allowing backtrace from other libraries
 # to be shown.
@@ -14,12 +13,7 @@ Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-# Load fixtures from the engine
-if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
-  ActiveSupport::TestCase.fixtures :all
-end
+ActiveSupport::TestCase.test_order = :random
 
 class ActiveSupport::TestCase
 	def assert_call obj, method, *args, &blk
@@ -35,4 +29,3 @@ class ActiveSupport::TestCase
 	end
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es_searchable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - zuozuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,35 +53,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: elasticsearch-rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 4.0.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.1.7
-- !ruby/object:Gem::Dependency
-  name: elasticsearch-model
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -142,53 +134,6 @@ files:
 - lib/es_searchable/search_collection.rb
 - lib/es_searchable/version.rb
 - lib/tasks/es_searchable_tasks.rake
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/images/.keep
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/concerns/.keep
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/mailers/.keep
-- test/dummy/app/models/.keep
-- test/dummy/app/models/concerns/.keep
-- test/dummy/app/models/user.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20160304063627_create_users.rb
-- test/dummy/db/migrate/20160304100221_add_is_admin_to_users.rb
-- test/dummy/db/schema.rb
-- test/dummy/lib/assets/.keep
-- test/dummy/log/.keep
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/test/fixtures/users.yml
-- test/dummy/test/models/user_test.rb
 - test/es_searchable/search_collection_test.rb
 - test/es_searchable_test.rb
 - test/test_helper.rb
@@ -212,59 +157,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A small wrapper of elasticsearch search api
 test_files:
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/images/.keep
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/concerns/.keep
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/mailers/.keep
-- test/dummy/app/models/.keep
-- test/dummy/app/models/concerns/.keep
-- test/dummy/app/models/user.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20160304063627_create_users.rb
-- test/dummy/db/migrate/20160304100221_add_is_admin_to_users.rb
-- test/dummy/db/schema.rb
-- test/dummy/lib/assets/.keep
-- test/dummy/log/.keep
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/test/fixtures/users.yml
-- test/dummy/test/models/user_test.rb
 - test/es_searchable/search_collection_test.rb
 - test/es_searchable_test.rb
 - test/test_helper.rb
-has_rdoc: