active_hash 0.8.2 → 0.8.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+2010-09-16
+ - Enum format now uses underscores instead of removing all characters
+ - Removed test dependency on acts_as_fu
+
 2010-05-26
  - Silence metaclass deprecation warnings in active support 2.3.8
 

data/Gemfile

@@ -1,9 +1,8 @@
 source :gemcutter
 
-gem "activerecord", ">= 2.3.8", :require => "active_record"
-gem "activesupport", ">= 2.3.8"
+gem "activerecord", "2.3.8", :require => "active_record"
+gem "activesupport", "2.3.8"
 gem "rspec", ">= 1.3.0"
 gem "fixjour", "0.4.1"
-gem "acts_as_fu", "0.0.5"
 gem "jeweler", "1.4.0"
 gem "sqlite3-ruby", ">= 1.2.5"

data/Gemfile.lock

@@ -0,0 +1,30 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.8)
+      activesupport (= 2.3.8)
+    activesupport (2.3.8)
+    fixjour (0.4.1)
+      activerecord
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    rspec (1.3.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 2.3.8)
+  activesupport (= 2.3.8)
+  fixjour (= 0.4.1)
+  jeweler (= 1.4.0)
+  rspec (>= 1.3.0)
+  sqlite3-ruby (>= 1.2.5)

data/Rakefile

@@ -10,7 +10,7 @@ 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", "Michael Schubert", "Jeremy Weiskotten"]
     gem.add_dependency('activesupport', [">= 2.2.2"])
-    gem.post_install_message = ""
+    gem.post_install_message = "NOTE:  Enums have changed to use underscores.\n\nYou may have to do a search and replace to get your suite green."
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/active_hash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   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", "Michael Schubert", "Jeremy Weiskotten"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-09-17}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
      ".gitignore",
      "CHANGELOG",
      "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -44,10 +45,12 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/zilkey/active_hash}
-  s.post_install_message = %q{}
+  s.post_install_message = %q{NOTE:  Enums have changed to use underscores.
+
+You may have to do a search and replace to get your suite green.}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{An ActiveRecord-like model that uses a hash or file as a datasource}
   s.test_files = [
     "spec/active_file/base_spec.rb",
@@ -62,7 +65,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.2.2"])

data/lib/active_hash/base.rb

@@ -9,7 +9,9 @@ module ActiveHash
       attr_reader :field_names
 
       def the_meta_class
-        respond_to?(:singleton_class) ? singleton_class : metaclass
+        class << self
+          self
+        end
       end
 
       def data=(array_of_hashes)
@@ -17,7 +19,7 @@ module ActiveHash
         @records = nil
         write_inheritable_attribute(:data, array_of_hashes)
         if array_of_hashes
-          auto_assign_fields( array_of_hashes )
+          auto_assign_fields(array_of_hashes)
           array_of_hashes.each do |hash|
             insert new(hash)
           end
@@ -32,7 +34,7 @@ module ActiveHash
       end
 
       def next_id
-        max_record = all.max {|a, b| a.id <=> b.id }
+        max_record = all.max { |a, b| a.id <=> b.id }
         if max_record.nil?
           1
         elsif max_record.id.is_a?(Numeric)
@@ -46,6 +48,7 @@ module ActiveHash
         mark_dirty
         record
       end
+
       alias_method :add, :create
 
       def create!(attributes = {})
@@ -73,28 +76,28 @@ module ActiveHash
         @records = []
       end
 
-      def find(id, *args)
+      def find(id, * args)
         case id
           when nil
             nil
           when :all
             all
           when Array
-            all.select {|record| id.map(&:to_i).include?(record.id) }
+            all.select { |record| id.map(& :to_i).include?(record.id) }
           else
             find_by_id(id) || begin
-             raise RecordNotFound.new("Couldn't find #{name} with ID=#{id}")
-           end
+              raise RecordNotFound.new("Couldn't find #{name} with ID=#{id}")
+            end
         end
       end
 
       def find_by_id(id)
-        all.detect {|record| record.id == id.to_i}
+        all.detect { |record| record.id == id.to_i }
       end
 
       delegate :first, :last, :to => :all
 
-      def fields(*args)
+      def fields(* args)
         options = args.extract_options!
         args.each do |field|
           field(field, options)
@@ -122,7 +125,7 @@ module ActiveHash
           end
       end
 
-      def method_missing(method_name, *args)
+      def method_missing(method_name, * args)
         return super unless respond_to? method_name
 
         config = configuration_for_custom_finder(method_name)
@@ -179,7 +182,7 @@ module ActiveHash
         unless singleton_methods.include?(method_name)
           the_meta_class.instance_eval do
             define_method(method_name) do |name|
-              all.detect {|record| record.send(field_name) == name }
+              all.detect { |record| record.send(field_name) == name }
             end
           end
         end
@@ -193,7 +196,7 @@ module ActiveHash
           the_meta_class.instance_eval do
             unless singleton_methods.include?(method_name)
               define_method(method_name) do |name|
-                all.select {|record| record.send(field_name) == name }
+                all.select { |record| record.send(field_name) == name }
               end
             end
           end
@@ -273,7 +276,7 @@ module ActiveHash
     alias quoted_id id
 
     def new_record?
-      ! self.class.all.include?(self)
+      !self.class.all.include?(self)
     end
 
     def destroyed?

data/lib/enum/enum.rb

@@ -44,7 +44,8 @@ module ActiveHash
 
       def constant_for(field_value)
         if constant = field_value.try(:dup)
-          constant.gsub!(/[^A-Za-z]*/, "") 
+          constant.gsub!(/[^A-Za-z]+/, "_")
+          constant.gsub!(/^_|_$/, '')
           constant.upcase!
           constant
         end

data/spec/active_hash/base_spec.rb

@@ -590,14 +590,21 @@ describe ActiveHash, "Base" do
         {:id => 1, :name => "foo"}
       ]
 
-      build_model :books do
-        text :subject_type
-        integer :subject_id
+      class Book < ActiveRecord::Base
+        establish_connection :adapter => "sqlite3", :database => ":memory:"
+        connection.create_table(:books, :force => true) do |t|
+          t.text :subject_type
+          t.integer :subject_id
+        end
         belongs_to :subject, :polymorphic => true
         belongs_to :country
       end
     end
 
+    after do
+      Object.send :remove_const, :Book
+    end
+
     it "should be possible to use it as a parent" do
       book = Book.new
       book.country = Country.first

data/spec/associations/associations_spec.rb

@@ -3,11 +3,16 @@ require 'spec/spec_helper'
 describe ActiveHash::Base, "associations" do
 
   before do
-    build_model :countries do
+    class Country < ActiveRecord::Base
+      establish_connection :adapter => "sqlite3", :database => ":memory:"
+      connection.create_table(:countries, :force => true) {}
     end
 
-    build_model :schools do
-      integer :city_id
+    class School < ActiveRecord::Base
+      establish_connection :adapter => "sqlite3", :database => ":memory:"
+      connection.create_table(:schools, :force => true) do |t|
+        t.integer :city_id
+      end
     end
 
     class City < ActiveHash::Base
@@ -18,14 +23,20 @@ describe ActiveHash::Base, "associations" do
       include ActiveHash::Associations
     end
 
-    build_model :books do
-      integer :author_id
+    class Book < ActiveRecord::Base
+      establish_connection :adapter => "sqlite3", :database => ":memory:"
+      connection.create_table(:books, :force => true) do |t|
+        t.integer :author_id
+      end
     end
   end
 
   after do
     Object.send :remove_const, :City
     Object.send :remove_const, :Author
+    Object.send :remove_const, :Country
+    Object.send :remove_const, :School
+    Object.send :remove_const, :Book
   end
 
   describe "#has_many" do

data/spec/enum/enum_spec.rb

@@ -45,10 +45,10 @@ describe ActiveHash::Base, "enum" do
         ]
         enum_accessor :name
       end
-      
-      Movie::DIEHARD.name.should == 'Die Hard 2'
-      Movie::THEINFORMANT.name.should == 'The Informant!'
-      Movie::INOUT.name.should == 'In & Out'
+
+      Movie::DIE_HARD.name.should == 'Die Hard 2'
+      Movie::THE_INFORMANT.name.should == 'The Informant!'
+      Movie::IN_OUT.name.should == 'In & Out'
     end
   end
 
@@ -77,9 +77,9 @@ describe ActiveHash::Base, "enum" do
 
     describe ".delete_all" do
       it "unsets all constants for deleted records" do
-        Borough.const_defined?("STATENISLAND").should be_true
+        Borough.const_defined?("STATEN_ISLAND").should be_true
         Borough.delete_all.should be_true
-        Borough.const_defined?("STATENISLAND").should be_false
+        Borough.const_defined?("STATEN_ISLAND").should be_false
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 require 'spec'
 require 'spec/autorun'
 require 'active_record'
-silence_stream STDERR do
-  require 'acts_as_fu' # suppress activerecord warnings
-end
 require 'fixjour'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -19,6 +16,5 @@ ActiveHash::Base.class_eval do
 end
 
 Spec::Runner.configure do |config|
-  config.include ActsAsFu
   config.include Fixjour
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Jeff Dean
@@ -23,16 +24,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2010-09-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 2
@@ -54,6 +57,7 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -80,29 +84,36 @@ has_rdoc: true
 homepage: http://github.com/zilkey/active_hash
 licenses: []
 
-post_install_message: ""
+post_install_message: |-
+  NOTE:  Enums have changed to use underscores.
+  
+  You may have to do a search and replace to get your suite green.
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource