lib/picky/query/combination.rb in picky-3.0.0.pre5 vs lib/picky/query/combination.rb in picky-3.0.0

@@ -11,60 +11,77 @@
     # An allocation consists of a number of combinations:
     # [[text1, index_bundle1], [text2, index_bundle2], [text3, index_bundle1]]
     #
     class Combination # :nodoc:all
 
-      attr_reader :token, :bundle, :category_name
+      attr_reader :token,
+                  :category
 
       def initialize token, category
-        @token         = token
-        @category_name = category.name
-        @bundle        = category.bundle_for token
-        @text          = @token.text # don't want to use reset_similar already
+        @token    = token
+        @category = category
       end
 
-      # Note: Required for uniq!
+      # Returns the token's text.
       #
-      def hash
-        [@token.to_s, @bundle].hash
+      def text
+        @text ||= token.text
       end
 
+      # Returns the category's bundle.
+      #
+      def bundle
+        @bundle ||= category.bundle_for(token)
+      end
+
+      # Returns the category's name.
+      #
+      def category_name
+        @category_name ||= category.name
+      end
+
       # Returns the weight of this combination.
       #
       # Note: Caching is most of the time useful.
       #
       def weight
-        @weight ||= @bundle.weight(@text)
+        @weight ||= bundle.weight(text)
       end
 
       # Returns an array of ids for the given text.
       #
       # Note: Caching is most of the time useful.
       #
       def ids
-        @ids ||= @bundle.ids(@text)
+        @ids ||= bundle.ids(text)
       end
 
       # The identifier for this combination.
       #
       def identifier
-        "#{bundle.identifier}:#{@token.identifier}"
+        "#{bundle.identifier}:#{token.identifier}"
       end
 
       # Is the identifier in the given identifiers?
       #
       def in? identifiers
         identifiers.include? identifier
       end
 
+      # Note: Required for uniq!
+      #
+      def hash
+        [token.to_s, bundle].hash
+      end
+
       # Combines the category names with the original names.
       # [
       #  [:title,    'Flarbl', :flarbl],
       #  [:category, 'Gnorf',  :gnorf]
       # ]
       #
       def to_result
-        [@category_name, *@token.to_result]
+        [category_name, *token.to_result]
       end
 
       # Example:
       #  "exact title:Peter*:peter"
       #
\ No newline at end of file