surus 0.3.2 → 0.4.0

data/spec/spec_helper.rb

@@ -1,13 +1,12 @@
 require 'surus'
 require 'yaml'
-
+require 'factory_girl'
+require 'faker'
 require 'rspec'
 
 database_config = YAML.load_file(File.expand_path("../database.yml", __FILE__))
 ActiveRecord::Base.establish_connection database_config["test"]
 
-
-
 class HstoreRecord < ActiveRecord::Base
   serialize :properties, Surus::Hstore::Serializer.new
 end
@@ -28,14 +27,55 @@ class DecimalArrayRecord < ActiveRecord::Base
   serialize :decimals, Surus::Array::DecimalSerializer.new
 end
 
+class User < ActiveRecord::Base
+  has_many :posts, foreign_key: :author_id
+  has_many :posts_with_order,
+    foreign_key: :author_id,
+    class_name: 'Post',
+    order: 'posts.id desc'
+  has_many :posts_with_conditions,
+    foreign_key: :author_id,
+    class_name: 'Post',
+    conditions: {subject: 'foo'}
+end
+
+class Forum < ActiveRecord::Base
+  has_many :posts
+end
+
+class Post < ActiveRecord::Base
+  belongs_to :forum
+  belongs_to :author, class_name: 'User'
+  belongs_to :forum_with_impossible_conditions,
+    foreign_key: :forum_id,
+    class_name: 'Forum',
+    conditions: '1=2'
+  has_and_belongs_to_many :tags
+end
+
+class Tag < ActiveRecord::Base
+  has_and_belongs_to_many :posts
+end
 
+FactoryGirl.find_definitions
 
 RSpec.configure do |config|
-  config.around :disable_transactions => nil do |example|
-    ActiveRecord::Base.transaction do
+  config.around do |example|
+    if example.metadata[:disable_transactions]
       example.call
-      raise ActiveRecord::Rollback
+    else
+      ActiveRecord::Base.transaction do
+        begin
+          example.call
+        ensure
+          raise ActiveRecord::Rollback
+        end
+      end
     end
   end
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end
 

data/spec/synchronous_commit/connection_spec.rb

@@ -4,92 +4,100 @@ describe Surus::SynchronousCommit::Connection, :disable_transactions => true do
   let(:conn) { ActiveRecord::Base.connection }
   before { conn.execute "SET synchronous_commit TO ON;" }
   after { conn.execute "SET synchronous_commit TO ON;" }
-  
+
   describe "synchronous_commit" do
     context "without parameter" do
       subject { conn.synchronous_commit }
-    
+
       context "when synchronous_commit commit is off" do
         before { conn.execute "SET synchronous_commit TO OFF;" }
         it { should == false }
       end
-    
+
       context "when synchronous_commit commit is on" do
         before { conn.execute "SET synchronous_commit TO ON;" }
         it { should == true }
       end
     end
-    
+
     context "with parameter" do
       context "true" do
         before { conn.execute "SET synchronous_commit TO OFF;" }
         it "sets synchronous_commit to on" do
           conn.synchronous_commit true
-          conn.select_value("SHOW synchronous_commit").should == "on"
+          value = conn.select_value("SHOW synchronous_commit")
+          expect(value).to eq("on")
         end
       end
-      
+
       context "false" do
         before { conn.execute "SET synchronous_commit TO ON;" }
         it "sets synchronous_commit to off" do
           conn.synchronous_commit false
-          conn.select_value("SHOW synchronous_commit").should == "off"
+          value = conn.select_value("SHOW synchronous_commit")
+          expect(value).to eq("off")
         end
       end
-      
+
       context "invalid value" do
         it "raises ArgumentError" do
           expect{conn.synchronous_commit "foo"}.to raise_error(ArgumentError)
         end
-      end      
-      
+      end
+
       context "inside transaction" do
         before { conn.execute "SET synchronous_commit TO OFF;" }
-        
+
         it "only persists for duration of transaction" do
           conn.transaction do
             conn.synchronous_commit true
-            conn.select_value("SHOW synchronous_commit").should == "on"
+            value = conn.select_value("SHOW synchronous_commit")
+            expect(value).to eq("on")
           end
-          conn.select_value("SHOW synchronous_commit").should == "off"
+          value = conn.select_value("SHOW synchronous_commit")
+          expect(value).to eq("off")
         end
       end
     end
   end
-  
+
   describe "synchronous_commit=" do
     context "true" do
       before { conn.execute "SET synchronous_commit TO OFF;" }
       it "sets synchronous_commit to on" do
         conn.synchronous_commit true
-        conn.select_value("SHOW synchronous_commit").should == "on"
+        value = conn.select_value("SHOW synchronous_commit")
+        expect(value).to eq("on")
       end
     end
-    
+
     context "false" do
       before { conn.execute "SET synchronous_commit TO ON;" }
       it "sets synchronous_commit to off" do
         conn.synchronous_commit false
-        conn.select_value("SHOW synchronous_commit").should == "off"
+        value = conn.select_value("SHOW synchronous_commit")
+        expect(value).to eq("off")
       end
     end
-    
+
     context "invalid value" do
       it "raises ArgumentError" do
         expect{conn.synchronous_commit "foo"}.to raise_error(ArgumentError)
       end
-    end      
-    
+    end
+
     context "inside transaction" do
       before { conn.execute "SET synchronous_commit TO OFF;" }
-      
+
       it "only persists for duration of transaction" do
         conn.transaction do
           conn.synchronous_commit true
-          conn.select_value("SHOW synchronous_commit").should == "on"
+          value = conn.select_value("SHOW synchronous_commit")
+          expect(value).to eq("on")
         end
-        conn.select_value("SHOW synchronous_commit").should == "off"
+        value = conn.select_value("SHOW synchronous_commit")
+        expect(value).to eq("off")
       end
     end
-  end  
+  end
 end

data/surus.gemspec

@@ -25,8 +25,13 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_dependency 'pg'
   s.add_dependency 'activerecord', ">= 3.1.0"
-  
-  s.add_development_dependency 'rspec', "~> 2.8.0"
+
+  s.add_development_dependency 'rspec', "~> 2.12.0"
   s.add_development_dependency 'guard', ">= 0.10.0"
-  s.add_development_dependency 'guard-rspec', ">= 0.6.0"  
+  s.add_development_dependency 'guard-rspec', ">= 0.6.0"
+  s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
+  s.add_development_dependency 'oj', '~> 2.0.2'
+  s.add_development_dependency 'pry', '~> 0.9.11'
+  s.add_development_dependency 'factory_girl', '~> 4.2.0'
+  s.add_development_dependency 'faker', '~> 1.1.2'
 end

data/tmp/rspec_guard_result

@@ -0,0 +1 @@
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surus
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &9002920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9002920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &9002400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *9002400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9018280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: *9018280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &9017820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +69,108 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *9017820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &9017360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *9017360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.11
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 description: ! "Surus accelerates ActiveRecord with PostgreSQL specific types and\n
   \                   functionality. It enables indexed searching of serialized arrays
   and hashes.\n                    It also can control PostgreSQL synchronous commit
@@ -94,6 +199,7 @@ files:
 - bench/hstore_create.rb
 - bench/hstore_find.rb
 - bench/hstore_serialize.rb
+- bench/json_generation.rb
 - bench/synchronous_commit.rb
 - lib/generators/surus/hstore/install_generator.rb
 - lib/generators/surus/hstore/templates/install_hstore.rb
@@ -105,6 +211,14 @@ files:
 - lib/surus/array/text_serializer.rb
 - lib/surus/hstore/scope.rb
 - lib/surus/hstore/serializer.rb
+- lib/surus/json/array_agg_query.rb
+- lib/surus/json/association_scope_builder.rb
+- lib/surus/json/belongs_to_scope_builder.rb
+- lib/surus/json/has_and_belongs_to_many_scope_builder.rb
+- lib/surus/json/has_many_scope_builder.rb
+- lib/surus/json/model.rb
+- lib/surus/json/query.rb
+- lib/surus/json/row_query.rb
 - lib/surus/synchronous_commit/connection.rb
 - lib/surus/synchronous_commit/model.rb
 - lib/surus/version.rb
@@ -115,12 +229,15 @@ files:
 - spec/array/text_serializer_spec.rb
 - spec/database.yml
 - spec/database_structure.sql
+- spec/factories.rb
 - spec/hstore/scope_spec.rb
 - spec/hstore/serializer_spec.rb
+- spec/json/json_spec.rb
 - spec/spec_helper.rb
 - spec/synchronous_commit/connection_spec.rb
 - spec/synchronous_commit/model_spec.rb
 - surus.gemspec
+- tmp/rspec_guard_result
 homepage: https://github.com/JackC/surus
 licenses: []
 post_install_message: 
@@ -141,8 +258,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: PostgreSQL Acceleration for ActiveRecord
-test_files: []
+test_files:
+- spec/array/decimal_serializer_spec.rb
+- spec/array/float_serializer_spec.rb
+- spec/array/integer_serializer_spec.rb
+- spec/array/scope_spec.rb
+- spec/array/text_serializer_spec.rb
+- spec/database.yml
+- spec/database_structure.sql
+- spec/factories.rb
+- spec/hstore/scope_spec.rb
+- spec/hstore/serializer_spec.rb
+- spec/json/json_spec.rb
+- spec/spec_helper.rb
+- spec/synchronous_commit/connection_spec.rb
+- spec/synchronous_commit/model_spec.rb