csdn-tire 0.6.1 → 0.7.0

data/lib/tire/cluster.rb

@@ -0,0 +1,56 @@
+# -*- encoding : utf-8 -*-
+module Tire
+  class Cluster
+    extend Utils
+    
+    def self.url
+      "#{Configuration.url}/cluster"
+    end
+
+    # [{"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)
+      else
+        []
+      end
+    ensure
+      curl = %Q|curl -X GET #{desc_url}|
+      logged('CLUSTER_STATE', curl)
+    end
+
+    # ["news","blog","ask"]
+    def self.index
+      desc_url = "#{url}/_index"
+
+      response = Configuration.client.get(desc_url)
+      if response.failure?
+        STDERR.puts "[REQUEST FAILED] \n"
+        raise response.to_s
+      end
+
+      MultiJson.decode(response.body)
+    ensure
+      curl = %Q|curl -X GET #{desc_url}|
+      logged('CLUSTER INDEX', curl)
+    end
+
+    # {"cs2":{"host":"192.168.6.35","master":false,"online":false,"port":9500},"cs1":{"host":"192.168.6.35","master":false,"online":true,"port":9400}}
+    def self.host
+      path = "#{url}/_host"
+
+      response = Configuration.client.get(path)
+      if response.failure?
+        STDERR.puts "[REQUEST FAILED] \n"
+        raise response.to_s
+      end
+
+      MultiJson.decode(response.body)
+    ensure
+      curl = %Q|curl -X GET #{path}|
+      logged('CLUSTER HOST', curl)
+    end
+  end
+end

data/lib/tire/dsl.rb

@@ -18,9 +18,5 @@ module Tire
       Count.new(names, types, payload)
     end
 
-    def state
-      State.new
-    end
-
   end
 end

data/lib/tire/index.rb

@@ -2,7 +2,6 @@
 module Tire
   class Index
     include Utils
-    extend Utils
     
     attr_reader :name, :response
 
@@ -10,21 +9,6 @@ module Tire
       @name = name
     end
 
-    def self.list
-      url = "#{Configuration.url}/cluster/_index"
-
-      @response = Configuration.client.get(url)
-      if @response.failure?
-        STDERR.puts "[REQUEST FAILED] \n"
-        raise @response.to_s
-      end
-
-      MultiJson.decode(@response.body)
-    ensure
-      curl = %Q|curl -X GET #{url}|
-      logged('Index list', curl)
-    end
-
     def url
       "#{Configuration.url}/#{@name}"
     end

data/lib/tire/version.rb

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

data/lib/tire.rb

@@ -16,7 +16,7 @@ require 'tire/http/response'
 require 'tire/http/client'
 require 'tire/search'
 require 'tire/count'
-require 'tire/state'
+require 'tire/cluster'
 require 'tire/click_log'
 require 'tire/index'
 require 'tire/dsl'

data/test/integration/cluster_test.rb

@@ -0,0 +1,31 @@
+# -*- encoding : utf-8 -*-
+require 'test_helper'
+
+module Tire
+
+  class ClusterIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "cluster" do
+      should "get host" do
+        assert_kind_of Hash, Tire::Cluster.host
+      end
+
+      should  "get  index list" do
+        assert_kind_of Array, Tire::Cluster.index
+      end
+
+      should "get short state" do
+        assert_kind_of Array, Tire::Cluster.state
+        assert_kind_of Hash, Tire::Cluster.state.first
+      end
+
+      should "get more state" do
+        assert_kind_of Array, Tire::Cluster.state(true)
+        assert_kind_of Hash, Tire::Cluster.state(true).first
+        assert_not_nil Tire::Cluster.state(true).first["blog"]
+      end
+
+    end
+  end
+end

data/test/integration/index_test.rb

@@ -50,12 +50,6 @@ module Tire
         setup_bulk
         assert @index.refresh
       end
-
-      should "get index list" do
-        @list = Tire::Index.list
-        assert_kind_of Array, @list
-      end
-
     end
 
   end

data/test/integration/search_test.rb

@@ -10,13 +10,21 @@ module Tire
       should "search results" do
         setup_bulk
         @index.refresh
