modelling 0.0.2 → 0.0.4

data/lib/modelling.rb

@@ -32,6 +32,10 @@ module Modelling
     def members
       @members ||= {}
     end
+    
+    def accessors
+      @accessors ||= []
+    end
 
     private
 
@@ -55,6 +59,7 @@ module Modelling
     end
 
     def create_accessor(name)
+      accessors << name
       instance_eval { attr_accessor name }
     end
 
@@ -74,5 +79,32 @@ module Modelling
     end
     args.each { |name, value| send "#{name}=", value }
   end
-
+  
+  def attributes
+    hash = {}
+    self.class.accessors.each do |method_name|
+      hash[method_name] = send(method_name)
+    end
+    hash
+  end
+  
+  def inspect
+    attributes_as_nice_string = attributes.collect { |name, value|
+      "#{name}: #{attribute_for_inspect(value)}"
+    }.compact.join(", ")
+    "#<#{self.class} #{attributes_as_nice_string}>"
+  end
+  
+  def attribute_for_inspect(value)
+    if value.is_a?(String) && value.length > 50
+      "#{value[0..50]}...".inspect
+    elsif value.is_a?(Date) || value.is_a?(Time)
+      %("#{value.to_s(:db)}")
+    elsif value.class.included_modules.include?(Modelling)
+      "#<#{value.class.to_s}>"
+    else
+      value.inspect
+    end
+  end
+  
 end

data/lib/modelling/version.rb

@@ -1,3 +1,3 @@
 module Modelling
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/modelling_spec.rb

@@ -125,7 +125,51 @@ describe Modelling do
   it 'doesnt fail when lambdas with no args are used' do
     LambdaTest.new.lambda.should  eq 'boo'
   end
-
+  
+  specify 'tracks list of accessors' do
+    User.accessors.should include :name, :age
+  end
+  
+  specify 'provides a Hash of attributes and values' do
+    User.new.attributes.key?(:name).should be_true
+    User.new.attributes.key?(:age).should be_true
+    User.new(:name => "Joe").attributes[:name].should eq "Joe"
+  end
+  
+  specify 'converts the attributes hash to a string for inspect' do
+    u = User.new(:name => "Joe")
+    u.inspect.should == "#<User name: \"Joe\", age: nil, test: 3, fav_colours: [], biggest_gripes: []>"
+  end
+  
+  context 'circular references' do
+    
+    before do
+      class FirstModel
+        include Modelling
+        attributes :test => lambda { |me| OtherModel.new(me) }
+      end
+
+      class OtherModel
+        include Modelling
+        attributes :owner
+        def initialize(owner)
+          @owner = owner
+        end
+      end
+    end
+    
+    it 'should not raise an error when inspecting' do
+      expect { FirstModel.new.inspect }.should_not raise_error(SystemStackError)
+    end
+    
+    it 'should show the class name instead of inspecting referenced models' do
+      FirstModel.new.inspect.should include("#<OtherModel>")
+    end
+    
+  end
+  
+  
+  
   context 'inheritence' do
     let(:car) { Car.new }
     let(:super_car) { SuperCar.new }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modelling
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346871923800 !ruby/object:Gem::Requirement
+  requirement: &70222335776840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,7 +24,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346871923800
+  version_requirements: *70222335776840
 description: We were doing PORO dev on Rails before it was hip.
 email:
 - ryan@eden.cc
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: modelling
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Wraps some common-ish plain-ruby object modelling junk.