hydra_attribute 0.4.1 → 0.4.2

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 .idea
 .rvmrc
 bin/
+gemfiles

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 rvm:
   - 1.9.3
 
+before_install: bundle && rake appraisal:gemfiles
+
 gemfile:
   - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+**0.4.2 (January 20, 2013)**
+* Fixed bug in `count` method which added unnecessary columns to query [#2](https://github.com/kostyantyn/hydra_attribute/issues/2)
+
 **0.4.1 (October 3, 2012)**
-* Fixed bug which din't allow to use hydra attributes for STI models
+* Fixed bug which didn't allow to use hydra attributes for STI models
 
 **0.4.0 (September 13, 2012)**
 * Add attribute sets
@@ -49,4 +52,4 @@
 * Implement `where` method for `ActiveRecord::Relation` object
 * Implement `order` method for `ActiveRecord::Relation` object
 * Implement `reverse_order` method for `ActiveRecord::Relation` object
-* Implement `select` method for `ActiveRecord::Relation` object
+* Implement `select` method for `ActiveRecord::Relation` object

data/README.md

@@ -1,13 +1,18 @@
-# hydra_attribute [![Build Status](https://secure.travis-ci.org/kostyantyn/hydra_attribute.png)](http://travis-ci.org/kostyantyn/hydra_attribute)
+# hydra_attribute [![Gem Version](https://fury-badge.herokuapp.com/rb/hydra_attribute.png)](http://badge.fury.io/rb/hydra_attribute) [![Build Status](https://secure.travis-ci.org/kostyantyn/hydra_attribute.png)](http://travis-ci.org/kostyantyn/hydra_attribute)
 
 [Wiki](https://github.com/kostyantyn/hydra_attribute/wiki) | [RDoc](http://rdoc.info/github/kostyantyn/hydra_attribute)
 
 hydra_attribute is an implementation of
 [EAV (Entity-Attribute-Value) pattern](http://en.wikipedia.org/wiki/Entity–attribute–value_model) for ActiveRecord models. It allows to create or remove attributes in runtime. Also each record may have different sets of attributes, for example: Product with ID 1 can have different set of attributes than Product with ID 2.
 
+## Notice
+Until the first major version is released:
+* each new minor version doesn't guarantee back compatibility with previous one
+* gem isn't stable enough for using in production
+
 ## Requirements
 * ruby >= 1.9.2
-* active_record >= 3.1
+* active_record ~> 3.1
 
 ## Installation
 
@@ -162,10 +167,6 @@ Product.group(:color).count
 * [Helper methods](https://github.com/kostyantyn/hydra_attribute/wiki/Helper-methods)
 * [Migrate from 0.3.2 to 0.4.0](https://github.com/kostyantyn/hydra_attribute/wiki/Migrate-from-0.3.2-to-0.4.0) 
 
-## Notice
-
-The each new minor version doesn't guarantee back compatibility with previous one until the first major version is released. 
-
 ## Contributing
 
 1. Fork it

data/hydra_attribute.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = Gem::Requirement.new('>= 1.9.2')
   gem.version               = HydraAttribute::VERSION
 
-  gem.add_dependency('activerecord', '>= 3.1.0')
+  gem.add_dependency('activerecord', '~> 3.1')
 
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('cucumber')
@@ -22,4 +22,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('database_cleaner')
   gem.add_development_dependency('appraisal')
   gem.add_development_dependency('rake')
-end
+end

data/lib/hydra_attribute.rb

@@ -33,6 +33,7 @@ require 'hydra_attribute/active_record/association'
 require 'hydra_attribute/active_record/association_preloader'
 require 'hydra_attribute/active_record/migration'
 require 'hydra_attribute/active_record/relation'
+require 'hydra_attribute/active_record/relation/calculations'
 require 'hydra_attribute/active_record/relation/query_methods'
 require 'hydra_attribute/active_record/attribute_methods'
 

data/lib/hydra_attribute/active_record/relation.rb

@@ -4,6 +4,7 @@ module HydraAttribute
       extend ActiveSupport::Concern
 
       included do
+        include Calculation
         include QueryMethods
 
         # @COMPATIBILITY with 3.1.x active_record 3.1 doesn't have "exec_queries" method

data/lib/hydra_attribute/active_record/relation/calculations.rb

@@ -0,0 +1,19 @@
+module HydraAttribute
+  module ActiveRecord
+    module Relation
+      module Calculation
+        extend ActiveSupport::Concern
+
+        included do
+          attr_accessor :hydra_attribute_performs_calculation
+        end
+
+        # Notifies +#build_arel+ method that it builds query for calculation
+        def execute_simple_calculation(operation, column_name, distinct)
+          self.hydra_attribute_performs_calculation = true
+          super(operation, column_name, distinct)
+        end
+      end
+    end
+  end
+end

data/lib/hydra_attribute/active_record/relation/query_methods.rb

@@ -53,8 +53,10 @@ module HydraAttribute
           @hydra_select_values.map!(&:to_s)
           @select_values.map!{ |value| hydra_helper.prepend_table_name(value) }
 
-          # attributes "id" and "hydra_set_id" are important for hydra_attribute gem
-          if @hydra_select_values.any? or @select_values.any?
+          # attributes "id" and "hydra_set_id" are required for models which use HydraAttribute::ActiveRecord model
+          # but if calculation method is performed, obtained data from database aren't converted to models
+          # so these attributes should not be forcibly added to query
+          if !hydra_attribute_performs_calculation && (@hydra_select_values.any? or @select_values.any?)
             @select_values << hydra_helper.prepend_table_name(klass.primary_key)
             @select_values << hydra_helper.prepend_table_name('hydra_set_id')
           end

data/lib/hydra_attribute/version.rb

@@ -1,3 +1,3 @@
 module HydraAttribute
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/hydra_attribute/active_record/relation/query_methods_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe HydraAttribute::ActiveRecord::Relation::QueryMethods do
+  describe '#build_arel' do
+    describe 'necessary columns for hydra attribute' do
+      let(:id_column)           { Product.quoted_table_name + '.' + Product.quoted_primary_key }
+      let(:hydra_set_id_column) { Product.quoted_table_name + '.' + Product.quoted_primary_key }
+
+      it 'should add "id" and "hydra_set_id" columns to query if they are omitted' do
+        arel = Product.select(:name).build_arel
+        arel.to_sql.should match(id_column)
+        arel.to_sql.should match(hydra_set_id_column)
+      end
+
+      it 'should not add "id" and "hydra_set_id" columns to default query' do
+        arel = Product.scoped.build_arel
+        arel.to_sql.should_not match(id_column)
+        arel.to_sql.should_not match(hydra_set_id_column)
+      end
+
+      it 'should not add "id" and "hydra_set_id" columns to query which performs calculation' do
+        scope = Product.select(:name)
+        scope.hydra_attribute_performs_calculation = true
+
+        arel = scope.build_arel
+        arel.to_sql.should_not match(id_column)
+        arel.to_sql.should_not match(hydra_set_id_column)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra_attribute
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -162,10 +162,6 @@ files:
 - features/step_definitions/record_steps.rb
 - features/support/env.rb
 - features/support/world.rb
-- gemfiles/3.1.gemfile
-- gemfiles/3.1.gemfile.lock
-- gemfiles/3.2.gemfile
-- gemfiles/3.2.gemfile.lock
 - hydra_attribute.gemspec
 - lib/hydra_attribute.rb
 - lib/hydra_attribute/active_record.rb
@@ -175,6 +171,7 @@ files:
 - lib/hydra_attribute/active_record/migration.rb
 - lib/hydra_attribute/active_record/reflection.rb
 - lib/hydra_attribute/active_record/relation.rb
+- lib/hydra_attribute/active_record/relation/calculations.rb
 - lib/hydra_attribute/active_record/relation/query_methods.rb
 - lib/hydra_attribute/active_record/scoping.rb
 - lib/hydra_attribute/association_builder.rb
@@ -195,6 +192,7 @@ files:
 - lib/rails/generators/hydra_attribute/install/install_generator.rb
 - lib/rails/generators/hydra_attribute/install/templates/hydra_attribute.txt
 - spec/hydra_attribute/active_record/attribute_methods_spec.rb
+- spec/hydra_attribute/active_record/relation/query_methods_spec.rb
 - spec/hydra_attribute/hydra_attribute_methods_spec.rb
 - spec/hydra_attribute/hydra_attribute_spec.rb
 - spec/hydra_attribute/hydra_methods_spec.rb
@@ -222,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3857802354378024215
+      hash: -595006172525400845
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -253,11 +251,8 @@ test_files:
 - features/step_definitions/record_steps.rb
 - features/support/env.rb
 - features/support/world.rb
-- gemfiles/3.1.gemfile
-- gemfiles/3.1.gemfile.lock
-- gemfiles/3.2.gemfile
-- gemfiles/3.2.gemfile.lock
 - spec/hydra_attribute/active_record/attribute_methods_spec.rb
+- spec/hydra_attribute/active_record/relation/query_methods_spec.rb
 - spec/hydra_attribute/hydra_attribute_methods_spec.rb
 - spec/hydra_attribute/hydra_attribute_spec.rb
 - spec/hydra_attribute/hydra_methods_spec.rb

data/gemfiles/3.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source :rubygems
-
-gem "activerecord", "~> 3.1.0"
-
-gemspec :path=>"../"

data/gemfiles/3.1.gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: /Users/kostyantyn/Sites/github/gems/hydra_attribute
-  specs:
-    hydra_attribute (0.4.1)
-      activerecord (>= 3.1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.1.8)
-      activesupport (= 3.1.8)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.8)
-      multi_json (>= 1.0, < 1.3)
-    appraisal (0.4.1)
-      bundler
-      rake
-    arel (2.2.3)
-    builder (3.0.3)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    database_cleaner (0.8.0)
-    diff-lcs (1.1.3)
-    gherkin (2.11.2)
-      json (>= 1.4.6)
-    i18n (0.6.1)
-    json (1.7.5)
-    multi_json (1.2.0)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.1.0)
-  appraisal
-  cucumber
-  database_cleaner
-  hydra_attribute!
-  rake
-  rspec
-  sqlite3

data/gemfiles/3.2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source :rubygems
-
-gem "activerecord", "~> 3.2.0"
-
-gemspec :path=>"../"

data/gemfiles/3.2.gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: /Users/kostyantyn/Sites/github/gems/hydra_attribute
-  specs:
-    hydra_attribute (0.4.1)
-      activerecord (>= 3.1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.4.1)
-      bundler
-      rake
-    arel (3.0.2)
-    builder (3.0.3)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    database_cleaner (0.8.0)
-    diff-lcs (1.1.3)
-    gherkin (2.11.2)
-      json (>= 1.4.6)
-    i18n (0.6.1)
-    json (1.7.5)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.2.0)
-  appraisal
-  cucumber
-  database_cleaner
-  hydra_attribute!
-  rake
-  rspec
-  sqlite3