seasyar 0.0.13 → 0.0.14

data/.rvmrc

@@ -4,7 +4,7 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p290"
+environment_id="ruby-1.9.2-p320"
 
 #
 # First we attempt to load the desired environment directly from the environment

data/Gemfile

@@ -4,16 +4,15 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "seasy", ">= 0.0.9"
-gem "activerecord", "~> 3.0"
+gem "activerecord", "~> 3.2"
 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 "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "bundler"#, "~> 1.0.0"
+  gem "jeweler"#, "~> 1.6.4"
   gem "standalone_migrations"
   gem "sqlite3"
 end

data/Gemfile.lock

@@ -1,53 +1,89 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.3)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
+    arel (3.0.2)
+    builder (3.0.4)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
+    hike (1.2.1)
+    i18n (0.6.1)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.0.4)
+      rdoc
+    journey (1.0.4)
+    json (1.7.5)
+    multi_json (1.3.7)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
     seasy (0.0.9)
-    sqlite3 (1.3.5)
-    standalone_migrations (1.0.5)
-      activerecord (>= 3)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    standalone_migrations (2.0.2)
+      activerecord (~> 3.2.6)
+      railties (~> 3.2.6)
       rake
-    tzinfo (0.3.31)
+    thor (0.16.0)
+    tilt (1.3.3)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
+  activerecord (~> 3.2)
+  bundler
+  jeweler
   multi_json (~> 1.0)
-  rcov
   rspec
   seasy (>= 0.0.9)
   sqlite3

data/Rakefile

@@ -32,14 +32,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/seasyar/seasyar.rb

@@ -1,9 +1,7 @@
 module Seasyar
   require 'seasy'
 
-  def index index_name, *fields
-    index = Seasy::Index.with_name index_name.to_s
-
+  def index index_name, *fields, &target_block
     has_changed = fields.detect do |one_field|
       changed_method = "#{one_field}_changed?".to_sym
       if self.respond_to? changed_method
@@ -14,16 +12,23 @@ module Seasyar
     end
 
     if has_changed
-      value = aggregated_value fields
+      reindex index_name, *fields, &target_block
+    end
+  end
 
-      source = "#{self.class}:#{self.id}"
+  def reindex index_name, *fields, &target_block
+    index = Seasy::Index.with_name index_name.to_s
 
-      target = block_given? ? yield( self ) : self.id
+    value = aggregated_value fields
 
-      index.add value.to_s, target.to_s, :source => source
-    end
+    source = "#{self.class}:#{self.id}"
+
+    target = target_block ? target_block.call( self ) : self.id
+
+    index.add value.to_s, target.to_s, :source => source
   end
 
+  private
   def aggregated_value fields
     value = ''
     fields.each do |one_field|
@@ -32,15 +37,18 @@ module Seasyar
     value
   end
 
-  def search index_name, query
+  public
+  def unindex index_name
     index = Seasy::Index.with_name index_name.to_s
-    index.search query
+    index.remove "#{self.class}:#{self.id}"
   end
 
-  def unindex index_name
+
+  module_function
+  def search index_name, query
     index = Seasy::Index.with_name index_name.to_s
-    index.remove "#{self.class}:#{self.id}"
+    index.search query
   end
 
-  module_function :index, :search, :unindex
+
 end

data/seasyar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "seasyar"
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fredrik Rubensson"]
-  s.date = "2012-10-30"
+  s.date = "2012-11-09"
   s.description = "Seasy integration. Active record storage for seasy and save hooks in models."
   s.email = "fredrik@eldfluga.se"
   s.extra_rdoc_files = [
@@ -49,33 +49,30 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<seasy>, [">= 0.0.9"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.2"])
       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<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<standalone_migrations>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<seasy>, [">= 0.0.9"])
-      s.add_dependency(%q<activerecord>, ["~> 3.0"])
+      s.add_dependency(%q<activerecord>, ["~> 3.2"])
       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<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<standalone_migrations>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
     s.add_dependency(%q<seasy>, [">= 0.0.9"])
-    s.add_dependency(%q<activerecord>, ["~> 3.0"])
+    s.add_dependency(%q<activerecord>, ["~> 3.2"])
     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<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<standalone_migrations>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
   end

data/spec/seasyar_spec.rb

@@ -29,6 +29,10 @@ class Dummy
     unindex INDEX_NAME
   end
 
+  def save_for_reindex
+    reindex INDEX_NAME, :static
+  end
+
   def id
     @id
   end
@@ -86,4 +90,13 @@ describe Seasyar do
     d.save_unchanged
     Seasyar::SeasyData.find_by_key( key ).updated_at.should == stamp
   end
+
+  it "reindex should always save" do
+    key = 'nonchanging'
+    d = Dummy.new 4711, key
+    d.save
+    stamp = Seasyar::SeasyData.find_by_key( key ).updated_at
+    d.save_for_reindex
+    Seasyar::SeasyData.find_by_key( key ).updated_at.should > stamp
+  end
 end

metadata

@@ -1,126 +1,153 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: seasyar
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.14
   prerelease: 
-  version: 0.0.13
 platform: ruby
-authors: 
+authors:
 - Fredrik Rubensson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: seasy
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: standalone_migrations
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-description: Seasy integration. Active record storage for seasy and save hooks in models.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Seasy integration. Active record storage for seasy and save hooks in
+  models.
 email: fredrik@eldfluga.se
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .rvmrc
 - Gemfile
@@ -142,34 +169,31 @@ files:
 - spec/seasyar_spec.rb
 - spec/storage_spec.rb
 homepage: http://github.com/froderik/seasyar
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1651341459813089592
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2707278775214487662
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: active record integration for seasy
 test_files: []
-