act_with_bag 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 902f6cb03acd3d73eb6acd10e125399aa782e240
-  data.tar.gz: bce079de55d373cd2d0335f6ec6c342d5426c580
+  metadata.gz: 377b880a5e83253a06619f5037a66f42b5225cf0
+  data.tar.gz: 4de0ea43eb837f92050ded8a36f8ffca378cdace
 SHA512:
-  metadata.gz: fb1593345aaf6d24cad5eb2061fd3de527847dc013edde45f328572af5cee6ebe0c91faf440124856ed368e3928b107c7f19f9176ffaccd93915592f3aad0213
-  data.tar.gz: 696c7b8438374e75b9d56bf1fa5a352901f041b4347a9bc5a048703bd9f793041ac20e40ed7a31d3bf6f4f3e12a7e0f6f4b0b4b382785758be066bff3a3764c9
+  metadata.gz: 572094a068fbaee745b42bf6da2c19613deeac107424642fbba60d5e3788ec72113655193ba1e1549c5b728b8c037d453c4f6609e7722945bd772aee6cf41447
+  data.tar.gz: 702ece6fbd63eb424237b2704dc18c211ff2a389dfaf7c4952d32196b50df71e582136c79764968854ec1e0216d7f30800ae80ecfe0a61fd1e5d73af8c889825

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+bag_test

data/lib/act_with_bag.rb

@@ -69,62 +69,61 @@ class << ActiveRecord::Base
 
 
  protected
-  def free_accessor(str)
-    accessor = str.to_sym
-    return accessor unless self.method_defined?(accessor)
-    logger.info "** Already defined #{self.to_s}.#{accessor}"
-#p "** Bag: untouched accessor '#{self.to_s}.#{accessor}'"
-    nil
+  def accessor_present?(accessor)
+    accessor_sym = accessor.to_sym
+    res = false
+
+    res = true  if self.method_defined?(accessor_sym)
+    res = true  if self.respond_to?(:attribute_names) &&
+		   self.attribute_names.include?(accessor)
+    if res
+#      logger.info "** Already defined #{self.to_s}.#{accessor}"
+#p "** act_to_bag: untouched accessor '#{self.to_s}.#{accessor}'"
+    end
+    return res
   end
 
   def add_accessor(baggie, type)
-    baggie_s = baggie.to_s
+    accessor = 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 :#{type} == :boolean
-	    return res if res.class == FalseClass
-	    return res if res.class == TrueClass
-	    return res.to_i != 0
-	  end
-	  res
+    return  if accessor_present?(accessor)
+
+    self.class_eval %{
+      def #{accessor}
+	res = bag && bag[:#{baggie}]
+	if :#{type} == :boolean
+	  return res if res.class == FalseClass
+	  return res if res.class == TrueClass
+	  return res.to_i != 0
 	end
-      }
-    end
+	res
+      end
+    }
 
-    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)
-	  unless value.nil?
-	    self.bag[:#{baggie}] = value
-	  else
-	    self.bag.delete(:#{baggie})
-	    nil
-	  end
+    @baggies_date[baggie] = type  if type == :date
+    self.class_eval %{
+      def #{accessor}=(value)
+	@attributes['bag'] = {}  unless bag.is_a?(Hash)
+	unless value.nil?
+	  self.bag[:#{baggie}] = value
+	else
+	  self.bag.delete(:#{baggie})
+	  nil
 	end
-      }
-    end
+      end
+    }
 
     return  unless type_sym == :boolean
-    accessor = free_accessor("#{baggie_s}?")
-    if accessor
-      self.class_eval %{
-	def #{accessor}
-	  res = bag && bag[:#{baggie}]
-	  return res if res.class == FalseClass
-	  return res if res.class == TrueClass
-	  res.to_i != 0
-	end
-      }
-    end
+    self.class_eval %{
+      def #{accessor}?
+	res = bag && bag[:#{baggie}]
+	return res if res.class == FalseClass
+	return res if res.class == TrueClass
+	res.to_i != 0
+      end
+    }
   end
 
 end

data/lib/act_with_bag/version.rb

@@ -1,3 +1,3 @@
 module ActWithBag
-  VERSION = "0.4.2"
+  VERSION = "0.4.4"
 end

data/test/accessor_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+
+class Order < ActiveRecord::Base
+  add_to_bag :category
+end
+
+
+class AccessorTest < ActiveSupport::TestCase
+
+  def setup
+    @order = Order.new
+  end
+
+  test "should reject overwriting of column category" do
+    value = 'abc'
+    assert @order.respond_to?(:category)
+    @order.category = value
+    assert_equal false, @order.bag.has_key?(:category)
+  end
+
+end

data/test/test_helper.rb

@@ -4,11 +4,12 @@ require 'active_record'
 
 ActiveRecord::Base.establish_connection({
   :adapter => 'sqlite3',
-  :database => 'docu_test'
+  :database => 'bag_test'
 })
 
 ActiveRecord::Schema.define do
   create_table 'orders', :force => true do |t|
+    t.string :category
     t.column 'bag', :text
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act_with_bag
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - matique
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -38,6 +38,7 @@ files:
 - act_with_bag.gemspec
 - lib/act_with_bag.rb
 - lib/act_with_bag/version.rb
+- test/accessor_test.rb
 - test/bag_test.rb
 - test/boolean_test.rb
 - test/clean_test.rb
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: act_with_bag
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: act_with_bag (baggies) gem