seasyar 0.0.2 → 0.0.8

data/Gemfile

@@ -3,14 +3,14 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "seasy", "0.0.4"
-gem "activerecord"
+gem "seasy", "0.0.6"
+gem "activerecord", "~> 3.0"
+gem "multi_json", "~> 1.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec"
-#  gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -20,6 +20,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    multi_json (1.0.3)
     rake (0.9.2)
     rcov (0.9.10)
     rspec (2.6.0)
@@ -30,7 +31,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    seasy (0.0.4)
+    seasy (0.0.6)
     sqlite3 (1.3.3)
     standalone_migrations (1.0.1)
       activerecord (>= 3)
@@ -41,11 +42,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
+  activerecord (~> 3.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
+  multi_json (~> 1.0)
   rcov
   rspec
-  seasy (= 0.0.4)
+  seasy (= 0.0.6)
   sqlite3
   standalone_migrations

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.8

data/db/migrate/20110926212900_add_source.rb

@@ -0,0 +1,9 @@
+class AddSource < ActiveRecord::Migration
+  def self.up
+    add_column :seasy_data, :source, :string
+  end
+
+  def self.down
+    remove_column :seasy_data, :source
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110906072000) do
+ActiveRecord::Schema.define(:version => 20110926212900) do
 
   create_table "seasy_data", :force => true do |t|
     t.string   "key"
@@ -18,6 +18,7 @@ ActiveRecord::Schema.define(:version => 20110906072000) do
     t.integer  "weight"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "source"
   end
 
 end

data/lib/{activerecordstorage.rb → seasyar/activerecordstorage.rb}

@@ -1,5 +1,4 @@
 require 'active_record'
-require 'seasydata'
 
 module Seasyar
   
@@ -7,17 +6,25 @@ module Seasyar
     
     ## seasy storage implementation ##
     
-    def save target, weights
+    def save target, weights, options = {}
+      raise "source is not set" if options[:source].nil?
+      source = options[:source] 
+      
+      old = SeasyData.find_all_by_source source
+      old.each { |data| data.delete }
+      
       weights.keys.each do |k|
         i = Seasyar::SeasyData.new
         i.key = k
         i.target = target
+        i.source = source
         i.weight = weights[k]
         i.save!
       end
     end
     
     def search question
+      # todo : count hits.....
       hits = Seasyar::SeasyData.find_all_by_key question
       result = {}
       hits.each do |one_hit|
@@ -26,6 +33,10 @@ module Seasyar
       result
     end
     
+    def remove deletee
+      Seasyar::SeasyData.find_all_by_source( deletee ).each {|data| data.delete}
+    end
+    
     ## helper methods ##
     
   end

data/lib/seasyar/seasyar.rb

@@ -0,0 +1,32 @@
+module Seasyar
+  require 'seasy'
+  
+  def index index_name, *fields
+    index = Seasy::Index.with_name index_name.to_s
+    
+    value = ''
+    fields.each do |one_field|
+      value << " #{self.send one_field }"
+    end
+    
+    target = self.id
+    source = "#{self.class}:#{target}"
+
+    if block_given?
+      target = yield self
+    end
+    index.add value.to_s, target.to_s, :source => source
+  end  
+  
+  def search index_name, query
+    index = Seasy::Index.with_name index_name.to_s
+    index.search query
+  end
+  
+  def unindex index_name
+    index = Seasy::Index.with_name index_name.to_s
+    index.remove "#{self.class}:#{self.id}"
+  end
+  
+  module_function :index, :search, :unindex
+end

data/lib/seasyar.rb

@@ -1,25 +1,4 @@
-require 'activerecordstorage'
-require 'seasydata'
+require 'seasyar/activerecordstorage'
+require 'seasyar/seasydata'
+require 'seasyar/seasyar'
 
-module Seasyar
-  require 'seasy'
-  
-  def index index_name, *fields
-    index = Seasy::Index.with_name index_name.to_s
-    fields.each do |one_field|
-      value = self.send one_field
-      target = self.id
-      if block_given?
-        target = yield self
-      end
-      index.add value.to_s, target.to_s  
-    end
-  end  
-  
-  def search index_name, query
-    index = Seasy::Index.with_name index_name.to_s
-    index.search query
-  end
-  
-  module_function :index, :search
-end

data/seasyar.gemspec

@@ -0,0 +1,83 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "seasyar"
+  s.version = "0.0.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Fredrik Rubensson"]
+  s.date = "2011-09-28"
+  s.description = "Seasy integration. Active record storage for seasy and save hooks in models."
+  s.email = "fredrik@eldfluga.se"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "db/config.yml",
+    "db/development.sqlite3",
+    "db/migrate/20110906072000_create_index.rb",
+    "db/migrate/20110926212900_add_source.rb",
+    "db/schema.rb",
+    "lib/seasyar.rb",
+    "lib/seasyar/activerecordstorage.rb",
+    "lib/seasyar/seasyar.rb",
+    "lib/seasyar/seasydata.rb",
+    "seasyar.gemspec",
+    "spec/seasyar_spec.rb",
+    "spec/storage_spec.rb"
+  ]
+  s.homepage = "http://github.com/froderik/seasyar"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "active record integration for seasy"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<seasy>, ["= 0.0.6"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<standalone_migrations>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+    else
+      s.add_dependency(%q<seasy>, ["= 0.0.6"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0"])
+      s.add_dependency(%q<multi_json>, ["~> 1.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<standalone_migrations>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<seasy>, ["= 0.0.6"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0"])
+    s.add_dependency(%q<multi_json>, ["~> 1.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<standalone_migrations>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+  end
+end
+

data/spec/seasyar_spec.rb

@@ -0,0 +1,69 @@
+require 'seasyar'
+
+
+class Dummy 
+  include Seasyar
+  
+  def initialize id, static
+    @id = id
+    @static = static
+  end
+
+  INDEX_NAME = "test_index_name" 
+
+  def save
+    index INDEX_NAME, :static
+  end
+  
+  def save_with_block
+    index( INDEX_NAME, :static ) {|unused| 666}
+  end
+  
+  def removal
+    unindex INDEX_NAME
+  end
+  
+  def id
+    @id
+  end
+  
+  def static 
+    @static
+  end
+end
+
+describe Seasyar do
+  before :all do
+    ActiveRecord::Base.configurations = YAML::load(IO.read('db/config.yml'))
+    ActiveRecord::Base.establish_connection('development')
+    
+    Seasy.configure do |config|
+      config.storage = Seasyar::ActiveRecordStorage
+    end
+  end
+
+  before :each do
+    Seasyar::SeasyData.all.each { |data| data.delete }
+  end
+  
+  it "should save to index" do
+    d = Dummy.new 42, 'static'
+    d.save
+    Seasyar.search( Dummy::INDEX_NAME, 'static' ).should == {42.to_s => 1}
+  end
+  
+  it "should save source" do
+    d = Dummy.new 144, 'diff'
+    d.save_with_block
+    Seasyar.search( Dummy::INDEX_NAME, 'diff' ).should == {666.to_s => 1}
+    
+    d.save # the 666 entry should be removed and 42 be there instead
+    Seasyar.search( Dummy::INDEX_NAME, 'diff' ).should == {144.to_s => 1}
+  end
+  
+  it "should remove from index" do
+    d = Dummy.new 43, 'static'
+    d.save
+    d.removal
+  end
+end

data/spec/storage_spec.rb

@@ -1,13 +1,12 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'activerecordstorage'
-require 'fragmentizer'
+require 'seasyar'
+require 'seasy'
 require 'active_record'
 
 describe Seasyar::ActiveRecordStorage do
   before :all do
-#    ActiveRecord::Base.logger = Logger.new('log/debug.log')
     ActiveRecord::Base.configurations = YAML::load(IO.read('db/config.yml'))
     ActiveRecord::Base.establish_connection('development')
   end
@@ -15,7 +14,36 @@ describe Seasyar::ActiveRecordStorage do
   it "should save entries and make them searchable" do
     target = 1
     weights = Fragmentizer.new.fragmentize 'test'
-    subject.save target, weights
-    subject.query( 'es' ).should == {"1" => 1}
+    subject.save target, weights, :source => "1"
+    subject.search( 'es' ).should == {"1" => 1}
+  end
+  
+  it "should remove entries when saving new ones" do
+    target = 1
+    weights = Fragmentizer.new.fragmentize 'test'
+    subject.save target, weights, :source => "1"
+    
+    weights = Fragmentizer.new.fragmentize 'different'
+    subject.save target, weights, :source => "1"
+    
+    subject.search( 'es' ).should == {}    
+  end
+  
+  it "should accept a source as basis for what to delete in between adding" do 
+    Seasy.configure do |config|
+      config.storage = Seasyar::ActiveRecordStorage
+    end
+    i = Seasy::Index.new 
+    i.add 'ruben', 'landsnora', :source => 'veddesta'
+    i.search( 'ruben' ).should == {'landsnora' => 1}
+    
+    i.add 'ruben', 'edsberg', :source => 'edsberg'
+    i.search( 'ruben' ).should == {'landsnora' => 1, 'edsberg' => 1}
+    
+    i.add 'sten', 'landsnora', :source => 'veddesta'
+    i.search( 'ruben' ).should == {'edsberg' => 1}
+    
+    i.add 'sten', 'edsberg', :source => 'edsberg'
+    i.search( 'ruben' ).should == {}
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: seasyar
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.8
 platform: ruby
 authors: 
 - Fredrik Rubensson
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 +02:00
-default_executable: 
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: seasy
@@ -20,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.0.4
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -29,15 +28,26 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "3.0"
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: multi_json
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,10 +55,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -56,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,10 +77,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,10 +88,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: standalone_migrations
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,10 +99,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,7 +110,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 description: Seasy integration. Active record storage for seasy and save hooks in models.
 email: fredrik@eldfluga.se
 executables: []
@@ -122,12 +132,15 @@ files:
 - db/config.yml
 - db/development.sqlite3
 - db/migrate/20110906072000_create_index.rb
+- db/migrate/20110926212900_add_source.rb
 - db/schema.rb
-- lib/activerecordstorage.rb
 - lib/seasyar.rb
-- lib/seasydata.rb
+- lib/seasyar/activerecordstorage.rb
+- lib/seasyar/seasyar.rb
+- lib/seasyar/seasydata.rb
+- seasyar.gemspec
+- spec/seasyar_spec.rb
 - spec/storage_spec.rb
-has_rdoc: true
 homepage: http://github.com/froderik/seasyar
 licenses: 
 - MIT
@@ -141,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1962273080970547351
+      hash: 2356686226470266283
       segments: 
       - 0
       version: "0"
@@ -154,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: active record integration for seasy