hobo_fields 2.0.1 → 2.1.0.pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 260c0dbe5e12d3b92f760ee5868fb0fb69645415
+  data.tar.gz: 14ca25b167b77d6b96e528d8ab23ed52ceaf0d36
+SHA512:
+  metadata.gz: 072e9859d3fc1024b5bf0af545cf8179b461b0ab4350ba875a88b32f51ec4be31dd6a57c0d4b2f508111b81687e54bbd2c0b0dab57e37a8fdb62632d48240dac
+  data.tar.gz: 5f26cda68869c92d3644e63e218278228cd4733807147210552f930b163c74abeadef05d67bca4f1c948ddd173229e3070a4a1dfc361775f6729e1cc5cff3679

data/Gemfile

@@ -1,8 +1,10 @@
 source "http://rubygems.org"
 
 gem 'rubydoctest', :git => 'git://github.com/bryanlarsen/rubydoctest.git'
-gem 'rails', '3.2.12'
+gem 'rails'
 gem 'yard'
+gem 'protected_attributes'
+
 gemspec :path => "../hobo_support"
 gemspec
 platform :ruby do

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0.pre1

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

@@ -1,4 +1,21 @@
 ActiveRecord::Base.class_eval do
+  def read_attribute_with_hobo(attr_name)
+    name = attr_name.to_s
+    if self.class.can_wrap_with_hobo_type?(name)
+      attr_name = attr_name.to_sym
+      val = read_attribute_without_hobo(name)
+      wrapper_type = self.class.attr_type(attr_name)
+      if HoboFields.can_wrap?(wrapper_type, val)
+        wrapper_type.new(val)
+      else
+        val
+      end
+    else
+      read_attribute_without_hobo(name)
+    end
+  end
+  alias_method_chain :read_attribute, :hobo
+
   class << self
 
     def can_wrap_with_hobo_type?(attr_name)
@@ -10,52 +27,6 @@ ActiveRecord::Base.class_eval do
       end
     end
 
-    # Rails 3.2+
-    def internal_attribute_access_code(attr_name, cast_code)
-      access_code = "(v=@attributes[attr_name]) && #{cast_code}"
-
-      unless attr_name == primary_key
-        access_code.insert(0, "missing_attribute(attr_name, caller) unless @attributes.has_key?(attr_name); ")
-      end
-
-      # This is the Hobo hook - add a type wrapper around the field
-      # value if we have a special type defined
-      if can_wrap_with_hobo_type?(attr_name)
-        access_code = "val = begin; #{access_code}; end; wrapper_type = self.class.attr_type(:#{attr_name}); " +
-            "if HoboFields.can_wrap?(wrapper_type, val); wrapper_type.new(val); else; val; end"
-      end
-
-      if cache_attribute?(attr_name)
-        access_code = "@attributes_cache['#{attr_name}'] ||= begin; #{access_code}; end;"
-      end
-
-      "attr_name = '#{attr_name}'; #{access_code}"
-    end
-
-    # Rails 3.1 or earlier
-    # Define an attribute reader method.  Cope with nil column.
-    def define_read_method(symbol, attr_name, column)
-      cast_code = column.type_cast_code('v') if column
-      access_code = cast_code ? "(v=@attributes['#{attr_name}']) && #{cast_code}" : "@attributes['#{attr_name}']"
-
-      unless attr_name.to_s == self.primary_key.to_s
-        access_code = access_code.insert(0, "missing_attribute('#{attr_name}', caller) unless @attributes.has_key?('#{attr_name}'); ")
-      end
-
-      # This is the Hobo hook - add a type wrapper around the field
-      # value if we have a special type defined
-      if can_wrap_with_hobo_type?(symbol)
-        access_code = "val = begin; #{access_code}; end; wrapper_type = self.class.attr_type(:#{attr_name}); " +
-            "if HoboFields.can_wrap?(wrapper_type, val); wrapper_type.new(val); else; val; end"
-      end
-
-      if cache_attribute?(attr_name)
-        access_code = "@attributes_cache['#{attr_name}'] ||= begin; #{access_code}; end;"
-      end
-
-      generated_attribute_methods.module_eval("def #{symbol}; #{access_code}; end", __FILE__, __LINE__)
-    end
-
     def define_method_attribute=(attr_name)
       if can_wrap_with_hobo_type?(attr_name)
         src = "begin; wrapper_type = self.class.attr_type(:#{attr_name}); " +

data/lib/hobo_fields/types/markdown_string.rb

@@ -13,7 +13,7 @@ module HoboFields
           Kramdown::Document
         when defined?(Maruku)
           Maruku
-        else
+        when defined?(Markdown)
           Markdown
         end
 

data/lib/hobo_fields/types/raw_markdown_string.rb

@@ -9,7 +9,7 @@ module HoboFields
           Kramdown::Document
         when defined?(Maruku)
           Maruku
-        else
+        when defined?(Markdown)
           Markdown
         end
 

data/lib/hobo_fields/types/text.rb

@@ -3,7 +3,7 @@ module HoboFields
   module Types
     class Text < String
 
-      COLUMN_TYPE = :text
+      COLUMN_TYPE = :text unless defined? COLUMN_TYPE
 
       def to_html(xmldoctype = true)
         ERB::Util.html_escape(self).gsub("\n", "<br#{xmldoctype ? ' /' : ''}>\n").html_safe

data/lib/hobo_fields/types/textile_string.rb

@@ -1,5 +1,3 @@
-require 'redcloth'
-
 module HoboFields
   module Types
     class TextileString < HoboFields::Types::Text
@@ -7,6 +5,8 @@ module HoboFields
       include SanitizeHtml
 
       def to_html(xmldoctype = true)
+        require 'redcloth'
+
         if blank?
           ""
         else

data/lib/hobo_fields.rb

@@ -92,6 +92,26 @@ module HoboFields
 
 end
 
-require 'hobo_fields/railtie'
+require 'hobo_fields/extensions/active_record/attribute_methods'
+require 'hobo_fields/extensions/active_record/fields_declaration'
+require 'hobo_fields/field_declaration_dsl'
+require 'hobo_fields/model'
+require 'hobo_fields/sanitize_html'
+require 'hobo_fields/model/field_spec'
+require 'hobo_fields/model/index_spec'
+require 'hobo_fields/types/email_address'
+require 'hobo_fields/types/enum_string'
+require 'hobo_fields/types/html_string'
+require 'hobo_fields/types/lifecycle_state'
+require 'hobo_fields/types/password_string'
+require 'hobo_fields/types/raw_html_string'
+# Disabled to avoid errors with Rails 4 and Ruby 2.0, they will be loaded later
+# require 'hobo_fields/types/markdown_string'
+# require 'hobo_fields/types/raw_markdown_string'
+require 'hobo_fields/types/serialized_object'
+require 'hobo_fields/types/text'
+require 'hobo_fields/types/textile_string'
+
+require 'hobo_fields/railtie' if defined?(Rails)
 
 

data/test/generators.rdoctest

@@ -23,11 +23,11 @@ doctest: module content matches
 
 
 doctest: test file exists
->> File.exist? 'test/unit/alpha/beta_test.rb'
+>> File.exist? 'test/models/alpha/beta_test.rb'
 => true
 
 doctest: test content matches
->> File.read 'test/unit/alpha/beta_test.rb'
+>> File.read 'test/models/alpha/beta_test.rb'
 =>
 require 'test_helper'
 

data/test/interactive_primary_key.rdoctest

@@ -19,7 +19,7 @@ And requires also that you enter the right choice when prompted. OK we're ready
     class Foo < ActiveRecord::Base
       fields do
       end
-      set_primary_key "foo_id"
+      self.primary_key="foo_id"
     end
    >> Rails::Generators.invoke 'hobo:migration', %w(-n -m)
    >> Foo.primary_key
@@ -29,7 +29,7 @@ And requires also that you enter the right choice when prompted. OK we're ready
    doctest: rename from custom primary_key
    >>
     class Foo < ActiveRecord::Base
-      set_primary_key "id"
+      self.primary_key="id"
     end
     puts "\n\e[45m Please enter 'id' (no quotes) at the next prompt \e[0m"
    >> Rails::Generators.invoke 'hobo:migration', %w(-n -m)
@@ -41,7 +41,7 @@ And requires also that you enter the right choice when prompted. OK we're ready
    doctest: rename to custom primary_key
    >>
     class Foo < ActiveRecord::Base
-      set_primary_key "foo_id"
+      self.primary_key="foo_id"
     end
     puts "\n\e[45m Please enter 'drop id' (no quotes) at the next prompt \e[0m"
    >> Rails::Generators.invoke 'hobo:migration', %w(-n -m)

data/test/migration_generator.rdoctest

@@ -445,7 +445,7 @@ The migration generator respects the `set_table_name` declaration, although as b
 
     >>
      class Advert
-       set_table_name "ads"
+       self.table_name="ads"
        fields do
          title :string, :default => "Untitled"
          body :text
@@ -459,7 +459,7 @@ The migration generator respects the `set_table_name` declaration, although as b
 
 Set the table name back to what it should be and confirm we're in sync:
 
-    >> class Advert; set_table_name "adverts"; end
+    >> class Advert; self.table_name="adverts"; end
     >> Generators::Hobo::Migration::Migrator.run
     => ["", ""]
 
@@ -626,7 +626,7 @@ HoboFields has some support for legacy keys.
          name :string, :default => "No Name"
          body :text
        end
-       set_primary_key "advert_id"
+       self.primary_key="advert_id"
      end
     >> up, down = Generators::Hobo::Migration::Migrator.run(:adverts => {:id => :advert_id})
     >> up

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: hobo_fields
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.1.0.pre1
 platform: ruby
 authors:
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo_support
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
 - !ruby/object:Gem::Dependency
   name: rubydoctest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -128,28 +119,26 @@ files:
 - test_responses.txt
 homepage: http://hobocentral.net
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: hobo
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rich field types and migration generator for Rails
 test_files: []
-has_rdoc: