hydra_attribute 0.5.0.rc1 → 0.5.0.rc2

data/.gitignore

@@ -17,6 +17,7 @@ test/tmp
 test/version_tmp
 tmp
 .idea
-.rvmrc
+.ruby-version
+.ruby-gemset
 bin/
 gemfiles/*.lock

data/lib/hydra_attribute/active_record/attribute_methods.rb

@@ -42,6 +42,19 @@ module HydraAttribute
         end
         super
       end
+
+      # Returns the column object for the named attribute.
+      #
+      # @param [String, Symbol] name
+      # @return [ActiveRecord::ConnectionAdapters::Column]
+      def column_for_attribute(name)
+        hydra_attribute = self.class.hydra_attributes.find { |hydra_attribute| hydra_attribute.name == name.to_s } # TODO should be cached
+        if hydra_attribute
+          HydraValue.column(hydra_attribute.id)
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/hydra_attribute/active_record/mass_assignment_security.rb

@@ -25,9 +25,13 @@ module HydraAttribute
           # TODO should be optimized. List of allowed attributes should be cached
           def hydra_attribute_by_name(attribute_name)
             ::HydraAttribute::HydraAttribute.all_by_entity_type(@entity.class.name).find do |attribute|
-              attribute.name == attribute_name
+              attribute.name == remove_multiparameter_id(attribute_name)
             end
           end
+
+          def remove_multiparameter_id(attribute_name)
+            attribute_name.to_s.gsub(/\(.+/m, '')
+          end
       end
 
       protected

data/lib/hydra_attribute/hydra_value.rb

@@ -60,7 +60,7 @@ module HydraAttribute
       #
       # @return [ActiveRecord::ConnectionAdapters::AbstractAdapter]
       def connection
-        @connection ||= ::ActiveRecord::Base.connection
+        ::ActiveRecord::Base.connection
       end
 
       # Returns virtual value column

data/lib/hydra_attribute/model.rb

@@ -21,6 +21,13 @@ module HydraAttribute
     include Dirty
     include HasManyThrough
 
+    included do
+      # Compatibility with Rails' helpers
+      include ActiveModel::Conversion
+      extend ActiveModel::Naming
+      extend ActiveModel::Translation
+    end
+
     module ClassMethods
       # Find first model
       #

data/lib/hydra_attribute/model/persistence.rb

@@ -59,7 +59,7 @@ module HydraAttribute
         #
         # @return [ActiveRecord::ConnectionAdapters::AbstractAdapter]
         def connection
-          @connection ||= ::ActiveRecord::Base.connection
+          ::ActiveRecord::Base.connection
         end
 
         # Returns table name

data/lib/hydra_attribute/railtie.rb

@@ -5,5 +5,10 @@ module HydraAttribute
         ::ActiveRecord::Migration.send(:include, ::HydraAttribute::ActiveRecord::Migration)
       end
     end
+
+    initializer 'hydra_attribute.middleware' do |app|
+      require 'hydra_attribute/middleware/identity_map'
+      app.middleware.use ::HydraAttribute::Middleware::IdentityMap
+    end
   end
 end

data/lib/hydra_attribute/version.rb

@@ -1,3 +1,3 @@
 module HydraAttribute
-  VERSION = '0.5.0.rc1'
+  VERSION = '0.5.0.rc2'
 end

data/spec/hydra_attribute/active_record/attribute_methods_spec.rb

@@ -31,4 +31,25 @@ describe HydraAttribute::ActiveRecord::AttributeMethods do
       product.read_attribute(:name).should be_nil
     end
   end
+
+  describe '#column_for_attribute' do
+    let!(:hydra_attribute) { Product.hydra_attributes.create(name: 'code',  backend_type: 'string',  default_value: 'abc') }
+    let(:product)          { Product.new }
+
+    it 'should return column for hydra attribute' do
+      column = product.column_for_attribute(:code)
+      column.should be_kind_of(ActiveRecord::ConnectionAdapters::Column)
+      column.name.should == 'code'
+    end
+
+    it 'should return column for static attribute' do
+      column = product.column_for_attribute(:name)
+      column.should be_kind_of(ActiveRecord::ConnectionAdapters::Column)
+      column.name.should == 'name'
+    end
+
+    it 'should return nil if cannot find attribute' do
+      product.column_for_attribute(:fake).should be_nil
+    end
+  end
 end

data/spec/hydra_attribute/active_record/mass_assignment_security_spec.rb

@@ -3,14 +3,28 @@ require 'spec_helper'
 module HydraAttribute::ActiveRecord::MassAssignmentSecurity
   describe 'WhiteList' do
     before do
-      ProductWhiteList.hydra_attributes.create(name: 'color', backend_type: 'string', white_list: true)
-      ProductWhiteList.hydra_attributes.create(name: 'code',  backend_type: 'string', white_list: false)
+      ProductWhiteList.hydra_attributes.create(name: 'color', backend_type: 'string',   white_list: true)
+      ProductWhiteList.hydra_attributes.create(name: 'code',  backend_type: 'string',   white_list: false)
+      ProductWhiteList.hydra_attributes.create(name: 'seen',  backend_type: 'datetime', white_list: true)
     end
 
-    let(:product) { ProductWhiteList.new(name: 'name', title: 'title', color: 'green', code: 'abc') }
+    let(:product) do
+      ProductWhiteList.new(
+        :name      => 'name',
+        :title     => 'title',
+        :color     => 'green',
+        :code      => 'abc',
+        'seen(1i)' => '2012',
+        'seen(2i)' => '12',
+        'seen(3i)' => '22',
+        'seen(4i)' => '15',
+        'seen(5i)' => '30'
+      )
+    end
 
     it 'should assign only hydra attributes which are in white list' do
       product.color.should == 'green'
+      product.seen.should  == DateTime.new(2012, 12, 22, 15, 30)
       product.code.should be_nil
     end
 
@@ -22,14 +36,28 @@ module HydraAttribute::ActiveRecord::MassAssignmentSecurity
 
   describe 'BlackList' do
     before do
-      ProductBlackList.hydra_attributes.create(name: 'color', backend_type: 'string', white_list: true)
-      ProductBlackList.hydra_attributes.create(name: 'code',  backend_type: 'string', white_list: false)
+      ProductBlackList.hydra_attributes.create(name: 'color', backend_type: 'string',   white_list: true)
+      ProductBlackList.hydra_attributes.create(name: 'code',  backend_type: 'string',   white_list: false)
+      ProductBlackList.hydra_attributes.create(name: 'seen',  backend_type: 'datetime', white_list: true)
     end
 
-    let(:product) { ProductBlackList.new(name: 'name', title: 'title', color: 'green', code: 'abc') }
+    let(:product) do
+      ProductBlackList.new(
+        :name      => 'name',
+        :title     => 'title',
+        :color     => 'green',
+        :code      => 'abc',
+        'seen(1i)' => '2012',
+        'seen(2i)' => '12',
+        'seen(3i)' => '22',
+        'seen(4i)' => '15',
+        'seen(5i)' => '30'
+      )
+    end
 
     it 'should assign only hydra attributes which are in white list' do
       product.color.should == 'green'
+      product.seen.should  == DateTime.new(2012, 12, 22, 15, 30)
       product.code.should be_nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra_attribute
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc1
+  version: 0.5.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord