thinkingtank 0.0.5 → 0.0.6

data/lib/thinkingtank/init.rb

@@ -1,11 +1,12 @@
 # Require these to allow requiring thinkingtank outside a Rails app, e.g.
 # for testing.
+require 'rubygems'
+require 'indextank'
+
 require 'erb'
 require 'yaml'
 require 'singleton'
 
-require 'thinkingtank/indextank_client'
-
 module ThinkingTank
     class Builder
         def initialize(model, &block)
@@ -40,7 +41,7 @@ module ThinkingTank
             conf = YAML::load(ERB.new(IO.read(path)).result)[environment]
             api_url = ENV['INDEXTANK_API_URL'] || conf['api_url']
             index_name = conf['index_name'] || 'default_index'
-            self.client = IndexTank::ApiClient.new(api_url).get_index(index_name)
+            self.client = IndexTank::Client.new(api_url).indexes(index_name)
         end
         def environment
             if defined?(Merb)
@@ -66,7 +67,7 @@ module ThinkingTank
             end
             data[:__any] = data.values.join " . "
             data[:__type] = self.class.name
-            it.add_document(docid, data)
+            it.document(docid).add(data)
         end
     end
 

data/lib/thinkingtank/tasks.rb

@@ -34,14 +34,12 @@ def reindex_models
         return false
     end
 
-    if it.exists? and it.code
-        # Check for code because it.exists? may return true for a
-        # nonexistent index
+    if it.exists?
         puts "Deleting existing index"
-        it.delete_index()
+        it.delete
     end
     puts "Creating a new empty index"
-    it.create_index()
+    it.add
     puts "Waiting for the index to be ready (this might take a while)"
     while not it.running?
         print "."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinkingtank
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Flaptor
@@ -15,10 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -02:00
+date: 2010-12-24 00:00:00 -02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: indextank
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
+        version: 0.0.5
+  type: :runtime
+  version_requirements: *id001
 description: |-
   ActiveRecord extension that allows to define models that should be indexed in an existing IndexTank index.
       It supports a very similar syntax to ThinkingSphinx allowing to easily port an existing project.
@@ -30,7 +45,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/thinkingtank/indextank_client.rb
 - lib/thinkingtank/init.rb
 - lib/thinkingtank/railtie.rb
 - lib/thinkingtank/tasks.rb

data/lib/thinkingtank/indextank_client.rb

