lardawge-rfm 1.4.1.1 → 1.4.1.2

data/lib/rfm/record.rb

@@ -189,31 +189,28 @@ module Rfm
     #
     # When you do, the change is noted, but *the data is not updated in FileMaker*. You must call
     # Record::save or Record::save_if_not_modified to actually save the data.
-    def []=(pname, value)
-      return super unless @loaded # keeps us from getting mods during initialization
-      name = pname
-      if self[name] != nil
-        @mods[name] = val
-      else
-        raise Rfm::Error::ParameterError.new("You attempted to modify a field called '#{name}' on the Rfm::Record object, but that field does not exist.")
-      end
-    end
-    
-    def method_missing (symbol, *attrs)
-      # check for simple getter
-      return self[symbol.to_s] if self.include?(symbol.to_s) 
-
-      # check for setter
-      symbol_name = symbol.to_s
-      if symbol_name[-1..-1] == '=' && self.has_key?(symbol_name[0..-2])
-        return @mods[symbol_name[0..-2]] = attrs[0]
-      end
-      super
+    def []=(name, value)
+      return super unless @loaded
+      raise Rfm::ParameterError, "You attempted to modify a field does not exist." unless self[name]
+      @mods[name] = value
     end
     
     def respond_to?(symbol, include_private = false)
-      return true if self[symbol.to_s] != nil
+      return true if self[symbol.to_s]
       super
     end
+    
+    private
+    
+      def method_missing (symbol, *attrs, &block)
+        method = symbol.to_s
+        return self[method] if self.include?(method) 
+      
+        if method =~ /(=)$/ && self.has_key?($`)
+          return @mods[$`] = attrs.first
+        end
+        super
+      end
+    
   end
 end

data/spec/rfm/error_spec.rb

@@ -1,69 +1,64 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-module Rfm
-  err_module = Error
-  describe err_module do
-    describe ".lookup" do
-      
-      it "should return a default system error if input code is 0" do
-        error = err_module.getError(0)
-        error.message.should eql('SystemError occurred: (FileMaker Error #0)')
-        error.code.should eql(0)
-      end
-      
-      it "should return a default system error if input code is 22" do
-        error = err_module.getError(20)
-        error.message.should eql('SystemError occurred: (FileMaker Error #20)')
-        error.code.should eql(20)
-      end
-      
-      it "should return a custom message as second argument" do
-        error = err_module.getError(104, 'Custom Message Here.')
-        error.message.should match(/Custom Message Here/)
-      end
+describe err_module = Rfm::Error do
+  describe ".lookup" do
     
-      it "should return a script missing error" do
-        error = err_module.getError(104)
-        error.message.should eql('ScriptMissingError occurred: (FileMaker Error #104)')
-        error.code.should eql(104)
-      end  
-      
-      it "should return a range validation error" do
-        error = err_module.getError(503)
-        error.message.should eql('RangeValidationError occurred: (FileMaker Error #503)')
-        error.code.should eql(503)
-      end  
-      
-      it "should return unknown error if code not found" do
-        error = err_module.getError(-1)
-        error.message.should eql('UnknownError occurred: (FileMaker Error #-1)')
-        error.code.should eql(-1)
-        error.class.should eql(Error::UnknownError)
-      end
-      
+    it "should return a default system error if input code is 0" do
+      error = err_module.getError(0)
+      error.message.should eql('SystemError occurred: (FileMaker Error #0)')
+      error.code.should eql(0)
     end
     
-    describe ".find_by_code" do
-      it "should return a constant representing the error class" do
-        constant = err_module.find_by_code(503)
-        constant.should eql(err_module::RangeValidationError)
-      end
+    it "should return a default system error if input code is 22" do
+      error = err_module.getError(20)
+      error.message.should eql('SystemError occurred: (FileMaker Error #20)')
+      error.code.should eql(20)
     end
     
-    describe ".build_message" do
-      before(:each) do
-        @message = err_module.build_message(503, 'This is a custom message')
-      end
-      
-      it "should return a string with the code and message included" do
-        @message.should match(/This is a custom message/)
-        @message.should match(/503/)
-      end
-      
-      it "should look like" do
-        @message.should eql('503 occurred: (FileMaker Error #This is a custom message)')
-      end
+    it "should return a custom message as second argument" do
+      error = err_module.getError(104, 'Custom Message Here.')
+      error.message.should match(/Custom Message Here/)
     end
+  
+    it "should return a script missing error" do
+      error = err_module.getError(104)
+      error.message.should eql('ScriptMissingError occurred: (FileMaker Error #104)')
+      error.code.should eql(104)
+    end  
     
+    it "should return a range validation error" do
+      error = err_module.getError(503)
+      error.message.should eql('RangeValidationError occurred: (FileMaker Error #503)')
+      error.code.should eql(503)
+    end  
+    
+    it "should return unknown error if code not found" do
+      error = err_module.getError(-1)
+      error.message.should eql('UnknownError occurred: (FileMaker Error #-1)')
+      error.code.should eql(-1)
+      error.class.should eql(err_module::UnknownError)
+    end
+    
+  end
+  
+  describe ".find_by_code" do
+    it "should return a constant representing the error class" do
+      constant = err_module.find_by_code(503)
+      constant.should eql(err_module::RangeValidationError)
+    end
+  end
+  
+  describe ".build_message" do
+    before(:each) do
+      @message = err_module.build_message(503, 'This is a custom message')
+    end
+    
+    it "should return a string with the code and message included" do
+      @message.should match(/This is a custom message/)
+      @message.should match(/503/)
+    end
+    
+    it "should look like" do
+      @message.should eql('503 occurred: (FileMaker Error #This is a custom message)')
+    end
   end
+  
 end

data/spec/rfm/record_spec.rb

@@ -0,0 +1,83 @@
+require 'rfm/record'
+describe Rfm::Record do
+  before(:each) do
+    @record = Rfm::Record.allocate
+  end
+  
+  describe "#[]=" do
+    before(:each) do
+      @record.instance_variable_set(:@mods, {})
+      @record.instance_variable_set(:@loaded, false)
+      @record['tester'] = 'red'
+    end
+    
+    it "creates a new hash key => value upon instantiation of record" do
+      @record.has_key?('tester').should be_true
+      @record['tester'].should eql('red')
+    end
+    
+    it "creates a new hash key => value in @mods when modifying an existing record key" do
+      @record.instance_variable_set(:@loaded, true)
+      @record['tester'] = 'green'
+      
+      @record.instance_variable_get(:@mods).has_key?('tester').should be_true
+      @record.instance_variable_get(:@mods)['tester'].should eql('green')
+    end
+    
+    it "raises an Rfm::ParameterError if a key is used that does not exist" do
+      @record.instance_variable_set(:@loaded, true)
+      
+      ex = rescue_from { @record['tester2'] = 'error' }
+      ex.class.should eql(Rfm::ParameterError)
+      ex.message.should eql('You attempted to modify a field does not exist.')
+    end
+    
+  end
+  
+  describe "#respond_to?" do
+    it "returns true if key is in hash" do
+      @record['red'] = 'stop'
+      
+      @record.respond_to?(:red).should be_true
+    end
+    
+    it "returns false if key is not in hash" do
+      @record.respond_to?(:red).should be_false
+    end
+  end
+  
+  describe "#method_missing" do
+    before(:each) do
+      @record.instance_variable_set(:@mods, {})
+      @record['name'] = 'red'
+    end
+    
+    describe "getter" do
+      it "will match a method to key in the hash if there is one" do
+        @record.name.should eql('red')
+      end
+
+      it "will raise NoMethodError if no key present that matches value" do
+        ex = rescue_from { @record.namee }
+        ex.class.should eql(NoMethodError)
+        ex.message.should match(/undefined method `namee'/)
+      end
+    end
+    
+    describe "setter" do
+      it "acts as a setter if the key exists in the hash" do
+        @record.name = 'blue'
+
+        @record.instance_variable_get(:@mods).has_key?('name').should be_true
+        @record.instance_variable_get(:@mods)['name'].should eql('blue')
+      end
+      
+      it "will raise NoMethodError if no key present that matches value" do
+        ex = rescue_from { @record.namee = 'red' }
+        ex.class.should eql(NoMethodError)
+        ex.message.should match(/undefined method `namee='/)
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -5,5 +5,14 @@ require 'spec'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  
+end
+
+def rescue_from(&block)
+  exception = nil
+  begin
+    yield
+  rescue StandardError => e
+    exception = e
+  end
+  exception
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: lardawge-rfm
 version: !ruby/object:Gem::Version 
-  hash: 121
+  hash: 127
   prerelease: false
   segments: 
   - 1
   - 4
   - 1
-  - 1
-  version: 1.4.1.1
+  - 2
+  version: 1.4.1.2
 platform: ruby
 authors: 
 - Geoff Coffey
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-03 00:00:00 -07:00
+date: 2010-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - LICENSE
 - README.rdoc
 - spec/rfm/error_spec.rb
+- spec/rfm/record_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://sixfriedrice.com/wp/products/rfm/
@@ -99,4 +100,5 @@ specification_version: 3
 summary: Ruby to Filemaker adapter
 test_files: 
 - spec/rfm/error_spec.rb
+- spec/rfm/record_spec.rb
 - spec/spec_helper.rb