lazy_observers 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9368b4489ad2f76e6ecbdd5bf386200f3145ac1b
-  data.tar.gz: 911a834c8160fd2b27cc23062b783a260d34b2c1
+  metadata.gz: c107075630a15e896e18d47e9e3d2fa9ce54f23d
+  data.tar.gz: fbbe3335d3de560d46c74b6ef4be67f4a6685328
 SHA512:
-  metadata.gz: 90f41cb278d45021ad2ba6e98eb02c580bd817909ae23535199f4d1e11dfdcb69ba50d12fed7cef9193a60c680e6d0e5e8a8296f75b33d2ca77ba8e68fcbabc7
-  data.tar.gz: 82cacd550131dc729285201634ce87d4d3ec6587515631f6f0ebbc06ba9ae257b27f099f1ef926ae5e4e096cbc4fc8f33a9c74841330b616030b3224be24bd88
+  metadata.gz: 2a6265b9884ff10ee907409d47d1d92b062bb7d74bca2f5739fa5f599dc3f6598b1f0c130f837ed4e76d1e6bdc3805d1020864b3d3d7cdd20f43e8475cfb7797
+  data.tar.gz: c6e9392383b3324f18e9545e1bc96530feaa7dbf87d43ea91d0fdee80f7548cb730f5dfb1152eb7bd6f7aad88cc29280d1d19502dd238de426f90fc6b5c8460a

data/.travis.yml

@@ -1,8 +1,11 @@
+sudo: false
+cache: bundler
+bundler_args: ""
 script: "bundle exec rake spec"
 rvm:
-  - 1.8.7
   - 1.9.3
+  - 2.1.6
 gemfile:
-  - gemfiles/rails-2.3.gemfile
   - gemfiles/rails-3.0.gemfile
   - gemfiles/rails-3.2.gemfile
+  - gemfiles/rails-4.0.gemfile

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "rails-2.3" do
-  gem "activerecord", "~> 2.3.6", :require => "active_record"
-end
-
 appraise "rails-3.0" do
   gem "activerecord", "~> 3.0.15", :require => "active_record"
 end
@@ -10,3 +6,9 @@ appraise "rails-3.2" do
   gem "activerecord", "~> 3.2.6", :require => "active_record"
 end
 
+appraise "rails-4.0" do
+ gem "railties", "~> 4.0.13", :require => "active_record"
+ gem "activerecord", "~> 4.0.13", :require => "active_record"
+ gem "rails-observers", "~> 0.1.2", :require => "active_record"
+end
+

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 gem 'rake'

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    lazy_observers (0.1.0)
+    lazy_observers (0.2.0)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.6)
       activesupport (= 3.2.6)

data/gemfiles/rails-3.0.gemfile

@@ -1,11 +1,12 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~>2"
 gem "sqlite3"
 gem "appraisal"
+gem "bump"
 gem "activerecord", "~> 3.0.15", :require=>"active_record"
 
 gemspec :path=>"../"

data/gemfiles/rails-3.0.gemfile.lock

@@ -1,11 +1,11 @@
 PATH
-  remote: /Users/mgrosser/code/tools/lazy_observers
+  remote: ../
   specs:
-    lazy_observers (0.0.4)
+    lazy_observers (0.1.0)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.0.15)
       activesupport (= 3.0.15)
@@ -22,6 +22,7 @@ GEM
       rake
     arel (2.0.10)
     builder (2.1.2)
+    bump (0.5.2)
     diff-lcs (1.1.3)
     i18n (0.5.0)
     rake (0.9.2.2)
@@ -42,7 +43,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 3.0.15)
   appraisal
+  bump
   lazy_observers!
   rake
   rspec (~> 2)
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/rails-3.2.gemfile

@@ -1,11 +1,12 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~>2"
 gem "sqlite3"
 gem "appraisal"
+gem "bump"
 gem "activerecord", "~> 3.2.6", :require=>"active_record"
 
 gemspec :path=>"../"

data/gemfiles/rails-3.2.gemfile.lock

@@ -1,11 +1,11 @@
 PATH
-  remote: /Users/mgrosser/code/tools/lazy_observers
+  remote: ../
   specs:
-    lazy_observers (0.0.4)
+    lazy_observers (0.1.0)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.6)
       activesupport (= 3.2.6)
@@ -23,6 +23,7 @@ GEM
       rake
     arel (3.0.2)
     builder (3.0.0)
+    bump (0.5.2)
     diff-lcs (1.1.3)
     i18n (0.6.0)
     multi_json (1.3.6)
@@ -44,7 +45,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 3.2.6)
   appraisal
+  bump
   lazy_observers!
   rake
   rspec (~> 2)
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/rails-4.0.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "rspec", "~>2"
+gem "sqlite3"
+gem "appraisal"
+gem "bump"
+gem "railties", "~> 4.0.13", :require=>"active_record"
+gem "activerecord", "~> 4.0.13", :require=>"active_record"
+gem "rails-observers", "~> 0.1.2", :require=>"active_record"
+
+gemspec :path=>"../"

data/gemfiles/rails-4.0.gemfile.lock

