hobo_fields 1.4.0.pre8 → 2.0.0.pre1

data/Rakefile

@@ -24,7 +24,7 @@ include HoboSupport::CommonTasks
 namespace "test" do
   desc "Run the doctests"
   task :doctest do |t|
-    files=Dir['test/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
+    files=Dir['test/*.rdoctest'].sort.map {|f| File.expand_path(f)}.join(' ')
     exit(1) if !system("#{RUBYDOCTEST} #{files}")
   end
 

data/VERSION

@@ -1 +1 @@
-1.4.0.pre8
+2.0.0.pre1

data/lib/generators/hobo/model/templates/model_injection.rb.erb

@@ -7,6 +7,7 @@
     timestamps
 <% end -%>
   end
+  attr_accessible <%= accessible_attributes.map {|a| ":#{a.name}"}.join ", " %>
 
 <% for bt in bts -%>
   belongs_to :<%= bt %>

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

@@ -10,9 +10,31 @@ 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}']"
 

data/test/api.rdoctest

@@ -24,7 +24,7 @@ This will generate the test, fixture and a model file like this:
         body :text
         contact_address :email_address
       end
-
+      attr_accessible :title, :body, :contact_address
     end
 
 (Note: `:email_address` is an example of a "Rich Type" provided by HoboFields -- more on those later)
@@ -112,6 +112,8 @@ HoboFields adds a few features to your models.
 
 Returns the type (i.e. class) declared for a given field or attribute
 
+        >> Advert.connection.schema_cache.clear!
+        >> Advert.reset_column_information
         >> Advert.attr_type :title
         => String
         >> Advert.attr_type :body
@@ -154,6 +156,7 @@ The `:required` argument to a field gives a `validates_presence_of`:
            fields do
              title :string, :required
            end
+           attr_accessible :title
          end
         >> a = Advert.new
         >> a.valid?
@@ -174,6 +177,7 @@ The `:unique` argument in a field declaration gives `validates_uniqueness_of`:
            fields do
              title :string, :unique
            end
+           attr_accessible :title
          end
         >> a = Advert.new :title => "Jimbo"
         >> a.valid?
@@ -194,6 +198,7 @@ Let's get back to the basic Advert class with no validations before we continue:
              body            :text
                   contact_address :email_address
            end
+           attr_accessible :title, :body, :contact_address
          end
 
 
@@ -226,6 +231,7 @@ You can set the type of a virtual field to a rich type, e.g.
         >>
          class Advert
            attr_accessor :alternative_email, :type => :email_address
+           attr_accessible :alternative_email
          end
 
 By default, virtual fields are not subject to validation.

data/test/generators.rdoctest

@@ -11,7 +11,7 @@ doctest: model file exists
 
 doctest: model content matches
 >> File.read 'app/models/alpha/beta.rb'
-=> "class Alpha::Beta < ActiveRecord::Base\n\n  fields do\n    one :string\n    two :integer\n  end\n\nend\n"
+=> "class Alpha::Beta < ActiveRecord::Base\n\n  fields do\n    one :string\n    two :integer\n  end\n  attr_accessible :one, :two\n\nend\n"
 
 doctest: module file exists
 >> File.exist? 'app/models/alpha.rb'
@@ -54,6 +54,7 @@ doctest: db file exists
 => true
 
 doctest: Alpha::Beta class exists
+>> Alpha::Beta.connection.schema_cache.clear!
+>> Alpha::Beta.reset_column_information
 >> Alpha::Beta
 => Alpha::Beta(id: integer, one: string, two: integer)
-

data/test/migration_generator.rdoctest

@@ -157,8 +157,6 @@ Let's apply that change to the database
 
 ### Change a type
 
-    >> Advert.attr_type :title
-    => String
     >>
      class Advert
        fields do
@@ -557,6 +555,8 @@ The migration generator is designed to create complete migrations even if many c
 
 First let's confirm we're in a known state. One model, 'Advert', with a string 'title' and text 'body':
 
+    >> Advert.connection.schema_cache.clear!
+    >> Advert.reset_column_information
     >> Advert.connection.tables
     => ["adverts"]
     >> Advert.columns.*.name

data/test/prepare_testapp.rb

@@ -8,4 +8,4 @@ system %(echo "gem 'RedCloth'" >> #{TESTAPP_PATH}/Gemfile)
 FileUtils.chdir TESTAPP_PATH
 require "#{TESTAPP_PATH}/config/environment"
 require 'rails/generators'
-Rails::Generators.configure!
+Rails::Generators.configure!(Rails.application.config.generators)

data/test/rich_types.rdoctest

@@ -118,6 +118,7 @@ Provides validation of correct email address format.
            fields do
              body HoboFields::Types::HtmlString
            end
+           attr_accessible :body
          end
         >> article = Article.create!(:body => "</div>>>p1<p>p2</p>p3<nasty>p4</nasty>p5&lt;script&gt;p6<script>p7</script>p8")
         # some unsafe html fragements are removed on save,
@@ -222,6 +223,7 @@ restrict the column type.
        fields do
          content :serialized
        end
+       attr_accessible :content
      end
 
     >> migrate
@@ -234,6 +236,7 @@ restrict the column type.
        fields do
          content :serialized, :class => Hash
        end
+       attr_accessible :content
      end
 
     >> migrate
@@ -241,10 +244,7 @@ restrict the column type.
     >> Vault2.first.content
     => {:key => "in Vault"}
     >> puts Vault2.count
-    >> v = Vault2.create!(:content => 17)
-    >> Vault2.count
-    => 2   # Invalid type is successfully created...
-    >> v.reload rescue 'broken' # ActiveRecord::SerializationTypeMismatch
+    >> v = Vault2.create!(:content => 17) rescue 'broken' # ActiveRecord::SerializationTypeMismatch
     => 'broken'
 
 ## Enum Strings
@@ -315,7 +315,7 @@ ActiveRecord validation framework.
            end
          end
         >> Article.attr_type :status
-        #<EnumString draft approved published>
+        => #<EnumString draft approved published>
 
 Sometimes it's nice to have a proper type name. Here's one way you might go about it:
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo_fields
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre8
+  version: 2.0.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo_support
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: rubydoctest
   requirement: !ruby/object:Gem::Requirement