hstore-document 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6b822aa3298952dc3444dc2c5198d92c7901aae
-  data.tar.gz: 2e08a5d7627f638ffd4c68d9618075172832f312
+  metadata.gz: 89ad567e63bc104409c20552510d962c1613a408
+  data.tar.gz: b8508c43a63da84b333424149e7c583e644efecf
 SHA512:
-  metadata.gz: eba7709d09faff0caf967936a1be26ed47c6e5a2e937d1d500b79144555f7f58926cb3f4711dbc33e476cbe399ea273e813c756c9c7aa1990f23554d8ed35290
-  data.tar.gz: 3206bd0eaaa2fbc5d957191247fef144e4e5f8d5078e1c73d3256214ec21beb97130a28964b93eaedb4e10418c23927e2fa5168748aa695d8282a61290f2a712
+  metadata.gz: 16f62b9048333f3a2ee7ab44637f2cc288193ed39cb47237155cc81bc4f623200b01383cf928424f82e460a456efa66519e8eae7f3755f37824dffc744213620
+  data.tar.gz: a9f276b5469cb1dd00bdba0a4fec7b8945fadcf9a8bdb7c29f3579bb1f00abb0d9735907503418e6c2eff55c2f7b91610b6c1128ad8d73a1a47d4a0505566ddc

data/Gemfile

@@ -6,16 +6,15 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.14"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 1.8.7"
-  gem "pry"
-  gem "pry-debugger"
+  gem "rspec"
+  gem "rdoc"
+  gem "bundler"
+  gem "jeweler"
+  gem "pry-byebug"
   gem "guard"
   gem "guard-rspec"
 end
 
 gem 'pg'
 gem 'pg-hstore'
-gem 'activerecord', '>=3.2', '<4.1'
+gem 'activerecord', '>=3.2', '<5'

data/Gemfile.lock

@@ -1,137 +1,137 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.0.4)
-      activesupport (= 4.0.4)
-      builder (~> 3.1.0)
-    activerecord (4.0.4)
-      activemodel (= 4.0.4)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.4)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.4)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
+      arel (~> 5.0.0)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
-    arel (4.0.2)
-    atomic (1.1.16)
-    builder (3.1.4)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    byebug (3.4.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     coderay (1.1.0)
-    columnize (0.3.6)
-    debugger (1.6.6)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.2)
+    columnize (0.8.9)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    ffi (1.9.3)
-    formatador (0.2.4)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.5)
+    formatador (0.2.5)
+    git (1.2.8)
+    github_api (0.12.1)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    guard (2.6.0)
+    guard (2.6.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.2.8)
+    guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    hashie (2.0.5)
+    hashie (3.3.1)
     highline (1.6.21)
-    i18n (0.6.9)
-    jeweler (1.8.8)
+    hitimes (1.2.2)
+    i18n (0.6.11)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    listen (2.7.1)
+    jwt (1.0.0)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.5)
+    lumberjack (1.0.9)
     method_source (0.8.2)
-    minitest (4.7.5)
-    multi_json (1.9.2)
+    mini_portile (0.6.0)
+    minitest (5.4.1)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nio4r (1.0.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.3)
+    multipart-post (2.0.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     pg (0.17.1)
     pg-hstore (1.2.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
+    pry-byebug (2.0.0)
+      byebug (~> 3.4)
+      pry (~> 0.10)
     rack (1.5.2)
-    rake (10.2.2)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdoc (3.12.2)
+    rdoc (4.1.2)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    slop (3.5.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.4)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
+    slop (3.6.0)
     thor (0.19.1)
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
-    timers (1.1.0)
-    tzinfo (0.3.39)
+    thread_safe (0.3.4)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.2, < 4.1)
-  bundler (~> 1.0)
+  activerecord (>= 3.2, < 5)
+  bundler
   guard
   guard-rspec
-  jeweler (~> 1.8.7)
+  jeweler
   pg
   pg-hstore
-  pry
-  pry-debugger
-  rdoc (~> 3.12)
-  rspec (~> 2.14)
+  pry-byebug
+  rdoc
+  rspec

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
+guard :rspec, cmd: 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/README.md

@@ -45,7 +45,7 @@ An example is worth a thousand words:
 
 ## TODO
 
-* Rails 4.1 support
+* ActiveRecord 5.0 support
 * Query support, e.g. Person.where('address.street' => 'Elm')
 
 ## Contributing to hstore-document

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/hstore-document.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: hstore-document 0.1.0 ruby lib
+# stub: hstore-document 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hstore-document"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roman Shterenzon"]
-  s.date = "2014-04-22"
+  s.date = "2014-09-26"
   s.description = "Allows embedding documents in ActiveRecord models using PostgreSQL HStore"
   s.email = "roman.shterenzon@gmail.com"
   s.extra_rdoc_files = [
@@ -52,38 +52,35 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<pg>, [">= 0"])
       s.add_runtime_dependency(%q<pg-hstore>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, ["< 4.1", ">= 3.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.14"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<pry-debugger>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, ["< 5", ">= 3.2"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<pry-byebug>, [">= 0"])
       s.add_development_dependency(%q<guard>, [">= 0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
     else
       s.add_dependency(%q<pg>, [">= 0"])
       s.add_dependency(%q<pg-hstore>, [">= 0"])
-      s.add_dependency(%q<activerecord>, ["< 4.1", ">= 3.2"])
-      s.add_dependency(%q<rspec>, ["~> 2.14"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<pry-debugger>, [">= 0"])
+      s.add_dependency(%q<activerecord>, ["< 5", ">= 3.2"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<pry-byebug>, [">= 0"])
       s.add_dependency(%q<guard>, [">= 0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<pg>, [">= 0"])
     s.add_dependency(%q<pg-hstore>, [">= 0"])
-    s.add_dependency(%q<activerecord>, ["< 4.1", ">= 3.2"])
-    s.add_dependency(%q<rspec>, ["~> 2.14"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<pry-debugger>, [">= 0"])
+    s.add_dependency(%q<activerecord>, ["< 5", ">= 3.2"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<pry-byebug>, [">= 0"])
     s.add_dependency(%q<guard>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
   end

data/lib/active_record/associations/builder/embeds_one.rb

@@ -12,6 +12,10 @@ module ActiveRecord
         def macro
           :embeds_one
         end
+
+        def valid_options
+          super + [:class_name]
+        end
       end
     end
   end

data/lib/active_record/associations/embeds_one_association.rb

@@ -2,17 +2,32 @@ require 'active_record/associations/association'
 
 module ActiveRecord
   module Associations
-    module ClassMethods
-      # @param [Symbol, String] name of association
-      # @param [Hash] options
-      # @option options [Boolean] :validate Validate associaited object (default: true)
-      # @option options [String] :class_name Name of the associated class
-      def embeds(name, options = {})
-        validates_associated(name) unless options.delete(:validate) == false
-        if ActiveRecord::VERSION::MAJOR < 4
-          Builder::EmbedsOne.build(self, name, options)
-        else
-          Builder::EmbedsOne.build(self, name, options, nil)
+    if ActiveRecord::VERSION::STRING >= '4.1'
+      module ClassMethods
+        # @param [Symbol, String] name of association
+        # @param scope
+        # @param [Hash] options
+        # @option options [Boolean] :validate Validate associaited object (default: true)
+        # @option options [String] :class_name Name of the associated class
+        def embeds(name, scope = nil, options = {}, &extension)
+          validates_associated(name) unless options.delete(:validate) == false
+          reflection = Builder::EmbedsOne.build(self, name, options, nil)
+          Reflection.add_reflection self, name, reflection
+        end
+      end
+    else
+      module ClassMethods
+        # @param [Symbol, String] name of association
+        # @param [Hash] options
+        # @option options [Boolean] :validate Validate associaited object (default: true)
+        # @option options [String] :class_name Name of the associated class
+        def embeds(name, options = {})
+          validates_associated(name) unless options.delete(:validate) == false
+          if ActiveRecord::VERSION::MAJOR < 4
+            Builder::EmbedsOne.build(self, name, options)
+          else
+            Builder::EmbedsOne.build(self, name, options, nil)
+          end
         end
       end
     end

data/lib/active_record/embeds_reflection.rb

@@ -3,38 +3,71 @@ require 'active_record/reflection'
 
 module ActiveRecord
   module Reflection
-    class AssociationReflection # :nodoc:
-      def association_class_with_embeds_one
-        if macro == :embeds_one
-          Associations::EmbedsOneAssociation
-        else
-          association_class_without_embeds_one
+    if ActiveRecord::VERSION::STRING >= '4.1'
+      class EmbedsOneReflection < AssociationReflection # :nodoc:
+        def initialize(name, scope, options, active_record)
+          super(macro, name, scope, options, active_record)
+        end
+
+        def macro; :embeds_one; end
+
+        def embeds_one?; true; end
+
+        def association_class_with_embeds_one
+          if macro == :embeds_one
+            Associations::EmbedsOneAssociation
+          else
+            association_class_without_embeds_one
+          end
         end
+
+        alias_method_chain :association_class, :embeds_one
       end
-      alias_method_chain :association_class, :embeds_one
-    end
 
-    module ClassMethods # :nodoc:
-      if ActiveRecord::VERSION::MAJOR < 4
-        def create_reflection_with_embeds(macro, name, options, active_record)
+      class << self
+        def create_with_embeds(macro, name, scope, options, active_record)
           unless macro == :embeds_one
-            return create_reflection_without_embeds(macro, name, options, active_record)
+            return create_without_embeds(macro, name, scope, options, active_record)
           end
-          AssociationReflection.new(macro, name, options, active_record).tap do |reflection|
-            reflections.merge!(name => reflection)
+          EmbedsOneReflection.new(name, scope, options, active_record)
+        end
+
+        alias_method_chain :create, :embeds
+      end
+    else
+      class AssociationReflection # :nodoc:
+        def association_class_with_embeds_one
+          if macro == :embeds_one
+            Associations::EmbedsOneAssociation
+          else
+            association_class_without_embeds_one
           end
         end
-      else
-        def create_reflection_with_embeds(macro, name, scope, options, active_record)
-          unless macro == :embeds_one
-            return create_reflection_without_embeds(macro, name, scope, options, active_record)
+        alias_method_chain :association_class, :embeds_one
+      end
+
+      module ClassMethods # :nodoc:
+        if ActiveRecord::VERSION::MAJOR < 4
+          def create_reflection_with_embeds(macro, name, options, active_record)
+            unless macro == :embeds_one
+              return create_reflection_without_embeds(macro, name, options, active_record)
+            end
+            AssociationReflection.new(macro, name, options, active_record).tap do |reflection|
+              reflections.merge!(name => reflection)
+            end
           end
-          AssociationReflection.new(macro, name, scope, options, active_record).tap do |reflection|
-            reflections.merge!(name => reflection)
+        else
+          def create_reflection_with_embeds(macro, name, scope, options, active_record)
+            unless macro == :embeds_one
+              return create_reflection_without_embeds(macro, name, scope, options, active_record)
+            end
+            AssociationReflection.new(macro, name, scope, options, active_record).tap do |reflection|
+              reflections.merge!(name => reflection)
+            end
           end
         end
+        alias_method_chain :create_reflection, :embeds
       end
-      alias_method_chain :create_reflection, :embeds
     end
   end
 end

data/lib/hstore/document.rb

@@ -51,7 +51,7 @@ module Hstore
         end
         assign_attributes(attributes.except(self.class.serialized_attributes.keys))
       else
-        assign_attributes(attributes)
+        assign_attributes(attributes) if attributes
       end
       changed_attributes.clear
     end

data/spec/document_spec.rb

@@ -6,15 +6,15 @@ describe Hstore::Document do
 
   describe "Instantiation" do
     it "builds" do
-      subject.street.should eq('Elm')
-      subject.number.should eq(13)
+      expect(subject.street).to eq('Elm')
+      expect(subject.number).to eq(13)
     end
 
     it "has defaults" do
       address = Address.new
-      address.street.should eq('unknown')
+      expect(address.street).to eq('unknown')
       address.street = nil
-      address.street.should be_nil
+      expect(address.street).to be_nil
     end
   end
 
@@ -23,13 +23,13 @@ describe Hstore::Document do
 
     it "validates" do
       subject.street = nil
-      subject.should_not be_valid
-      subject.errors[:street].should_not be_empty
-      subject.errors[:number].should_not be_empty
+      expect(subject).not_to be_valid
+      expect(subject.errors[:street]).not_to be_empty
+      expect(subject.errors[:number]).not_to be_empty
 
       subject.street = 'Oak'
       subject.number = 7
-      subject.should be_valid
+      expect(subject).to be_valid
     end
   end
 
@@ -38,7 +38,7 @@ describe Hstore::Document do
     let(:data) { %{"street"=>"Elm","number"=>"13","business"=>"t"} }
 
     it "serializes to json" do
-      subject.as_json.should eq({
+      expect(subject.as_json).to eq({
         'street' => 'Elm',
         'number' => 13,
         'business' => true
@@ -46,9 +46,9 @@ describe Hstore::Document do
     end
 
     it "serializes to hstore" do
-      subject.to_hstore.should eq(data)
+      expect(subject.to_hstore).to eq(data)
       subject.business = false
-      subject.to_hstore.should eq(%{"street"=>"Elm","number"=>"13","business"=>"f"})
+      expect(subject.to_hstore).to eq(%{"street"=>"Elm","number"=>"13","business"=>"f"})
     end
 
     it "unserializes from hstore" do
@@ -58,10 +58,10 @@ describe Hstore::Document do
         {"street"=>"Elm","number"=>"13","business"=>"t"}
       end
       obj = Address.from_hstore(serialized)
-      obj.should be_a_kind_of(Address)
-      obj.street.should eq('Elm')
-      obj.business.should eq(true)
-      obj.number.should eq(13)
+      expect(obj).to be_a_kind_of(Address)
+      expect(obj.street).to eq('Elm')
+      expect(obj.business).to eq(true)
+      expect(obj.number).to eq(13)
     end
 
   end
@@ -69,11 +69,11 @@ describe Hstore::Document do
   describe "State change tracking" do
     subject { Address.new }
 
-    it { should_not be_changed }
+    it { is_expected.not_to be_changed }
 
     it "is changed when attribute is changed" do
       subject.street = 'Elm'
-      subject.should be_changed
+      expect(subject).to be_changed
     end
 
     it "destroys" do

data/spec/integration_spec.rb

@@ -12,7 +12,7 @@ describe "Embedded" do
   describe "Assignment" do
     it "assigns" do
       subject.address = address
-      subject.address.should eq(address)
+      expect(subject.address).to eq(address)
     end
   end
 
@@ -20,7 +20,7 @@ describe "Embedded" do
     subject { Person.create!(address: address) }
 
     it "saves" do
-      subject.reload.address.should eq(address)
+      expect(subject.reload.address).to eq(address)
     end
   end
 
@@ -28,24 +28,24 @@ describe "Embedded" do
     subject { Person.create!(address: address) }
 
     it "tracks persisted state" do
-      subject.reload.address.should be_persisted
+      expect(subject.reload.address).to be_persisted
     end
 
     it "tracks destroyed state" do
       subject.destroy
-      subject.address.should be_destroyed
+      expect(subject.address).to be_destroyed
     end
 
     it "destroys" do
       subject.address.destroy
-      subject.should_not be_destroyed
-      subject.reload.address.should be_nil
+      expect(subject).not_to be_destroyed
+      expect(subject.reload.address).to be_nil
     end
 
     it "updates" do
       subject.address.number = 17
       subject.address.save
-      subject.reload.address.number.should eq(17)
+      expect(subject.reload.address.number).to eq(17)
     end
 
     it "creates" do
@@ -53,7 +53,7 @@ describe "Embedded" do
       address = Address.new(valid_attributes)
       person.address = address
       person.address.save
-      person.reload.address.should eq(address)
+      expect(person.reload.address).to eq(address)
     end
 
   end
@@ -63,18 +63,18 @@ describe "Embedded" do
 
     it "assigns" do
       address = subject.address
-      address.street.should eq('Birch')
-      address.number.should eq(1)
-      address.business.should eq(false)
+      expect(address.street).to eq('Birch')
+      expect(address.number).to eq(1)
+      expect(address.business).to eq(false)
     end
 
     it "saves" do
       subject.save!
       subject.reload
       address = subject.address
-      address.street.should eq('Birch')
-      address.number.should eq(1)
-      address.business.should eq(false)
+      expect(address.street).to eq('Birch')
+      expect(address.number).to eq(1)
+      expect(address.business).to eq(false)
     end
   end
 
@@ -82,20 +82,20 @@ describe "Embedded" do
 
     it "builds" do
       address = subject.build_address(valid_attributes)
-      address.should be_a_kind_of(Address)
-      address.number.should eq(1)
+      expect(address).to be_a_kind_of(Address)
+      expect(address.number).to eq(1)
     end
 
     it "creates" do
       address = subject.create_address(valid_attributes)
-      address.should be_a_kind_of(Address)
-      address.number.should eq(1)
+      expect(address).to be_a_kind_of(Address)
+      expect(address.number).to eq(1)
     end
 
     it "creates!" do
       address = subject.create_address!(valid_attributes)
-      address.should be_a_kind_of(Address)
-      address.number.should eq(1)
+      expect(address).to be_a_kind_of(Address)
+      expect(address.number).to eq(1)
     end
   end
 
@@ -104,13 +104,13 @@ describe "Embedded" do
 
     context "Invalid" do
       it "validates associated" do
-        subject.address.should_not be_valid
-        subject.should_not be_valid
-        subject.errors['address'].should_not be_empty
+        expect(subject.address).not_to be_valid
+        expect(subject).not_to be_valid
+        expect(subject.errors['address']).not_to be_empty
       end
 
       it "doesn't save parent when validation fails" do
-        subject.save.should be_false
+        expect(subject.save).to be_falsey
       end
     end
   end

data/spec/spec_helper.rb

@@ -4,11 +4,16 @@ require 'rspec'
 require 'active_record'
 require 'hstore-document'
 require 'pry'
+if ActiveRecord::VERSION::STRING > '4.1'
+  require 'json'
+end
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+I18n.enforce_available_locales = true
+
 RSpec.configure do |config|
   config.before(:suite) do
     ActiveRecord::Base.establish_connection({
@@ -16,7 +21,8 @@ RSpec.configure do |config|
       encoding: 'unicode',
       database: 'hstore_document',
       username: 'postgres',
-      password: 'postgres'
+      password: 'postgres',
+      host: 'localhost'
     })
     # ActiveRecord::Base.logger = Logger.new(STDERR)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hstore-document
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Roman Shterenzon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
@@ -62,60 +62,46 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.7
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="