modalfields 1.1.10 → 1.1.11

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.1.11

data/lib/modalfields.rb

@@ -1,7 +1,7 @@
 require 'modalfields/modalfields'
 require 'modalfields/standardfields'
 
-if defined?(Rails)
+if defined?(Rails) && Rails.respond_to?(:version)
   if Rails.version.split('.').first.to_i > 2
     class BackupTask < Rails::Railtie
       rake_tasks do

data/lib/modalfields/modalfields.rb

@@ -18,14 +18,10 @@ module ModalFields
   SPECIFIERS = [:indexed, :unique, :required]
   COMMON_ATTRIBUTES = {:default=>nil, :null=>true}
 
-  if defined?(ActiveSupport::BasicObject) && ActiveSupport::BasicObject.instance_methods.map(&:to_sym).include?(:instance_eval)
-    DslBase = ActiveSupport::BasicObject
-  elsif defined?(BasicObject) && BasicObject.instance_methods.map(&:to_sym).include?(:instance_eval)
-    DslBase = BasicObject
-  else
-    class DslBase
-       instance_methods.each { |m| undef_method m unless m =~ /^(__|instance_eval)/ }
-     end
+  # We'll use a somewhat conservative kind of 'blank slate' base for DSLs. that
+  # works on Ruby 1.9 & 1.8
+  class DslBase
+    instance_methods.each { |m| undef_method m unless m =~ /^(__|instance_)/ }
   end
 
   class FieldDeclaration < Struct.new(:name, :type, :specifiers, :attributes)
@@ -70,14 +66,14 @@ module ModalFields
 
   class DefinitionsDsl < DslBase
     def field(name, attributes={})
-      ::ModalFields.definitions[name.to_sym] = COMMON_ATTRIBUTES.merge(attributes)
+      ModalFields.definitions[name.to_sym] = COMMON_ATTRIBUTES.merge(attributes)
     end
     def method_missing(name, *args)
       field(name, *args)
     end
   end
 
-  class HooksDsl
+  class HooksDsl < DslBase
     def field_type(type, &blk)
       ModalFields.hooks[type.to_sym] = lambda{|model, column_declaration|
         blk[model, column_declaration]
@@ -92,7 +88,7 @@ module ModalFields
     end
   end
 
-  class DeclarationsDsl
+  class DeclarationsDsl < DslBase
     def initialize(model)
       @model = model.base_class
     end
@@ -290,7 +286,7 @@ module ModalFields
 
     def validate(declaration)
       definition = definitions[declaration.type.to_sym]
-      raise "Field type #{declaration.type} not defined" unless definition
+      raise "Field type #{declaration.type} not defined (#{declaration.inspect})" unless definition
       # TODO: validate declaration.specifiers
       # TODO: validate declaration.attributes with definition
       true

data/modalfields.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "modalfields"
-  s.version = "1.1.10"
+  s.name = %q{modalfields}
+  s.version = "1.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = "2012-08-10"
-  s.description = "ModelFields is a Rails plugin that adds fields declarations to your models."
-  s.email = "jgoizueta@gmail.com"
+  s.date = %q{2012-09-04}
+  s.description = %q{ModelFields is a Rails plugin that adds fields declarations to your models.}
+  s.email = %q{jgoizueta@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc",
@@ -54,13 +54,14 @@ Gem::Specification.new do |s|
     "test/test_diff.rb",
     "test/test_update.rb"
   ]
-  s.homepage = "http://github.com/jgoizueta/modalfields"
+  s.homepage = %q{http://github.com/jgoizueta/modalfields}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Model annotator with Ruby (Hobo-like) syntax and hooks."
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Model annotator with Ruby (Hobo-like) syntax and hooks.}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,169 +1,159 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: modalfields
-version: !ruby/object:Gem::Version
-  version: 1.1.10
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 11
+  version: 1.1.11
 platform: ruby
-authors:
+authors: 
 - Javier Goizueta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-04 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.5
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.5
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 12
+        version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        version: "1"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 8
+        - 3
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: pg
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
+  version_requirements: *id009
 description: ModelFields is a Rails plugin that adds fields declarations to your models.
 email: jgoizueta@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
 - TODO
-files:
+files: 
 - .document
 - Gemfile
 - Gemfile.lock
@@ -199,32 +189,38 @@ files:
 - test/schema.rb
 - test/test_diff.rb
 - test/test_update.rb
+has_rdoc: true
 homepage: http://github.com/jgoizueta/modalfields
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 1020436365
+      segments: 
       - 0
-      hash: 147065444603111565
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Model annotator with Ruby (Hobo-like) syntax and hooks.
 test_files: []
+