tire 0.4.1 → 0.4.2

data/lib/tire/alias.rb

@@ -0,0 +1,296 @@
+module Tire
+
+  # Represents an *alias* in _ElasticSearch_. An alias may point to one or multiple
+  # indices, for instance to separate physical indices into logical entities, where
+  # each user has a "virtual index" or for setting up "sliding window" scenarios.
+  #
+  # See: http://www.elasticsearch.org/guide/reference/api/admin-indices-aliases.html
+  #
+  class Alias
+
+    # Create an alias pointing to multiple indices:
+    #
+    #     Tire::Alias.create name: 'my_alias', indices: ['index_1', 'index_2']
+    #
+    # Pass the routing and/or filtering configuration in the options Hash:
+    #
+    #     a = Tire::Alias.new name:    'index_anne',
+    #                     indices: ['index_2012_04', 'index_2012_03', 'index_2012_02'],
+    #                     routing: 1,
+    #                     filter:  { :terms => { :user => 'anne' } }
+    #     a.save
+    #
+    # You may configure the alias in an imperative manner:
+    #
+    #     a = Tire::Alias.new
+    #     a.name('index_anne')
+    #     a.index('index_2012_04')
+    #     a.index('index_2012_03')
+    #     # ...
+    #     a.save
+    #
+    # or more declaratively, with a block:
+    #
+    #     Tire::Alias.new name: 'my_alias' do
+    #       index 'index_A'
+    #       index 'index_B'
+    #       filter :terms, username: 'mary'
+    #     end
+    #
+    # To update an existing alias, find it by name, configure it and save it:
+    #
+    #     a = Tire::Alias.find('my_alias')
+    #     a.indices.delete 'index_A'
+    #     a.indices.add    'index_B'
+    #     a.indices.add    'index_C'
+    #     a.save
+    #
+    # Or do it with a block:
+    #
+    #     Tire::Alias.find('articles_aliased') do |a|
+    #       a.indices.remove 'articles_2'
+    #       puts '---', "#{a.name} says: /me as JSON >", a.as_json, '---'
+    #       a.save
+    #     end
+    #
+    # To remove indices from alias, you may want to use the `delete_all` method:
+    #
+    #
+    #     require 'active_support/core_ext/numeric'
+    #     require 'active_support/core_ext/date/calculations'
+    #
+    #     a = Tire::Alias.find('articles_aliased')
+    #     a.indices.delete_if do |i|
+    #       Time.parse( i.gsub(/articles_/, '') ) < 4.weeks.ago rescue false
+    #     end
+    #     a.save
+    #
+    # To get all aliases, use the `Tire::Alias.all` method:
+    #
+    #     Tire::Alias.all.each do |a|
+    #      puts "#{a.name.rjust(30)} points to: #{a.indices}"
+    #    end
+    #
+    def initialize(attributes={}, &block)
+      raise ArgumentError, "Please pass a Hash-like object" unless attributes.respond_to?(:each_pair)
+
+      @attributes = { :indices => IndexCollection.new([]) }
+
+      attributes.each_pair do |key, value|
+        if key.to_s =~ /index|indices/
+          @attributes[:indices] = IndexCollection.new(value)
+        else
+          @attributes[key.to_sym] = value
+        end
+      end
+
+      block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
+    end
+
+    # Returns a collection of Tire::Alias objects for all aliases defined in the cluster, or for a specific index.
+    #
+    def self.all(index=nil)
+      @response = Configuration.client.get [Configuration.url, index, '_aliases'].compact.join('/')
+
+      aliases = MultiJson.decode(@response.body).inject({}) do |result, (index, value)|
+        # 1] Skip indices without aliases
+        next result if value['aliases'].empty?
+
+        # 2] Build a reverse map of hashes (alias => indices, config)
+        value['aliases'].each do |key, value| (result[key] ||= { 'indices' => [] }).update(value)['indices'].push(index) end
+        result
+      end
+
+      # 3] Build a collection of Alias objects from hashes
+      aliases.map do |key, value|
+        self.new(value.update('name' => key))
+      end
+
+    ensure
+      # FIXME: Extract the `logged` method
+      Alias.new.logged '_aliases', %Q|curl "#{Configuration.url}/_aliases"|
+    end
+
+    # Returns an alias by name
+    #
+    def self.find(name, &block)
+      a = all.select { |a| a.name == name }.first
+      block.call(a) if block_given?
+      return a
+    end
+
+    # Create new alias
+    #
+    def self.create(attributes={}, &block)
+      new(attributes, &block).save
+    end
+
+    # Delegate to the `@attributes` Hash
+    #
+    def method_missing(method_name, *arguments)
+      @attributes.has_key?(method_name.to_sym) ? @attributes[method_name.to_sym] : super
+    end
+
+    # Get or set the alias name
+    #
+    def name(value=nil)
+      value ? (@attributes[:name] = value and return self) : @attributes[:name]
+    end
+
+    # Get or set the alias indices
+    #
+    def indices(*names)
+      names = Array(names).flatten
+      names.compact.empty? ? @attributes[:indices] : (names.each { |n| @attributes[:indices].push(n) } and return self)
+    end
+    alias_method :index, :indices
+
+    # Get or set the alias routing
+    #
+    def routing(value=nil)
+      value ? (@attributes[:routing] = value and return self) : @attributes[:routing]
+    end
+
+    # Get or set the alias routing
+    def filter(type=nil, *options)
+      type ? (@attributes[:filter] = Search::Filter.new(type, *options).to_hash and return self ) : @attributes[:filter]
+    end
+
+    # Save the alias in _ElasticSearch_
+    #
+    def save
+      @response = Configuration.client.post "#{Configuration.url}/_aliases", to_json
+
+    ensure
+      logged '_aliases', %Q|curl -X POST "#{Configuration.url}/_aliases" -d '#{to_json}'|
+    end
+
+    # Return a Hash suitable for JSON serialization
+    #
+    def as_json(options=nil)
+      actions = []
+      indices.add_indices.each do |index|
+        operation = { :index => index, :alias => name }
+        operation.update( { :routing => routing } ) if respond_to?(:routing) and routing
+        operation.update( { :filter  => filter } )  if respond_to?(:filter)  and filter
+        actions.push( { :add => operation } )
+      end
+
+      indices.remove_indices.each do |index|
+        operation = { :index => index, :alias => name }
+        actions.push( { :remove => operation } )
+      end
+
+      { :actions => actions }
+    end
+
+    # Return alias serialized in JSON for _ElasticSearch_
+    #
+    def to_json(options=nil)
+      as_json.to_json
+    end
+
+    def inspect
+      %Q|<#{self.class} #{@attributes.inspect}>|
+    end
+
+    def to_s
+      name
+    end
+
+    def logged(endpoint='/', curl='')
+      # FIXME: Extract the `logged` method into module and mix it into classes
+      if Configuration.logger
+        error = $!
+
+        Configuration.logger.log_request endpoint, @name, curl
+
+        code = @response ? @response.code : error.class rescue 200
+
+        if Configuration.logger.level.to_s == 'debug'
+          body = if @response
+            defined?(Yajl) ? Yajl::Encoder.encode(@response.body, :pretty => true) : MultiJson.encode(@response.body)
+          else
+            error.message rescue ''
+          end
+        else
+          body = ''
+        end
+
+        Configuration.logger.log_response code, nil, body
+      end
+    end
+
+    # Thin wrapper around array representing a collection of indices for a specific alias,
+    # which allows hooking into adding/removing indices.
+    #
+    # It keeps track of which aliases to add and which to remove in two separate collections,
+    # `add_indices` and `remove_indices`.
+    #
+    # It delegates Enumerable-like methods to the `add_indices` collection.
+    #
+    class IndexCollection
+      include Enumerable
+      attr_reader :add_indices, :remove_indices
+
+      def initialize(*values)
+        @add_indices    = Array.new(values).flatten.compact
+        @remove_indices = []
+      end
+
+      def push(value)
+        @add_indices |= [value]
+        @remove_indices.delete value
+      end
+      alias_method :add, :push
+
+      def delete(value)
+        @add_indices.delete value
+        @remove_indices |= [value]
+      end
+      alias_method :remove, :delete
+
+      def delete_if(&block)
+        @add_indices.clone.each do |name|
+          delete(name) if block.call(name)
+        end
+      end
+
+      def each(&block)
+        @add_indices.each(&block)
+      end
+
+      def empty?
+        @add_indices.empty?
+      end
+
+      def clear
+        @remove_indices = @add_indices.clone
+        @add_indices.clear
+      end
+
+      def [](index)
+        @add_indices[index]
+      end
+
+      def size
+        @add_indices.size
+      end
+
+      def to_ary
+        @add_indices
+      end
+
+      def to_s
+        @add_indices.join(', ')
+      end
+
+      def inspect
+        %Q|<#{self.class} #{@add_indices.map{|i| "\"#{i}\""}.join(', ')}>|
+      end
+
+    end
+
+  end
+
+end

data/lib/tire/dsl.rb

@@ -36,13 +36,7 @@ module Tire
     end
 
     def aliases
-      @response = Configuration.client.get "#{Configuration.url}/_aliases"
-      MultiJson.decode(@response.body).inject({}) do |acc, (index, value)|
-        next acc if value['aliases'].empty?
-
-        acc[index] = value['aliases'].keys
-        acc
-      end
+      Alias.all
     end
 
   end

data/lib/tire/http/clients/curb.rb

@@ -36,8 +36,7 @@ module Tire
 
         def self.put(url, data)
           @client.url = url
-          @client.put_data = data
-          @client.http_put
+          @client.http_put data
           Response.new @client.body_str, @client.response_code
         end
 

data/lib/tire/index.rb

@@ -5,7 +5,7 @@ module Tire
 
     def initialize(name, &block)
       @name = name
-      instance_eval(&block) if block_given?
+      block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
     end
 
     def url
@@ -41,36 +41,15 @@ module Tire
     end
 
     def add_alias(alias_name, configuration={})
-      payload = {'actions' => [ {'add' => {'index' => @name, 'alias' => alias_name}.merge(configuration) } ]}
-      @response = Configuration.client.post "#{Configuration.url}/_aliases", MultiJson.encode(payload)
-      @response.success?
-
-    ensure
-      curl = %Q|curl -X POST "#{Configuration.url}/_aliases" -d '#{MultiJson.encode(payload)}'|
-      logged('POST', curl)
+      Alias.create(configuration.merge( :name => alias_name, :index => @name ) )
     end
 
     def remove_alias(alias_name)
-      payload = {'actions' => [{'remove' => {'index' => @name, 'alias' => alias_name}}]}
-      @response = Configuration.client.post "#{Configuration.url}/_aliases", MultiJson.encode(payload)
-      @response.success?
-
-    ensure
-      curl = %Q|curl -X POST "#{Configuration.url}/_aliases" -d '#{MultiJson.encode(payload)}'|
-      logged('POST', curl)
+      Alias.find(alias_name) { |a| a.indices.delete @name }.save
     end
 
-    def aliases(alias_name = nil)
-      @response = Configuration.client.get "#{url}/_aliases"
-      if alias_name
-        MultiJson.decode(@response.body)[@name]['aliases'][alias_name]
-      else
-        MultiJson.decode(@response.body)[@name]['aliases'].keys
-      end
-
-    ensure
-      curl = %Q|curl "#{url}/_aliases?pretty"|
-      logged('GET', curl)
+    def aliases(alias_name=nil)
+      alias_name ? Alias.all(@name).select { |a| a.name == alias_name }.first : Alias.all(@name)
     end
 
     def mapping

data/lib/tire/version.rb

@@ -1,14 +1,22 @@
 module Tire
-  VERSION   = "0.4.1"
+  VERSION   = "0.4.2"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
+    Version 0.4.1
+    -------------
     * Added a Index#settings method to retrieve index settings as a Hash
     * Added support for the "scan" search in the Ruby API
     * Added support for reindexing the index documents into new index
     * Added basic support for index aliases
     * Changed, that Index#bulk_store runs against an index endpoint, not against `/_bulk`
     * Refactorings, fixes, Ruby 1.8 compatibility
+
+    Version 0.4.2
+    -------------
+    * Fixed incorrect handling of PUT requests in the Curb client
+    * Fixed, that blocks passed to `Tire::Index.new` or `Tire.index` losed the scope
+    * Added `Tire::Alias`, interface and DSL to manage aliases as resources
   END
 end

data/lib/tire.rb

@@ -29,6 +29,7 @@ require 'tire/results/pagination'
 require 'tire/results/collection'
 require 'tire/results/item'
 require 'tire/index'
+require 'tire/alias'
 require 'tire/dsl'
 require 'tire/model/naming'
 require 'tire/model/callbacks'

data/test/integration/index_aliases_test.rb

@@ -1,5 +1,8 @@
 require 'test_helper'
 
+require 'active_support/core_ext/numeric'
+require 'active_support/core_ext/date/calculations'
+
 module Tire
 
   class IndexAliasesIntegrationTest < Test::Unit::TestCase
@@ -50,17 +53,68 @@ module Tire
        should "retrieve a list of aliases for an index" do
          @index.add_alias 'index-aliased'
       
-         assert_equal ['index-aliased'], @index.aliases
+         assert_equal ['index-aliased'], @index.aliases.map(&:name)
        end
  
       should "retrieve the properties of an alias" do
         @index.add_alias 'index-aliased', :routing => '1'
 
-        assert_equal(
-          { 'index_routing'  => '1',
-            'search_routing' => '1' },
-          @index.aliases('index-aliased') )
+        assert_equal '1', @index.aliases('index-aliased').search_routing
+      end
+    end
+
+    context "In the 'sliding window' scenario" do
+
+      setup do
+        WINDOW_SIZE_IN_WEEKS = 4
+
+        @indices = WINDOW_SIZE_IN_WEEKS.times.map { |number| "articles_#{number.weeks.ago.strftime('%Y-%m-%d')}" }
+
+        @indices.each_with_index do |name,i|
+          Tire.index(name) do
+            delete
+            create
+            store   :title => "Document #{i}"
+            refresh
+          end
+          Alias.new(:name => "articles_current") { |a| a.indices(name) and a.save }
+        end
+      end
+
+      teardown do
+        @indices.each { |index| Tire.index(index).delete }
       end
+
+      should "add a new index to alias" do
+        @indices << "articles_#{(WINDOW_SIZE_IN_WEEKS+1).weeks.ago.strftime('%Y-%m-%d')}"
+        Tire.index(@indices.last).create
+        Alias.new(:name => "articles_current") { |a| a.index @indices.last and a.save }
+
+        a = Alias.find("articles_current")
+        assert_equal 5, a.indices.size
+      end
+
+      should "remove the stale index from the alias" do
+        Alias.find("articles_current") do |a|
+          # Remove all indices older then 2 weeks from the alias
+          a.indices.delete_if do |i|
+            Time.parse( i.gsub(/articles_/, '') ) < 2.weeks.ago rescue false
+          end
+          a.save
+        end
+
+        assert_equal 2, Alias.find("articles_current").indices.size
+      end
+
+      should "search within the alias" do
+        Alias.find("articles_current") do |a|
+          a.indices.clear and a.indices @indices[0..1] and a.save
+        end
+
+        assert_equal 4, Tire.search(@indices) { query {all} }.results.size
+        assert_equal 2, Tire.search("articles_current") { query {all} }.results.size
+      end
+
     end
 
   end

data/test/unit/index_alias_test.rb

@@ -0,0 +1,275 @@
+require 'test_helper'
+
+module Tire
+
+  class IndexAliasTest < Test::Unit::TestCase
+
+    context "Index Alias" do
+      teardown { Configuration.reset }
+
+      context "initialization" do
+
+        should "have a name and defaults" do
+          @alias = Alias.new :name => 'dummy'
+          assert_equal 'dummy', @alias.name
+          assert @alias.indices.empty?
+        end
+
+        should "have indices" do
+          @alias = Alias.new :indices => ['index_A', 'index_B']
+          assert_equal ['index_A', 'index_B'], @alias.indices.to_a
+        end
+
+        should "have single index" do
+          @alias = Alias.new :index => 'index_A'
+          assert_equal ['index_A'], @alias.indices.to_a
+          assert_equal ['index_A'], @alias.index.to_a
+        end
+
+        should "have properties" do
+          @alias = Alias.new :routing => '1'
+          assert_equal '1', @alias.routing
+        end
+
+        should "allow to add indices in a block" do
+          @alias = Alias.new do
+            index 'index_A'
+            index 'index_B'
+          end
+          assert_equal ['index_A', 'index_B'], @alias.indices.to_a
+
+          @alias = Alias.new do |a|
+            a.index 'index_A'
+            a.index 'index_B'
+          end
+          assert_equal ['index_A', 'index_B'], @alias.indices.to_a
+        end
+
+        should "allow to define filter with DSL" do
+          @alias = Alias.new do
+            filter :terms, :username => 'mary'
+          end
+
+          assert_equal( { :terms => { :username => 'mary' } }, @alias.filter )
+        end
+
+        should "allow chaining" do
+          @alias = Alias.new.name('my_alias').index('index_1').index('index_2').routing('1')
+
+          assert_equal 'my_alias',             @alias.name
+          assert_equal ['index_1', 'index_2'], @alias.indices.to_a
+          assert_equal '1',                    @alias.routing
+        end
+
+        should "be converted to JSON" do
+          @alias = Alias.new :name    => 'index_anne',
+                             :indices => ['index_2012_04', 'index_2012_03', 'index_2012_02'],
+                             :routing => 1,
+                             :filter  => { :terms => { :user => 'anne' } }
+          # p @alias.to_json
+          result = MultiJson.decode @alias.to_json
+
+          assert_equal 3, result['actions'].size
+          assert_equal 'index_2012_04', result['actions'][0]['add']['index']
+        end
+
+        should "be converted to string" do
+          @alias = Alias.new :name => 'my_alias'
+          assert_equal 'my_alias', @alias.to_s
+        end
+
+      end
+
+      context "updating" do
+        setup do
+          Configuration.client.expects(:get).
+                               returns( mock_response(                               %q|{"index_A":{"aliases":{}},"index_B":{"aliases":{"alias_john":{"filter":{"term":{"user":"john"}}},"alias_martha":{"filter":{"term":{"user":"martha"}}}}},"mongoid_articles":{"aliases":{}},"index_C":{"aliases":{"alias_martha":{"filter":{"term":{"user":"martha"}}}}}}|), 200 ).at_least_once
+        end
+
+        should "add indices to alias" do
+          Configuration.client.expects(:post).with do |url, json|
+            # puts json
+            MultiJson.decode(json)['actions'].any? do |a|
+              a['add']['index'] == 'index_A' &&
+              a['add']['alias'] == 'alias_martha'
+              end
+          end.returns(mock_response('{}'), 200)
+          
+          a = Alias.find('alias_martha')
+          a.indices.push 'index_A'
+          a.save
+        end
+
+        should "remove indices from alias" do
+          Configuration.client.expects(:post).with do |url, json|
+            # puts json
+            MultiJson.decode(json)['actions'].any? do |a|
+                a['remove'] &&
+                a['remove']['index'] == 'index_A' &&
+                a['remove']['alias'] == 'alias_martha'
+              end
+          end.returns(mock_response('{}'), 200)
+          
+          a = Alias.find('alias_martha')
+          a.indices.delete 'index_A'
+          a.save
+        end
+
+        should "change alias configuration" do
+          Configuration.client.expects(:post).with do |url, json|
+            # puts json
+            MultiJson.decode(json)['actions'].all? { |a| a['add']['routing'] == 'martha' }
+          end.returns(mock_response('{}'), 200)
+          
+          a = Alias.find('alias_martha')
+          a.routing('martha')
+          a.save
+        end
+
+      end
+
+      context "saving" do
+
+        should "send data to ElasticSearch" do
+          Configuration.client.expects(:post).with do |url, json|
+            url  == "#{Configuration.url}/_aliases" &&
+            json =~ /"index":"index_2012_05"/ &&
+            json =~ /"alias":"index_current"/
+          end.returns(mock_response('{}'), 200)
+
+          @alias = Alias.new :name => 'index_current', :index => 'index_2012_05'
+          @alias.save
+        end
+
+        should "log request" do
+          Tire.configure { logger '/dev/null' }
+
+          Configuration.client.expects(:post)
+          Configuration.logger.expects(:log_request)
+          Alias.new( :name => 'index_current', :index => 'index_2012_05' ).save
+        end
+
+      end
+
+      context "finding" do
+        setup do
+          Configuration.client.expects(:get).with do |url, json|
+              url  == "#{Configuration.url}/_aliases"
+            end.returns( mock_response(                               %q|{"index_A":{"aliases":{}},"index_B":{"aliases":{"alias_john":{"filter":{"term":{"user":"john"}}},"alias_martha":{"filter":{"term":{"user":"martha"}}}}},"index_C":{"aliases":{"alias_martha":{"filter":{"term":{"user":"martha"}}}}}}|), 200 )
+        end
+
+        should "find all aliases" do
+          aliases = Alias.all
+          # p aliases
+          assert_equal 2, aliases.size
+          assert_equal ['index_B', 'index_C'], aliases.select { |a| a.name == 'alias_martha'}.first.indices.to_a.sort
+        end
+
+        should "find aliases for a specific index" do
+          Configuration.client.unstub(:get)
+          Configuration.client.expects(:get).with do |url, json|
+              url  == "#{Configuration.url}/index_C/_aliases"
+            end.returns( mock_response(                               %q|{"index_C":{"aliases":{"alias_martha":{"filter":{"term":{"user":"martha"}}}}}}|), 200 )
+
+          aliases = Alias.all('index_C')
+          # p aliases
+          assert_equal 1, aliases.size
+          assert_equal ['index_C'], aliases.last.indices.to_a
+        end
+
+        should "find an alias" do
+          a = Alias.find('alias_martha')
+          assert_instance_of Alias, a
+          assert_equal ['index_B', 'index_C'], a.indices.to_a.sort
+        end
+
+        should "find an alias and configure it with a block" do
+          a = Alias.find('alias_martha') do |a|
+                a.indices.delete 'index_A'
+                a.indices.add    'index_D'
+              end
+
+          assert_equal ['index_B', 'index_C', 'index_D'], a.indices.to_a.sort
+        end
+
+      end
+
+      context "creating" do
+        setup do
+          Configuration.client.expects(:post).with do |url, json|
+            url  == "#{Configuration.url}/_aliases" &&
+            json =~ /"index":"index_2012_05"/ &&
+            json =~ /"alias":"index_current"/
+          end.returns(mock_response('{}'), 200)
+        end
+
+        should "create the alias" do
+          Alias.create :name => 'index_current', :index => 'index_2012_05'
+        end
+
+        should "create the alias with a block" do
+          Alias.create :name => 'index_current' do
+            index 'index_2012_05'
+          end
+        end
+
+      end
+
+    end
+
+    context "IndexCollection" do
+
+      should "be intialized with an array or arguments list" do
+        c1 = Alias::IndexCollection.new ['1', '2', '3']
+        c2 = Alias::IndexCollection.new '1', '2', '3'
+        assert_equal c1.to_a, c2.to_a
+      end
+
+      should "be iterable" do
+        c = Alias::IndexCollection.new '1', '2', '3'
+        assert_respond_to c, :each
+        assert_respond_to c, :size
+        assert_equal [1, 2, 3], c.map(&:to_i)
+      end
+
+      should "allow adding values" do
+        c = Alias::IndexCollection.new '1', '2'
+        c.add '3'
+        assert_equal 3, c.size
+        assert_equal ['1', '2', '3'], c.add_indices
+        assert_equal [],              c.remove_indices
+      end
+
+      should "allow removing values" do
+        c = Alias::IndexCollection.new '1', '2'
+        c.remove '1'
+        assert_equal 1, c.size
+        assert_equal ['2'], c.add_indices
+        assert_equal ['1'], c.remove_indices
+      end
+
+      should "clear everything" do
+        c = Alias::IndexCollection.new '1', '2'
+        c.clear
+        assert_equal 0, c.size
+        assert_equal [], c.add_indices
+        assert_equal ['1', '2'], c.remove_indices
+      end
+
+      should "respond to empty" do
+        c = Alias::IndexCollection.new
+        assert c.empty?, "#{c.inspect} should be empty"
+      end
+
+      should "remove values with a block" do
+        c = Alias::IndexCollection.new '1', '2', '3'
+
+        c.delete_if { |a| a.to_i > 1 }
+        assert_equal 1, c.size
+        assert_equal ['1'],      c.add_indices
+        assert_equal ['2', '3'], c.remove_indices
+      end
+
+    end
+  end
+end

data/test/unit/index_test.rb

@@ -75,6 +75,7 @@ module Tire
       end
 
       should "delete an index alias" do
+        Configuration.client.expects(:get).returns(mock_response({'dummy' => {'aliases' => {'foo' => {}}}}.to_json))
         Configuration.client.expects(:post).with do |url, payload|
           url =~ /_aliases/ &&
           MultiJson.decode(payload)['actions'][0]['remove'] == {'index' => 'dummy', 'alias' => 'foo'}
@@ -87,14 +88,14 @@ module Tire
         json = {'dummy' => {'aliases' => {'foo' => {}}}}.to_json
         Configuration.client.expects(:get).returns(mock_response(json))
 
-        assert_equal ['foo'], @index.aliases
+        assert_equal ['foo'], @index.aliases.map(&:name)
       end
 
       should "return properties of an alias" do
         json = {'dummy' => { 'aliases' => {'foo' => { 'filter' => { 'term' => { 'user' => 'john' } }}} }}.to_json
         Configuration.client.expects(:get).returns(mock_response(json))
 
-        assert_equal( { 'filter' => { 'term' => {'user' => 'john'} } }, @index.aliases('foo') )
+        assert_equal( { 'term' => {'user' => 'john'} }, @index.aliases('foo').filter )
       end
 
       should "refresh the index" do
@@ -466,7 +467,7 @@ module Tire
         context "namespaced models" do
           should "not URL-escape the document_type" do
             Configuration.client.expects(:post).with do |url, json|
-              puts url, json
+              # puts url, json
               url  == "#{Configuration.url}/my_namespace_my_models/_bulk" &&
               json =~ %r|"_index":"my_namespace_my_models"| &&
               json =~ %r|"_type":"my_namespace/my_model"|
@@ -813,6 +814,26 @@ module Tire
         end
 
       end
+
+      context "when accessing the variables from outer scope" do
+
+        should "access the variables" do
+          @my_title = 'Title From Outer Space'
+
+          def index_something
+            @tags = ['block', 'scope', 'revenge']
+
+            Index.any_instance.expects(:store).with(title: 'Title From Outer Space', tags: ['block', 'scope', 'revenge'])
+
+            Tire::Index.new 'outer-space' do |index|
+              index.store title: @my_title, tags: @tags
+            end
+          end
+
+          index_something
+        end
+
+      end
     end
 
   end

data/test/unit/tire_test.rb

@@ -96,7 +96,10 @@ module Tire
           json = {'dummy' => {'aliases' => {'foo' => {}}}}.to_json
           Configuration.client.expects(:get).returns(mock_response(json))
 
-          assert_equal({'dummy' => ['foo']}, Tire.aliases)
+          aliases = Tire.aliases
+
+          assert_equal 'foo',     aliases.first.name
+          assert_equal ['dummy'], aliases.first.indices.to_a
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tire
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70192999444940 !ruby/object:Gem::Requirement
+  requirement: &70096833142860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192999444940
+  version_requirements: *70096833142860
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70192999442960 !ruby/object:Gem::Requirement
+  requirement: &70096833142140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70192999442960
+  version_requirements: *70096833142140
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70192999441940 !ruby/object:Gem::Requirement
+  requirement: &70096833140840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192999441940
+  version_requirements: *70096833140840
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70192999441400 !ruby/object:Gem::Requirement
+  requirement: &70096833140320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192999441400
+  version_requirements: *70096833140320
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70192999440740 !ruby/object:Gem::Requirement
+  requirement: &70096833139860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70192999440740
+  version_requirements: *70096833139860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70192999440040 !ruby/object:Gem::Requirement
+  requirement: &70096833139320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70192999440040
+  version_requirements: *70096833139320
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70192999439360 !ruby/object:Gem::Requirement
+  requirement: &70096833138860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70192999439360
+  version_requirements: *70096833138860
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70192999438620 !ruby/object:Gem::Requirement
+  requirement: &70096833138480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192999438620
+  version_requirements: *70096833138480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70192999438160 !ruby/object:Gem::Requirement
+  requirement: &70096833137960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192999438160
+  version_requirements: *70096833137960
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70192999437460 !ruby/object:Gem::Requirement
+  requirement: &70096833137400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70192999437460
+  version_requirements: *70096833137400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70192999436980 !ruby/object:Gem::Requirement
+  requirement: &70096833136840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192999436980
+  version_requirements: *70096833136840
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70192999436360 !ruby/object:Gem::Requirement
+  requirement: &70096833131700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70192999436360
+  version_requirements: *70096833131700
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70192999435800 !ruby/object:Gem::Requirement
+  requirement: &70096833131100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192999435800
+  version_requirements: *70096833131100
 - !ruby/object:Gem::Dependency
   name: redis-persistence