@@ -1,255 +0,0 @@
-require 'net/http'
-require 'uri'
-require 'rubygems'
-require 'json'
-
-module IndexTank
-
-    private
-    
-    class RestClient
-        def GET(path, params={})
-            path = "#{path}?#{to_query(params)}" if params
-            request = Net::HTTP::Get.new "#{@uri}#{path}"
-            authorize request
-            return execute(request)
-        end
-        
-        def PUT(path, body={})
-            request = Net::HTTP::Put.new "#{@uri}#{path}"
-            authorize request
-            request.body = body.to_json if body
-            return execute(request)
-        end
-        
-        def DELETE(path, params={})
-            path = "#{path}?#{to_query(params)}" if params
-            request = Net::HTTP::Delete.new "#{@uri}#{path}"
-            authorize request
-            return execute(request)
-        end
-        
-        private
-        
-        def to_query(params)
-            require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
-            r = ''
-            params.each do |k,v|
-                r << "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}&"
-            end
-            return r            
-        end
-        
-        def authorize(req)
-            req.basic_auth(@uri.user, @uri.password)
-        end
-        
-        def execute(req)
-            res = Net::HTTP.new(@uri.host).start { |http| http.request(req) }
-            if res.is_a? Net::HTTPSuccess
-                if res.body.nil? or res.body.empty? 
-                    return res.code, nil
-                else
-                    begin
-                        return res.code, JSON.parse(res.body)
-                    rescue
-                        raise "Invalid JSON response: #{res.body}"
-                    end
-                end
-            elsif res.is_a? Net::HTTPUnauthorized
-                raise SecurityError, "Authorization required"
-            elsif res.is_a? Net::HTTPBadRequest
-                raise ArgumentError, res.body
-            else
-                raise HttpCodeException.new(res.code, res.body)
-            end
-        end
-        
-    end
-    
-    public    
-    
-    class ApiClient < RestClient
-        def initialize(api_url)
-            @uri = URI.parse(api_url)
-        end
-        
-        def get_index(name)
-            return IndexClient.new("#{@uri}/v1/indexes/#{name}")
-        end
-    
-        def create_index(name)
-            index = get_index(name)
-            index.create_index()
-            return index
-        end
-    
-        def delete_index(name)
-            return get_index(name).delete_index()
-        end
-    
-        def list_indexes()
-            code, indexes = GET "/v1/indexes"
-            return indexes.map do |name,metadata| IndexClient.new "#{@uri}/v1/indexes/#{name}", metadata end 
-        end
-    end
-    
-    class IndexClient < RestClient
-        def initialize(index_url, metadata=nil)
-            @uri = URI.parse(index_url)
-            @metadata = metadata
-        end
-        
-        def code
-            return metadata['code']
-        end
-    
-        def running?
-            return metadata!['started']
-        end
-        
-        def creation_time
-            return metadata['creation_time']
-        end
-        
-        def size
-            return metadata['size']
-        end
-    
-        def exists?
-            begin
-                metadata!
-                return true
-            rescue HttpCodeException
-                if $!.code == "404"
-                    return false
-                end
-                raise
-            end
-        end
-    
-        # the options argument may contain a :variables key
-        # with a Hash from variable numbers to their float values
-        # this variables can be used in the scoring functions
-        # when sorting a search
-        def add_document(docid, fields, options={})
-            options.merge!( :docid => docid, :fields => fields )
-            code, r = PUT "/docs", options
-            return r
-        end
-    
-        def update_variables(docid, variables, options={})
-            options.merge!( :docid => docid, :variables => variables )
-            code, r = PUT "/docs/variables", options
-            return r
-        end
-    
-        def delete_document(docid, options={})
-            options.merge!( :docid => docid )
-            code, r = DELETE "/docs", options
-            return r
-        end
-    
-        # the options argument may contain an :index_code definition to override 
-        # this instance's default index_code  
-        def promote(docid, query, options={})
-            options.merge!( :docid => docid, :query => query )
-            code, r = PUT "/promote", options
-            return r
-        end
-    
-    
-        # the options argument may contain an :index_code definition to override 
-        # this instance's default index_code
-        # it can also contain any of the following:
-        #   :start => an int with the number of results to skip
-        #   :len => an int with the number of results to return
-        #   :snippet => a comma separated list of field names for which a snippet
-        #               should be returned. (requires an index that supports snippets)
-        #   :fetch => a comma separated list of field names for which its content
-        #             should be returned. (requires an index that supports storage)
-        #   :function => an int with the index of the scoring function to be used
-        #                for this query 
-        def search(query, options={})
-            options = { :start => 0, :len => 10 }.merge(options)
-            options.merge!( :q => query )
-            begin
-                code, r = GET "/search", options
-                return r
-            rescue HttpCodeException
-                raise
-            end
-        end
-    
-        def add_function(function_index, definition, options={})
-            options.merge!( :definition => definition )
-            code, r = PUT "/functions/#{function_index}", options
-            return r
-        end
-        
-        def del_function(function_index, options={})
-            code, r = DELETE "/functions/#{function_index}", options
-            return r
-        end
-        
-        def list_functions(options={})
-            code, r = GET "/functions"
-            return r
-        end
-    
-        def create_index()
-            begin
-                code, r = PUT ""
-                raise IndexAlreadyExists if code == "204"
-                return r
-            rescue HttpCodeException
-                if $!.code == "409"
-                    puts $!.code
-                    raise TooManyIndexes
-                end
-                raise
-            end
-        end
-        
-        def delete_index()
-            code, r = DELETE ""
-            return r
-        end
-        
-        def metadata
-            metadata! if @metadata.nil?
-            return @metadata
-        end    
-        
-        def metadata!
-            code, @metadata = GET ""
-            return @metadata
-        end
-        
-    end
-    
-    class IndexAlreadyExists < StandardError
-    end
-    class TooManyIndexes < StandardError
-    end
-
-    class HttpCodeException < StandardError
-        def initialize(code, message)
-            @code = code
-            @message = message
-            super("#{code}: #{message}")
-        end
-        
-        attr_accessor :code
-        attr_accessor :message
-    end
-    
-    class HerokuClient < ApiClient
-        def initialize()
-            super(ENV['INDEXTANK_API_URL'])
-        end
-    end
-
-    
-end
-