active_hash 0.7.8 → 0.7.9

data/CHANGELOG

@@ -1,3 +1,6 @@
+2010-03-01
+  - Removed "extend"-related deprecations - they didn't play well with rails class loading
+
 2010-01-18
   - Added stub for #destroyed? method, since Rails associations now depend on it
 

data/README.md

@@ -182,15 +182,15 @@ You can also use standard rails view helpers, like #collection_select:
 
     <%= collection_select :person, :country_id, Country.all, :id, :name %>
 
-If you extend the ActiveHash::Associations module, you can also create associations from your ActiveHash classes, like so:
+If you include the ActiveHash::Associations module, you can also create associations from your ActiveHash classes, like so:
 
     class Country < ActiveHash::Base
-      extend ActiveHash::Associations
+      include ActiveHash::Associations
       has_many :people
     end
 
     class Person < ActiveHash::Base
-      extend ActiveHash::Associations
+      include ActiveHash::Associations
       belongs_to :country
       has_many :pets
     end
@@ -201,7 +201,7 @@ If you extend the ActiveHash::Associations module, you can also create associati
 Once you define a belongs to, you also get the setter method:
 
     class City < ActiveHash::Base
-      extend ActiveHash::Associations
+      include ActiveHash::Associations
       belongs_to :state
     end
 
@@ -254,7 +254,7 @@ Since ActiveYaml just creates a hash from the YAML file, you will have all field
 
 ## ActiveFile
 
-If you store encrypted data, or you'd like to store your flat files as CSV or XML or any other format, you can easily extend ActiveHash to parse and load your file.  Just add a custom ::load_file method, and define the extension you want the file to use:
+If you store encrypted data, or you'd like to store your flat files as CSV or XML or any other format, you can easily include ActiveHash to parse and load your file.  Just add a custom ::load_file method, and define the extension you want the file to use:
 
     class Country < ActiveFile::Base
       set_root_path "/u/data"
@@ -289,7 +289,7 @@ ActiveHash can expose its data in an Enumeration by setting constants for each r
 The field to be used as the constant is set using _enum_accessor_ which takes the name of a field as an argument.
 
     class Country < ActiveHash::Base
-      extend ActiveHash::Enum
+      include ActiveHash::Enum
       self.data = [
           {:id => 1, :name => "US", :capital => "Washington, DC"},
           {:id => 2, :name => "Canada", :capital => "Ottawa"},

data/Rakefile

@@ -10,6 +10,19 @@ begin
     gem.homepage = "http://github.com/zilkey/active_hash"
     gem.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata"]
     gem.add_dependency('activesupport', [">= 2.2.2"])
+    gem.post_install_message = %q{NOTE: Breaking change!  Please change any extend statements to include statements:
+      
+      extend ActiveHash::Associations
+      extend ActiveHash::Enum
+  
+  becomes
+  
+      include ActiveHash::Associations
+      include ActiveHash::Enum
+
+  Sorry for the inconvenience.
+  
+}
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.7.9

data/active_hash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.7.8"
+  s.version = "0.7.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata"]
-  s.date = %q{2010-01-18}
+  s.date = %q{2010-03-01}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -44,6 +44,19 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/zilkey/active_hash}
+  s.post_install_message = %q{NOTE: Breaking change!  Please change any extend statements to include statements:
+      
+      extend ActiveHash::Associations
+      extend ActiveHash::Enum
+  
+  becomes
+  
+      include ActiveHash::Associations
+      include ActiveHash::Enum
+
+  Sorry for the inconvenience.
+  
+}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}

data/lib/associations/associations.rb

@@ -2,12 +2,7 @@ module ActiveHash
   module Associations
 
     def self.included(base)
-      puts %Q{DEPRECATION WARNING: include #{self} should be extend #{self} and will be removed in later versions.  Called from #{caller.first}}
-      base.extend self
-    end
-
-    def self.extended(base)
-      base.send :extend, Methods
+      base.extend Methods
     end
 
     module Methods

data/lib/enum/enum.rb

@@ -3,48 +3,56 @@ module ActiveHash
 
     DuplicateEnumAccessor = Class.new(RuntimeError)
 
-    def enum_accessor(field_name)
-      @enum_accessor = field_name
-      reload
+    def self.included(base)
+      base.extend(Methods)
     end
+    
+    module Methods
 
-    def insert(record)
-      super
-      set_constant(record) if @enum_accessor.present?
-    end
+      def enum_accessor(field_name)
+        @enum_accessor = field_name
+        reload
+      end
 
-    def delete_all
-      if @enum_accessor.present?
-        @records.each do |record|
-          constant = constant_for(record.attributes[@enum_accessor])
-          remove_const(constant) if const_defined?(constant)
+      def insert(record)
+        super
+        set_constant(record) if @enum_accessor.present?
+      end
+
+      def delete_all
+        if @enum_accessor.present?
+          @records.each do |record|
+            constant = constant_for(record.attributes[@enum_accessor])
+            remove_const(constant) if const_defined?(constant)
+          end
         end
+        super
       end
-      super
-    end
 
-    def set_constant(record)
-      constant = constant_for(record.attributes[@enum_accessor])
-      return nil if constant.blank?
+      def set_constant(record)
+        constant = constant_for(record.attributes[@enum_accessor])
+        return nil if constant.blank?
 
-      unless const_defined?(constant)
-        const_set(constant, record)
-      else
-        raise DuplicateEnumAccessor, "#{constant} already defined for #{self.class}" unless const_get(constant) == record
+        unless const_defined?(constant)
+          const_set(constant, record)
+        else
+          raise DuplicateEnumAccessor, "#{constant} already defined for #{self.class}" unless const_get(constant) == record
+        end
       end
-    end
 
-    private :set_constant
+      private :set_constant
 
-    def constant_for(field_value)
-      if constant = field_value.try(:dup)
-        constant.gsub!(/[^A-Za-z]*/, "") 
-        constant.upcase!
-        constant
+      def constant_for(field_value)
+        if constant = field_value.try(:dup)
+          constant.gsub!(/[^A-Za-z]*/, "") 
+          constant.upcase!
+          constant
+        end
       end
+
+      private :constant_for
     end
 
-    private :constant_for
   end
 
 end

data/spec/associations/associations_spec.rb

@@ -1,35 +1,5 @@
 require 'spec/spec_helper'
 
-describe ActiveHash::Base, "associations when included" do
-  before do
-    class City < ActiveHash::Base
-      silence_stream STDOUT do
-        include ActiveHash::Associations
-      end
-    end
-
-    class Author < ActiveHash::Base
-      silence_stream STDOUT do
-        include ActiveHash::Associations
-      end
-      field :publisher_id
-      field :city_id
-    end
-  end
-
-  after do
-    Object.send :remove_const, :City
-    Object.send :remove_const, :Author
-  end
-
-  it "works until the deprecation period is up" do
-    Author.belongs_to :city
-    city = City.create!
-    author = Author.new :city => city
-    author.city.should == city
-  end
-end
-
 describe ActiveHash::Base, "associations" do
 
   before do
@@ -37,11 +7,11 @@ describe ActiveHash::Base, "associations" do
     end
 
     class City < ActiveHash::Base
-      extend ActiveHash::Associations
+      include ActiveHash::Associations
     end
 
     class Author < ActiveHash::Base
-      extend ActiveHash::Associations
+      include ActiveHash::Associations
     end
 
     build_model :books do

data/spec/enum/enum_spec.rb

@@ -6,7 +6,7 @@ describe ActiveHash::Base, "enum" do
     ActiveYaml::Base.set_root_path File.expand_path(File.dirname(__FILE__) + "/../fixtures")
     
     class Borough < ActiveYaml::Base
-      extend ActiveHash::Enum
+      include ActiveHash::Enum
       fields :name, :county, :population
       enum_accessor :name
     end
@@ -24,7 +24,7 @@ describe ActiveHash::Base, "enum" do
     it "ensures that values stored in the field specified are unique" do
       lambda do
         Class.new(ActiveHash::Base) do
-          extend ActiveHash::Enum
+          include ActiveHash::Enum
           self.data = [
             { :name => 'Woodford Reserve' },
             { :name => 'Bulliet Bourbon' },
@@ -37,7 +37,7 @@ describe ActiveHash::Base, "enum" do
 
     it "removes non-word characters from values before setting constants" do
       Movie = Class.new(ActiveHash::Base) do
-        extend ActiveHash::Enum
+        include ActiveHash::Enum
         self.data = [
           {:name => 'Die Hard 2', :rating => '4.3'},
           {:name => 'The Informant!', :rating => '4.3'},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors: 
 - Jeff Dean
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 -05:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,20 @@ has_rdoc: true
 homepage: http://github.com/zilkey/active_hash
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  NOTE: Breaking change!  Please change any extend statements to include statements:
+        
+        extend ActiveHash::Associations
+        extend ActiveHash::Enum
+    
+    becomes
+    
+        include ActiveHash::Associations
+        include ActiveHash::Enum
+  
+    Sorry for the inconvenience.
+    
+
 rdoc_options: 
 - --charset=UTF-8
 require_paths: