dm-observer 0.9.11 → 0.10.0

data/{History.txt → History.rdoc}

@@ -1,3 +1,7 @@
+=== 0.10.0 / 2009-10-15
+
+* Updated to work with dm-core 0.10.0
+
 === 0.9.11 / 2009-03-29
 
 * No changes this version

data/Manifest.txt

@@ -1,10 +1,11 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 lib/dm-observer.rb
+lib/dm-observer/observer.rb
 lib/dm-observer/version.rb
 spec/integration/dm-observer_spec.rb
 spec/spec.opts

data/{README.txt → README.rdoc}

@@ -8,7 +8,7 @@ Example:
 class Adam
   include DataMapper::Resource
 
-  property :id, Integer, :serial => true
+  property :id, Serial
   property :name, String
 end
 

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -14,10 +13,10 @@ GEM_NAME = 'dm-observer'
 GEM_VERSION = DataMapper::Observer::VERSION
 GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
 
 PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin for observing Resource Models'
 
 [ ROOT, ROOT.parent ].each do |dir|

data/lib/dm-observer.rb

@@ -1,91 +1 @@
-module DataMapper
-  # Observers allow you to add callback hooks to DataMapper::Resource objects
-  # in a separate class. This is great for separating out logic that is not
-  # really part of the model, but needs to be triggered by a model, or models.
-  module Observer
-
-    def self.included(klass)
-      klass.extend(ClassMethods)
-    end
-
-    module ClassMethods
-
-      attr_accessor :observing
-
-      def initialize
-        self.observing = []
-      end
-
-      # Assign an Array of Class names to watch.
-      #   observe User, Article, Topic
-      def observe(*args)
-        # puts "#{self.to_s} observing... #{args.collect{|c| Extlib::Inflection.classify(c.to_s)}.join(', ')}"
-        self.observing = args
-      end
-
-      def before(sym, &block)
-        self.observing.each do |klass|
-          klass.before(sym.to_sym, &block)
-        end
-      end
-
-      def after(sym, &block)
-        self.observing.each do |klass|
-          klass.after(sym.to_sym, &block)
-        end
-      end
-
-      def before_class_method(sym, &block)
-        self.observing.each do |klass|
-          klass.before_class_method(sym.to_sym, &block)
-        end
-      end
-
-      def after_class_method(sym, &block)
-        self.observing.each do |klass|
-          klass.after_class_method(sym.to_sym, &block)
-        end
-      end
-
-    end # ClassMethods
-
-  end # Observer
-end # DataMapper
-
-if $0 == __FILE__
-  require 'rubygems'
-
-  gem 'dm-core', '0.9.11'
-  require 'dm-core'
-
-  FileUtils.touch(File.join(Dir.pwd, "migration_test.db"))
-  DataMapper.setup(:default, "sqlite3://#{Dir.pwd}/migration_test.db")
-
-  class Foo
-    include DataMapper::Resource
-
-    property :id, Integer, :serial => true
-    property :bar, Text
-  end
-
-  Foo.auto_migrate!
-
-  class FooObserver
-    include DataMapper::Observer
-
-    observe :foo
-
-    before :save do
-      raise "Hell!" if self.bar.nil?
-      puts "hi"
-    end
-
-    after :save do
-      puts "bye"
-    end
-
-  end
-
-  Foo.new(:bar => "hello").save
-
-end
+require 'dm-observer/observer'

data/lib/dm-observer/observer.rb

@@ -0,0 +1,52 @@
+module DataMapper
+  # Observers allow you to add callback hooks to DataMapper::Resource objects
+  # in a separate class. This is great for separating out logic that is not
+  # really part of the model, but needs to be triggered by a model, or models.
+  module Observer
+
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
+
+    module ClassMethods
+
+      attr_accessor :observing
+
+      def initialize
+        self.observing = []
+      end
+
+      # Assign an Array of Class names to watch.
+      #   observe User, Article, Topic
+      def observe(*args)
+        self.observing = args
+      end
+
+      def before(sym, &block)
+        self.observing.each do |klass|
+          klass.before(sym.to_sym, &block)
+        end
+      end
+
+      def after(sym, &block)
+        self.observing.each do |klass|
+          klass.after(sym.to_sym, &block)
+        end
+      end
+
+      def before_class_method(sym, &block)
+        self.observing.each do |klass|
+          klass.before_class_method(sym.to_sym, &block)
+        end
+      end
+
+      def after_class_method(sym, &block)
+        self.observing.each do |klass|
+          klass.after_class_method(sym.to_sym, &block)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/dm-observer/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Observer
-    VERSION = '0.9.11'
+    VERSION = '0.10.0'.freeze
   end
 end

data/spec/integration/dm-observer_spec.rb

@@ -1,12 +1,11 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 describe DataMapper::Observer do
   before :all do
     class ::Adam
       include DataMapper::Resource
 
-      property :id, Integer, :serial => true
+      property :id, Serial
       property :name, String
       attr_accessor :done
 
@@ -37,7 +36,7 @@ describe DataMapper::Observer do
       class Beer
         include DataMapper::Resource
 
-        property :id, Integer, :serial => true
+        property :id, Serial
         property :name, String
 
         def drink

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -1,13 +1,14 @@
-require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.2'
-require 'spec'
-
-gem 'dm-core', '0.9.11'
+# Use local dm-core if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-core', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
 require 'dm-core'
 
-require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-observer'
+# Support running specs with 'rake spec' and 'spec'
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+
+require 'dm-observer'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-observer
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Mark Bates
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: DataMapper plugin for observing Resource Models
 email: 
 - mark [a] mackframework [d] com
@@ -30,18 +21,19 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - lib/dm-observer.rb
+- lib/dm-observer/observer.rb
 - lib/dm-observer/version.rb
 - spec/integration/dm-observer_spec.rb
 - spec/spec.opts
@@ -49,11 +41,13 @@ files:
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-observer
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-observer
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -71,9 +65,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin for observing Resource Models
 test_files: []