-  requirement: &70192999435140 !ruby/object:Gem::Requirement
+  requirement: &70096833130080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192999435140
+  version_requirements: *70096833130080
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70192999434360 !ruby/object:Gem::Requirement
+  requirement: &70096833129280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192999434360
+  version_requirements: *70096833129280
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70192999423380 !ruby/object:Gem::Requirement
+  requirement: &70096833128320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192999423380
+  version_requirements: *70096833128320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70192999422820 !ruby/object:Gem::Requirement
+  requirement: &70096833127440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70192999422820
+  version_requirements: *70096833127440
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70192999422100 !ruby/object:Gem::Requirement
+  requirement: &70096833125920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,7 +208,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70192999422100
+  version_requirements: *70096833125920
 description: ! "   Tire is a Ruby client for the ElasticSearch search engine/database.\n\n
   \  It provides Ruby-like API for fluent communication with the ElasticSearch server\n
   \  and blends with ActiveModel class for convenient usage in Rails applications.\n\n
@@ -233,6 +233,7 @@ files:
 - examples/rails-application-template.rb
 - examples/tire-dsl.rb
 - lib/tire.rb
+- lib/tire/alias.rb
 - lib/tire/configuration.rb
 - lib/tire/dsl.rb
 - lib/tire/http/client.rb
@@ -317,6 +318,7 @@ files:
 - test/unit/configuration_test.rb
 - test/unit/http_client_test.rb
 - test/unit/http_response_test.rb
+- test/unit/index_alias_test.rb
 - test/unit/index_test.rb
 - test/unit/logger_test.rb
 - test/unit/model_callbacks_test.rb
@@ -339,12 +341,15 @@ homepage: http://github.com/karmi/tire
 licenses: []
 post_install_message: ! "================================================================================\n\n
   \ Please check the documentation at <http://karmi.github.com/tire/>.\n\n--------------------------------------------------------------------------------\n\n
-  \ IMPORTANT CHANGES LATELY:\n\n  * Added a Index#settings method to retrieve index
-  settings as a Hash\n  * Added support for the \"scan\" search in the Ruby API\n
-  \ * Added support for reindexing the index documents into new index\n  * Added basic
-  support for index aliases\n  * Changed, that Index#bulk_store runs against an index
-  endpoint, not against `/_bulk`\n  * Refactorings, fixes, Ruby 1.8 compatibility\n\n
-  \ See the full changelog at <http://github.com/karmi/tire/commits/v0.4.1>.\n\n--------------------------------------------------------------------------------\n"
+  \ IMPORTANT CHANGES LATELY:\n\n  Version 0.4.1\n  -------------\n  * Added a Index#settings
+  method to retrieve index settings as a Hash\n  * Added support for the \"scan\"
+  search in the Ruby API\n  * Added support for reindexing the index documents into
+  new index\n  * Added basic support for index aliases\n  * Changed, that Index#bulk_store
+  runs against an index endpoint, not against `/_bulk`\n  * Refactorings, fixes, Ruby
+  1.8 compatibility\n\n  Version 0.4.2\n  -------------\n  * Fixed incorrect handling
+  of PUT requests in the Curb client\n  * Fixed, that blocks passed to `Tire::Index.new`
+  or `Tire.index` losed the scope\n  * Added `Tire::Alias`, interface and DSL to manage
+  aliases as resources\n\n  See the full changelog at <http://github.com/karmi/tire/commits/v0.4.2>.\n\n--------------------------------------------------------------------------------\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths:
@@ -419,6 +424,7 @@ test_files:
 - test/unit/configuration_test.rb
 - test/unit/http_client_test.rb
 - test/unit/http_response_test.rb
+- test/unit/index_alias_test.rb
 - test/unit/index_test.rb
 - test/unit/logger_test.rb
 - test/unit/model_callbacks_test.rb