acts_as_strip 1.0.0 → 1.1.0

data/Gemfile

@@ -1,12 +1,15 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-gem "activerecord", ">= 2.3.5"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "activerecord", ">= 2.3.5"
+  gem "activemodel", ">= 3.0.0"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.0.pre5"
-  gem "rcov", ">= 0"
+  gem "jeweler", "~> 1.5.2"
+  gem 'simplecov', '>= 0.3.8', :require => false
+  gem "rspec", "~> 2.3.0"
+  gem "yard", "~> 0.6.0"
 end

data/README.rdoc

@@ -2,9 +2,11 @@
 
 Plugin to remove spaces on fields
 
-== Dependency
+== Support for
 
-* ActiveRecord
+* ActiveRecord (with auto strip)
+* ActiveModel
+* And other
 
 == Install
 
@@ -14,9 +16,31 @@ Insert into Gemfile
 
 == Integration
 
-class Model < ActiveRecord::Base
-  acts_as_strip :field1, :field2
-end
+=== ActiveRecord
+
+  class Model < ActiveRecord::Base
+    acts_as_strip :field1, :field2
+  end
+
+=== ActiveModel
+
+  class Model
+    include ActsAsStrip
+    attr_accessor :field
+    acts_as_strip :field
+  end
+  
+  Model.new(data).strip_fields!
+
+== History
+
+ * 1.0 init
+ * 1.1 support for active model
+
+== Maintainers
+
+* Team Phatworx (http://github.com/phatworx)
+* Marco Scholl (http://github.com/traxanos)
 
 == Contributing to acts_as_strip
  
@@ -30,6 +54,5 @@ end
 
 == Copyright
 
-Copyright (c) 2010 Marco Scholl. See LICENSE.txt for
-further details.
+Copyright (c) 2010 Marco Scholl. See LICENSE.txt for further details.
 

data/Rakefile

@@ -15,41 +15,19 @@ Jeweler::Tasks.new do |gem|
   gem.name = "acts_as_strip"
   gem.summary = %Q{Plugin to remove spaces on fields}
   gem.description = %Q{Plugin to remove spaces on fields}
-  gem.email = "develop@marco-scholl.de"
-  gem.homepage = "http://github.com/traxanos/acts_as_strip"
+  gem.email = "team@phatworx.de"
+  gem.homepage = "http://github.com/phatworx/acts_as_strip"
   gem.authors = ["Marco Scholl"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'activerecord', '>= 0'
-  #  spec.add_development_dependency 'rspec', '> 1.2.3'
-  gem.add_development_dependency "bundler", "~> 1.0.0"
-  gem.add_development_dependency "jeweler", "~> 1.5.0.pre5"
-  gem.add_development_dependency "rcov", ">= 0"
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
+task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "acts_as_strip #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/acts_as_strip.gemspec

@@ -1,17 +1,17 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_strip}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Scholl"]
-  s.date = %q{2010-10-25}
+  s.date = %q{2011-02-13}
   s.description = %q{Plugin to remove spaces on fields}
-  s.email = %q{develop@marco-scholl.de}
+  s.email = %q{team@phatworx.de}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -24,51 +24,50 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "acts_as_strip.gemspec",
+    "init.rb",
     "lib/acts_as_strip.rb",
-    "test/helper.rb",
-    "test/test_acts_as_strip.rb"
+    "spec/acts_as_strip_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/models.rb"
   ]
-  s.homepage = %q{http://github.com/traxanos/acts_as_strip}
+  s.homepage = %q{http://github.com/phatworx/acts_as_strip}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Plugin to remove spaces on fields}
   s.test_files = [
-    "test/helper.rb",
-    "test/test_acts_as_strip.rb"
+    "spec/acts_as_strip_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/models.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
+      s.add_development_dependency(%q<activerecord>, [">= 2.3.5"])
+      s.add_development_dependency(%q<activemodel>, [">= 3.0.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<simplecov>, [">= 0.3.8"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<simplecov>, [">= 0.3.8"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<simplecov>, [">= 0.3.8"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
   end
 end
 

data/init.rb

@@ -0,0 +1 @@
+require 'acts_as_strip'

data/lib/acts_as_strip.rb

@@ -1,32 +1,48 @@
 require 'rubygems'
 require 'active_record'
 
-module ActiveRecord #:nodoc:
-  module ActsAsStrip #:nodoc:
+# Plugin to remove spaces on fields
+module ActsAsStrip
 
-    def self.included(base)
-      base.extend ClassMethods
+  def self.included(base) # :nodoc:
+    base.extend ClassMethods
+  end
+
+  # class methods for active record and active model
+  module ClassMethods
+
+    # activate gem on ar-model to trim spaces on fields
+    #
+    # -----
+    #
+    # === Example:
+    #   class User < ActiveRecord::Base
+    #     acts_as_strip :field1, :field2
+    #   end
+    #
+    def acts_as_strip(*fields)
+      include InstanceMethods
+      cattr_accessor :strip_fields
+      self.strip_fields = fields
+      before_validation :strip_fields! if self.respond_to? :before_validation
     end
 
-    module ClassMethods
-      # activate gem on ar-model to trim spaces on fields
-      #
-      # -----
-      # 
-      # === Example:
-      #   class User
-      #     acts_as_strip :field1, :field2
-      #   end
-      # 
-      def acts_as_strip(*fields)
-        before_validation do |model|
-          fields.each do |n|
-            model[n] = model[n].strip if model[n].respond_to?('strip')
-          end
-        end
+  end
+
+  # instance methods for active record and active model
+  module InstanceMethods
+    # strip declared fields
+    #
+    # ----
+    #
+    # === Example:
+    # User.new(data).strip_fields
+    def strip_fields!
+      strip_fields.each do |n|
+        send("#{n}=", send("#{n}").strip) if send("#{n}").respond_to?('strip')
       end
     end
   end
 end
 
-ActiveRecord::Base.send(:include, ActiveRecord::ActsAsStrip)
+ActiveRecord::Base.send(:include, ActsAsStrip) if defined? ActiveRecord

data/spec/acts_as_strip_spec.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ActsAsStrip do
+  describe ActiveRecordDummy do
+    before { @dummy = ActiveRecordDummy.new }
+    subject { @dummy }
+
+    context "when fields empty" do
+      specify { should be_valid }
+
+      describe :field1 do
+        subject { @dummy.field1 }
+        it { should be_blank }
+      end
+
+      describe :field2 do
+        subject { @dummy.field2 }
+        it { should be_blank }
+      end
+    end
+
+    context "when field1 and field2 filled with \" TEST \"" do
+      before do
+        @dummy.field1 = " TEST "
+        @dummy.field2 = " TEST "
+        @dummy.valid?
+      end
+
+      describe :field1 do
+        subject { @dummy.field1 }
+        it { should == "TEST" }
+      end
+
+      describe :field2 do
+        subject { @dummy.field2 }
+        it { should == "TEST" }
+      end
+    end
+  end
+
+  describe ActiveModelDummy do
+    before { @dummy = ActiveModelDummy.new }
+    subject { @dummy }
+
+    context "when fields empty" do
+      before do
+        @dummy.strip_fields!
+      end
+
+      describe :field1 do
+        subject { @dummy.field1 }
+        it { should be_blank }
+      end
+
+      describe :field2 do
+        subject { @dummy.field2 }
+        it { should be_blank }
+      end
+    end
+
+    context "when field1 and field2 filled with \" TEST \"" do
+      before do
+        @dummy.field1 = " TEST "
+        @dummy.field2 = " TEST "
+        @dummy.strip_fields!
+      end
+
+      describe :field1 do
+        subject { @dummy.field1 }
+        it { should == "TEST" }
+      end
+
+      describe :field2 do
+        subject { @dummy.field2 }
+        it { should == "TEST" }
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'simplecov'
+SimpleCov.start 'rails'
+require 'rspec'
+require 'acts_as_strip'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |c|
+
+end

data/spec/support/models.rb

@@ -0,0 +1,24 @@
+class ActiveRecordDummy < ActiveRecord::Base
+  class_inheritable_accessor :columns
+  self.columns = []
+
+  def self.column(name, sql_type = nil, default = nil, null = true)
+    columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+  end
+
+  column :field1, :string
+  column :field2, :string
+
+  acts_as_strip :field1, :field2
+end
+
+class ActiveModelDummy
+  include ActsAsStrip
+
+  attr_accessor :field1
+  attr_accessor :field2
+  
+  acts_as_strip :field1, :field2
+end
+
+

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_strip
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Marco Scholl
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 +02:00
+date: 2011-02-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,117 +20,78 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
         version: 2.3.5
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: activemodel
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 0
-        - pre5
-        version: 1.5.0.pre5
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: jeweler
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: simplecov
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
+        version: 0.3.8
+  type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: yard
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 0
-        - pre5
-        version: 1.5.0.pre5
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id008
 description: Plugin to remove spaces on fields
-email: develop@marco-scholl.de
+email: team@phatworx.de
 executables: []
 
 extensions: []
@@ -150,11 +107,13 @@ files:
 - Rakefile
 - VERSION
 - acts_as_strip.gemspec
+- init.rb
 - lib/acts_as_strip.rb
-- test/helper.rb
-- test/test_acts_as_strip.rb
+- spec/acts_as_strip_spec.rb
+- spec/spec_helper.rb
+- spec/support/models.rb
 has_rdoc: true
-homepage: http://github.com/traxanos/acts_as_strip
+homepage: http://github.com/phatworx/acts_as_strip
 licenses: []
 
 post_install_message: 
@@ -167,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4457438205387924726
+      hash: -1681287196575352078
       segments: 
       - 0
       version: "0"
@@ -176,16 +135,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Plugin to remove spaces on fields
 test_files: 
-- test/helper.rb
-- test/test_acts_as_strip.rb
+- spec/acts_as_strip_spec.rb
+- spec/spec_helper.rb
+- spec/support/models.rb

data/test/helper.rb

@@ -1,17 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'acts_as_strip'
-
-class Test::Unit::TestCase
-end

data/test/test_acts_as_strip.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestActsAsStrip < Test::Unit::TestCase
-  def test_something_for_real
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end