act_with_bag 0.2.0 → 0.4.0

data/README

@@ -22,6 +22,9 @@ If baggies of type :date are being used then
 params must be corrected before an update_attributes.
 Warning: :date fields are not well integrated; avoid them.
 
+Obsolete fields are deleted before_save by:
+  delete_from_bag :field
+
 
 Example
 =======

data/lib/act_with_bag.rb

@@ -9,58 +9,66 @@ class << ActiveRecord::Base
 	#bag changes disabled as it must be handled by Bag himself
       end
     }
-    model = model_sym
-    @baggies ||= {}
-    @baggies[model] ||= {}
+
+    @baggies_date ||= {}
     baglets.each {|b|
       if b.is_a?(Hash)
 	b.each {|baggie, type|
-	  @baggies[model].merge!(baggie => type)
-	  add_accessor(baggie)
+	  add_accessor(baggie, type)
 	}
       else
-	@baggies[model].merge!(b => :string)
-	add_accessor(b)
+	add_accessor(b, :string)
       end
     }
   end
 
-  def baggies
-    @baggies ||= {}
-    @baggies[model_sym] || {}
+  def delete_from_bag(*baglets)
+#p "delete_from_bag baglets #{baglets.inspect}"
+
+    self.class_eval %{
+      before_save :baggies_delete
+      def baggies_delete
+	#{baglets}.each {|b|
+	  if b.is_a?(Hash)
+	    b.each {|baggie, type|
+	      self.bag.delete(baggie.to_sym)
+	    }
+	  else
+	    self.bag.delete(b.to_sym)
+	  end
+	}
+
+      end
+    }
+
   end
 
   def merge(bag, params)
-    model = model_sym
+    model = self.to_s.underscore.to_sym
     return params unless params[model]
 
