collabda 0.0.1a → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72411f5cfca47c38d7810c6d0619bfb68fda266a
-  data.tar.gz: 5c73e2d894bbb0d1fbb64c7c527686a4826873f9
+  metadata.gz: 13114a383a52ca5a6177a72200d820379bbfa5b5
+  data.tar.gz: 40bd5d6768707b98d1c0d2b92be9a72b61025cb8
 SHA512:
-  metadata.gz: 647e46c9f8395fd4e99d9534764073ec36408e77dc3663fc9af315872081056678ca2da94c0f41c614169cc78a908ff8dcb699fc6adcba41f0772973dfbc0255
-  data.tar.gz: 762fa5e7c1d0e82ca7937b9d13330c2667c44bdd0147ba78cc5aaadfc58b4af65a0e14de5f9de1c6512218cb3650f9ed4153ce5680354254df8925f32e2ffb5a
+  metadata.gz: cbd2bbcc34f7c71b915cd5963dd62ffdeb74c2b159149f9dc61608e6c6c802d44440c484a1a656b7bfedc6ab426c39172ead16f088aa31c510d9cb99d47d8f91
+  data.tar.gz: 10e0d034de14e5c6a29eeb036e0d3047db38999d2420d5d7ae3b69c84eee69986d3fd71b98f687ce1303580812c94d1d0f2ca82b4851587e0f862a5b63a77e4f

data/lib/collabda.rb

@@ -1,3 +1,6 @@
+require 'json'
+require 'yaml'
+
 module Collabda
   def self.included(base)
     base.extend(Enumerable)
@@ -24,9 +27,12 @@ module Collabda
     return model
   end
 
-  # def self.watch_files
-  #   @classes.map{|c| c.source_path}
-  # end
+  def initialize(attributes_hash={})
+    self.class.instance_variable_get("@properties").each do |attribute|
+      instance_variable_set("@#{attribute}",attributes_hash[attribute])
+    end
+    self.class.register_model(self)
+  end
 
   InvalidSource = Class.new(StandardError)
   MissingAttributes = Class.new(StandardError)
@@ -39,7 +45,12 @@ module Collabda
     end
 
     def all
-      @collabda_models
+      @collabda_models || []
+    end
+
+    def register_model(model)
+      @collabda_models ||= []
+      @collabda_models << model
     end
 
     def each(&block)
@@ -54,17 +65,9 @@ module Collabda
     def build_collection
       check_validity
       fetch_data
-      @collabda_models = @parsed_data.map do |el|
-        build(el)
-      end
-    end
-
-    def build(attributes_hash)
-      model = self.new
-      @properties.each do |attribute|
-        model.instance_variable_set("@#{attribute}",attributes_hash[attribute])
+      @parsed_data.each do |el|
+        self.new(el)
       end
-      model
     end
 
     def properties(*attributes)

data/spec/lib/collabda_spec.rb

@@ -72,10 +72,6 @@ describe "Collabda" do
       expect(Collabda.instance_variable_get(:@classes)).to include FooList
     end
 
-    # it "maintains a list of yaml files to watch" do
-    #   expect(Collabda.watch_files).to include "spec/lib/foo.yaml"
-    # end
-
     it "loads yaml data from file" do
       expect(model_class.parsed_data.count).to eq 3
     end
@@ -95,10 +91,15 @@ describe "Collabda" do
     end
 
     it "can build a new instance from an attributes hash, bypassing yaml" do
-      instance = model_class.build(:name=>"Bat",:description=>"man")
+      YAML.should_not_receive(:load)
+      instance = model_class.new(:name=>"Bat",:description=>"man")
       expect(instance.description).to eq "man"
     end
 
+    it "adds to collection when creating an external instance with new" do
+      expect{model_class.new(:name=>"Bat",:description=>"man")}.to change{model_class.all.count}.by 1
+    end
+
     context "when collection built" do
       before(:each){model_class.build_collection}
       it "it provides access to all models" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collabda
 version: !ruby/object:Gem::Version
-  version: 0.0.1a
+  version: 0.0.1
 platform: ruby
 authors:
 - James Edwards-Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -47,9 +47,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.9