active_hash 0.9.1 → 0.9.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+2011-01-22
+  - improved method_missing errors for dynamic finders (
+  - prevent users from trying to overwrite :attributes (https://github.com/zilkey/active_hash/issues/#issue/33)
+
 2010-12-08
   - ruby 1.9.2 compatibility
 

data/active_hash.gemspec

@@ -1,8 +1,11 @@
 # -*- encoding: utf-8 -*-
 
+$:.push File.expand_path("../lib", __FILE__)
+require "active_hash/version"
+
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.9.1"
+  s.version = ActiveHash::Gem::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [
@@ -21,7 +24,7 @@ Gem::Specification.new do |s|
     "Joel Chippindale",
     "Kevin Olsen"
   ]
-  s.date = %q{2010-12-08}
+  s.date = %q{2011-01-22}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -31,7 +34,6 @@ Gem::Specification.new do |s|
     "CHANGELOG",
     "LICENSE",
     "README.md",
-    "VERSION",
     "active_hash.gemspec",
     Dir.glob("lib/**/*")
   ].flatten

data/lib/active_hash/base.rb

@@ -3,6 +3,9 @@ module ActiveHash
   class RecordNotFound < StandardError
   end
 
+  class ReservedFieldError < StandardError
+  end
+
   class Base
     class_inheritable_accessor :data, :dirty
 
@@ -16,7 +19,9 @@ module ActiveHash
     end
 
     class << self
-      attr_reader :field_names
+      def field_names
+        @field_names ||= []
+      end
 
       def the_meta_class
         class << self
@@ -113,7 +118,7 @@ module ActiveHash
 
       delegate :first, :last, :to => :all
 
-      def fields(* args)
+      def fields(*args)
         options = args.extract_options!
         args.each do |field|
           field(field, options)
@@ -121,8 +126,8 @@ module ActiveHash
       end
 
       def field(field_name, options = {})
-        @field_names ||= []
-        @field_names << field_name
+        validate_field(field_name)
+        field_names << field_name
 
         define_getter_method(field_name, options[:default])
         define_setter_method(field_name)
@@ -131,6 +136,14 @@ module ActiveHash
         define_custom_find_all_method(field_name)
       end
 
+      def validate_field(field_name)
+        if [:attributes].include?(field_name.to_sym)
+          raise ReservedFieldError.new("#{field_name} is a reserved field in ActiveHash.  Please use another name.")
+        end
+      end
+
+      private :validate_field
+
       def respond_to?(method_name, include_private=false)
         super ||
           begin

data/lib/active_hash/version.rb

@@ -0,0 +1,5 @@
+module ActiveHash
+  module Gem
+    VERSION = "0.9.2"
+  end
+end

data/spec/active_hash/base_spec.rb

@@ -75,6 +75,12 @@ describe ActiveHash, "Base" do
       Country.find_by_name_and_iso_name("Canada", "CA", :select => nil).should be_nil
       Country.find_all_by_name_and_iso_name("Canada", "CA", :select => nil).should == []
     end
+
+    it "blows up if you try to overwrite :attributes" do
+      proc do
+        Country.field :attributes
+      end.should raise_error(ActiveHash::ReservedFieldError)
+    end
   end
 
   describe ".data=" do
@@ -147,7 +153,7 @@ describe ActiveHash, "Base" do
     end
 
     it "returns all data as inflated objects" do
-      Country.all.all?{|country| country.should be_kind_of(Country)}
+      Country.all.all? { |country| country.should be_kind_of(Country) }
     end
 
     it "populates the data correctly" do
@@ -167,7 +173,7 @@ describe ActiveHash, "Base" do
       records.first.name.should == "Canada"
       records.length.should == 1
     end
-    
+
     it "filters the records from a AR-like conditions hash" do
       record = Country.all(:conditions => {:name => 'US'})
       record.count.should == 1
@@ -468,6 +474,14 @@ describe ActiveHash, "Base" do
     end
   end
 
+  describe "#method_missing" do
+    it "doesn't blow up if you call a missing dynamic finder when fields haven't been set" do
+      proc do
+        Country.find_by_name("Foo")
+      end.should raise_error(NoMethodError, "undefined method `find_by_name' for Country:Class")
+    end
+  end
+
   describe "#attributes" do
     it "returns the hash passed in the initializer" do
       Country.field :foo
@@ -644,8 +658,8 @@ describe ActiveHash, "Base" do
     end
 
     it "is hashable" do
-      { Country.new(:id => 4) => "bar"}.should == {Country.new(:id => 4) => "bar" }
-      { Country.new(:id => 3) => "bar"}.should_not == {Country.new(:id => 4) => "bar" }
+      {Country.new(:id => 4) => "bar"}.should == {Country.new(:id => 4) => "bar"}
+      {Country.new(:id => 3) => "bar"}.should_not == {Country.new(:id => 4) => "bar"}
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Jeff Dean
@@ -28,7 +28,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -07:00
+date: 2011-01-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,10 +60,10 @@ files:
 - CHANGELOG
 - LICENSE
 - README.md
-- VERSION
 - active_hash.gemspec
 - lib/active_file/base.rb
 - lib/active_hash/base.rb
+- lib/active_hash/version.rb
 - lib/active_hash.rb
 - lib/active_yaml/base.rb
 - lib/associations/associations.rb
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource

data/VERSION

@@ -1 +0,0 @@
-0.9.0