hydra_attribute 0.1.3 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**0.2.0 (June 13, 2012)**
+* Implement `group` method for `ActiveRecord::Relation` object 
+
 **0.1.3 (June 11, 2012)**
 * Fix bug when quoted column is passed to `ActiveRecord::Relation` method as a parameter
 

data/README.md

@@ -114,6 +114,12 @@ SimpleProduct.select([:code, :price]).map(&:attributes)
 => [{"code"=>"100", "price"=>2.75}, {"code"=>"101", "price"=>3.75}, {"code"=>"102", "price"=>4.5}, {"code"=>"103", "price"=>4.5}, {"code"=>"104", "price"=>5.0}]
 ```
 
+##### "group"
+```shell
+SimpleProduct.group(:name, :price).count
+=> {["Book", 2.75]=>1, ["Book", 3.75]=>1, ["Book", 4.5]=>2, ["Book", 5.0]=>1}
+```
+
 ## Contributing
 
 1. Fork it

data/features/attribute_methods.feature

@@ -24,12 +24,7 @@ Feature: helper methods for hydra attributes
   Then hydra attribute value before type cast should be returned
 
   Background: create models and describe hydra attributes
-    Given removed constants if they exist:
-      | name          |
-      | GroupProduct  |
-      | SimpleProduct |
-      | Product       |
-    And create model class "Product"
+    Given create model class "Product"
     And create model class "SimpleProduct" as "Product" with hydra attributes:
       | type   | name  |
       | string | code  |

data/features/define_attributes.feature

@@ -5,12 +5,7 @@ Feature: define hydra attributes
   Model should not respond to hydra attribute if it isn't described in it class.
 
   Background: create models and describe hydra attributes
-    Given removed constants if they exist:
-      | name          |
-      | GroupProduct  |
-      | SimpleProduct |
-      | Product       |
-    And create model class "Product"
+    Given create model class "Product"
     And create model class "SimpleProduct" as "Product" with hydra attributes:
       | type   | name |
       | string | code |

data/features/load_associations.feature

@@ -6,12 +6,7 @@ Feature: hydra attribute associations
   Then hydra attribute association should not be loaded automatically
 
   Background: create models and describe hydra attributes
-    Given removed constants if they exist:
-      | name          |
-      | GroupProduct  |
-      | SimpleProduct |
-      | Product       |
-    And create model class "Product"
+    Given create model class "Product"
     And create model class "SimpleProduct" as "Product" with hydra attributes:
       | type   | name  |
       | string | code  |

data/features/query_methods/group.feature

@@ -0,0 +1,43 @@
+Feature: group conditions by hydra attributes
+  When group by hydra attribute
+  Then correct table should be joined and group condition should be added
+
+  Background: create models and describe hydra attributes
+    Given create model class "Product"
+    And create model class "SimpleProduct" as "Product" with hydra attributes:
+      | type    | name  |
+      | integer | code  |
+      | string  | title |
+      | integer | total |
+    And create models:
+      | model         | attributes                                                          |
+      | SimpleProduct | name=[string:a] code=[integer:1] title=[string:q] total=[integer:5] |
+      | SimpleProduct | name=[string:b] code=[integer:2] title=[string:w] total=[integer:5] |
+      | SimpleProduct | name=[string:b] code=[integer:3] title=[string:w] total=[nil:]      |
+      | SimpleProduct | name=[string:c] code=[integer:4] title=[string:e]                   |
+
+  Scenario Outline: group by attributes
+    When group "SimpleProduct" by "<group by>"
+    Then total records should be "<total>"
+    And "first" record should have "<first attribute>"
+    And "last" record should have "<last attribute>"
+
+    Scenarios: group attributes
+      | group by   | total | first attribute                  | last attribute                   |
+      | code       | 4     | code=[integer:1]                 | code=[integer:4]                 |
+      | name       | 3     | name=[string:a] code=[integer:1] | name=[string:c] code=[integer:4] |
+      | name title | 3     | name=[string:a] code=[integer:1] | name=[string:c] code=[integer:4] |
+
+  Scenario Outline: group by attributes with filter
+    When group "SimpleProduct" by "<group by>"
+    And filter records by "<filter>"
+    Then total records should be "<total>"
+    And "first" record should have "<first attribute>"
+    And "last" record should have "<last attribute>"
+
+    Scenarios: group attributes
+      | group by   | filter           | total | first attribute                  | last attribute                   |
+      | code       | title=[string:w] | 2     | code=[integer:2]                 | code=[integer:3]                 |
+      | name       | title=[string:w] | 1     | name=[string:b] title=[string:w] | name=[string:b] title=[string:w] |
+      | name title | title=[string:w] | 1     | name=[string:b] title=[string:w] | name=[string:b] title=[string:w] |
+      | name title | total=[nil:]     | 2     | name=[string:b] title=[string:w] | name=[string:c] title=[string:e] |

data/features/{order_conditions.feature → query_methods/order.feature}

@@ -12,12 +12,7 @@ Feature: order conditions by hydra attributes
   Then old hydra attributes should be removed and new should be added
 
   Background: create models and describe hydra attributes
-    Given removed constants if they exist:
-      | name          |
-      | GroupProduct  |
-      | SimpleProduct |
-      | Product       |
-    And create model class "Product"
+    Given create model class "Product"
     And create model class "SimpleProduct" as "Product" with hydra attributes:
       | type    | name  |
       | integer | code  |

data/features/{select_attributes.feature → query_methods/select.feature}

@@ -3,12 +3,7 @@ Feature: select concrete attributes
   Then hydra attribute table should be joined and concrete attribute should be selected
 
   Background: create models and describe hydra attributes
-    Given removed constants if they exist:
-      | name          |
-      | GroupProduct  |
-      | SimpleProduct |
-      | Product       |
-    And create model class "Product"
+    Given create model class "Product"
     And create model class "SimpleProduct" as "Product" with hydra attributes:
       | type     | name     |
       | integer  | code     |

data/features/{where_conditions.feature → query_methods/where.feature}

@@ -6,12 +6,7 @@ Feature: hydra attribute where conditions
   Then records with nil value should be selected  or records which don't have this hydra attribute
 
   Background: create models and describe hydra attributes
-    Given removed constants if they exist:
-      | name          |
-      | GroupProduct  |
-      | SimpleProduct |
-      | Product       |
-    And create model class "Product"
+    Given create model class "Product"
     And create model class "SimpleProduct" as "Product" with hydra attributes:
       | type    | name    |
       | string  | code    |

data/features/step_definitions/query_methods.rb

@@ -0,0 +1,44 @@
+When /^filter "([^"]+)" by:$/ do |klass, table|
+  condition = table.hashes.each_with_object({}) { |item, hash| hash[item[:field].to_sym] = typecast_value(item[:value]) }
+  @records  = Object.const_get(klass).where(condition)
+end
+
+When /^filter "([^"]+)" records by "([^"]+)"$/ do |klass, attribute|
+  @records = Object.const_get(klass)
+  step %Q(filter records by "#{attribute}")
+end
+
+When /^filter records by "([^"]+)"$/ do |attribute|
+  name, value = typecast_attribute(attribute)
+  @records = @records.where(name => value)
+end
+
+When /^group "([^"]+)" by "([^"]+)"$/ do |klass, attributes|
+  @records = Object.const_get(klass)
+  step %Q(group by "#{attributes}")
+end
+
+When /^group by "([^"]+)"$/ do |attributes|
+  @records = @records.group(attributes.split)
+end
+
+When /^(order|reorder) "([^"]+)" records by "([^"]+)"$/ do |sort_method, klass, attributes|
+  @records = Object.const_get(klass)
+  step %Q(#{sort_method} records by "#{attributes}")
+end
+
+When /^(order|reorder) records by "([^"]+)"$/ do |sort_method, attributes|
+  reverse  = false
+  fields   = attributes.split.inject([]) do |items, attribute|
+    name, direction = attribute.split('=')
+    reverse = true if direction == 'desc'
+    items << name.to_sym
+  end
+
+  @records = @records.send(sort_method, fields)
+  @records = @records.reverse_order if reverse
+end
+
+When /^"([^"]+)" select only the following columns "([^"]+)"$/ do |klass, columns|
+  @records = Object.const_get(klass).select(columns.split(/\s+/).map(&:to_sym))
+end

data/features/step_definitions/record_steps.rb

@@ -6,42 +6,6 @@ When /^select "(first|last)" "([^"]+)" record$/ do |method, klass|
   @record = Object.const_get(klass).send(method)
 end
 
-When /^filter "([^"]+)" by:$/ do |klass, table|
-  condition = table.hashes.each_with_object({}) { |item, hash| hash[item[:field].to_sym] = typecast_value(item[:value]) }
-  @records  = Object.const_get(klass).where(condition)
-end
-
-When /^filter "([^"]+)" records by "([^"]+)"$/ do |klass, attribute|
-  @records = Object.const_get(klass)
-  step %Q(filter records by "#{attribute}")
-end
-
-When /^filter records by "([^"]+)"$/ do |attribute|
-  name, value = typecast_attribute(attribute)
-  @records = @records.where(name => value)
-end
-
-When /^(order|reorder) "([^"]+)" records by "([^"]+)"$/ do |sort_method, klass, attributes|
-  @records = Object.const_get(klass)
-  step %Q(#{sort_method} records by "#{attributes}")
-end
-
-When /^(order|reorder) records by "([^"]+)"$/ do |sort_method, attributes|
-  reverse  = false
-  fields   = attributes.split.inject([]) do |items, attribute|
-    name, direction = attribute.split('=')
-    reverse = true if direction == 'desc'
-    items << name.to_sym
-  end
-
-  @records = @records.send(sort_method, fields)
-  @records = @records.reverse_order if reverse
-end
-
-When /^"([^"]+)" select only the following columns "([^"]+)"$/ do |klass, columns|
-  @records = Object.const_get(klass).select(columns.split(/\s+/).map(&:to_sym))
-end
-
 Then /^record should have the following ((?:hydra )?attributes(?: before type cast)?) "([^"]+)" in attribute hash$/ do |method, attributes|
   method = method.gsub(/\s+/, '_')
   typecast_attributes(attributes).each do |(name, value)|
@@ -55,8 +19,9 @@ Then /^record (read attribute(?: before type cast)?) "([^"]+)" and value should
 end
 
 Then /^"(first|last)" record should have "([^"]+)"$/ do |method, attribute|
-  name, value = typecast_attribute(attribute)
-  @records.send(method).send(name).should == value
+  typecast_attributes(attribute).each do |(name, value)|
+    @records.send(method).send(name).should == value
+  end
 end
 
 Then /^records should have the following attributes:$/ do |table|
@@ -82,7 +47,7 @@ Then /^records should raise "([^"]+)" when call the following "([^"]+)"$/ do |er
 end
 
 Then /^total records should be "([^"]+)"$/ do |count|
-  @records.should have(count.to_i).items
+  @records.to_a.should have(count.to_i).items
 end
 
 Then /^records "(should|should_not)" have loaded associations:$/ do |should, table|

data/features/support/env.rb

@@ -15,6 +15,9 @@ Before do
     const = HydraAttribute.config.associated_const_name(type)
     HydraAttribute.send(:remove_const, const) if HydraAttribute.const_defined?(const)
   end
+  [:Product, :SimpleProduct, :GroupProduct].each do |const|
+    Object.send(:remove_const, const) if Object.const_defined?(const)
+  end
   ActiveSupport::Dependencies::Reference.clear!
   DatabaseCleaner.start
 end

data/features/typecast_attributes.feature

@@ -2,12 +2,7 @@ Feature: create model
   Model should be created with typecast hydra attributes.
 
   Background: create models and describe hydra attributes
-    Given removed constants if they exist:
-      | name          |
-      | GroupProduct  |
-      | SimpleProduct |
-      | Product       |
-    And create model class "Product"
+    Given create model class "Product"
     And create model class "SimpleProduct" as "Product" with hydra attributes:
       | type   | name  |
       | string | code  |

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kostyantyn/Sites/github/gems/hydra_attribute
   specs:
-    hydra_attribute (0.1.3.beta1)
+    hydra_attribute (0.2.0.beta1)
       activerecord (>= 3.1.0)
 
 GEM

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kostyantyn/Sites/github/gems/hydra_attribute
   specs:
-    hydra_attribute (0.1.3.beta1)
+    hydra_attribute (0.2.0.beta1)
       activerecord (>= 3.1.0)
 
 GEM

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

@@ -39,10 +39,11 @@ module HydraAttribute
         end
 
         def build_arel
-          @order_values = build_order_values_for_arel(@order_values.uniq.reject(&:blank?))
+          @group_values = build_hydra_values_for_arel(@group_values.uniq.reject(&:blank?))
+          @order_values = build_hydra_values_for_arel(@order_values.uniq.reject(&:blank?))
 
           if instance_variable_defined?(:@reorder_value) and instance_variable_get(:@reorder_value).present? # for compatibility with 3.1.x
-            @reorder_value = build_order_values_for_arel(@reorder_value.uniq.reject(&:blank?))
+            @reorder_value = build_hydra_values_for_arel(@reorder_value.uniq.reject(&:blank?))
           end
 
           @hydra_select_values, @select_values = @select_values.partition { |value| klass.hydra_attribute_names.include?(value.to_s) }
@@ -94,7 +95,7 @@ module HydraAttribute
           @hydra_attr_helper ||= Helper.new(self)
         end
 
-        def build_order_values_for_arel(collection)
+        def build_hydra_values_for_arel(collection)
           collection.map do |attribute|
             attribute = attribute.respond_to?(:to_sql) ? attribute.to_sql : attribute.to_s
             if klass.hydra_attribute_names.include?(attribute)

data/lib/hydra_attribute/active_record/relation.rb

@@ -5,11 +5,15 @@ module HydraAttribute
 
       included do
         include QueryMethods
+
+        target = ::ActiveRecord::VERSION::STRING.starts_with?('3.1.') ? :to_a : :exec_queries
+        alias_method :__old_exec_queries__, target
+        alias_method target, :__exec_queries__
       end
 
-      define_method HydraAttribute.config.relation_execute_method do
+      def __exec_queries__
         return @records if loaded?
-        records = super()
+        records = __old_exec_queries__
         return records if records.empty?
 
         limit_values = select_values.any? || hydra_select_values.any?

data/lib/hydra_attribute/configuration.rb

@@ -35,13 +35,5 @@ module HydraAttribute
     def associated_const_name(type)
       "#{type.to_s.titlecase}Attribute".to_sym
     end
-
-    def relation_execute_method
-      if ::ActiveRecord::VERSION::MINOR > 1
-        :exec_queries
-      else
-        :to_a
-      end
-    end
   end
 end

data/lib/hydra_attribute/version.rb

@@ -1,3 +1,3 @@
 module HydraAttribute
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

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

@@ -93,13 +93,13 @@ describe HydraAttribute::ActiveRecord::Relation::QueryMethods do
     end
 
     it 'should update @order_values before generate the arel object' do
-      relation.stub(build_order_values_for_arel: %w(build_order))
+      relation.stub(build_hydra_values_for_arel: %w(build_order))
       relation.build_arel.should == arel
       relation.instance_variable_get(:@order_values).should == %w(build_order)
     end
   end
 
-  describe '#build_order_values_for_arel' do
+  describe '#build_hydra_values_for_arel' do
     let(:connection) do
       conn = mock
       conn.stub(:quote_column_name) { |column| column.to_s        }
@@ -124,14 +124,14 @@ describe HydraAttribute::ActiveRecord::Relation::QueryMethods do
 
     describe 'collection has not hydra attributes' do
       it 'should return the same collection' do
-        relation.send(:build_order_values_for_arel, %w(name zone)).should == %w(product.name product.zone)
+        relation.send(:build_hydra_values_for_arel, %w(name zone)).should == %w(product.name product.zone)
         relation.joins_values.should == []
       end
     end
 
     describe 'collection has hydra attributes' do
       it 'should change hydra attributes and join hydra tables' do
-        relation.send(:build_order_values_for_arel, %w(name code title price)).should == %w(product.name code_inner.value title_.value price_.value)
+        relation.send(:build_hydra_values_for_arel, %w(name code title price)).should == %w(product.name code_inner.value title_.value price_.value)
         relation.joins_values.should == %w(price__join)
       end
     end

data/spec/hydra_attribute/active_record/relation_spec.rb

@@ -1,91 +1,65 @@
 require 'spec_helper'
 
 describe HydraAttribute::ActiveRecord::Relation do
-  def record_class(loaded_associations = false)
-    Class.new do
 
-      @hydra_attributes = {'code' => :string}
-      define_singleton_method :hydra_attribute_types do
-        [:string]
-      end
-
-      define_singleton_method :hydra_attribute_names do
-        ['code']
-      end
-
-      define_singleton_method :hydra_attributes do
-        @hydra_attributes
-      end
-
-      define_method :association do |_|
-        Class.new do
-          define_singleton_method :loaded? do
-            loaded_associations
-          end
-        end
-      end
-    end
+  let(:record_class) do
+    mock(:record_class, hydra_attribute_types: [:string], hydra_attribute_names: %w(code), hydra_attributes: {'code' => :string})
   end
 
-  def relation_function(records)
-    Module.new do
-      define_method :loaded? do
-        false
-      end
+  let(:record) do
+    mock(:record, class: record_class, association: mock(loaded?: false))
+  end
 
-      define_method :select_values do
-        []
-      end
+  let(:loaded_record) do
+    mock(:loaded_record, class: record_class, association: mock(loaded?: true))
+  end
 
-      define_method :hydra_select_values do
-        []
-      end
+  let(:exec_method) do
+    ::ActiveRecord::VERSION::STRING.start_with?('3.1.') ? :to_a : :exec_queries
+  end
 
-      define_method HydraAttribute.config.relation_execute_method do
-        records
-      end
+  let(:relation) do
+    mock_relation = mock(:relation, loaded?: false, select_values: [], hydra_select_values: [])
 
-      define_method :klass do
-        records.first.class
-      end
+    mock_relation.stub(exec_method).and_return(records)
+    mock_relation.stub(:klass).and_return(records.first.class)
+    mock_relation.stub(:where).and_return(mock_relation)
+    mock_relation
+  end
 
-      define_method :where do |*|
-        self
-      end
-    end
+  let(:records) do
+    [record]
   end
 
-  let(:records)  { [record_class.new] }
-  let(:ancestor) { relation_function(records) }
-  let(:klass)    { Class.new.extend(ancestor).extend(HydraAttribute::ActiveRecord::Relation) }
+  before do
+    relation.singleton_class.send(:include, HydraAttribute::ActiveRecord::Relation)
+  end
 
-  describe "##{HydraAttribute.config.relation_execute_method}" do
+  describe "#exec_queries" do
     describe 'parent method return one record' do
       it 'should return one record' do
-        klass.send(HydraAttribute.config.relation_execute_method).should have(1).record
+        relation.send(exec_method).should have(1).record
       end
     end
 
     describe 'parent method returns two records' do
-      let(:records) { [record_class(loaded_associations).new, record_class(loaded_associations).new] }
-
       describe 'association models are already loaded' do
-        let(:loaded_associations) { true }
+        let(:records) { [loaded_record, loaded_record] }
 
         it 'should return two record' do
-          klass.send(HydraAttribute.config.relation_execute_method).should have(2).records
+          relation.send(exec_method).should have(2).records
         end
       end
 
       describe 'association models are not yet loaded' do
-        let(:loaded_associations) { false }
+        let(:records) { [record, record] }
 
         before do
           ::ActiveRecord::Associations::Preloader.should_receive(:new).with(records, :hydra_string_attributes).and_return(mock(run: records))
         end
 
         it 'should return two record' do
-          klass.send(HydraAttribute.config.relation_execute_method).should have(2).records
+          relation.send(exec_method).should have(2).records
         end
       end
     end

data/spec/hydra_attribute/active_record/scoping_spec.rb

@@ -3,9 +3,13 @@ require 'spec_helper'
 describe HydraAttribute::ActiveRecord::Scoping do
   describe '#scoped' do
     let(:ancestor) do
+      method   = ::ActiveRecord::VERSION::STRING.starts_with?('3.1.') ? :to_a : :exec_queries
+      instance = mock(:instance_relation, where: nil, method => nil)
+
       Module.new do
-        def scoped(*) self end
-        def where(*) self end
+        define_method :scoped do |*|
+          instance
+        end
       end
     end
 

data/spec/hydra_attribute/configuration_spec.rb

@@ -62,35 +62,4 @@ describe HydraAttribute::Configuration do
       config.associated_const_name(:string).should == :StringAttribute
     end
   end
-
-  describe '#relation_execute_method' do
-    after do
-      ::ActiveRecord::VERSION.send(:remove_const, :MINOR)
-      ::ActiveRecord::VERSION.const_set(:MINOR, @old_value)
-    end
-
-    describe 'ActiveRecord::VERSION::MINOR is great than 1' do
-      before do
-        @old_value = ::ActiveRecord::VERSION::MINOR
-        ::ActiveRecord::VERSION.send(:remove_const, :MINOR)
-        ::ActiveRecord::VERSION.const_set(:MINOR, 2)
-      end
-
-      it 'should return :exec_queries' do
-        config.relation_execute_method.should == :exec_queries
-      end
-    end
-
-    describe 'ActiveRecord::VERSION::MINOR is less than or equal 1' do
-      before do
-        @old_value = ::ActiveRecord::VERSION::MINOR
-        ::ActiveRecord::VERSION.send(:remove_const, :MINOR)
-        ::ActiveRecord::VERSION.const_set(:MINOR, 1)
-      end
-
-      it 'should return :to_a' do
-        config.relation_execute_method.should == :to_a
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra_attribute
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000Z
+date: 2012-06-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153039400 !ruby/object:Gem::Requirement
+  requirement: &2151761260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153039400
+  version_requirements: *2151761260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153032420 !ruby/object:Gem::Requirement
+  requirement: &2151759920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153032420
+  version_requirements: *2151759920
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153031960 !ruby/object:Gem::Requirement
+  requirement: &2151757300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153031960
+  version_requirements: *2151757300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153031540 !ruby/object:Gem::Requirement
+  requirement: &2151755780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153031540
+  version_requirements: *2151755780
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2153031120 !ruby/object:Gem::Requirement
+  requirement: &2151753880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153031120
+  version_requirements: *2151753880
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &2153030700 !ruby/object:Gem::Requirement
+  requirement: &2151747420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153030700
+  version_requirements: *2151747420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153030280 !ruby/object:Gem::Requirement
+  requirement: &2151746260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153030280
+  version_requirements: *2151746260
 description: hydra_attribute is an implementation of EAV pattern for ActiveRecord
   models.
 email: kostya.stepanyuk@gmail.com
@@ -107,16 +107,18 @@ files:
 - features/attribute_methods.feature
 - features/define_attributes.feature
 - features/load_associations.feature
-- features/order_conditions.feature
-- features/select_attributes.feature
+- features/query_methods/group.feature
+- features/query_methods/order.feature
+- features/query_methods/select.feature
+- features/query_methods/where.feature
 - features/step_definitions/class_steps.rb
 - features/step_definitions/model_steps.rb
+- features/step_definitions/query_methods.rb
 - features/step_definitions/record_steps.rb
 - features/support/env.rb
 - features/support/schema.rb
 - features/support/world.rb
 - features/typecast_attributes.feature
-- features/where_conditions.feature
 - gemfiles/3.1.gemfile
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
@@ -170,6 +172,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -33625434151420815
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -181,16 +186,18 @@ test_files:
 - features/attribute_methods.feature
 - features/define_attributes.feature
 - features/load_associations.feature
-- features/order_conditions.feature
-- features/select_attributes.feature
+- features/query_methods/group.feature
+- features/query_methods/order.feature
+- features/query_methods/select.feature
+- features/query_methods/where.feature
 - features/step_definitions/class_steps.rb
 - features/step_definitions/model_steps.rb
+- features/step_definitions/query_methods.rb
 - features/step_definitions/record_steps.rb
 - features/support/env.rb
 - features/support/schema.rb
 - features/support/world.rb
 - features/typecast_attributes.feature
-- features/where_conditions.feature
 - gemfiles/3.1.gemfile
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile