act_with_bag 0.4.9.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5400088a8114c378118513bc78774d3fbbca2aa6fa7f0b4ae39bb2fed42e5062
-  data.tar.gz: '018ebdeb46710cac99ce1d9d9e7c9d877be2440aaa50b01a661632b1c54234cd'
+SHA1:
+  metadata.gz: da896ae57908fcd807d126a495328cfbdf346aec
+  data.tar.gz: 50c4ee5b105455155dcfedcb49c92803fe2b048f
 SHA512:
-  metadata.gz: 5a321aa6cf65cb09ab1400d15d846d615a5d83c794c3acdcd84e067c81210aa68760fce319a8cb3d62635ee1985d56dbeb0872dc92be2ca8c22116b2ba33252c
-  data.tar.gz: b168a73cb8e598bd6c6252caa1e521e3a8c56a03652050651e33ea4e094527810aef1be2813cbda23eb5ad875074a65c2bdf4086f5221ea1363edcdb1b118ac7
+  metadata.gz: e9157f4c59e32b6f316243579bb629d0ec24ba76d8bfda696eb4797d1584ba2d63b4862eb158d18b5744ac001a08fccab6a99432079f63069bfaa39342642428
+  data.tar.gz: 85dd0f6fbe79d4d1989e46950d35f92f41428d46b93b6f9b4cb92927de6068555ce9a797a036cb24fe041db0c37c9d4f428fe56ef867e880fc52ff188b9b4973

data/.travis.yml

@@ -4,11 +4,16 @@ before_install: rm -f Gemfile.lock
 
 rvm:
   - 1.9.3
-  - 2.1.0
+  - 2.2.3
 
 env:
   - "RAILS_VERSION=3.2.16"
-  - "RAILS_VERSION=4.0.2"
+  - "RAILS_VERSION=4.2.4"
+
+matrix:
+  exclude:
+    - rvm: 2.2.3
+      env: "RAILS_VERSION=3.2.16"
 
 notifications:
   email: false

data/.watchr

@@ -0,0 +1,54 @@
+HH = '#' * 22  unless defined?(HH)
+H = '#' * 5    unless defined?(H)
+
+def usage
+  puts <<-EOS
+  Ctrl-\\ or ctrl-4   Running all tests
+  Ctrl-C             Exit
+  EOS
+end
+
+def run(cmd)
+  puts "#{HH} #{Time.now} #{HH}"
+  puts "#{H} #{cmd}"
+  system "/usr/bin/time --format '#{HH} Elapsed time %E' #{cmd}"
+end
+
+def run_it(type, file)
+  case type
+  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
+#  when 'spec';  run %Q{spring rspec -X #{file}}
+  else;         puts "#{H} unknown type: #{type}, file: #{file}"
+  end
+end
+
+def run_all_tests
+  puts "\n#{HH} Running all tests #{HH}\n"
+#  %w{test spec}.each { |dir| run "spring rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
+#  %w{test}.each { |dir| run "spring rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
+  %w{test}.each { |dir| run "rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
+end
+
+def run_matching_files(base)
+  base = base.split('_').first
+  %w{test spec}.each { |type|
+    files = Dir["#{type}/**/*.rb"].select { |file| file =~ /#{base}_.*\.rb/ }
+    run_it type, files.join(' ')  unless files.empty?
+  }
+end
+
+%w{test spec}.each { |type|
+  watch("#{type}/#{type}_helper\.rb") { run_all_tests }
+  watch("#{type}/.*/*_#{type}\.rb")   { |match| run_it type, match[0] }
+}
+%w{rb erb haml slim}.each { |type|
+  watch("app/.*/.*\.#{type}") { |m|
+    run_matching_files("#{m[0].split('/').at(2).split('.').first}")
+  }
+}
+
+# Ctrl-\ or ctrl-4
+    Signal.trap('QUIT') { run_all_tests }
+# Ctrl-C
+    Signal.trap('INT')  { abort("Interrupted\n") }
+usage

data/Gemfile

@@ -1,12 +1,19 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gemspec
 
 version = ENV["RAILS_VERSION"]
-gem 'rails', version ? "~> #{version}" : ">= 4.0.0"
+gem 'rails', version ? "~> #{version}" : ">= 4.0.2"
 
 group :development, :test do
   gem 'sqlite3'
-  gem 'watchr'
-  gem 'spork'
+  gem 'observr'
+#  gem 'spork'
+#  gem 'spring'
+end
+
+group :test do
+#  gem 'watchr'
+  gem 'observr'
   gem 'simplecov', require: false
 end
+

data/README.md

@@ -15,12 +15,19 @@ Additional fields or removal of them are easy.
 No migration is required for new fields.
 
 Keep in mind that the collection is kept in a YAML bag, i.e.
-SQL commands can't access the fields.
+SQL commands can't access the bag fields.
 
-Boolean and Date fields require explicit typing, others are
-treated as string.
+Boolean and Date fields require explicit typing.
+
+Fields without typing accept any values which YAML can handle
+(e.g. @order.color = ['red', 'yellow']).
+
+Types :integer, :float and :string
+forces a conversion (.to_i, .to_f, .to_s) before storing the value,
+a convenience similar to ActiveRecord handling due to migration definitions.
 
 Technical background: getters and putters are injected into models.
+
 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.
@@ -36,9 +43,19 @@ Example
 In model:
 
     class Order < ActiveRecord::Base
-     add_to_bag :name, :color, :description,
-       {:active => :boolean},
-       {:paused_at => :date}
+     add_to_bag :name,
+      :color,
+      :description,
+      {idx: :integer},
+      {price: :float},
+      {active: :boolean},
+      {paused_at: :date},
+      {msg: :string}
+
+     def to_s
+      "Order #{name} #{color} #{price}"
+     end
+     ...
 
 In controller:
 
@@ -47,14 +64,17 @@ In controller:
      def create
       params = Order.merge({}, self.params)   # only if type :date is being used
       @order = Order.new(params[:order])
-
+      @order.price = 1.23
+      logger.info "Order #{@order.to_s} repriced to #{@order.price}"
+      ...
      def update
       @order = Order.find(params[:id])
       params = Order.merge(@order.bag, self.params) # only if type :date is being used
+      @order.update_attributes(params[:order])
 
 Test
 ====
 
     rake
 
-Copyright (c) 2009-2014 [Dittmar Krall], released under the MIT license
+Copyright (c) 2009-2015 [Dittmar Krall], released under the MIT license

data/lib/act_with_bag/version.rb

@@ -1,3 +1,3 @@
 module ActWithBag
-  VERSION = "0.4.9.1"
+  VERSION = "0.5.1"
 end

data/lib/act_with_bag.rb

@@ -17,7 +17,7 @@ class << ActiveRecord::Base
 	  add_accessor(baggie, type)
 	}
       else
-	add_accessor(b, :string)
+	add_accessor(b, :field)
       end
     }
   end
