ginjo-rfm 3.0.7 → 3.0.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzYwZGY1MDliMjZkM2U5NTBhZTQ0YjRiYWU2ZWFkYmQ1ZGM0MmE3Zg==
-  data.tar.gz: !binary |-
-    NDZkOTg4ODU2OGExYTc1M2QwMDA1ZjQxZjhmZDg4ZTgyNzgwMjJhOQ==
+SHA1:
+  metadata.gz: 3a124ce5cf138e1c46547069cc547a46f4692827
+  data.tar.gz: 597d7eaa2f436d8d224340f2d3bdb4a090b8113f
 SHA512:
-  metadata.gz: !binary |-
-    MGM4YzRjMjMzMmUwNzM2YjliNzQ5OGI1OGI0NGYxZGU1M2FiOGY5MDdkOGQ5
-    OGRiYTU0MmRhNDQzZjA5ZTU0ZjA5ODM3ZjA5MzM5YmRmNGQwZTBkYTVjMDc4
-    MmQyYmFjNGRmYTlhZGM1YzFhYmRiOWRkODM4ZWUxNTZlNDdkY2I=
-  data.tar.gz: !binary |-
-    YWJmM2RiNDZjMjhjZmM5ODRjYTc1YWE2MDg4MTY4MzNkZWFkMDkxZTIyMTk0
-    ZDI0MzEzZDAxMDM1NDY0YmY5YjZlOTk3NGNlY2FiNWM0ZWIwZjFjODEyNmNi
-    ZjJmODc4NDU0YzEzYjFiZWUyYzcyMjVjMTRlYzY3M2UxZDYyYjg=
+  metadata.gz: 00974925e3e0434eb7056421575f35d4bf2e567e79eb6c9a8b4d88d42d39cba3ed77514d0aaa592e148aaf541c1abdbbffbe381ab4805ab64f510c9b6371b5aa
+  data.tar.gz: 3c9fe4a727cae3c8d24fa4ccef9244ec9edb82522bb7a227c3b95c8ddbdd5654102ed197b0bf8b7cc077c729ef308810d0ff36270ab0dc1f3b1c71844faadc09

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## Ginjo-Rfm 3.0.8
+
+* Implemented proxy option for database connections thru a proxy server.
+
+	  config :proxy=>['my.proxy.com', 8888]
+	
+* Implemented erb parsing of config.yml
+	
+* Disabled ```:grammar => :auto``` option. The current xml parser cannot yet use the FMPXMLRESULT grammar for general queries.
+
+
 ## Ginjo-Rfm 3.0.7
 
 * Changed record creation so that generic records created from non-modelized layouts will be instances of Rfm::Record, instead of instances of a transient model class based on the layout. Transient model classes will foul up serialization and any number of other things. Records created from a user-defined model class will continue to be instances of the model class.

data/README.md

@@ -19,7 +19,7 @@
 
 Rfm is a Ruby-Filemaker adapter, a Ruby Gem that provides an interface between Filemaker Server and Ruby. Query your Filemaker database, browse result records as persistent objects, and create/update/delete records with a syntax similar to ActiveRecord. Ginjo-rfm picks up from the lardawge-rfm gem and continues to refine code and fix bugs. Version 3 removes the dependency on ActiveSupport and is now a completely independent Gem, able to run most of its core features without requiring any other supporting Gems. ActiveModel features can be activated by adding activemodel to your Gemfile (or requiring activemodel manually).
 
-Ginjo-rfm version 3 has been tested successfully on Ruby 1.8.7, 1.9.3, 2.0.0, and 2.1.2.
+Ginjo-rfm version 3 has been tested successfully on Ruby 1.8.7 thru 2.1.3.
 
 
 ## Documentation & Links
@@ -205,6 +205,7 @@ See `Rfm::Config::CONFIG_KEYS` for a list of currently allowed configuration opt
 	   :root_cert_path   => '/'
 	   :account_name     => ''
 	   :password         => ''
+	   :proxy            => false                         # Pass an array of Net::HTTP::Proxy options (p_addr, p_port = nil, p_user = nil, p_pass = nil).
 	   :log_actions      => false
 	   :log_responses    => false
 	   :log_parser       => false
@@ -212,13 +213,18 @@ See `Rfm::Config::CONFIG_KEYS` for a list of currently allowed configuration opt
 	   :raise_on_401     => false
 	   :timeout          => 60
 	   
-	   :use                                               # use configuration subgroups, or filter configuration subgoups
-	   :layout                                            # specify the name of the layout to use
-	   :parent           => 'Rfm::Config'                 # the parent configuration object of the current configuration object, as string
-	   :file_name        => 'rfm.yml                      # name of configuration file to load yaml from
-	   :file_path        => ['', 'config/']               # array of additional file paths to look for configuration file
-	   :parser                                            # Prefferred XML parser (you must also require the parsing gem or specify it in your gemfile, if not using the built-in Ruby XML parser REXML). Can be :libxml, :nokogiri, :ox, :rexml.
-	   :ignore_bad_data  => nil                           # Instruct Rfm to ignore data mismatch errors when loading a resultset
+	   :use                                               # Use configuration subgroups, or filter configuration subgoups.
+	   :layout                                            # Specify the name of the layout to use.
+	   :parent           => 'Rfm::Config'                 # The parent configuration object of the current configuration object, as string.
+	   :file_name        => 'rfm.yml                      # Name of configuration file to load yaml from.
+	   :file_path        => ['', 'config/']               # Array of additional file paths to look for configuration file.
+	   :parser                                            # Prefferred XML parser. Can be :libxml, :nokogiri, :ox, :rexml.
+	                                                      # You must also require the parsing gem or specify it in your gemfile,
+	                                                      # if not using the built-in Ruby XML parser REXML. 
+	                                                      # You only need to use this option if you have multiple
+	                                                      # parsing gems loaded and want to use a specfic one. 
+	                                                      # Otherwise, Rfm will use the best parser it can find amongst your currently loaded parsing gems.
+	   :ignore_bad_data  => nil                           # Instruct Rfm to ignore data mismatch errors when loading a resultset.
 	
 
 ### Using Models

data/lib/rfm/VERSION

@@ -1 +1 @@
-3.0.7
+3.0.8

data/lib/rfm/layout.rb

@@ -289,8 +289,7 @@ module Rfm
     end
     
     def get_records(action, extra_params = {}, options = {})
-    	# TODO: The grammar stuff here won't work properly until you handle config between
-    	# models/sublayouts/layout/server (Is this done now?).
+    	# TODO: See auto-grammar bypbass in connection.rb.
     	grammar_option = state(options)[:grammar]
     	options.merge!(:grammar=>grammar_option) if grammar_option
     	template = options.delete :template

data/lib/rfm/utilities/config.rb

@@ -7,6 +7,7 @@ module Rfm
 	#
   module Config
   	require 'yaml'
+  	require 'erb'
   	
 		CONFIG_KEYS = %w(
 			file_name
@@ -14,6 +15,7 @@ module Rfm
 			parser
 			host
 			port
+			proxy
 			account_name
 			password
 			database
@@ -123,9 +125,9 @@ module Rfm
 		def get_config_file
 			@@config_file_data ||= (
 				config_file_name = @config[:file_name] || (RFM_CONFIG[:file_name] rescue nil) || 'rfm.yml'
-				config_file_paths = [''] | [(@config[:file_path] || (RFM_CONFIG[:file_path] rescue nil) || %w( config/ ))].flatten
+				config_file_paths = [''] | [(@config[:file_path] || (RFM_CONFIG[:file_path] rescue nil) || %w( config/ ./ ))].flatten
 				config_file_paths.collect do |path|
-					(YAML.load_file(File.join(path, config_file_name)) rescue {})
+					(YAML.load(ERB.new(File.read(File.join(path, config_file_name))).result) rescue {})
 				end.inject({}){|h,a| h.merge(a)}
 			) || {}
 		end

data/lib/rfm/utilities/connection.rb

@@ -32,6 +32,7 @@ module Rfm
       @defaults = {
         :host => 'localhost',
         #:port => 80,
+        :proxy=>false,  # array of (p_addr, p_port = nil, p_user = nil, p_pass = nil)
         :ssl => true,
         :root_cert => true,
         :root_cert_name => '',
@@ -68,6 +69,8 @@ module Rfm
     def select_grammar(post, options={})
 			grammar = state(options)[:grammar] || 'fmresultset'
 			if grammar.to_s.downcase == 'auto'
+				# TODO: Build grammar parser in new sax engine templates to handle FMPXMLRESULT.
+				return "fmresultset"
 				post.keys.find(){|k| %w(-find -findall -dbnames -layoutnames -scriptnames).include? k.to_s} ? "FMPXMLRESULT" : "fmresultset"   
     	else
     		grammar
@@ -99,7 +102,11 @@ module Rfm
       request.basic_auth(account_name, password)
       request.set_form_data(post_data)
   
-      connection = Net::HTTP.new(host_name, port)
+  		if state[:proxy]
+	  		connection = Net::HTTP::Proxy(*state[:proxy]).new(host_name, port)
+  		else
+	      connection = Net::HTTP.new(host_name, port)
+	    end
       #ADDED LONG TIMEOUT TIMOTHY TING 05/12/2011
       connection.open_timeout = connection.read_timeout = state[:timeout]
       if state[:ssl]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ginjo-rfm
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Geoff Coffey
@@ -12,174 +12,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rfm lets your Ruby scripts and Rails applications talk directly to your
@@ -194,7 +194,7 @@ extra_rdoc_files:
 - CHANGELOG.md
 - lib/rfm/VERSION
 files:
-- .yardopts
+- ".yardopts"
 - CHANGELOG.md
 - LICENSE
 - README.md
@@ -231,24 +231,24 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby to Filemaker adapter