ginjo-rfm 2.1.5 → 2.1.6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Ginjo-Rfm 2.1.6
+
+* Fixed typo in Rfm::Record#[]=
+* Fixed bug where valid? was called on models without ActiveModel::Validations being loaded.
+* Fixed bug where Rfm::Base#reload wasn't clearing mods.
+
 ## Ginjo-Rfm 2.1.5
 
 * Fixed bug preventing validation callbacks from running.

data/lib/rfm/VERSION

@@ -1 +1 @@
-2.1.5
+2.1.6

data/lib/rfm/base.rb

@@ -9,6 +9,7 @@ module Rfm
 	# 	end
 	#
 	# And similar to ActiveRecord, you can define callbacks, validations, attributes, and methods on your model.
+	#   (if you have ActiveModel loaded).
 	#
 	#   class Account < Rfm::Base
 	#     config :layout=>'account_xml'
@@ -297,6 +298,7 @@ module Rfm
 		# TODO: handle error when record has been deleted
 		def reload(force=false)
 	    if (@mods.empty? or force) and record_id
+	    	@mods.clear
 	      self.replace self.class.find(self.record_id)
       end
     end
@@ -400,7 +402,7 @@ module Rfm
     end
     
     def create
-      raise "Record not valid" unless valid?
+      raise "Record not valid" if (defined?(ActiveModel::Validations) && !valid?)
       run_callbacks :create do
         return unless @mods.size > 0
   	    merge_rfm_result self.class.create_from_new(@mods)
@@ -409,7 +411,7 @@ module Rfm
   	end
   	
     def update(mod_id=nil)
-      raise "Record not valid" unless valid?
+      raise "Record not valid" if (defined?(ActiveModel::Validations) && !valid?)
       return false unless record_id 
   	  run_callbacks :update do
   	    return unless @mods.size > 0

data/lib/rfm/record.rb

@@ -222,24 +222,24 @@ module Rfm
       super
     end
     
-    def []=(key, value)
+    def []=(key, val)
       key_string = key.to_s.downcase
       return super unless @loaded # is this needed?
       raise Rfm::ParameterError, "You attempted to modify a field (#{key_string}) that does not exist in the current Filemaker layout." unless self.key?(key_string)
-      # @mods[key_string] = value
+      # @mods[key_string] = val
       # TODO: This needs cleaning up.
       # TODO: can we get field_type from record instead?
-			@mods[key_string] = if [Date, Time, DateTime].member?(value.class)
+			@mods[key_string] = if [Date, Time, DateTime].member?(val.class)
 				field_type = layout.field_meta[key_string.to_sym].result
 				case field_type
 					when 'time'; val.strftime(layout.time_format)
 					when 'date'; val.strftime(layout.date_format)
 					when 'timestamp'; val.strftime(layout.timestamp_format)
-				else value
+				else val
 				end
-			else value
+			else val
 			end
-      super(key, value)
+      super(key, val)
     end
 		#
 		# 		alias_method :old_setter, '[]='

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ginjo-rfm
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -265,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1648802043392305173
+      hash: 802999713867049737
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: