surus 0.4.2 → 0.5.0

data/lib/surus/json/has_many_scope_builder.rb

@@ -2,12 +2,11 @@ module Surus
   module JSON
     class HasManyScopeBuilder < AssociationScopeBuilder
       def scope
-        association_scope = association
+        s = association
           .klass
           .where("#{outside_primary_key}=#{association_foreign_key}")
-        association_scope = association_scope.where(conditions) if conditions
-        association_scope = association_scope.order(order) if order
-        association_scope
+        s = s.instance_eval(&association.scope) if association.scope
+        s
       end
 
       def outside_primary_key

data/lib/surus/json/model.rb

@@ -7,7 +7,7 @@ module Surus
       end
 
       def all_json(options={})
-        sql = ArrayAggQuery.new(scoped, options).to_sql
+        sql = ArrayAggQuery.new(all, options).to_sql
         connection.select_value sql
       end
     end

data/lib/surus/version.rb

@@ -1,3 +1,3 @@
 module Surus
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/array/scope_spec.rb

@@ -14,17 +14,17 @@ describe Surus::Array::Scope do
     end
 
     context "with one element" do
-      subject { TextArrayRecord.array_has(:texts, "b").all }
+      subject { TextArrayRecord.array_has(:texts, "b") }
       shared_examples
     end
 
     context "with array of elements" do
-      subject { TextArrayRecord.array_has(:texts, ["a", "b"]).all }
+      subject { TextArrayRecord.array_has(:texts, ["a", "b"]) }
       shared_examples
     end
 
     context "with multiple elements" do
-      subject { TextArrayRecord.array_has(:texts, "a", "b").all }
+      subject { TextArrayRecord.array_has(:texts, "a", "b") }
       shared_examples
     end
   end
@@ -40,17 +40,17 @@ describe Surus::Array::Scope do
     end
 
     context "with one element" do
-      subject { TextArrayRecord.array_has_any(:texts, "b").all }
+      subject { TextArrayRecord.array_has_any(:texts, "b") }
       shared_examples
     end
 
     context "with array of elements" do
-      subject { TextArrayRecord.array_has_any(:texts, ["b", "c"]).all }
+      subject { TextArrayRecord.array_has_any(:texts, ["b", "c"]) }
       shared_examples
     end
 
     context "with multiple elements" do
-      subject { TextArrayRecord.array_has_any(:texts, "b", "c").all }
+      subject { TextArrayRecord.array_has_any(:texts, "b", "c") }
       shared_examples
     end
   end

data/spec/hstore/scope_spec.rb

@@ -7,69 +7,69 @@ describe Surus::Hstore::Scope do
     let!(:match) { HstoreRecord.create! :properties => { "a" => "1", "b" => "2", "c" => "3" } }
     let!(:missing_key) { HstoreRecord.create! :properties => { "a" => "1", "c" => "3" } }
     let!(:wrong_value) { HstoreRecord.create! :properties => { "a" => "1", "b" => "5" } }
-    
-    subject { HstoreRecord.hstore_has_pairs(:properties, "a" => "1", "b" => "2").all }
-    
+
+    subject { HstoreRecord.hstore_has_pairs(:properties, "a" => "1", "b" => "2") }
+
     it { should include(match) }
     it { should_not include(missing_key) }
     it { should_not include(wrong_value) }
     it { should_not include(empty) }
   end
-  
+
   context "hstore_has_key" do
     let!(:match) { HstoreRecord.create! :properties => { "a" => "1", "b" => "2" } }
     let!(:missing_key) { HstoreRecord.create! :properties => { "a" => "1", "c" => "3" } }
-    
-    subject { HstoreRecord.hstore_has_key(:properties, "b").all }
+
+    subject { HstoreRecord.hstore_has_key(:properties, "b") }
 
     it { should include(match) }
     it { should_not include(missing_key) }
     it { should_not include(empty) }
   end
-  
+
   context "hstore_has_all_keys" do
     let!(:match) { HstoreRecord.create! :properties => { "a" => "1", "b" => "2", "c" => "3" } }
     let!(:missing_one_key) { HstoreRecord.create! :properties => { "b" => "2", "c" => "3" } }
     let!(:missing_all_keys) { HstoreRecord.create! :properties => { "f" => "1", "g" => "2" } }
-    
+
     def self.shared_examples
       it { should include(match) }
       it { should_not include(missing_one_key) }
       it { should_not include(missing_all_keys) }
-      it { should_not include(empty) }  
+      it { should_not include(empty) }
     end
-    
+
     context "with array of keys" do
-      subject { HstoreRecord.hstore_has_all_keys(:properties, ["a", "b"]).all }
+      subject { HstoreRecord.hstore_has_all_keys(:properties, ["a", "b"]) }
       shared_examples
     end
-    
+
     context "with multiple key arguments" do
-      subject { HstoreRecord.hstore_has_all_keys(:properties, "a", "b").all }
+      subject { HstoreRecord.hstore_has_all_keys(:properties, "a", "b") }
       shared_examples
     end
   end
-  
+
   context "hstore_has_any_key" do
     let!(:match_1) { HstoreRecord.create! :properties => { "a" => "1", "c" => "3" } }
     let!(:match_2) { HstoreRecord.create! :properties => { "b" => "2", "d" => "4" } }
     let!(:missing_all_keys) { HstoreRecord.create! :properties => { "c" => "3", "d" => "4" } }
-    
+
     def self.shared_examples
       it { should include(match_1) }
       it { should include(match_2) }
       it { should_not include(missing_all_keys) }
-      it { should_not include(empty) }      
-      it { should_not include(empty) }      
+      it { should_not include(empty) }
+      it { should_not include(empty) }
     end
-    
+
     context "with array of keys" do
-      subject { HstoreRecord.hstore_has_any_keys(:properties, ["a", "b"]).all }
+      subject { HstoreRecord.hstore_has_any_keys(:properties, ["a", "b"]) }
       shared_examples
     end
-    
+
     context "with multiple key arguments" do
-      subject { HstoreRecord.hstore_has_any_keys(:properties, "a", "b").all }
+      subject { HstoreRecord.hstore_has_any_keys(:properties, "a", "b") }
       shared_examples
     end
   end

data/spec/spec_helper.rb

@@ -12,35 +12,21 @@ class HstoreRecord < ActiveRecord::Base
 end
 
 class TextArrayRecord < ActiveRecord::Base
-  serialize :texts, Surus::Array::TextSerializer.new
 end
 
 class VarcharArrayRecord < ActiveRecord::Base
-  serialize :varchars, Surus::Array::TextSerializer.new
-end
-
-class IntegerArrayRecord < ActiveRecord::Base
-  serialize :integers, Surus::Array::IntegerSerializer.new
-end
-
-class FloatArrayRecord < ActiveRecord::Base
-  serialize :floats, Surus::Array::FloatSerializer.new
-end
-
-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,
+    -> { order 'posts.id desc' },
     foreign_key: :author_id,
-    class_name: 'Post',
-    order: 'posts.id desc'
+    class_name: 'Post'
   has_many :posts_with_conditions,
+    -> { where subject: 'foo' },
     foreign_key: :author_id,
-    class_name: 'Post',
-    conditions: {subject: 'foo'}
+    class_name: 'Post'
 end
 
 class Forum < ActiveRecord::Base
@@ -51,9 +37,9 @@ class Post < ActiveRecord::Base
   belongs_to :forum
   belongs_to :author, class_name: 'User'
   belongs_to :forum_with_impossible_conditions,
+    -> { where '1=2' },
     foreign_key: :forum_id,
-    class_name: 'Forum',
-    conditions: '1=2'
+    class_name: 'Forum'
   has_and_belongs_to_many :tags
 end
 

data/surus.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_dependency 'activerecord', "~> 3.1"
+  s.add_dependency 'activerecord', "~> 4.0"
 
   s.add_development_dependency 'rspec', "~> 2.12.0"
   s.add_development_dependency 'guard', ">= 0.10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surus
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -169,32 +169,21 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bench/array_create.rb
-- bench/array_find.rb
-- bench/array_serialize.rb
 - bench/benchmark_helper.rb
 - bench/database.yml
 - bench/database_structure.sql
-- 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
 - lib/surus.rb
-- lib/surus/array/decimal_serializer.rb
-- lib/surus/array/float_serializer.rb
-- lib/surus/array/integer_serializer.rb
 - lib/surus/array/scope.rb
-- lib/surus/array/text_serializer.rb
-- lib/surus/hstore/connection_adapters.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/connection_adapters.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
@@ -203,11 +192,7 @@ files:
 - lib/surus/synchronous_commit/connection.rb
 - lib/surus/synchronous_commit/model.rb
 - lib/surus/version.rb
-- 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
@@ -238,16 +223,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: PostgreSQL Acceleration for ActiveRecord
 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

data/bench/array_create.rb

@@ -1,46 +0,0 @@
-require 'benchmark_helper'
-
-options = {}
-optparse = OptionParser.new do |opts|
-  options[:records] = 1000
-  opts.on '-r NUM', '--records NUM', Integer, 'Number of records to create' do |n|
-    options[:records] = n
-  end
-  
-  options[:elements] = 10
-  opts.on '-e NUM', '--elements NUM', Integer, 'Number of elements' do |n|
-    options[:elements] = n
-  end  
-end
-
-optparse.parse!
-
-clean_database
-
-num_records = options[:records]
-num_elements = options[:elements]
-
-arrays = num_records.times.map do
-  num_elements.times.map { SecureRandom.hex(4) }
-end
-
-puts
-puts "Writing #{num_records} records with a #{num_elements} element string array"
-
-Benchmark.bm(8) do |x|
-  x.report("Surus") do
-    SurusKeyValueRecord.transaction do
-      num_records.times do |i|
-        SurusTextArrayRecord.create! :names => arrays[i]
-      end
-    end
-  end    
-  
-  x.report("YAML") do
-    YamlKeyValueRecord.transaction do
-      num_records.times do |i|
-        YamlArrayRecord.create! :names => arrays[i]
-      end
-    end
-  end  
-end

data/bench/array_find.rb

@@ -1,79 +0,0 @@
-require 'benchmark_helper'
-
-options = {}
-optparse = OptionParser.new do |opts|
-  options[:records] = 2_000
-  opts.on '-r NUM', '--records NUM', Integer, 'Number of records to create' do |n|
-    options[:records] = n
-  end
-  
-  options[:elements] = 10
-  opts.on '-e NUM', '--elements NUM', Integer, 'Number of elements per array' do |n|
-    options[:elements] = n
-  end
-  
-  options[:finds] = 200
-  opts.on '-f NUM', '--finds NUM', Integer, 'Number of finds to perform' do |n|
-    options[:finds] = n
-  end   
-  
-  options[:yaml] = false
-  opts.on '-y', '--yaml', 'Include YAML in benchmark (VERY SLOW!)' do
-    options[:yaml] = true
-  end
-end
-
-optparse.parse!
-
-clean_database
-
-num_records = options[:records]
-num_elements = options[:elements]
-num_finds = options[:finds]
-yaml = options[:yaml]
-
-puts "Skipping YAML test. Use -y to enable (VERY SLOW!)" unless yaml
-
-arrays = num_records.times.map do
-  num_elements.times.map { SecureRandom.hex(4) }
-end
-
-print "Creating Surus test data... "
-SurusKeyValueRecord.transaction do
-  num_records.times do |i|
-    SurusTextArrayRecord.create! :names => arrays[i]
-  end
-end
-puts "Done."
-
-if yaml
-  print "Creating YAML test data... "
-  YamlArrayRecord.transaction do
-    num_records.times do |i|
-      YamlArrayRecord.create! :names => arrays[i]
-    end
-  end
-  puts "Done."
-end
-
-puts
-puts "#{num_records} records with #{num_elements} element arrays"
-puts "Finding all where array includes value #{num_finds} times"
-
-values_to_find = arrays.sample(num_finds).map { |a| a.sample }
-
-Benchmark.bm(8) do |x|
-  x.report("Surus") do
-    values_to_find.each do |value_to_find|
-      SurusTextArrayRecord.array_has(:names, value_to_find).all
-    end
-  end
-
-  if yaml
-    x.report("YAML") do
-      values_to_find.each do |value_to_find|
-        YamlArrayRecord.all.select { |r| r.names.include?(value_to_find) }
-      end
-    end    
-  end
-end