jm81-dm-filters 0.1.1 → 0.2.0

data/.gitignore

@@ -5,3 +5,5 @@ rdoc
 pkg
 .project
 .loadpath
+qt_temp.*
+*~

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.homepage = "http://github.com/jm81/dm-filters"
     gem.authors = ["Jared Morgan"]
     gem.add_dependency('extlib')
-    gem.add_dependency('dm-core')
+    gem.add_dependency('dm-core', '>= 0.10.0')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/dm-filters.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-filters}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2009-07-09}
+  s.date = %q{2009-09-19}
   s.email = %q{jmorgan@morgancreative.net}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -31,10 +34,11 @@ Gem::Specification.new do |s|
      "spec/filters_resource_spec.rb",
      "spec/spec_helper.rb"
   ]
+  s.has_rdoc = true
   s.homepage = %q{http://github.com/jm81/dm-filters}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{TODO}
   s.test_files = [
     "spec/dm-filters_spec.rb",
@@ -46,17 +50,17 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<extlib>, [">= 0"])
-      s.add_runtime_dependency(%q<dm-core>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-core>, [">= 0.10.0"])
     else
       s.add_dependency(%q<extlib>, [">= 0"])
-      s.add_dependency(%q<dm-core>, [">= 0"])
+      s.add_dependency(%q<dm-core>, [">= 0.10.0"])
     end
   else
     s.add_dependency(%q<extlib>, [">= 0"])
-    s.add_dependency(%q<dm-core>, [">= 0"])
+    s.add_dependency(%q<dm-core>, [">= 0.10.0"])
   end
 end

data/lib/dm-filters.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'extlib'
 
 # This module enables a property to be filtered on save into another property,
@@ -12,6 +11,7 @@ require 'extlib'
 # should be defined before to filtered property.
 
 module Filters
+  VERSION = "0.2.0"
   
   # A hash, with each entry of the form:
   # Filter name (used in +filters+ property) => 
@@ -112,15 +112,11 @@ module Filters
         if filter = options.delete(:filter)
           @filtered_properties ||= []
           @filtered_properties << filter.merge({:name => name})
-          begin
-            self.properties[filter[:to].to_s]
-          rescue
-            self.property(filter[:to], type)
+          unless self.properties.named?(filter[:to])
+            self.property(filter[:to], String)
           end
           if filter[:with].kind_of?(Symbol)
-            begin
-              self.properties[filter[:with].to_s]
-            rescue
+            unless self.properties.named?(filter[:with])
               self.property(filter[:with], String)
             end
           end

data/spec/dm-filters_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Filters do
   describe "#process" do

data/spec/filters/bible_ml_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../lib/filters/bible_ml')
+require 'spec_helper'
+require 'filters/bible_ml'
 
 describe BibleML do
 

data/spec/filters/linebreaker_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../lib/filters/linebreaker')
+require 'spec_helper'
+require 'filters/linebreaker'
 
 describe Linebreaker do
 

data/spec/filters_resource_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 require 'dm-core'
 
 class MockContent
@@ -18,12 +18,12 @@ describe Filters::Resource do
         
     it "should add :to property if not defined" do
       @model.property(:body, String, :filter => {:to => :html2, :with => "Markdown"})
-      MockContent.properties['html2'].should be_kind_of(DataMapper::Property)
+      @model.properties.named?('html2').should be_true
     end
 
     it "should not add :with property if not defined" do
       @model.property(:body, String, :filter => {:to => :html, :with => :filters2})
-      MockContent.properties['filters2'].should be_kind_of(DataMapper::Property)
+      @model.properties.named?(:filters2).should be_true
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
+require 'rubygems' # For extlib require in dm-filters
 require 'spec'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'dm-filters'
 
 Spec::Runner.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jm81-dm-filters
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-09 00:00:00 -07:00
+date: 2009-09-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.10.0
     version: 
 description: 
 email: jmorgan@morgancreative.net
@@ -59,8 +59,9 @@ files:
 - spec/filters/linebreaker_spec.rb
 - spec/filters_resource_spec.rb
 - spec/spec_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/jm81/dm-filters
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -81,9 +82,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: TODO
 test_files: 
 - spec/dm-filters_spec.rb