ephemeral 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/ephemeral.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ephemeral"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Ehmke"]
-  s.date = "2012-09-24"
+  s.date = "2013-09-23"
   s.description = "Ephemeral lets you define one-to-many relationships between in-memory objects, with ORM-like support for where clauses and chainable scopes."
   s.email = "corey@idolhands.com"
   s.extra_rdoc_files = [

data/lib/ephemeral/base.rb

@@ -7,21 +7,31 @@ module Ephemeral
 
     def self.included(base)
       base.extend ClassMethods
-      base.send(:attr_accessor, :collections, :relations)
+      base.send(:attr_accessor, :relations)
+      base.send(:attr_writer, :collections)
+    end
+
+    def collections
+      @collections ||= {}
     end
 
     module ClassMethods
 
-      def collects(name, args={})
+      def collects(name=nil, args={})
+        return @@collections unless name
         class_name = args[:class_name] || name.to_s.classify
+        @@collections ||= {}
+        @@collections[name] = Ephemeral::Collection.new(class_name)
+
         self.send :define_method, name do
-          self.collections ||= {}
           self.collections[class_name] ||= Ephemeral::Collection.new(class_name)
+          return [] if self.collections[class_name].empty?
+          self.collections[class_name]
         end
         self.send :define_method, "#{name}=" do |objects|
-          self.collections ||= {}
           self.collections[class_name] = Ephemeral::Collection.new(class_name, objects)
         end
+
       end
 
       def has_one(name, args={})

data/spec/ephemeral_spec.rb

@@ -44,12 +44,12 @@ describe Ephemeral do
     context 'collections' do
 
       it 'defines a collection' do
-        Collector.new.rarities.klass.should == Rarity
-        Collector.new.antiques.klass.should == Antique
+        Collector.collects[:rarities].klass.should == Rarity
+        Collector.collects[:antiques].klass.should == Antique
       end
 
       it 'accepts a class name' do
-        Collector.new.junk.klass.should == NotCollectible
+        Collector.collects[:junk].klass.should == NotCollectible
       end
 
       it 'creates a setter' do
@@ -79,12 +79,15 @@ describe Ephemeral do
 
     context 'relations' do
 
-      before :each do
-        @antique = Antique.new(:name => 'Model T Ford', :item_count => 1, :picker => {:name => "Mike Wolfe"} )
+      it 'initializes with a hash' do
+        antique = Antique.new(:name => 'Model T Ford', :item_count => 1, :picker => {:name => "Mike Wolfe"} )
+        antique.picker.name.should == "Mike Wolfe"
       end
 
       it 'initializes with a materialized object' do
-        @antique.picker.name.should == "Mike Wolfe"
+        picker = Picker.new(:name => 'Mike Wolfe')
+        antique = Antique.new(:name => 'Model T Ford', :item_count => 1, :picker => picker )
+        antique.picker.name.should == "Mike Wolfe"
       end
 
     end
@@ -124,6 +127,10 @@ describe Ephemeral do
 
       end
 
+      it 'initializes with an empty array' do
+        Collector.new.rarities.should == []
+      end
+
       it 'performs a where' do
         @collector.rarities.where(:name => 'Paychecks').should_not be_blank
         @collector.antiques.where(:name => 'Trading Cards').should_not be_blank

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ephemeral
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1586023366873335519
+      hash: 1892452542155194633
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: