belongs_to_hstore 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf262a9e10ec75ac8d7e1a153833ef61f07545de
-  data.tar.gz: a3e34610c95272553f3bbb2d7a31a2ed8b46783c
+  metadata.gz: 39dc6679c57af7b7ec58fb67390f88b79e1c65d4
+  data.tar.gz: 87df0683e7f0c7117f5945f145e6130176ddd4a0
 SHA512:
-  metadata.gz: d2e28a32db4fc0078d5cb99f043768bf76022760ec20b894cfb7de8b9a1679c88679e07ee8c39a6ab956c54b0aaa2e83dedec73ccfe77b21e8639b3160202ec3
-  data.tar.gz: 27e19494aba2c3d9053132154dc2c8ee4899c18f34b98631e290f4d1c37929723c7089ac8c16dfa02b150b3b00efc721212026a30b256f31c4030d29333089fe
+  metadata.gz: 40f37bd2411560d6cbbdba0f434ef5145d3963657f5b8ade05724b5551856add50872d3f73cb6be345916e8ca2c48879d89c1ecf89545d61b27347f002402c20
+  data.tar.gz: de2357f110d067525e1a54bd6644a56816c7ab9a25ecef8d9c5ff974de19351005ea654a377bad6dca0d0852adbf8a749e5a19cdfaa354e97e64c5e3abd09ad5

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p247
+ruby-2.1.0

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"

data/README.md

@@ -1,4 +1,4 @@
-# BelongsToHstore
+# BelongsToHstore [![Build Status](https://travis-ci.org/evanlok/belongs_to_hstore.png?branch=master)](https://travis-ci.org/evanlok/belongs_to_hstore)
 
 Create ActiveRecord belongs_to associations using postgresql hstore columns. Compatible with polymorphic associations
 and supports eager loading.
@@ -23,6 +23,9 @@ Or install it yourself as:
 Create an association using an hstore column:
 ```ruby
 class Audit < ActiveRecord::Base
+  include BelongsToHstore::Association
+  serialize :properties, ActiveRecord::Coders::Hstore # Rails 3 only
+
   belongs_to_hstore :properties, :item
 end
 ```
@@ -30,6 +33,7 @@ end
 Works for polymorphic associations too:
 ```ruby
 class Audit < ActiveRecord::Base
+  include BelongsToHstore::Association
   serialize :properties, ActiveRecord::Coders::Hstore # Rails 3 only
 
   belongs_to_hstore :properties, :item, :polymorphic => true

data/lib/belongs_to_hstore.rb

@@ -3,15 +3,4 @@ require 'belongs_to_hstore/hstore_query_helper'
 require 'belongs_to_hstore/association'
 
 module BelongsToHstore
-  if defined?(Rails)
-    class Railtie < Rails::Railtie
-      initializer "belongs_to_hstore.active_record" do
-        ActiveSupport.on_load :active_record do
-          ActiveRecord::Base.send :include, BelongsToHstore::Association
-        end
-      end
-    end
-  else
-    ActiveRecord::Base.send :include, BelongsToHstore::Association
-  end
 end

data/lib/belongs_to_hstore/association.rb

@@ -3,18 +3,27 @@ module BelongsToHstore
     extend ActiveSupport::Concern
     include BelongsToHstore::HstoreQueryHelper
 
+    included do
+      class_attribute :belongs_to_hstore_attributes, instance_accessor: false, instance_predicate: false
+      self.belongs_to_hstore_attributes = {}
+    end
+
     module ClassMethods
       def belongs_to_hstore(store_attribute, name, options={})
-        @belongs_to_hstore_attributes ||= Set.new
+
+        self.belongs_to_hstore_attributes = self.belongs_to_hstore_attributes.dup
+
         key = options[:foreign_key] || "#{name}_id"
         key_type = key.gsub(/_id$/, '_type')
+
         store_accessor store_attribute, key.to_s
-        @belongs_to_hstore_attributes.add(key.to_s)
+        self.belongs_to_hstore_attributes[key.to_s]= true
 
         if options[:polymorphic]
           store_accessor store_attribute, key_type
-          @belongs_to_hstore_attributes.add(key_type)
+          self.belongs_to_hstore_attributes[key_type]= true
         end
+
         belongs_to name, options
 
         define_singleton_method("where_#{store_attribute}") do |options|
@@ -22,14 +31,10 @@ module BelongsToHstore
         end
       end
 
-      def belongs_to_hstore_attributes
-        attrs = @belongs_to_hstore_attributes || Set.new
-        superclass.respond_to?(:belongs_to_hstore_attributes) ? superclass.belongs_to_hstore_attributes + attrs : attrs
-      end
     end
 
     def read_attribute(attr_name)
-      if self.class.belongs_to_hstore_attributes.include?(attr_name.to_s)
+      if self.class.belongs_to_hstore_attributes[attr_name]
         send(attr_name)
       else
         super
@@ -37,7 +42,7 @@ module BelongsToHstore
     end
 
     def write_attribute(attr_name, attr_value)
-      if self.class.belongs_to_hstore_attributes.include?(attr_name.to_s)
+      if self.class.belongs_to_hstore_attributes[attr_name]
         send("#{attr_name}=", attr_value.to_s)
       else
         super

data/lib/belongs_to_hstore/version.rb

@@ -1,3 +1,3 @@
 module BelongsToHstore
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

data/spec/belongs_to_hstore_spec.rb

@@ -1,18 +1,25 @@
 require 'spec_helper'
 
 class Widget < ActiveRecord::Base
+  include BelongsToHstore::Association
+
   serialize :properties, Hash
 
   belongs_to_hstore :properties, :item
   belongs_to_hstore :properties, :poly_item, :polymorphic => true
 end
 
+class ExtendedWidget < Widget
+  belongs_to_hstore :properties, :additonal_item, :class_name => 'Item'
+end
+
 class Item < ActiveRecord::Base
 end
 
 describe BelongsToHstore do
   let(:item) { Item.create }
   let(:widget) { Widget.new }
+  let(:extended_widget) { ExtendedWidget.new }
 
   it 'sets properties from object' do
     widget.item = item
@@ -43,4 +50,28 @@ describe BelongsToHstore do
       widget.reload.poly_item.class.should == item.class
     end
   end
+
+  context 'subclasses' do
+    it 'sets/gets properties from base class' do
+      extended_widget.item = item
+      extended_widget.poly_item = item
+      extended_widget.properties['item_id'].should == item.id.to_s
+      extended_widget.properties['poly_item_id'].should == item.id.to_s
+      extended_widget.properties['poly_item_type'].should == item.class.to_s
+    end
+
+    it 'sets/gets properties from subclass' do
+      extended_widget.additonal_item = item
+      extended_widget.properties['additonal_item_id'].should == item.id.to_s
+      extended_widget.additonal_item.should == item
+    end
+
+    it 'does not add subclass properties to base class' do
+      expect{widget.additonal_item = item}.to raise_error(NameError)
+      expect{widget.additonal_item}.to raise_error(NameError)
+      Widget.belongs_to_hstore_attributes.should include('item_id')
+      Widget.belongs_to_hstore_attributes.should_not include('additional_item_id')
+    end
+  end
+
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: belongs_to_hstore
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Evan Lok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Allows hstore columns to store belongs_to association foreign keys with
@@ -88,10 +88,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -115,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Allows hstore columns to store belongs_to associations