simple_hstore_accessor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmZlZjcxZTE1YTNiNGRjZTA4OTAyZTFkNzlhNTM0YzRmYTljOGU0MA==
-  data.tar.gz: !binary |-
-    MTgwNzNhY2Q3YjAwMDQ4ODViNjg5MzNiM2E0MmViNTZhOGQ1NmYzMQ==
+SHA1:
+  metadata.gz: e5f069e33e0657ec3220df25f0165bb5e3150f2a
+  data.tar.gz: ffd0cb5ba7bbce7ab89e128ec7bc97efe32577c7
 SHA512:
-  metadata.gz: !binary |-
-    ZDk1ZTJlOWI2NzExMjI2YTFkYmMzNzg2MmMyMGE2YzUwZmJhOTg4NDUxNWU1
-    N2E4Nzg1YTZiYmNiZjViMzU2ODFkMTc1YmQ5NmU0NmZkYmZhMjMzODhkOTI5
-    ZTFmNDAyYWVlNDAwNDY5M2JiZmYzZGE4OTdjOGYzYjUzNTEyZjA=
-  data.tar.gz: !binary |-
-    MzVmMWZlZmE4ODlkMzRiY2RhYzA3OTlhOGM2MDg0NWE5YWRiODE4NDM0ODM1
-    NDM2MGI0MWYxZDRkOGIyNjVhOTkxMDBkM2I5MDM0ZjNmNDIzNTQ3NGYxM2Jj
-    OTY3ZTk0MGMyYTZmOGM4MTc3ZWM4OTI4ZDgwMWMxMDM4NWI0OWQ=
+  metadata.gz: a4c2430df1a81c6e7c69b7ee3807999a905ee6b92350aa44fdfd6dcb2a3687341c5370a4e735a9ad3ddf21bda292fba3ab3f699d19b6f0b0d1c4ef524cd704b9
+  data.tar.gz: 7fa18a717eb1ae5fe8d8e76c075196e2ca80cd0be29fba1cac6d8be9d1cb3342662db2b6dc49c4418267ce51c178facae34bfde5bd40e62e2484bde268b2f74b

data/.gitignore

@@ -16,3 +16,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+gemfiles/
+.ruby-version
+.ruby-gemset
+Makefile.local

data/Appraisals

@@ -1,11 +1,11 @@
 appraise 'rails3.1' do
   gem 'rails', '~> 3.1.0'
-  gem 'activerecord-postgres-hstore', '~> 0.6.0'
+  gem 'activerecord-postgres-hstore', require: false
 end
 
 appraise 'rails3.2' do
   gem 'rails', '~> 3.2.0'
-  gem 'activerecord-postgres-hstore', '~> 0.6.0'
+  gem 'activerecord-postgres-hstore', require: false
 end
 
 appraise 'rails4.0' do

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+
+#### [Current]
+ * 2016-02-04 [2ff69e5](../../commit/2ff69e5) - __(evseevleo)__ fix(hstore_accsessor): nil accessor_keys in subclasses
+ * 2016-01-29 [670a23c](../../commit/670a23c) - __(evseevleo)__ fix(simple_hstore_accessor): flatten keys in store_accessor
+ * 2016-01-15 [f2f6acc](../../commit/f2f6acc) - __(Konstantin Lazarev)__ feature: add read/write_attribute methods
+ * 2015-10-07 [8134d71](../../commit/8134d71) - __(Andrew N. Shalaev)__ fix: clean dependencies
+ * 2015-10-06 [4acfbd1](../../commit/4acfbd1) - __(Andrew N. Shalaev)__ fix: using last version for activerecord-postgres-hstore
+
+#### v0.1.0
+ * 2015-09-03 [2006165](../../commit/2006165) - __(Sergey D)__ Release v0.1.0
+ * 2015-06-03 [29cad8f](../../commit/29cad8f) - __(Sergey D)__ feature(hstore-serialize): adds hstore coder
+ * 2015-09-02 [35f83fe](../../commit/35f83fe) - __(Stanislav Gordanov)__ fix(offer): исправление нормализации внешней ссылки на акцию
+
+#### v0.0.2
+ * 2015-06-02 [20959e8](../../commit/20959e8) - __(Sergey D)__ chore(version): change due to yanked gem release
+
+#### v0.0.1
+ * 2015-06-02 [cce0634](../../commit/cce0634) - __(Sergey D)__ Initial commit #2
+ * 2015-06-02 [a880e53](../../commit/a880e53) - __(Sergey D)__ first commit

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in simple_hstore_accessor.gemspec
 gemspec
+
+gem 'activerecord-postgres-hstore', require: false
+
+group :test do
+  gem 'combustion', github: 'pat/combustion'
+end

data/Makefile

@@ -1,28 +1,32 @@
 RAILS_ENV = test
 BUNDLE = RAILS_ENV=${RAILS_ENV} bundle
-BUNDLE_OPTIONS = -j 2
+BUNDLE_OPTIONS = --jobs=3
 RSPEC = rspec
 APPRAISAL = appraisal
 
 all: test
 
-test: config/database bundler/install appraisal/install
+test: configs bundler appraisal
 	${BUNDLE} exec ${APPRAISAL} ${RSPEC} spec 2>&1
 
-config/database:
-	touch spec/internal/config/database.yml
-	echo 'test:' >> spec/internal/config/database.yml
-	echo '  adapter: postgresql' >> spec/internal/config/database.yml
-	echo '  database: docker' >> spec/internal/config/database.yml
-	echo '  username: docker' >> spec/internal/config/database.yml
-	echo '  host: localhost' >> spec/internal/config/database.yml
-	echo '  min_messages: warning' >> spec/internal/config/database.yml
+define DATABASE_YML
+test:
+  adapter: postgresql
+  database: docker
+  username: docker
+  host: localhost
+  min_messages: warning
+endef
+export DATABASE_YML
 
-bundler/install:
+configs:
+	echo "$${DATABASE_YML}" > spec/internal/config/database.yml
+
+bundler:
 	if ! gem list bundler -i > /dev/null; then \
 	  gem install bundler; \
 	fi
 	${BUNDLE} install ${BUNDLE_OPTIONS}
 
-appraisal/install:
+appraisal:
 	${BUNDLE} exec ${APPRAISAL} install

data/lib/simple_hstore_accessor.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 require 'active_record'
-require 'activerecord-postgres-hstore'
+require 'activerecord-postgres-hstore' if ::ActiveRecord::VERSION::MAJOR < 4
 require 'simple_hstore_accessor/version'
 
 module SimpleHstoreAccessor
@@ -17,9 +17,13 @@ module SimpleHstoreAccessor
   #
   # Returns nothing
   def store_accessor(hstore_attribute, *keys)
-    serialize hstore_attribute, ActiveRecord::Coders::Hstore
+    if defined?(ActiveRecord::Coders::Hstore)
+      serialize hstore_attribute, ActiveRecord::Coders::Hstore
+    end
+
+    accessor_keys = Array(keys).flatten.map(&:to_sym)
 
-    Array(keys).flatten.each do |key|
+    accessor_keys.each do |key|
       define_method("#{key}=") do |value|
         send("#{hstore_attribute}_will_change!")
         send("#{hstore_attribute}=", (send(hstore_attribute) || {}).merge(key.to_s => value))
@@ -31,6 +35,22 @@ module SimpleHstoreAccessor
       define_method("#{key}_changed?") { attribute_changed?(key.to_s) }
     end
 
+    define_method :write_attribute do |attr_name, value|
+      if accessor_keys.include?(attr_name.to_sym)
+        public_send("#{attr_name}=", value)
+      else
+        super(attr_name, value)
+      end
+    end
+
+    define_method :read_attribute do |attr_name|
+      if accessor_keys.include?(attr_name.to_sym)
+        public_send(attr_name)
+      else
+        super(attr_name)
+      end
+    end
+
     define_method("#{hstore_attribute}=") do |new_properties|
       current_properties = send(hstore_attribute) || {}
 

data/lib/simple_hstore_accessor/version.rb

@@ -1,3 +1,3 @@
 module SimpleHstoreAccessor
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

data/simple_hstore_accessor.gemspec

@@ -18,16 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activerecord', '>= 3.1'
+  spec.add_runtime_dependency 'activerecord', '>= 3.1', '< 5.0'
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'activerecord-postgres-hstore', '~> 0.6.0'
+  spec.add_runtime_dependency 'activerecord-postgres-hstore'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake'
 
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'rspec', '>= 2.14.0'
   spec.add_development_dependency 'appraisal', '>= 1.0.2'
-  spec.add_development_dependency 'combustion', '>= 0.5.3'
-  spec.add_development_dependency 'pry-debugger'
+  spec.add_development_dependency 'combustion'
 end

data/spec/app/models/dummy_argument_spec.rb

@@ -0,0 +1,18 @@
+# coding: utf-8
+require 'spec_helper'
+
+describe DummyArgument do
+  let(:dummy) { described_class.new(latitude: 7, longitude: 11) }
+
+  it { expect(dummy).to respond_to(:properties) }
+
+  it { expect(dummy).to respond_to(:latitude) }
+  it { expect(dummy).to respond_to(:latitude=) }
+  it { expect(dummy).to respond_to(:latitude_will_change!) }
+  it { expect(dummy).to respond_to(:latitude_changed?) }
+
+  it { expect(dummy).to respond_to(:longitude) }
+  it { expect(dummy).to respond_to(:longitude=) }
+  it { expect(dummy).to respond_to(:longitude_will_change!) }
+  it { expect(dummy).to respond_to(:longitude_changed?) }
+end

data/spec/app/models/dummy_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Dummy do
   let(:dummy) { described_class.new(latitude: 7, longitude: 11) }
 
-  it { expect(dummy).to respond_to(:coordinates) }
+  it { expect(dummy).to respond_to(:properties) }
 
   it { expect(dummy).to respond_to(:latitude) }
   it { expect(dummy).to respond_to(:latitude=) }
@@ -85,4 +85,46 @@ describe Dummy do
       end
     end
   end
+
+  describe '#write_attribute' do
+    context 'when called with hstore attribute' do
+      before { dummy.write_attribute(:longitude, 5) }
+
+      it { expect(dummy.longitude).to eq(5) }
+    end
+
+    context 'when called with regular attribute' do
+      before { dummy.write_attribute(:regular_attribute, 'changed') }
+
+      it { expect(dummy.regular_attribute).to eq('changed') }
+    end
+  end
+
+  describe '#read_attribute' do
+    context 'when called with hstore attribute' do
+      it { expect(dummy.read_attribute(:longitude)).to eq(dummy.longitude) }
+    end
+
+    context 'when called with regular attribute' do
+      it { expect(dummy.read_attribute(:regular_attribute)).to eq(dummy.regular_attribute) }
+    end
+  end
+
+  context 'when hstore attribute is used as an association key' do
+    let(:dummy_association) { DummyAssociation.create }
+    let(:dummy) { described_class.create }
+
+    before do
+      dummy.dummy_association = dummy_association
+      dummy.save
+    end
+
+    describe '#dummy_association_id' do
+      it { expect(dummy.dummy_association_id.to_i).to eq(dummy_association.id) }
+    end
+
+    describe '#dummy_association' do
+      it { expect(described_class.find(dummy.id).dummy_association).to eq(dummy_association) }
+    end
+  end
 end

data/spec/app/models/dummy_subclass_spec.rb

@@ -0,0 +1,49 @@
+# coding: utf-8
+require 'spec_helper'
+
+describe Dummies::DummySubclass do
+  let(:dummy) { described_class.new(latitude: 7, longitude: 11) }
+
+  it { expect(dummy).to respond_to(:properties) }
+
+  it { expect(dummy).to respond_to(:latitude) }
+  it { expect(dummy).to respond_to(:latitude=) }
+  it { expect(dummy).to respond_to(:latitude_will_change!) }
+  it { expect(dummy).to respond_to(:latitude_changed?) }
+
+  it { expect(dummy).to respond_to(:longitude) }
+  it { expect(dummy).to respond_to(:longitude=) }
+  it { expect(dummy).to respond_to(:longitude_will_change!) }
+  it { expect(dummy).to respond_to(:longitude_changed?) }
+
+  it { expect(dummy).to respond_to(:write_attribute) }
+  it { expect(dummy).to respond_to(:read_attribute) }
+
+  describe '#latitude=' do
+    it { expect { dummy.latitude = 14 }.to change { dummy.latitude }.from(7).to(14) }
+  end
+
+  describe '#write_attribute' do
+    context 'when called with hstore attribute' do
+      before { dummy.write_attribute(:longitude, 5) }
+
+      it { expect(dummy.longitude).to eq(5) }
+    end
+
+    context 'when called with regular attribute' do
+      before { dummy.write_attribute(:regular_attribute, 'changed') }
+
+      it { expect(dummy.regular_attribute).to eq('changed') }
+    end
+  end
+
+  describe '#read_attribute' do
+    context 'when called with hstore attribute' do
+      it { expect(dummy.read_attribute(:longitude)).to eq(dummy.longitude) }
+    end
+
+    context 'when called with regular attribute' do
+      it { expect(dummy.read_attribute(:regular_attribute)).to eq(dummy.regular_attribute) }
+    end
+  end
+end