-        search = Tire.search(INDEX, TYPE, '{"query":{"text":{"title":"java"}},"size":4,"from":0}')
+
+        max_size = 4
+        query = "java"
+
+        search = Tire.search(INDEX, TYPE, %Q!{"query":{"text":{"title":"#{query}"}},"size":#{max_size},"from":0}!)
+
         results = search.results
         assert_kind_of Hash, results
         assert results["total"] > 0
         assert_kind_of Array, results["hits"]
-        assert_equal 6, results["total"]
-        assert_equal 4, results["hits"].size
+
+        hits_count = DOC.select{|item| item["title"] =~ /#{query}/}.size
+
+        assert_equal hits_count, results["total"]
+        assert_equal max_size, results["hits"].size
       end
     end
   end

data/test/test_helper.rb

@@ -24,6 +24,59 @@ module Test::Integration
   URL = "http://192.168.6.35:9400"
   INDEX = "articles_test"
   TYPE = "type_test"
+  DOC =  [
+    {"title"=>"java 是好东西",
+      "body"=>"hey java",
+      "id"=>"1",
+      "username"=>"jack",
+      "created_at"=>2007072323},
+    {"title"=>"this java cool",
+      "body"=>"hey java",
+      "id"=>"2",
+      "created_at"=>2009072323,
+      "username"=>"robbin"},
+    {"title"=>"this is java cool",
+      "body"=>"hey java",
+      "id"=>"3",
+      "created_at"=>2010072323,
+      "username"=>"www"},
+    {"title"=>"java is really cool",
+      "body"=>"hey java",
+      "id"=>"4",
+      "created_at"=>2007062323,
+      "username"=>"google"},
+    {"title"=>"this is wakak cool",
+      "body"=>"hey java",
+      "id"=>"5",
+      "created_at"=>2007062323,
+      "username"=>"jackde"},
+    {"title"=>"this is java cool",
+      "body"=>"hey java",
+      "id"=>"6",
+      "created_at"=>2007012323,
+      "username"=>"jackk wa"},
+    {"title"=>"this java really cool",
+      "body"=>"hey java",
+      "id"=>"7",
+      "created_at"=>2002072323,
+      "username"=>"william"}
+  ]
+
+  MAPPING =  {TYPE => {"_source"=>{"enabled"=>false},
+      "properties"=>
+        {"title"=>
+          {"type"=>"string",
+          "term_vector"=>"with_positions_offsets",
+          "boost"=>2.0},
+        "body"=>{"type"=>"string", "term_vector"=>"with_positions_offsets"},
+        "username"=>{"type"=>"string", "index"=>"not_analyzed", "store"=>"no"},
+        "id"=>
+          {"type"=>"integer", "index"=>"not_analyzed", "include_in_all"=>false},
+        "created_at"=>
+          {"type"=>"integer", "index"=>"not_analyzed", "include_in_all"=>false}
+      }
+    }
+  }
 
   def setup
     Tire::Configuration.url(URL)
@@ -35,65 +88,13 @@ module Test::Integration
   end
 
   def setup_mapping
-    mapping = {TYPE => {"_source"=>{"enabled"=>false},
-        "properties"=>
-          {"title"=>
-            {"type"=>"string",
-            "term_vector"=>"with_positions_offsets",
-            "boost"=>2.0},
-          "body"=>{"type"=>"string", "term_vector"=>"with_positions_offsets"},
-          "username"=>{"type"=>"string", "index"=>"not_analyzed", "store"=>"no"},
-          "id"=>
-            {"type"=>"integer", "index"=>"not_analyzed", "include_in_all"=>false},
-          "created_at"=>
-            {"type"=>"integer", "index"=>"not_analyzed", "include_in_all"=>false}
-        }
-      }
-    }
     setup_shard
-    @index.create_mapping(TYPE, mapping)
+    @index.create_mapping(TYPE, MAPPING)
   end
 
   def setup_bulk
-    doc = [
-      {"title"=>"java 是好东西",
-        "body"=>"hey java",
-        "id"=>"1",
-        "username"=>"jack",
-        "created_at"=>2007072323},
-      {"title"=>"this java cool",
-        "body"=>"hey java",
-        "id"=>"2",
-        "created_at"=>2009072323,
-        "username"=>"robbin"},
-      {"title"=>"this is java cool",
-        "body"=>"hey java",
-        "id"=>"3",
-        "created_at"=>2010072323,
-        "username"=>"www"},
-      {"title"=>"java is really cool",
-        "body"=>"hey java",
-        "id"=>"4",
-        "created_at"=>2007062323,
-        "username"=>"google"},
-      {"title"=>"this is wakak cool",
-        "body"=>"hey java",
-        "id"=>"5",
-        "created_at"=>2007062323,
-        "username"=>"jackde"},
-      {"title"=>"this is java cool",
-        "body"=>"hey java",
-        "id"=>"6",
-        "created_at"=>2007012323,
-        "username"=>"jackk wa"},
-      {"title"=>"this java really cool",
-        "body"=>"hey java",
-        "id"=>"7",
-        "created_at"=>2002072323,
-        "username"=>"william"}
-    ]
     setup_mapping
-    @index.bulk(TYPE, doc)
+    @index.bulk(TYPE, DOC)
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csdn-tire
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -222,6 +222,7 @@ files:
 - examples/tire.rb
 - lib/tire.rb
 - lib/tire/click_log.rb
+- lib/tire/cluster.rb
 - lib/tire/configuration.rb
 - lib/tire/count.rb
 - lib/tire/dsl.rb
@@ -233,13 +234,12 @@ files:
 - lib/tire/rubyext/ruby_1_8.rb
 - lib/tire/rubyext/to_json.rb
 - lib/tire/search.rb
-- lib/tire/state.rb
 - lib/tire/utils.rb
 - lib/tire/version.rb
+- test/integration/cluster_test.rb
 - test/integration/count_test.rb
 - test/integration/index_test.rb
 - test/integration/search_test.rb
-- test/integration/state_test.rb
 - test/test_helper.rb
 - test/unit/configuration_test.rb
 - test/unit/http_client_test.rb

data/lib/tire/state.rb

@@ -1,27 +0,0 @@
-# -*- encoding : utf-8 -*-
-module Tire
-  class State
-    include Utils
-    
-    def initialize
-
-    end
-
-    def url
-      "#{Configuration.url}/cluster/_state"
-    end
-
-    def info(more = false)
-      desc_url = more ? "#{url}?more=true" : "#{url}?more=false"
-      @response = Configuration.client.get(desc_url)
-      if @response.success?
-        MultiJson.decode(@response.body)
-      else
-        []
-      end
-    ensure
-      curl = %Q|curl -X GET #{desc_url}|
-      logged('CLUSTER_STATE', curl)
-    end
-  end
-end

data/test/integration/state_test.rb

@@ -1,22 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-module Tire
-
-  class StateIntegrationTest < Test::Unit::TestCase
-    include Test::Integration
-
-    context "state" do
-      should "get short state" do
-        assert_kind_of Array, Tire.state.info
-        assert_kind_of Hash, Tire.state.info.first
-      end
-
-      should "get more state" do
-        assert_kind_of Array, Tire.state.info(true)
-        assert_kind_of Hash, Tire.state.info(true).first
-        assert_not_nil Tire.state.info(true).first["blog"]
-      end
-    end
-  end
-end