hydra_attribute 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,11 +1,30 @@
+**0.1.3 (June 11, 2012)**
+* Fix bug when quoted column is passed to `ActiveRecord::Relation` method as a parameter
+
 **0.1.2 (June 7, 2012)**
-* eval define_hydra_attributes block in Builder scope
+* Eval `define_hydra_attributes` block in Builder scope    
+  
+  ```ruby
+    define_hydra_attributes do
+      string :name
+      float  :price
+    end
+  ```
 
 **0.1.1 (June 6, 2012)**
+* Update gem specification
 
 **0.1.0 (June 6, 2012)** (initial release)
-* define EAV attributes
-* "where" condition
-* "order" condition
-* "reverse_order" condition
-* "select" condition
+* Define EAV attributes
+  
+  ```ruby
+    define_hydra_attributes do |hydra|
+      hydra.string :name
+      hydra.float  :price
+    end
+  ```
+
+* 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

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kostyantyn/Sites/github/gems/hydra_attribute
   specs:
-    hydra_attribute (0.1.2.beta1)
+    hydra_attribute (0.1.3.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.2.beta1)
+    hydra_attribute (0.1.3.beta1)
       activerecord (>= 3.1.0)
 
 GEM

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

@@ -77,13 +77,11 @@ module HydraAttribute
           end
 
           def prepend_table_name(column)
-            case column
-            when Symbol, String
-              if column.to_s.include?('.') or column.to_s.include?(')')
-                column
-              else
-                klass.quoted_table_name + '.' + connection.quote_column_name(column.to_s)
-              end
+            return column unless column.is_a?(Symbol) or column.is_a?(String)
+
+            copy = column.to_s.strip
+            if copy =~ /^\w+$/
+              klass.quoted_table_name + '.' + connection.quote_column_name(copy)
             else
               column
             end

data/lib/hydra_attribute/version.rb

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

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

@@ -283,4 +283,52 @@ describe HydraAttribute::ActiveRecord::Relation::QueryMethods do
       end
     end
   end
+end
+
+describe HydraAttribute::ActiveRecord::Relation::QueryMethods::Helper do
+  let(:relation_class) do
+    mock(table_name: 'entities', quoted_table_name: '"entities"')
+  end
+
+  let(:connection) do
+    mock_connection = mock
+    mock_connection.stub(:quote_column_name) { |column| %Q("#{column}") }
+    mock_connection
+  end
+
+  let(:relation) do
+    mock(klass: relation_class, connection: connection)
+  end
+
+  let(:helper) do
+    HydraAttribute::ActiveRecord::Relation::QueryMethods::Helper.new(relation)
+  end
+
+  describe '#prepend_table_name' do
+    describe 'param is Symbol' do
+      it 'should prepend table name and quote param' do
+        helper.prepend_table_name(:column).should == '"entities"."column"'
+      end
+    end
+
+    describe 'param is String' do
+      describe 'params is a word character (letter, number, underscore)' do
+        it 'should prepend table name and quote param' do
+          helper.prepend_table_name('abc').should == '"entities"."abc"'
+          helper.prepend_table_name('a_c').should == '"entities"."a_c"'
+          helper.prepend_table_name('a1c').should == '"entities"."a1c"'
+          helper.prepend_table_name(' a ').should == '"entities"."a"'
+        end
+      end
+
+      describe 'params is not a word character (letter, number, underscore)' do
+        it 'should return current string' do
+          helper.prepend_table_name('a c').should == 'a c'
+          helper.prepend_table_name('a-c').should == 'a-c'
+          helper.prepend_table_name('(a)').should == '(a)'
+          helper.prepend_table_name('.').should   == '.'
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra_attribute
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000Z
+date: 2012-06-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152687640 !ruby/object:Gem::Requirement
+  requirement: &2153039400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152687640
+  version_requirements: *2153039400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152687240 !ruby/object:Gem::Requirement
+  requirement: &2153032420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152687240
+  version_requirements: *2153032420
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152686780 !ruby/object:Gem::Requirement
+  requirement: &2153031960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152686780
+  version_requirements: *2153031960
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152686340 !ruby/object:Gem::Requirement
+  requirement: &2153031540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152686340
+  version_requirements: *2153031540
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2152685920 !ruby/object:Gem::Requirement
+  requirement: &2153031120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152685920
+  version_requirements: *2153031120
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &2152685500 !ruby/object:Gem::Requirement
+  requirement: &2153030700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152685500
+  version_requirements: *2153030700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152685080 !ruby/object:Gem::Requirement
+  requirement: &2153030280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152685080
+  version_requirements: *2153030280
 description: hydra_attribute is an implementation of EAV pattern for ActiveRecord
   models.
 email: kostya.stepanyuk@gmail.com