csdn-tire 0.7.0 → 0.7.1

data/README.markdown

@@ -7,11 +7,6 @@ Usage
 
 配置：
 
-```
-# 设置搜索后端节点数量：
-Tire::Configuration.nodes_count(2)
-```
-
 ```
 # 设置日志：
 Tire::Configuration.logger(STDOUT, :level => "debug")
@@ -23,22 +18,23 @@ Tire::Configuration.url("http://localhost:9200")
 ```
 或者在环境变量设置：
 ```
-export ELASTICSEARCH_URL=http://localhost:9200
+export CSDNSEARCH_URL=http://localhost:9200
 ```
 
-注册分片：index.regist_shard(total)
+注册分片：index.regist_shard(options)
 ```
 [1] pry(main)> index = Tire.index("index_name")
-=> #<Tire::Index:0x9cd1564 @name="index_name">
-[2] pry(main)> index.regist_shard(6)
-# 2012-06-05 16:23:44:053 [_regist_shard] ("index_name")
+=> #<Tire::Index:0xb2b3b958 @name="index_name">
+[2] pry(main)> index.regist_shard :cs1 => [0,1], :cs2 => [2]
+# 2012-06-21 17:47:34:%L [_regist_shard] ("index_name")
 #
-curl -X PUT "http://192.168.6.35:9400/index_name/_shard" -d '{"cs1":[0,2,4],"cs2":[1,3,5]}'
+curl -X PUT "http://192.168.6.35:9400/index_name/_shard" -d '{"cs2":[2],"cs1":[0,1]}'
 
-# 2012-06-05 16:23:44:053 [200]
+# 2012-06-21 17:47:34:%L [200]
+#
+# "{\"ok\":true,\"acknowledged\":\"true\"}"
 
 => true
-[3] pry(main)> 
 ```
 
 查看分片信息：index.shard_info
@@ -282,10 +278,20 @@ curl -X GET http://192.168.6.35:9400/bbs/csdn/_count -d '{"query":{"text":{"titl
 #   "totalHits": 6
 # }
 ```
+
 集群状态：
+```
+Tire::Cluster.state
+Tire::Cluster.state(true)
+```
 
+索引列表：
+```
+Tire::Cluster.index
 ```
-state = Tire.state.info
 
-more_state = Tire.state.info(true)
+主机信息：
 ```
+Tire::Cluster.host
+```
+

data/lib/tire/cluster.rb

@@ -10,9 +10,9 @@ module Tire
     # [{"host":"192.168.6.35","master":false,"online":false,"port":9500},{"host":"192.168.6.35","master":false,"online":true,"port":9400}]
     def self.state(more = false)
       desc_url = more ? "#{url}/_state?more=true" : "#{url}/_state?more=false"
-      response = Configuration.client.get(desc_url)
-      if response.success?
-        MultiJson.decode(response.body)
+      @response = Configuration.client.get(desc_url)
+      if @response.success?
+        MultiJson.decode(@response.body)
       else
         []
       end
@@ -25,13 +25,13 @@ module Tire
     def self.index
       desc_url = "#{url}/_index"
 
-      response = Configuration.client.get(desc_url)
-      if response.failure?
+      @response = Configuration.client.get(desc_url)
+      if @response.failure?
         STDERR.puts "[REQUEST FAILED] \n"
-        raise response.to_s
+        raise @response.to_s
       end
 
-      MultiJson.decode(response.body)
+      MultiJson.decode(@response.body)
     ensure
       curl = %Q|curl -X GET #{desc_url}|
       logged('CLUSTER INDEX', curl)
@@ -41,13 +41,13 @@ module Tire
     def self.host
       path = "#{url}/_host"
 
-      response = Configuration.client.get(path)
-      if response.failure?
+      @response = Configuration.client.get(path)
+      if @response.failure?
         STDERR.puts "[REQUEST FAILED] \n"
-        raise response.to_s
+        raise @response.to_s
       end
 
-      MultiJson.decode(response.body)
+      MultiJson.decode(@response.body)
     ensure
       curl = %Q|curl -X GET #{path}|
       logged('CLUSTER HOST', curl)

data/lib/tire/configuration.rb

@@ -2,11 +2,6 @@
 module Tire
 
   class Configuration
-    
-    def self.nodes_count(n=2)
-      @nodes_count ||= n
-    end
-
     def self.url(value=nil)
       @url = (value ? value.to_s.gsub(%r|/*$|, '') : nil) || @url || ENV['CSDNSEARCH_URL'] || "http://localhost:9200"
     end

data/lib/tire/index.rb

@@ -13,9 +13,8 @@ module Tire
       "#{Configuration.url}/#{@name}"
     end
 
-    def regist_shard(total = 6)
-      notes_count = Configuration.nodes_count
-      regist_json = MultiJson.encode(build_regist_options(total, notes_count))
+    def regist_shard(options)
+      regist_json = MultiJson.encode(options)
       @response = Configuration.client.put("#{url}/_shard", regist_json)
       @response.success?
 
@@ -88,11 +87,5 @@ module Tire
       logged('REFRESH', curl)
     end
 
-    private
-
-    def build_regist_options(total, notes_count)
-      Hash[(0..total - 1).group_by{|x| x.modulo notes_count}.map{|key, value| ["cs#{key + 1}", value]}]
-    end
-
   end
 end

data/lib/tire/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Tire
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,218 +1,208 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: csdn-tire
-version: !ruby/object:Gem::Version
-  version: 0.7.0
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
-authors:
+authors: 
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-21 00:00:00 +08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rest-client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: multi_json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: hashr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.19
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hashr
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 0
+        - 19
         version: 0.0.19
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.3'
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: shoulda
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: mocha
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: curb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! '   Tire is a Ruby client for the CSDNSearch search engine/database.
-
-'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
+description: "   Tire is a Ruby client for the CSDNSearch search engine/database.\n"
 email: wangxz@csdn.net
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
 - MIT-LICENSE
-files:
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -246,29 +236,41 @@ files:
 - test/unit/http_response_test.rb
 - test/unit/logger_test.rb
 - tire.gemspec
+has_rdoc: true
 homepage: https://github.com/csdn-dev/tire
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: tire
-rubygems_version: 1.8.24
+rubygems_version: 1.3.9.4
 signing_key: 
 specification_version: 3
 summary: Ruby client for CSDNSearch
 test_files: []
+