data/spec/internal/app/models/dummies/dummy_subclass.rb

@@ -0,0 +1,5 @@
+# coding: utf-8
+module Dummies
+  class DummySubclass < Dummy
+  end
+end

data/spec/internal/app/models/dummy.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 class Dummy < ActiveRecord::Base
-  serialize :coordinates, ActiveRecord::Coders::Hstore if ::ActiveRecord::VERSION::MAJOR < 4
-  store_accessor :coordinates, :latitude, :longitude
+  store_accessor :properties, :latitude, :longitude, :dummy_association_id
+
+  belongs_to :dummy_association
 end

data/spec/internal/app/models/dummy_argument.rb

@@ -0,0 +1,4 @@
+# coding: utf-8
+class DummyArgument < ActiveRecord::Base
+  store_accessor :properties, [:latitude, :longitude]
+end

data/spec/internal/app/models/dummy_association.rb

@@ -0,0 +1,4 @@
+# coding: utf-8
+
+class DummyAssociation < ActiveRecord::Base
+end

data/spec/internal/db/schema.rb

@@ -1,5 +1,13 @@
 ActiveRecord::Schema.define do
   create_table(:dummies, :force => true) do |t|
-    t.column :coordinates, :hstore
+    t.column :properties, :hstore
+    t.string :regular_attribute
+  end
+
+  create_table(:dummy_arguments, :force => true) do |t|
+    t.column :properties, :hstore
+  end
+
+  create_table(:dummy_associations, :force => true) do |t|
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
 require 'simple_hstore_accessor'
-require 'activerecord-postgres-hstore' if ::ActiveRecord::VERSION::MAJOR < 4
 
 require 'combustion'
 Combustion.initialize! :active_record

metadata

@@ -1,155 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: simple_hstore_accessor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergey D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
+        version: '0'
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   name: activerecord-postgres-hstore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
+        version: '1.7'
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
+        version: '0'
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 2.14.0
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.0
-- !ruby/object:Gem::Dependency
+        version: 1.0.2
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: pry-debugger
+        version: '0'
+  name: combustion
   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: Simple Hstore Accessor extension for Rails 3
 email:
 - sclinede@gmail.com
@@ -160,17 +152,22 @@ files:
 - .gitignore
 - .rspec
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - Makefile
 - README.md
 - Rakefile
-- gemfiles/.gitignore
 - lib/simple_hstore_accessor.rb
 - lib/simple_hstore_accessor/version.rb
 - simple_hstore_accessor.gemspec
+- spec/app/models/dummy_argument_spec.rb
 - spec/app/models/dummy_spec.rb
+- spec/app/models/dummy_subclass_spec.rb
+- spec/internal/app/models/dummies/dummy_subclass.rb
 - spec/internal/app/models/dummy.rb
+- spec/internal/app/models/dummy_argument.rb
+- spec/internal/app/models/dummy_association.rb
 - spec/internal/config/.gitignore
 - spec/internal/config/environments/test.rb
 - spec/internal/db/schema.rb
@@ -188,23 +185,28 @@ 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.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simple Hstore Accessor extension for Rails 3
 test_files:
+- spec/app/models/dummy_argument_spec.rb
 - spec/app/models/dummy_spec.rb
+- spec/app/models/dummy_subclass_spec.rb
+- spec/internal/app/models/dummies/dummy_subclass.rb
 - spec/internal/app/models/dummy.rb
+- spec/internal/app/models/dummy_argument.rb
+- spec/internal/app/models/dummy_association.rb
 - spec/internal/config/.gitignore
 - spec/internal/config/environments/test.rb
 - spec/internal/db/schema.rb

data/gemfiles/.gitignore

@@ -1,2 +0,0 @@
-*.gemfile.lock
-*.gemfile