@@ -0,0 +1,82 @@
+PATH
+  remote: ../
+  specs:
+    lazy_observers (0.1.0)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (4.0.2)
+    builder (3.1.4)
+    bump (0.5.2)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    minitest (4.7.5)
+    multi_json (1.11.2)
+    rack (1.5.5)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    sqlite3 (1.3.10)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (0.3.44)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.0.13)
+  appraisal
+  bump
+  lazy_observers!
+  rails-observers (~> 0.1.2)
+  railties (~> 4.0.13)
+  rake
+  rspec (~> 2)
+  sqlite3
+
+BUNDLED WITH
+   1.10.6

data/lib/lazy_observers.rb

@@ -1,6 +1,6 @@
 require 'lazy_observers/version'
 require 'active_record'
-require 'active_record/observer'
+require 'lazy_observers/rails_observer'
 require 'lazy_observers/railtie' if defined?(Rails)
 
 module LazyObservers
@@ -87,8 +87,7 @@ module LazyObservers
   end
 end
 
-descendants = (ActiveRecord::VERSION::MAJOR > 2 ? :descendants : :subclasses)
-ActiveRecord::Base.send(descendants).each{|klass| LazyObservers.observed_loaded(klass) }
+ActiveRecord::Base.send(:descendants).each{|klass| LazyObservers.observed_loaded(klass) }
 
 ActiveRecord::Observer.class_eval do
   def self.lazy_observe(*classes)

data/lib/lazy_observers/rails_observer.rb

@@ -0,0 +1,13 @@
+if ActiveRecord::VERSION::MAJOR < 4
+  require 'active_record/observer'
+else
+  begin
+    require 'rails/observers/activerecord/active_record'
+  rescue LoadError => _
+    $stderr.puts(<<-MSG)
+ERROR: Failed loading rails-observers dependencies.
+If you are using Rails 4+, make sure `gem 'rails-observers'` is in your Gemfile.
+    MSG
+    raise
+  end
+end

data/lib/lazy_observers/railtie.rb

@@ -1,3 +1,5 @@
+require 'rails/railtie'
+
 module LazyObservers
   class Railtie < Rails::Railtie
     config.to_prepare do

data/lib/lazy_observers/version.rb

@@ -1,3 +1,3 @@
 module LazyObservers
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/database.rb

@@ -2,10 +2,11 @@ require "active_record"
 
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
-  :database => ":memory:",
+  :database => ":memory:"
 )
 
 # create tables
+ActiveRecord::Schema.verbose = false
 ActiveRecord::Schema.define(:version => 1) do
   create_table :users do |t|
     t.string :name

data/spec/lazy_observers_spec.rb

@@ -40,9 +40,6 @@ describe LazyObservers do
     defined?(InheritedProduct).should == nil
     require File.expand_path("../app/products", __FILE__)
 
-    # no duplicates (sets are weirdly nested :/ )
-    ProductObserver.instance.observed_classes.map{|x| x.is_a?(Set) ? x.to_a : x }.flatten.map{|x| x.is_a?(Set) ? x.to_a : x }.flatten.should == [Product, InheritedProduct]
-
     # for inherited
     ProductObserver.instance.called.should == []
     product = InheritedProduct.create!
@@ -87,15 +84,13 @@ describe LazyObservers do
       loaded.should == [T2]
     end
 
-    it "can use classmethods when on_load is called" do
-      pending do
-        loaded = []
-        LazyObservers.on_load("T1") do |klass|
-          loaded << klass.xxx
-        end
-        require File.expand_path("../app/t1", __FILE__)
-        loaded.should == [111]
+    it "can use classmethods when on_load is called", :pending => true do
+      loaded = []
+      LazyObservers.on_load("T1") do |klass|
+        loaded << klass.xxx
       end
+      require File.expand_path("../app/t1", __FILE__)
+      loaded.should == [111]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazy_observers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,14 +36,15 @@ files:
 - Gemfile.lock
 - Rakefile
 - Readme.md
-- gemfiles/rails-2.3.gemfile
-- gemfiles/rails-2.3.gemfile.lock
 - gemfiles/rails-3.0.gemfile
 - gemfiles/rails-3.0.gemfile.lock
 - gemfiles/rails-3.2.gemfile
 - gemfiles/rails-3.2.gemfile.lock
+- gemfiles/rails-4.0.gemfile
+- gemfiles/rails-4.0.gemfile.lock
 - lazy_observers.gemspec
 - lib/lazy_observers.rb
+- lib/lazy_observers/rails_observer.rb
 - lib/lazy_observers/railtie.rb
 - lib/lazy_observers/version.rb
 - spec/app/inherited_movie.rb

data/gemfiles/rails-2.3.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source :rubygems
-
-gem "rake"
-gem "rspec", "~>2"
-gem "sqlite3"
-gem "appraisal"
-gem "activerecord", "~> 2.3.6", :require=>"active_record"
-
-gemspec :path=>"../"

data/gemfiles/rails-2.3.gemfile.lock

@@ -1,37 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/lazy_observers
-  specs:
-    lazy_observers (0.0.4)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    appraisal (0.4.1)
-      bundler
-      rake
-    diff-lcs (1.1.3)
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sqlite3 (1.3.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 2.3.6)
-  appraisal
-  lazy_observers!
-  rake
-  rspec (~> 2)
-  sqlite3