redis_tags 0.0.2 → 0.0.3

data/README.md

@@ -60,8 +60,8 @@ Or install it yourself as:
     @user.tag_collection = ["beata"]      # => ["beata"]
     @user.save
 
-    User.tagged_with(:tags => ["elad"])   # => [@user.id]
-    User.tagged_with_prefix("el")         # => ["elad"]
+    User.has_tags(:tags => ["elad"])   # => [@user.id]
+    User.tags_starting_with("el")         # => ["elad"]
 
 ## Contributing
 

data/lib/redis_tags/{tag.rb → redis_tag.rb}

@@ -1,5 +1,5 @@
 module RedisTags
-  class Tag
+  class RedisTag
     attr_accessor :name
     attr_reader :owner_class
 
@@ -24,27 +24,32 @@ module RedisTags
     end
 
     def count
-      engine.scard redis_key
+      engine.zcard redis_key
     end
 
-    def self.tagged_with(klass, options = {})
-  #debugger
+    def self.has_tags(klass, options = {})
       key_array = []
       if options[:tags].to_a.size == 1
         if options[:random].to_i > 0
-          klass.redis_tags_engine.srandmember RedisTags::Tag.tagged_with_key_for(klass, options[:tags]), options[:random].to_i
+          klass.redis_tags_engine.zrandmember RedisTags::RedisTag.tagged_with_key_for(klass, options[:tags]), options[:random].to_i
+        elsif options[:since]
+          klass.redis_tags_engine.zrangebyscore RedisTags::RedisTag.tagged_with_key_for(klass, options[:tags]), options[:since].to_i, Time.now.to_i
         else
-          klass.redis_tags_engine.smembers RedisTags::Tag.tagged_with_key_for(klass, options[:tags])
+          klass.redis_tags_engine.zrangebyscore RedisTags::RedisTag.tagged_with_key_for(klass, options[:tags]), Time.now.to_i - 7 * 60 * 60 * 24, Time.now.to_i
         end
       else
         options[:tags].to_a.each do |tag_name|
-          key_array << Tag.tagged_with_key_for(klass, tag_name)
+          key_array << RedisTag.tagged_with_key_for(klass, tag_name)
         end
-        klass.redis_tags_engine.sinterstore RedisTags::Tag.intersect_key_for(klass, options[:tags]), *key_array
+
+        klass.redis_tags_engine.zinterstore RedisTags::RedisTag.intersect_key_for(klass, options[:tags]), key_array, {:aggregate => :max}
+
         if options[:random].to_i > 0
-          klass.redis_tags_engine.srandmember RedisTags::Tag.intersect_key_for(klass, options[:tags]), options[:random].to_i
+          klass.redis_tags_engine.zrandmember RedisTags::RedisTag.intersect_key_for(klass, options[:tags]), options[:random].to_i
+        elsif options[:since]
+          klass.redis_tags_engine.zrangebyscore RedisTags::RedisTag.intersect_key_for(klass, options[:tags]), options[:since].to_i, Time.now.to_i
         else
-          klass.redis_tags_engine.smembers RedisTags::Tag.intersect_key_for(klass, options[:tags])
+          klass.redis_tags_engine.zrangebyscore RedisTags::RedisTag.intersect_key_for(klass, options[:tags]), (Time.now.to_i - 7 * 60 * 60 * 24), Time.now.to_i
         end
       end
     end
@@ -66,4 +71,5 @@ module RedisTags
     def redis_key
       "#{self.owner_class}:tagged_with:#{self.name.downcase.gsub(" ", '-')}"
     end
-  end
+  end
+end

data/lib/redis_tags/{tag_list.rb → redis_tag_list.rb}

@@ -1,14 +1,20 @@
 module RedisTags
-  class TagList < Array
+  class RedisTagList < Array
 
     attr_reader :owner, :owner_class, :owner_id, :tags
     
-    def initialize(owner)
+    def initialize(owner, tags = nil)
       @owner = owner
       @owner_class = owner.class.to_s.downcase
       @owner_id = owner.id
-      super(engine.smembers(self.redis_key))
-      self
+      if tags.nil? && !(owner.id.nil?)
+        super(engine.smembers(self.redis_key))
+      else
+        if tags.nil?
+          tags = []
+        end
+        append_multi(tags)
+      end
     end
 
     def <<(tag_name)
@@ -16,10 +22,10 @@ module RedisTags
       if !(self.owner_id.nil?)
         engine.multi do
           engine.sadd self.redis_key, tag_name
-          engine.sadd "#{self.owner_class}:tagged_with:#{tag_name.gsub(" ", '-')}", self.owner_id
+          engine.zadd "#{self.owner_class}:tagged_with:#{tag_name.gsub(" ", '-')}", @owner.created_at.to_i.to_s, self.owner_id
         end
         engine.multi do
-          RedisTags::Tag.register_tag_for_autocomplete(engine, tag_name)
+          RedisTags::RedisTag.register_tag_for_autocomplete(engine, tag_name)
         end
       end
       super(tag_name)
@@ -30,7 +36,7 @@ module RedisTags
       if !(self.owner_id.nil?)
         engine.multi do
           engine.srem self.redis_key, tag_name
-          engine.srem "#{self.owner_class}:tagged_with:#{tag_name.gsub(" ", '-')}", self.owner_id
+          engine.zrem "#{self.owner_class}:tagged_with:#{tag_name.gsub(" ", '-')}", self.owner_id
         end
       end
       super(tag_name)

data/lib/redis_tags/version.rb

@@ -1,3 +1,3 @@
 module RedisTags
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/redis_tags.rb

@@ -1,6 +1,6 @@
 require "redis_tags/version"
-require "redis_tags/tag"
-require "redis_tags/tag_list"
+require "redis_tags/redis_tag"
+require "redis_tags/redis_tag_list"
 
 module RedisTags
   
@@ -37,45 +37,39 @@ module RedisTags
       @@redis_tags_engine
     end
 
-    def tagged_with(options = {})
-      Tag.tagged_with(self, options)
+    def has_tags(options = {})
+      RedisTags::RedisTag.has_tags(self, options)
     end
 
-    def tagged_with_prefix(partial_tag_name)
-      RedisTags::Tag.starts_with?(self.redis_tags_engine, partial_tag_name)
+    def tags_starting_with(partial_tag_name)
+      RedisTags::RedisTag.starts_with?(self.redis_tags_engine, partial_tag_name)
     end
   end
 
   module InstanceMethods
 
-    def tag_list
+    def tags_collection
       if self.class.acts_as_taggable_on_steroids_legacy_mode?
-        legacy_tag_list = super()
-        tags_collection = legacy_tag_list
-        legacy_tag_list
+        @_tag_list ||= RedisTags::RedisTagList.new(self, self.tag_list) 
       else
-        tags_collection
+        @_tag_list ||= RedisTags::RedisTagList.new(self)
       end
     end
 
-    def tags_collection
-      @tag_list ||= RedisTags::TagList.new(self)
-    end
-
     def tag_with(tag)
       tags_collection << tag
     end
 
     def tags_collection=(new_tag_list)
       tags_collection.delete_all
-      @tag_list = RedisTags::TagList.new(self).append_multi(new_tag_list)
+      @_tag_list = RedisTags::RedisTagList.new(self, new_tag_list)
     end
 
     private
 
     # After save callback, confirms that redis is saved after object exists.
     def update_tags_to_redis
-      tags_collection = @tag_list
+      tags_collection = RedisTags::RedisTagList.new(self, @_tag_list)
     end
   end
 end

data/spec/models/book.rb

@@ -1,10 +1,20 @@
 class Book
+
+  attr_accessor :id
+  attr_reader :created_at
+  attr_accessor :tag_list
+  def Book.after_save(arg)
+    
+  end
+
   include RedisTags
 
   uses_redis_tags
 
-  def new
+  def initialize(tag_list = [])
     @id = nil
+    @created_at = Time.now
+    @tag_list = tag_list
   end
 
   def id
@@ -12,7 +22,7 @@ class Book
   end
 
   def save
-    @id = rand(1000)
+    self.id = rand(1000)
     after_save
   end
 

data/spec/spec/{tag_spec.rb → redis_tag_spec.rb}

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe Tag do
+describe RedisTags::RedisTag do
 
   before(:each) do
       Book.redis_tags_engine.flushdb
   end
 
-  it "should initialize a new Tag instance" do
+  it "should initialize a new RedisTag instance" do
     @b = Book.new
-    @t = Tag.new(@b, "koksi")
+    @t = RedisTags::RedisTag.new(@b, "koksi")
     @t.name.should == "koksi"
     @t.owner_class.should == "book"
     
@@ -18,14 +18,13 @@ describe Tag do
   it "should intersect more than 1 tag" do
     @book1 = Book.new
     @book2 = Book.new
-#debugger
     @book1.tags_collection = "elad, deddy, erez"
-
     @book1.save
+
     @book2.tags_collection = "elad, deddy"
     @book2.save
 
-    [@book1.id, @book2.id].should =~ Tag.tagged_with(Book, {:tags => ["elad", "deddy"]}).collect(&:to_i)
+    [@book1.id, @book2.id].should =~ RedisTags::RedisTag.has_tags(Book, {:tags => ["elad", "deddy"]}).collect(&:to_i)
   end
 
   it "should intersect 1 tag" do
@@ -37,15 +36,15 @@ describe Tag do
     @book2.tags_collection = "elad, deddy"
     @book2.save
 
-    [@book1.id, @book2.id].should =~ Tag.tagged_with(Book, {:tags => ["elad"]}).collect(&:to_i)
+    [@book1.id, @book2.id].should =~ RedisTags::RedisTag.has_tags(Book, {:tags => ["elad"]}).collect(&:to_i)
   end
 
   it "should log autocomplete options for each tag" do
     @book = Book.new
     @book.tags_collection = "elad", "eli", "eliran hamelech shel ramle"
     @book.save
-    Book.tagged_with_prefix("el").should =~ ["elad", "eli", "eliran hamelech shel ramle"]
-    Book.tagged_with_prefix("ela").should =~ ["elad"]
-    Book.tagged_with_prefix("eli").should =~ ["eli", "eliran hamelech shel ramle"]
+    Book.tags_starting_with("el").should =~ ["elad", "eli", "eliran hamelech shel ramle"]
+    Book.tags_starting_with("ela").should =~ ["elad"]
+    Book.tags_starting_with("eli").should =~ ["eli", "eliran hamelech shel ramle"]
   end
 end

data/spec/spec/redis_tags_spec.rb

@@ -9,18 +9,21 @@ describe RedisTags do
     it "should create multiple tags" do
       @book = Book.new
       @book.tags_collection = "elad, koko, loko"
+      @book.save
       @book.tags_collection.should  eql(["elad", "koko", "loko"])
     end
 
     it "should save a new tag using <<" do
       @book = Book.new
       @book.tag_with "elad"
+      @book.save
       @book.tags_collection.should eql(["elad"])
     end
 
     it "should save a new tag downcased" do
       @book = Book.new
       @book.tag_with "ELAD"
+      @book.save
       @book.tags_collection.should eql(["elad"])
     end
 
@@ -32,7 +35,7 @@ describe RedisTags do
       @book = Book.new
       lambda {
         @book.tag_list
-      }.should raise_error(NoMethodError)
+      }.should_not raise_error(NoMethodError)
     end
 
     it "should update Redis tags collection with backward compatibility for acts_as_taggable_on_steroids (#tag_list)" do
@@ -40,10 +43,7 @@ describe RedisTags do
         uses_redis_tags :acts_as_taggable_on_steroids_legacy_mode => true
       end
 
-      @book = Book.new
-      lambda {
-        @book.tag_list
-      }.should raise_error(NoMethodError)
+      @book = Book.new([])
 
       @book.tags_collection.should eql([])
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis_tags
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Elad Meidar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-05 00:00:00 +02:00
+date: 2012-11-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,13 +79,13 @@ files:
 - README.md
 - Rakefile
 - lib/redis_tags.rb
-- lib/redis_tags/tag.rb
-- lib/redis_tags/tag_list.rb
+- lib/redis_tags/redis_tag.rb
+- lib/redis_tags/redis_tag_list.rb
 - lib/redis_tags/version.rb
 - redis_tags.gemspec
 - spec/models/book.rb
+- spec/spec/redis_tag_spec.rb
 - spec/spec/redis_tags_spec.rb
-- spec/spec/tag_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: ""
@@ -123,6 +123,6 @@ specification_version: 3
 summary: This implementation consists over 3 basic rules. keep who is tagged, keep what is tagged and keep all tags.
 test_files: 
 - spec/models/book.rb
+- spec/spec/redis_tag_spec.rb
 - spec/spec/redis_tags_spec.rb
-- spec/spec/tag_spec.rb
 - spec/spec_helper.rb