active_record_stash 0.1.2 → 0.1.3

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+*.sqlite3

data/active_record_stash.gemspec

@@ -19,6 +19,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "pry"
+  s.add_runtime_dependency "activerecord"
+  s.add_runtime_dependency "activemodel"
+  s.add_runtime_dependency "activesupport", "> 3.1.0"
 end

data/lib/active_record_stash.rb

@@ -6,23 +6,21 @@ module ActiveRecordStash
 
   NO_TARGET_ERROR = "stashing needs a target serialized column. Supply an options hash with a :in key as the last argument (e.g. stash :apple, :in => :greeter)."
 
-  included do
+  included do |klass|
     class_attribute :stashed_attributes
-    self.stashed_attributes = Hash.new([])
-
-    after_initialize :_load_stashed_attributes
-    before_save :_stash_attributes
+    klass.stashed_attributes = {}
+    klass.after_initialize :_load_stashed_attributes
+    klass.before_save :_stash_attributes
   end
 
   private
   def _load_stashed_attributes
     stashed_attributes.each_pair do |store_name,methods|
-      store = send(store_name)
 
-      next unless store
+      return unless store = send(store_name)
 
       methods.each do |method|
-        send :"#{method}=", store[method] unless send(method)
+        send :"#{method}=", store[method] if respond_to? method
       end
 
     end
@@ -31,12 +29,12 @@ module ActiveRecordStash
   def _stash_attributes
     stashed_attributes.each_pair do |store_name,methods|
 
-      eval "self.#{store_name} ||= {}"
-
-      methods.each do |method|
-        send(store_name)[method] = send method
+      data = methods.inject({}) do |data,method|
+        data[method] = send method
+        data
       end
 
+      self[store_name] = data
     end
   end
 
@@ -51,7 +49,8 @@ module ActiveRecordStash
         raise ArgumentError,  NO_TARGET_ERROR
       end
 
-      stashed_attributes[serialized_column] += methods.map(&:to_sym)
+      self.stashed_attributes = {}
+      self.stashed_attributes[serialized_column] = methods.map(&:to_sym)
 
       serialize serialized_column
       attr_accessor *methods

data/lib/active_record_stash/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordStash
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/active_record_stash_spec.rb

@@ -1,14 +1,24 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'active_support/concern'
+require 'active_record'
+require 'active_model'
+require './lib/active_record_stash'
 
-conn = { 
+conn = {
   :adapter => 'sqlite3',
   :database => 'activerecord_unittest',
   :database => 'spec/testing.sqlite3',
-  :encoding => 'utf8' 
+  :encoding => 'utf8'
 }
 
 ActiveRecord::Base.establish_connection(conn)
 
+class User < ActiveRecord::Base
+  connection.create_table :users, :force => true do |t|
+    t.string :name
+    t.timestamps
+  end
+end
+
 class Email < ActiveRecord::Base
   connection.create_table :emails, :force => true do |t|
     t.string :name
@@ -20,115 +30,96 @@ class Email < ActiveRecord::Base
   stash :phone, :address, :postal_code, :in => :data
 end
 
-describe ActiveRecord::Stash do
+describe 'ActiveRecordStash' do
   describe "new object initialization" do
-    before(:all) do
-      @email = Email.new(
-        :phone        => "123456789", 
-        :address      => "1234 Apple way", 
+    subject do
+      Email.new(
+        :phone        => "123456789",
+        :address      => "1234 Apple way",
         :postal_code  => "13244"
       )
     end
 
-    it "is a valid object" do
-      @email.should be_valid
-    end
-
-    it "has all the correct forward facing attributes" do
-      @email.phone.should match("123456789")
-      @email.address.should match("1234 Apple way")
-      @email.postal_code.should match("13244")
-    end
-
-    it "has an empty data column" do
-      @email.data.should be_nil
-    end
-
-    describe "save" do 
-      it "is successful" do
-        @email.save.should be_true
-      end
-
-      it "still has the correct forward facing attributes" do
-        @email.phone.should match("123456789")
-        @email.address.should match("1234 Apple way")
-        @email.postal_code.should match("13244")
-      end
-
-      it "does not have an empty data column" do
-        @email.data.should_not be_empty
-      end
-
-      it "has the correct serialized data in the serialized column" do
+    it { should be_valid }
+    its(:phone){       should match("123456789") }
+    its(:address){     should match("1234 Apple way") }
+    its(:postal_code){ should match("13244") }
+    its(:data){        should be_nil }
 
-        @email.data.should eql({
-          :phone        =>  "123456789", 
-          :address      =>  "1234 Apple way", 
-          :postal_code  =>  "13244"
-        })
-      end
-    end
   end
 
   describe "object creation" do
-    before :all do
+    subject do
       @email = Email.create(
-        :phone        => "123456789", 
-        :address      => "1234 Apple way", 
+        :phone        => "123456789",
+        :address      => "1234 Apple way",
         :postal_code  => "13244"
       )
-    end
-
-    it "is a valid object" do
-      @email.should be_valid
-    end
 
-    it "still has the correct forward facing attributes" do
-      @email.phone.should match("123456789")
-      @email.address.should match("1234 Apple way")
-      @email.postal_code.should match("13244")
+      @email.reload
     end
-    it "does not have an empty data column" do
-      @email.data.should_not be_empty
-    end
-
-    it "has the correct serialized data in the serialized column" do
-
-      @email.data.should eql({
-        :phone        =>  "123456789", 
-        :address      =>  "1234 Apple way", 
+    it { should be_valid }
+
+    its(:phone)       { should match("123456789") }
+    its(:address)     { should match("1234 Apple way") }
+    its(:postal_code) { should match("13244") }
+    its(:data) do
+      should eql({
+        :phone        =>  "123456789",
+        :address      =>  "1234 Apple way",
         :postal_code  =>  "13244"
       })
     end
 
     describe "#update_attributes" do
       before :all do
-        @email.update_attributes({
+        subject.update_attributes({
           :phone   => "2222222",
           :address => "4321 yaw elppa"
         })
       end
-      it "has no errors" do
-        @email.errors.any?.should be_false
-      end
-
-      it "does not have an empty data column" do
-        @email.data.should_not be_empty
-      end
-
-      it "has all the expected contents of the data column" do
-        @email.data.should eql({
+      its(:errors) { should_not be_any }
+      its(:data)   { should_not be_empty }
+      its(:data) do
+        should eql({
           :phone   => "2222222",
           :address => "4321 yaw elppa",
           :postal_code => "13244"
         })
       end
+      its(:phone)   { should match("2222222") }
+      its(:address) { should match("4321 yaw elppa") }
+      its(:postal_code) { should match("13244") }
+    end
+  end
+  describe 'artifact cleanup between classes' do
+    it 'non-stashed object -> stashed object -> non-stashed object' do
+      email = Email.create
+      user  = User.create
+      email.reload
+      user.reload
+    end
+  end
 
-    it "still has the correct forward facing attributes" do
-      @email.phone.should match("2222222")
-      @email.address.should match("4321 yaw elppa")
-      @email.postal_code.should match("13244")
+  describe 'inheritence, where child should inherit stash' do
+    subject do
+      class SpecialEmail < Email
+      end
+      SpecialEmail
     end
+
+    its(:stashed_attributes) { should ==({data: [:phone, :address, :postal_code]}) }
+  end
+
+  describe 'inheritence, where child should NOT inherit stash' do
+    subject do
+      class SpecialEmail < Email
+        stash in: :data
+      end
+      SpecialEmail
     end
+
+    its(:stashed_attributes) { should_not==({data: [:phone, :address, :postal_code]}) }
+    its(:stashed_attributes) { should ==({data: []}) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_stash
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-01-23 00:00:00.000000000Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70107239613000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70107239613000
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70107239612580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70107239612580
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70107239612160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70107239612160
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70107239611740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70107239611740
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70107239611320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70107239611320
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70107239610820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70107239610820
 description: ActiveRecordStash provides a helpful syntax, which faciliates active_model
   compliant attributes, which are stored within a single serialized attribute. Poor
   mans NoSQL with AR
@@ -34,7 +100,6 @@ files:
 - lib/active_record_stash/version.rb
 - spec/active_record_stash_spec.rb
 - spec/spec.opts
-- spec/spec_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -62,5 +127,4 @@ summary: Validations for serialized ActiveRecrd fields
 test_files:
 - spec/active_record_stash_spec.rb
 - spec/spec.opts
-- spec/spec_helper.rb
 has_rdoc: 

data/spec/spec_helper.rb

@@ -1,18 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'rubygems'
-require 'bundler'
-
-Bundler.setup
-
-require 'active_support/concern'
-require 'active_record'
-require 'active_model'
-require 'active_record_stash'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end