ginjo-rfm 2.0.0 → 2.0.1

data/.yardopts

@@ -0,0 +1,5 @@
+--no-private
+-
+CHANGELOG.md
+LICENSE
+lib/rfm/VERSION

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Ginjo-Rfm 2.0.1
+
+* Fixed bug in Base.find where options weren't being passed to Layout#find correctly
+
+* Fixed bug in rfm.rb when calling #models or #modelize.
+
 ## Ginjo-Rfm 2.0.0
 
 * ActiveModel compatibility allows Rails ActiveRecord-style models

data/README.md

@@ -6,10 +6,10 @@ Rfm is a Ruby-Filemaker adapter, a Ruby gem that allows scripts and applications
 ## Documentation & Links
 
 * Ginjo-rfm rubygem   <https://rubygems.org/gems/ginjo-rfm>
-* Original homepage   <http://sixfriedrice.com/wp/products/rfm/>
 * Rdoc location       <http://rubydoc.info/github/ginjo/rfm/frames>
 * Discussion          <http://groups.google.com/group/rfmcommunity>
 * Ginjo at github     <https://github.com/ginjo/rfm>
+* Original homepage   <http://sixfriedrice.com/wp/products/rfm/>
 * Lardawge at github  <https://github.com/lardawge/rfm>
 
 
@@ -239,15 +239,6 @@ Once the gem is installed, you can use rfm in your ruby scripts by requiring it:
 	   require 'rfm'
 
 
-### Edge - in an upcoming version of ginjo-rfm
-
-Try out unreleased features of ginjo-rfm in the edge branch.
-
-	   #gemfile
-	   gem 'ginjo-rfm', :git=>'git://github.com/ginjo/rfm.git', :branch=>'edge'
-
-
-
 ## Ginjo-rfm Basic Usage
 
 The first step in getting connected to your Filemaker databases with Rfm is to store your configuration settings in a yaml file or in the RFM_CONFIG hash. The second step is creating a model that represents a layout from one of your Filemaker databases. 
@@ -356,7 +347,7 @@ Use `get_config` to view the compiled configuration settings for any object. Con
 	          :account_name => 'name', :password => 'pass'
 	         }
 	
-#### Possible Configuration Options
+**Possible Configuration Options**
 
 Following are all of the recognized configuration options, including defaults if applicable.
 
@@ -473,7 +464,7 @@ To learn more about ActiveModel, see the ActiveModel or RubyOnRails documentatio
 
 Once you have an Rfm model or layout, you can use any of the standard Rfm commands to create, search, edit, and delete records. To learn more about these commands, see below for Databases, Layouts, Resultsets, and Records. Or checkout the API documentation for Rfm::Server, Rfm::Database, Rfm::Layout, Rfm::Record, and Rfm::Base.
 
-#### Two Small Changes in Rfm Return Values
+**Two Small Changes in Rfm Return Values**
 
 When using Models to retrieve records using the `any` method or the `find(record_id)` method, the return values will be single Rfm::Record objects. This differs from the traditional Rfm behavior of these methods when accessed directly from the the Rfm::Layout instance, where the return value is always a Rfm::Resultset.
 
@@ -777,6 +768,10 @@ So, for an annoying, but detailed load of output, make a connection like this:
 	     :log_responses    => true
 	   )
 
+### Source Code
+
+If you were tracking ginjo-rfm on github before the switch to version 2.0.0, please accept my humblest apologies for making a mess of the branching. The pre 2.0.0 edge branch has become master, and the pre 2.0.0 master branch has become ginjo-1-4-stable. I don't intend to make that kind of hard reset again, at least not on public branches. Master will be the branch to find the latest-greatest public source, and 'stable' branches will emerge as necessary to preserve historical releases.
+
 
 ## Credits
 

data/lib/rfm.rb

@@ -58,10 +58,20 @@ module Rfm
 		"Using ginjo-rfm version #{::Rfm::VERSION} with #{XmlParser.backend}"
 	end
 	
-	def_delegators 'Rfm::Factory', :servers, :server, :db, :database, :layout, :models, :modelize
+	def_delegators 'Rfm::Factory', :servers, :server, :db, :database, :layout
 	def_delegators 'Rfm::XmlParser', :backend, :backend=
 	def_delegators 'Rfm::Config', :config, :get_config, :config_clear
 	
+	def models(*args)
+		Rfm::Base
+		Rfm::Factory.models(*args)
+	end
+	
+	def modelize(*args)
+		Rfm::Base
+		Rfm::Factory.modelize(*args)
+	end
+	
 	extend self
 
 end # Rfm

data/lib/rfm/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/lib/rfm/base.rb

@@ -30,7 +30,8 @@ module Rfm
 	#   @person.update_attributes(:name => 'Michael', :title => "Senior Partner")
 	#   @person.save
 	# 
-	# 
+	#
+	require 'active_support/core_ext/string/inflections'
 	require 'rfm/database'
 	require 'rfm/layout'
 	require 'rfm/record'
@@ -225,7 +226,7 @@ module Rfm
 		  			
 			# Just like Layout#find, but searching by record_id will return a record, not a resultset.
 	  	def find(find_criteria, options={})
-	  	  r = layout.find(find_criteria, options={})
+	  	  r = layout.find(find_criteria, options)
 	  	  if ![Hash,Array].include?(find_criteria.class) and r.size == 1
 	  	    r[0]
 		    else

data/lib/rfm/utilities/compound_query.rb

@@ -1,11 +1,12 @@
+# The classes in this module are used internally by RFM and are not intended for outside use.
 module Rfm
 
 
-	# Class to build complex FMP queries
-	# Perform Filemaker find using complex boolean logic (multiple value options for a single field)
-	# Or create multiple find requests.
-	# Also allow find requests to be :omit
-  class CompoundQuery < Array # @private :nodoc:
+	# Class to build complex FMP queries.
+	# Perform Filemaker find using complex boolean logic (multiple value options for a single field),
+	# or create multiple find requests.
+	# Also allow find requests to be :omit.
+  class CompoundQuery < Array
   
   	attr_accessor :original_input, :query_type, :key_values, :key_arrays, :key_map, :key_map_string, :key_counter
   	
@@ -65,7 +66,7 @@ module Rfm
   	end
 
 
-		# Build key-value definitions and query map  '-q1...'
+		# Build key-value definitions and query map  '-q1...'.
 		# Converts query_hash to fmresultset uri format for -findquery query type.
 		def build_key_values(input_hash)
 			input_hash = input_hash.clone
@@ -89,7 +90,7 @@ module Rfm
 
 		
 		# Input array of arrays.
-		# Transform single key_array into key_map (array of requests)
+		# Transform single key_array into key_map (array of requests).
 		# Creates all combinations of sub-arrays where each combination contains one element of each subarray.
 		def build_key_map(key_array)
 			key_array = key_array.clone

data/lib/rfm/utilities/core_ext.rb

@@ -5,7 +5,7 @@ Module.module_eval do
 	include Forwardable
 end
 
-class Object # @private :nodoc: all
+class Object
 
 	#extend Forwardable
 

data/lib/rfm/utilities/factory.rb

@@ -12,7 +12,7 @@ module Rfm
   	extend Config
   	config :parent=>'Rfm::Config'
   
-  	class ServerFactory < Rfm::CaseInsensitiveHash # @private :nodoc: all
+  	class ServerFactory < Rfm::CaseInsensitiveHash
       
       def [](host, conf = Factory.get_config) #(Factory.instance_variable_get(:@config) || {}))
       	conf[:host] = host

data/lib/rfm/utilities/xml_parser.rb

@@ -1,5 +1,5 @@
 module Rfm
-	module XmlParser # @private :nodoc: all
+	module XmlParser
 
 		extend Config
 		config :parent=>'Rfm::Config'
@@ -12,7 +12,7 @@ module Rfm
 		BACKENDS[:jdom]					= {:require=>'jdom',			:class =>	'JDOM'}
 
 		BACKENDS[:oxsax]				= {:require=>'ox',	  :class =>	proc{
-																# rexmlsax module is part of Rfm, not XmlMini,
+																# Ox module is part of Rfm, not XmlMini,
 																# and needs to be handed manually to XmlMini.
 																require File.join(File.dirname(__FILE__), '../xml_mini/ox_sax.rb')
 																ActiveSupport::XmlMini_OxSAX}}
@@ -34,7 +34,7 @@ module Rfm
 		BACKENDS[:rexml]				= {:require=>'rexml/document',	:class=>'REXML'}
 
 		BACKENDS[:rexmlsax]			= {:require=>'rexml/parsers/sax2parser',	  :class =>	proc{
-																# rexmlsax module is part of Rfm, not XmlMini,
+																# Rexmlsax module is part of Rfm, not XmlMini,
 																# and needs to be handed manually to XmlMini.
 																require File.join(File.dirname(__FILE__), '../xml_mini/rexml_sax.rb')
 																ActiveSupport::XmlMini_REXMLSAX}}

data/lib/rfm/xml_mini/hpricot.rb

@@ -2,8 +2,8 @@ require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/object/blank'
 require 'stringio'
 
-module ActiveSupport # @private :nodoc:
-  module XmlMini_Hpricot # @private :nodoc:
+module ActiveSupport
+  module XmlMini_Hpricot
     extend self
 
     CONTENT_KEY = '__content__'.freeze

data/lib/rfm/xml_mini/ox_sax.rb

@@ -10,7 +10,7 @@ require 'stringio'
 # = XmlMini Ox implementation using a SAX-based parser
 # This Ox Sax parser was lifted directly from multi_xml gem.
 module ActiveSupport
-  module XmlMini_OxSAX # @private :nodoc: all
+  module XmlMini_OxSAX
 
     extend self
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ginjo-rfm
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Geoff Coffey
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-08 00:00:00 Z
+date: 2012-04-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -214,6 +214,7 @@ files:
 - lib/rfm/xml_mini/rexml_sax.rb
 - lib/rfm.rb
 - lib/rfm/VERSION
+- .yardopts
 - LICENSE
 - README.md
 - CHANGELOG.md