active_hash 0.8.7 → 0.9.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+2010-12-06
+ - added dependency on ActiveModel
+ - add persisted? method to ActiveHash::Base
+ - ActiveHash::Base#save takes *args to be compatible with ActiveModel
+ - ActiveHash::Base#to_param returns nil if the object hasn't been saved
+
 2010-11-09
  - Use Ruby's definition of "word character" (numbers, underscores) when forming ActiveHash::Enum constants (tstuart)
 

data/Gemfile

@@ -1,9 +1,8 @@
 source :gemcutter
 
-gem "activerecord", "2.3.8", :require => "active_record"
-gem "activesupport", "2.3.8"
-gem "rspec", ">= 1.3.0"
-gem "fixjour", "0.4.1"
-gem "jeweler", "1.4.0"
-gem "sqlite3-ruby", ">= 1.2.5"
+gem "activerecord", "3.0.3"
+gem "activesupport", "3.0.3"
+gem "fixjour", "0.5.3"
+gem "rspec", "2.2.0"
+gem "sqlite3-ruby", ">= 1.3.2"
 gem 'rake'

data/Gemfile.lock

@@ -1,32 +1,41 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.8)
-      activesupport (= 2.3.8)
-    activesupport (2.3.8)
-    fixjour (0.4.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    fixjour (0.5.3)
       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)
+    i18n (0.5.0)
     rake (0.8.7)
-    rspec (1.3.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    sqlite3-ruby (1.3.1)
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.2.0)
+    sqlite3-ruby (1.3.2)
+    tzinfo (0.3.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 2.3.8)
-  activesupport (= 2.3.8)
-  fixjour (= 0.4.1)
-  jeweler (= 1.4.0)
+  activerecord (= 3.0.3)
+  activesupport (= 3.0.3)
+  fixjour (= 0.5.3)
   rake
-  rspec (>= 1.3.0)
-  sqlite3-ruby (>= 1.2.5)
+  rspec (= 2.2.0)
+  sqlite3-ruby (>= 1.3.2)

data/VERSION

@@ -1 +1 @@
-0.8.7
+0.9.0

data/active_hash.gemspec

@@ -1,61 +1,53 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.8.7"
+  s.version = "0.9.0"
 
   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", "Ryan Garver", "Tom Stuart", "Joel Chippindale"]
-  s.date = %q{2010-11-09}
+  s.authors = [
+    "Jeff Dean",
+    "Mike Dalessio",
+    "Corey Innis",
+    "Peter Jaros",
+    "Brandon Keene",
+    "Brian Takita",
+    "Pat Nakajima",
+    "John Pignata",
+    "Michael Schubert",
+    "Jeremy Weiskotten",
+    "Ryan Garver",
+    "Tom Stuart",
+    "Joel Chippindale"
+  ]
+  s.date = %q{2010-12-06}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".document",
-     ".gitignore",
-     "CHANGELOG",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "active_hash.gemspec",
-     "lib/active_file/base.rb",
-     "lib/active_hash.rb",
-     "lib/active_hash/base.rb",
-     "lib/active_yaml/base.rb",
-     "lib/associations/associations.rb",
-     "lib/enum/enum.rb",
-     "spec/active_file/base_spec.rb",
-     "spec/active_hash/base_spec.rb",
-     "spec/active_yaml/base_spec.rb",
-     "spec/associations/associations_spec.rb",
-     "spec/enum/enum_spec.rb",
-     "spec/fixtures/array_rows.yml",
-     "spec/fixtures/boroughs.yml",
-     "spec/fixtures/cities.yml",
-     "spec/fixtures/countries.yml",
-     "spec/fixtures/states.yml",
-     "spec/spec_helper.rb"
-  ]
+    "CHANGELOG",
+    "LICENSE",
+    "README.md",
+    "VERSION",
+    "active_hash.gemspec",
+    Dir.glob("lib/**/*")
+  ].flatten
   s.homepage = %q{http://github.com/zilkey/active_hash}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   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 = [
+    "Gemfile",
+    "Gemfile.lock",
     "spec/active_file/base_spec.rb",
-     "spec/active_hash/base_spec.rb",
-     "spec/active_yaml/base_spec.rb",
-     "spec/associations/associations_spec.rb",
-     "spec/enum/enum_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/active_hash/base_spec.rb",
+    "spec/active_yaml/base_spec.rb",
+    "spec/associations/associations_spec.rb",
+    "spec/enum/enum_spec.rb",
+    "spec/lint_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/active_hash.rb

@@ -1,4 +1,16 @@
 require 'active_support'
+
+begin
+  require 'active_support/all'
+rescue MissingSourceFile
+end
+
+begin
+  require 'active_model'
+  require 'active_model/naming'
+rescue MissingSourceFile
+end
+
 require 'active_hash/base'
 require 'active_file/base'
 require 'active_yaml/base'

data/lib/active_hash/base.rb

@@ -5,6 +5,16 @@ module ActiveHash
 
   class Base
     class_inheritable_accessor :data, :dirty
+
+    if Object.const_defined?(:ActiveModel)
+      extend ActiveModel::Naming
+      include ActiveModel::Conversion
+    else
+      def to_param
+        id.present? ? id.to_s : nil
+      end
+    end
+
     class << self
       attr_reader :field_names
 
@@ -143,7 +153,7 @@ module ActiveHash
         else
           result = matches.first
           if config[:bang?]
-            result || raise(RecordNotFound, "Couldn\'t find #{name} with #{attribute_pairs.collect {|pair| "#{pair.first} = #{pair.second}"}.join(', ')}")
+            result || raise(RecordNotFound, "Couldn\'t find #{name} with #{attribute_pairs.collect {|pair| "#{pair[0]} = #{pair[1]}"}.join(', ')}")
           else
             result
           end
@@ -304,12 +314,12 @@ module ActiveHash
       false
     end
 
-    def readonly?
-      true
+    def persisted?
+      self.class.all.map(&:id).include?(id)
     end
 
-    def to_param
-      id.to_s
+    def readonly?
+      true
     end
 
     def eql?(other)
@@ -333,7 +343,21 @@ module ActiveHash
       end
     end
 
-    def save
+    def errors
+      obj = Object.new
+
+      def obj.[](key)
+        []
+      end
+
+      def obj.full_messages()
+        []
+      end
+
+      obj
+    end
+
+    def save(*args)
       self.class.insert(self)
       true
     end

data/spec/active_file/base_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ActiveFile::Base do
   before do

data/spec/active_hash/base_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ActiveHash, "Base" do
 
@@ -241,7 +241,7 @@ describe ActiveHash, "Base" do
 
     context "with :all" do
       it "returns all records" do
-        Country.find(:all).should =~ [Country.new(:id => 1), Country.new(:id => 2)]
+        Country.find(:all).should == [Country.new(:id => 1), Country.new(:id => 2)]
       end
     end
 
@@ -262,7 +262,7 @@ describe ActiveHash, "Base" do
       end
 
       it "returns all matching ids" do
-        Country.find([1, 3]).should =~ [Country.new(:id => 1), Country.new(:id => 3)]
+        Country.find([1, 3]).should == [Country.new(:id => 1), Country.new(:id => 3)]
       end
     end
   end
@@ -567,7 +567,27 @@ describe ActiveHash, "Base" do
 
   describe "#to_param" do
     it "should return id as a string" do
-      Country.new(:id => 2).to_param.should == "2"
+      Country.create(:id => 2).to_param.should == "2"
+    end
+  end
+
+  describe "#persisted" do
+    it "should return true if the object has been saved" do
+      Country.create(:id => 2).should be_persisted
+    end
+
+    it "should return false if the object has not been saved" do
+      Country.new(:id => 2).should_not be_persisted
+    end
+  end
+
+  describe "#persisted" do
+    it "should return true if the object has been saved" do
+      Country.create(:id => 2).should be_persisted
+    end
+
+    it "should return false if the object has not been saved" do
+      Country.new(:id => 2).should_not be_persisted
     end
   end
 

data/spec/active_yaml/base_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ActiveYaml::Base do
 

data/spec/associations/associations_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ActiveHash::Base, "associations" do
 
@@ -29,7 +29,12 @@ describe ActiveHash::Base, "associations" do
         t.integer :author_id
         t.boolean :published
       end
-      named_scope :published, { :conditions => { :published => true } }
+
+      if Object.const_defined?(:ActiveModel)
+        scope :published, {:conditions => {:published => true}}
+      else
+        named_scope :published, {:conditions => {:published => true}}
+      end
     end
   end
 
@@ -45,42 +50,42 @@ describe ActiveHash::Base, "associations" do
 
     context "with ActiveRecord children" do
       before do
-        @included_book_1  = Book.create! :author_id => 1, :published => true
-        @included_book_2  = Book.create! :author_id => 1, :published => false
-        @excluded_book    = Book.create! :author_id => 2, :published => true
+        @included_book_1 = Book.create! :author_id => 1, :published => true
+        @included_book_2 = Book.create! :author_id => 1, :published => false
+        @excluded_book = Book.create! :author_id => 2, :published => true
       end
 
       it "find the correct records" do
         Author.has_many :books
         author = Author.create :id => 1
-        author.books.should =~ [@included_book_1, @included_book_2]
+        author.books.should == [@included_book_1, @included_book_2]
       end
 
       it "return a scope so that we can apply further scopes" do
         Author.has_many :books
         author = Author.create :id => 1
-        author.books.published.should =~ [@included_book_1]
+        author.books.published.should == [@included_book_1]
       end
     end
 
     context "with ActiveHash children" do
       before do
         Author.field :city_id
-        @included_author_1  = Author.create :city_id => 1
-        @included_author_2  = Author.create :city_id => 1
-        @excluded_author    = Author.create :city_id => 2
+        @included_author_1 = Author.create :city_id => 1
+        @included_author_2 = Author.create :city_id => 1
+        @excluded_author = Author.create :city_id => 2
       end
 
       it "find the correct records" do
         City.has_many :authors
         city = City.create :id => 1
-        city.authors.should =~ [@included_author_1, @included_author_2]
+        city.authors.should == [@included_author_1, @included_author_2]
       end
 
       it "uses the correct class name when passed" do
         City.has_many :writers, :class_name => "Author"
         city = City.create :id => 1
-        city.writers.should =~ [@included_author_1, @included_author_2]
+        city.writers.should == [@included_author_1, @included_author_2]
       end
     end
 

data/spec/enum/enum_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ActiveHash::Base, "enum" do
 

data/spec/lint_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+if Object.const_defined?(:ActiveModel)
+
+  require 'test/unit'
+  require 'test/unit/assertions'
+  require 'active_model/lint'
+
+  describe ActiveModel::Lint do
+    include Test::Unit::Assertions
+    include ActiveModel::Lint::Tests
+
+    before do
+      class Category < ActiveHash::Base
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :Category)
+    end
+
+    # to_s is to support ruby-1.9
+    ActiveModel::Lint::Tests.public_instance_methods.map { |m| m.to_s }.grep(/^test/).each do |m|
+      example m.gsub('_', ' ') do
+        send m
+      end
+    end
+
+    def model
+      Category.new
+    end
+
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'active_record'
 require 'fixjour'
 
@@ -7,14 +7,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'active_hash'
 
-ActiveHash::Base.class_eval do
-  def self.to_ary
-  end
-
-  def self.to_str
-  end
-end
-
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include Fixjour
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 7
-  version: 0.8.7
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Jeff Dean
@@ -27,7 +27,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -07:00
+date: 2010-12-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,40 +56,33 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .document
-- .gitignore
 - CHANGELOG
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
 - VERSION
 - active_hash.gemspec
 - lib/active_file/base.rb
-- lib/active_hash.rb
 - lib/active_hash/base.rb
+- lib/active_hash.rb
 - lib/active_yaml/base.rb
 - lib/associations/associations.rb
 - lib/enum/enum.rb
+- Gemfile
+- Gemfile.lock
 - spec/active_file/base_spec.rb
 - spec/active_hash/base_spec.rb
 - spec/active_yaml/base_spec.rb
 - spec/associations/associations_spec.rb
 - spec/enum/enum_spec.rb
-- spec/fixtures/array_rows.yml
-- spec/fixtures/boroughs.yml
-- spec/fixtures/cities.yml
-- spec/fixtures/countries.yml
-- spec/fixtures/states.yml
+- spec/lint_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/zilkey/active_hash
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -118,9 +111,12 @@ signing_key:
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource
 test_files: 
+- Gemfile
+- Gemfile.lock
 - spec/active_file/base_spec.rb
 - spec/active_hash/base_spec.rb
 - spec/active_yaml/base_spec.rb
 - spec/associations/associations_spec.rb
 - spec/enum/enum_spec.rb
+- spec/lint_spec.rb
 - spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,9 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-.idea
-junk.*
-.bundle/*
-.rvmrc

data/Rakefile

@@ -1,57 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "active_hash"
-    gem.summary = %Q{An ActiveRecord-like model that uses a hash or file as a datasource}
-    gem.email = "jeff@zilkey.com"
-    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",
-      "Ryan Garver",
-      "Tom Stuart",
-      "Joel Chippindale"
-    ]
-    gem.add_dependency('activesupport', [">= 2.2.2"])
-    # gem.post_install_message = ""
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "the-perfect-gem #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/spec/fixtures/array_rows.yml

@@ -1,4 +0,0 @@
-- id: 1
-  name: Row 1
-- id: 2
-  name: Row 2

data/spec/fixtures/boroughs.yml

@@ -1,16 +0,0 @@
-- id: 1
-  name: Manhattan
-  county: New York
-  population: 1634795
-- id: 2
-  name: Brooklyn
-  county: Kings
-  population: 2556598
-- id: 3
-  name: Queens
-  county: Queens
-  population: 2293007
-- id: 4
-  name: Staten Island
-  county: Richmond
-  population: 487407

data/spec/fixtures/cities.yml

@@ -1,8 +0,0 @@
-albany:
-  id: 1
-  state: :new_york
-  name: Albany
-portland:
-  id: 2
-  state: Oregon
-  name: Portland

data/spec/fixtures/countries.yml

@@ -1,15 +0,0 @@
-- id: 1
-  name: US
-  independence_date: 1776-07-04
-  created_at: Wed Jul 22 22:41:44 -0400 2009
-  custom_field_1: value1
-- id: 2
-  name: Canada
-  independence_date: 1867-07-01
-  created_at: Wed Jul 22 22:41:44 -0400 2009
-  custom_field_2: value2
-- id: 3
-  name: Mexico
-  independence_date: 1810-09-16
-  created_at: Wed Jul 22 22:41:44 -0400 2009
-  custom_field_3: value3

data/spec/fixtures/states.yml

@@ -1,6 +0,0 @@
-new_york:
-  id: 1
-  name: New York
-oregon:
-  id: 2
-  name: Oregon