active_hash 0.7.6 → 0.7.7

data/CHANGELOG

@@ -1,5 +1,6 @@
 2009-12-19
   - Added ActiveHash::Enum (John Pignata)
+  - Deprecated include ActiveHash::Associations in favor of extend ActiveHash::Associations
 
 2009-12-10
   - Fixed a bug where belongs_to associations would raise an error instead of returning

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 include the ActiveHash::Associations module, you can also create associations from your ActiveHash classes, like so:
+If you extend the ActiveHash::Associations module, you can also create associations from your ActiveHash classes, like so:
 
     class Country < ActiveHash::Base
-      include ActiveHash::Associations
+      extend ActiveHash::Associations
       has_many :people
     end
 
     class Person < ActiveHash::Base
-      include ActiveHash::Associations
+      extend ActiveHash::Associations
       belongs_to :country
       has_many :pets
     end
@@ -201,7 +201,7 @@ If you include the ActiveHash::Associations module, you can also create associat
 Once you define a belongs to, you also get the setter method:
 
     class City < ActiveHash::Base
-      include ActiveHash::Associations
+      extend ActiveHash::Associations
       belongs_to :state
     end
 

data/Rakefile

@@ -11,7 +11,7 @@ begin
     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"])
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
@@ -33,16 +33,10 @@ task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "active_hash #{version}"
+  rdoc.title = "the-perfect-gem #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.7.7

data/active_hash.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.7.6"
+  s.version = "0.7.7"
 
   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"]

data/lib/associations/associations.rb

@@ -2,10 +2,15 @@ module ActiveHash
   module Associations
 
     def self.included(base)
-      base.send(:extend, ClassMethods)
+      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
 
-    module ClassMethods
+    def self.extended(base)
+      base.send :extend, Methods
+    end
+
+    module Methods
       def has_many(association_id, options = {})
 
         define_method(association_id) do
@@ -36,5 +41,6 @@ module ActiveHash
 
       end
     end
+
   end
 end

data/spec/associations/associations_spec.rb

@@ -1,5 +1,35 @@
 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
@@ -8,11 +38,11 @@ describe ActiveHash::Base, "associations" do
 
     class City < ActiveHash::Base
       field :country_id
-      include ActiveHash::Associations
+      extend ActiveHash::Associations
     end
 
     class Author < ActiveHash::Base
-      include ActiveHash::Associations
+      extend ActiveHash::Associations
       field :publisher_id
       field :city_id
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors: 
 - Jeff Dean