-    baggies.each {|baggie, type|
-      if type == :date
-	res, found, stopped = [], false, false
-	(1..3).each {|i|
-	  p = params[model].delete("#{baggie}(#{i}i)")
-	  break if p.nil?
-	  found = true
-	  stopped = true if p.empty?
-	  res << p.to_i unless stopped
-	}
-	next unless found
+    (@baggies_date || {}).each {|baggie, type|
+      res, found, stopped = [], false, false
+      (1..3).each {|i|
+	p = params[model].delete("#{baggie}(#{i}i)")
+	break if p.nil?
+	found = true
+	stopped = true if p.empty?
+	res << p.to_i unless stopped
+      }
+      next unless found
   ## weird Timestamp, Hash and YAML problem
-	res = [0]  if res == []
-	res[0] = 0  unless res[0] >= 0
+      res = [0]  if res == []
+      res[0] = 0  unless res[0] >= 0
 
-	value = Date.new(*res) rescue value = nil
-	params[model][baggie] = value
-      end
+      value = Date.new(*res) rescue value = nil
+      params[model][baggie] = value
     }
     params
   end
 
- private
-  def model_sym
-    self.to_s.underscore.to_sym
-  end
 
+ protected
   def free_accessor(str)
     accessor = str.to_sym
     return accessor unless self.method_defined?(accessor)
@@ -69,35 +77,38 @@ class << ActiveRecord::Base
     nil
   end
 
-  def add_accessor(baggie)
-#p "add_accessor #{self.to_s} #{baggie.inspect}"
-    accessor = free_accessor("#{baggie.to_s}")
+  def add_accessor(baggie, type)
+    baggie_s = baggie.to_s
+    type_sym = type.to_sym
+#p "add_accessor #{self.to_s} #{baggie.inspect} #{type_sym.inspect}"
+
+    accessor = free_accessor("#{baggie_s}")
     if accessor
       self.class_eval %{
 	def #{accessor}
 	  res = bag && bag[:#{baggie}]
-	  if #{self.to_s}.baggies[:#{baggie}] == :boolean
-	    return res if res.class == FalseClass
-	    return res if res.class == TrueClass
-	    return res.to_i != 0
-	  end
-	  res
 	end
       }
     end
 
-    accessor = free_accessor("#{baggie.to_s}=")
+    accessor = free_accessor("#{baggie_s}=")
     if accessor
+      @baggies_date[baggie] = type  if type == :date
       self.class_eval %{
 	def #{accessor}(value)
 	  @attributes['bag'] = {}  unless bag.is_a?(Hash)
-	  self.bag.merge!(:#{baggie} => value)
+	  unless value.nil?
+	    self.bag[:#{baggie}] = value
+	  else
+	    self.bag.delete(:#{baggie})
+	    nil
+	  end
 	end
       }
     end
 
-    return  unless baggies["#{baggie}".to_sym] == :boolean
-    accessor = free_accessor("#{baggie.to_s}?")
+    return  unless type_sym == :boolean
+    accessor = free_accessor("#{baggie_s}?")
     if accessor
       self.class_eval %{
 	def #{accessor}

data/lib/act_with_bag/version.rb

@@ -1,3 +1,3 @@
 module ActWithBag
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/test/bag_test.rb

@@ -62,4 +62,11 @@ class BagTest < ActiveSupport::TestCase
     assert_equal value, @order.field
   end
 
+  test "merge for :at :date" do
+    model = :order
+    params = {model => {'at(1i)' => '1', 'at(2i)' => '2','at(3i)' => '3'}}
+    res = Order.merge({}, params)
+    assert_equal Date.new(1, 2, 3), res[model][:at]
+  end
+
 end

data/test/clean_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+
+class Order < ActiveRecord::Base
+  add_to_bag :name
+  add_to_bag :name2
+end
+
+
+class CleanTest < ActiveSupport::TestCase
+
+  def setup
+    @order = Order.new
+  end
+
+  test "assigning nil removes field from bag" do
+    value = 'abc'
+    assert_equal false, @order.bag.has_key?(:name)
+    @order.name = value
+    assert_equal true, @order.bag.has_key?(:name)
+    @order.name = nil
+    assert_equal false, @order.bag.has_key?(:name)
+  end
+
+  test "assigning nil to not yet initialized field" do
+    assert_equal false, @order.bag.has_key?(:name2)
+    @order.name2 = nil
+    assert_equal false, @order.bag.has_key?(:name2)
+  end
+
+end

data/test/delete_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+
+class Order < ActiveRecord::Base
+  add_to_bag :aa, :bb, :cc
+  delete_from_bag :bb
+end
+
+
+class DeleteTest < ActiveSupport::TestCase
+
+  def setup
+    @order = Order.new
+  end
+
+  test "delete a field" do
+    @order.aa = 'aa'
+    @order.bb = 'bb'
+    @order.cc = 'cc'
+    @order.save
+    assert_equal 'aa', @order.aa
+    assert_nil @order.bb
+    assert_equal 'cc', @order.cc
+  end
+
+end

data/test/sti_test.rb

@@ -0,0 +1,66 @@
+require 'test_helper'
+
+
+class User < ActiveRecord::Base
+  add_to_bag :name
+end
+
+class Administrator < User
+  add_to_bag :key
+end
+
+
+class StiTest < ActiveSupport::TestCase
+
+  def setup
+    @user = User.new
+    @admin = Administrator.new
+  end
+
+  test "kind of" do
+    assert_kind_of User, @user
+    assert_kind_of Administrator, @admin
+  end
+
+  test "STI field type" do
+    assert_nil @user.type
+    assert_equal 'Administrator', @admin.type
+  end
+
+  test "have bag" do
+    assert @user.respond_to?(:bag)
+    assert @admin.respond_to?(:bag)
+  end
+
+  test "has setters and getters" do
+    assert @user.respond_to?(:name)
+    assert @admin.respond_to?(:name)
+    assert @admin.respond_to?(:key)
+
+    assert @user.respond_to?('name=')
+    assert @admin.respond_to?('name=')
+    assert @admin.respond_to?('key=')
+
+    assert_equal false, @user.respond_to?(:key)
+    assert_equal false, @user.respond_to?('key=')
+  end
+
+  test "access to name & key" do
+    name = 'name'
+    key = 'key'
+    @admin.name = name
+    @admin.key = key
+    assert_equal name, @admin.name
+    assert_equal key, @admin.key
+    assert_not_equal 'def', @admin.name
+    assert_not_equal 'def', @admin.key
+  end
+
+  test "merge" do
+    model = :administrator
+    params = {model => {'at(1i)' => '1', 'at(2i)' => '2','at(3i)' => '3'}}
+    res = Administrator.merge({}, params)
+    assert_nil res[model][:at]
+  end
+
+end

data/test/test_helper.rb

@@ -13,4 +13,11 @@ ActiveRecord::Schema.define do
   end
 end
 
+ActiveRecord::Schema.define do
+  create_table 'users', :force => true do |t|
+    t.string :type
+    t.text   :bag
+  end
+end
+
 require File.dirname(__FILE__) + '/../lib/act_with_bag.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: act_with_bag
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70820700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70820700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Add a bag to a Rails model
 email:
 - dittmar.krall@matique.de
@@ -37,6 +42,9 @@ files:
 - lib/act_with_bag.rb
 - lib/act_with_bag/version.rb
 - test/bag_test.rb
+- test/clean_test.rb
+- test/delete_test.rb
+- test/sti_test.rb
 - test/test_helper.rb
 homepage: http://www.matique.de
 licenses: []
@@ -58,10 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: act_with_bag
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: act_with_bag (baggies) gem
-test_files:
-- test/bag_test.rb
-- test/test_helper.rb
+test_files: []