@@ -26,8 +26,7 @@ class << ActiveRecord::Base
 #p "delete_from_bag baglets #{baglets.inspect}"
 
     self.class_eval %{
-      before_save :baggies_delete
-      def baggies_delete
+      before_save do
 	#{baglets}.each {|b|
 	  if b.is_a?(Hash)
 	    b.each {|baggie, type|
@@ -37,7 +36,6 @@ class << ActiveRecord::Base
 	    self.bag.delete(b.to_sym)
 	  end
 	}
-
       end
     }
 
@@ -85,58 +83,67 @@ class << ActiveRecord::Base
 
   def add_accessor(baggie, type)
     accessor = baggie.to_s
+    return  if accessor_present?(accessor)
+
     type_sym = type.to_sym
+    typing = {integer: '.to_i', float: '.to_f',
+	      string: '.to_s'}[type_sym] || ''
 #p "add_accessor #{self.to_s} #{baggie.inspect} #{type_sym.inspect}"
 
-    return  if accessor_present?(accessor)
-#MARS patch, new:
-    #
-    # The @baggies field is indispensable. Otherwise mistakes in renaming
-    # or deleting baggies (without renaming/deleting) the value entry from the
-    # bag, e. g. via delete_from_bag) cannot be detected in a clean way.
-    # Detecting the accessor would be not sufficient, as the accessor may be
-    # created by ActiveRecord::Base or the derived model and it may be
-    # doing completely other things (e. g. accessing a database column).
-    #
-    @baggies ||= {}
-    baggies = ( @baggies[self.to_s.underscore.to_sym] ||= {} )
-    baggies[ baggie ] = type
-#END
+    @baggies_date[baggie] = type  if type_sym == :date
 
-    self.class_eval %{
-      def #{accessor}
-	res = bag && bag[:#{baggie}]
-	if :#{type} == :boolean
+    unless type_sym == :boolean
+      self.class_eval %{
+	def #{accessor}
+	  self.bag && self.bag[:#{baggie}]
+	end
+      }
+
+      self.class_eval %{
+	def #{accessor}=(value)
+	  @attributes['bag'] = {}  unless bag.is_a?(Hash)
+	  unless value.nil?
+	    self.bag[:#{baggie}] = value#{typing}
+	  else
+	    self.bag.delete(:#{baggie})
+	    nil
+	  end
+	end
+      }
+
+    else   ################ now boolean handling ###################
+
+      self.class_eval %{
+	def #{accessor}
+	  res = bag && bag[:#{baggie}]
 	  return res if res.class == FalseClass
 	  return res if res.class == TrueClass
 	  return res.to_i != 0
+	  res
 	end
-	res
-      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
+      self.class_eval %{
+	def #{accessor}=(value)
+	  @attributes['bag'] = {}  unless bag.is_a?(Hash)
+	  falsys = [false, "false", 0, "0", nil]
+	  unless falsys.include?(value)
+	    self.bag[:#{baggie}] = (value == 'true') || value
+	  else
+	    self.bag.delete(:#{baggie})
+	    nil
+	  end
 	end
-      end
-    }
+      }
+
+      self.class_eval %{
+	def #{accessor}?
+	  #{accessor}
+	end
+      }
+
+    end
 
-    return  unless type_sym == :boolean
-    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/test/bag_boolean_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+
+class Order < ActiveRecord::Base
+  add_to_bag bool: :boolean
+end
+
+
+class BagBooleanTest < ActiveSupport::TestCase
+
+  def setup
+    @order = Order.new
+  end
+
+  test "uninitialized boolean should return false" do
+    assert_equal false, @order.bool
+    assert_equal false, @order.bag.has_key?(:bool)
+  end
+
+  test "optimized storage of boolean" do
+    @order.bool = false
+    assert_equal false, @order.bag.has_key?(:bool)
+    @order.bool = 0
+    assert_equal false, @order.bag.has_key?(:bool)
+    @order.bool = '0'
+    assert_equal false, @order.bag.has_key?(:bool)
+  end
+
+  test "a true value requires storage in the bag" do
+    @order.bool = true
+    assert_equal true, @order.bag.has_key?(:bool)
+    assert_equal true, @order.bool
+  end
+
+  test "reassigning a false value should drop storage in bag" do
+    @order.bool = true
+    @order.bool = false
+    assert_equal false, @order.bag.has_key?(:bool)
+  end
+
+end

data/test/boolean_test.rb

@@ -49,4 +49,14 @@ class BooleanTest < ActiveSupport::TestCase
     assert_equal false, @order.flag
   end
 
+  test "'false' returns a boolean" do
+    @order.flag = 'false'
+    assert_equal false, @order.flag
+  end
+
+  test "'true' returns a boolean" do
+    @order.flag = 'true'
+    assert_equal true, @order.flag
+  end
+
 end

data/test/string_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class Order < ActiveRecord::Base
+  add_to_bag string: :string
+end
+
+
+class StringTest < ActiveSupport::TestCase
+
+  def setup
+    @order = Order.new
+  end
+
+  test "assigning boolean to string" do
+    value = false
+    @order.string = value
+    assert_equal 'false', @order.string
+    value = true
+    @order.string = value
+    assert_equal 'true', @order.string
+  end
+
+end

data/test/test_helper.rb

@@ -1,10 +1,16 @@
+require 'simplecov'
 #require 'coveralls'
 #Coveralls.wear!
 
 require 'rubygems'
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_record'
 
+#SimpleCov.start do
+#  add_filter 'test'
+#  command_name 'Minitest'
+#end
+
 ActiveRecord::Base.establish_connection({
   :adapter => 'sqlite3',
   :database => 'bag_test'

data/test/type_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class Order < ActiveRecord::Base
+  add_to_bag({i: :integer}, {f: :float})
+end
+
+
+class TypeTest < ActiveSupport::TestCase
+
+  def setup
+    @order = Order.new
+  end
+
+  test "miscellaneous values" do
+    time = Time.now
+    [123, 2.3, "abc", nil, {a: 1}, [1,2], time].each { |value|
+      @order.field = value
+      assert_equal value, @order.field
+
+      @order.save
+      id = @order.id
+      order = Order.find(id)
+      assert_equal value, order.field
+    }
+  end
+
+  test "integer" do
+    value = "123"
+    @order.i = value
+    assert_equal value.to_i, @order.i
+    assert_kind_of Integer, @order.i
+  end
+
+  test "float" do
+    value = "1.23"
+    @order.f = value
+    assert_equal value.to_f, @order.f
+    assert_kind_of Float, @order.f
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act_with_bag
 version: !ruby/object:Gem::Version
-  version: 0.4.9.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- ".watchr"
 - Gemfile
 - README.md
 - Rakefile
@@ -40,12 +41,15 @@ files:
 - lib/act_with_bag.rb
 - lib/act_with_bag/version.rb
 - test/accessor_test.rb
+- test/bag_boolean_test.rb
 - test/bag_test.rb
 - test/boolean_test.rb
 - test/clean_test.rb
 - test/delete_test.rb
 - test/sti_test.rb
+- test/string_test.rb
 - test/test_helper.rb
+- test/type_test.rb
 homepage: http://matique.de
 licenses:
 - MIT
@@ -66,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: act_with_bag (baggies) gem