hobo_fields 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd86ea58f333b2b604f564c34fbd1fa881de752a
-  data.tar.gz: 362708497d9bb86e9180d2aa54fcf54cfd1b1bab
+  metadata.gz: ae374e5d1218a6f0810c9f92c324ada484d6b6f7
+  data.tar.gz: d115ea2e44e137f51a47a20af4e0931c22460242
 SHA512:
-  metadata.gz: 4902e3628e1c82294c3c5039cc66b686d5f9e993509dbb624808a311e7a9e80e58a183509ef5e74b883bce26cde777730a7c9b235f9c3061937109996d1b0cf4
-  data.tar.gz: befa22f838ac4ece879a18b2693d5e56fde46d18b8e70b29fbd2b281692bedd0ffc00fc6c85648c03d34678cb7d0a27990b4c9612f41a1e3eeaebba1dbde6bd0
+  metadata.gz: ff3940da7cc52302e0b195453b86c641a9b57f2a6c8dc5e713fa2eed6ec804c7b8dbb4fa17e2fa8b231722df150d72bcaaf6aa62e75cecc5d70fc7ee4b2c61e7
+  data.tar.gz: 9e79e3f50365f9ff2ae05680dbabffda08b354847a14f6fce1b83403c1f38deaad3cf8c31d961ce185c301289e21efe93f69103f4ec1998abb5e5746d7ded979

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'active_record'
+require 'action_view'
 require 'tmpdir'
 
 include Rake::DSL

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/hobo_fields.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = 'Rich field types and migration generator for Rails'
 
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
-  s.add_development_dependency('rubydoctest', [">= 0"])
+  # s.add_development_dependency('rubydoctest', [">= 0"])
   s.add_development_dependency('RedCloth', [">= 0"]) # for testing rich types
   s.add_development_dependency('kramdown', [">= 0"])  # for testing rich types
 

data/lib/hobo_fields/extensions/active_record/attribute_methods.rb

@@ -19,11 +19,17 @@ ActiveRecord::Base.class_eval do
   class << self
 
     def can_wrap_with_hobo_type?(attr_name)
-      if connected?
-        type_wrapper = try.attr_type(attr_name)
-        type_wrapper.is_a?(Class) && type_wrapper.not_in?(HoboFields::PLAIN_TYPES.values)
+      @can_wrap_cache ||= {}
+      if @can_wrap_cache.include?(attr_name)
+        @can_wrap_cache[attr_name]
       else
-        false
+        @can_wrap_cache[attr_name] = \
+          if connected?
+            type_wrapper = try.attr_type(attr_name)
+            type_wrapper.is_a?(Class) && type_wrapper.not_in?(HoboFields::PLAIN_TYPES.values)
+          else
+            false
+          end
       end
     end
 

data/lib/hobo_fields/model.rb

@@ -82,14 +82,22 @@ module HoboFields
 
 
     # Extend belongs_to so that it creates a FieldSpec for the foreign key
-    def self.belongs_to_with_field_declarations(name, options={}, &block)
+    def self.belongs_to_with_field_declarations(name, *args, &block)
+      if args.size == 0 || (args.size == 1 && args[0].kind_of?(Proc))
+          options = {}
+          args.push(options)
+      elsif args.size == 1
+          options = args[0]
+      else
+          options = args[1]
+      end
       column_options = {}
       column_options[:null] = options.delete(:null) if options.has_key?(:null)
       column_options[:comment] = options.delete(:comment) if options.has_key?(:comment)
 
       index_options = {}
       index_options[:name] = options.delete(:index) if options.has_key?(:index)
-      bt = belongs_to_without_field_declarations(name, options, &block)
+      bt = belongs_to_without_field_declarations(name, *args, &block)
       refl = reflections[name.to_sym]
       fkey = refl.foreign_key
       declare_field(fkey.to_sym, :integer, column_options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobo_fields
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo_support
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
-- !ruby/object:Gem::Dependency
-  name: rubydoctest
-  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'
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement